# HG changeset patch
# User Zheng Shen <zheng.shen@nokia.com>
# Date 1276149024 -28800
# Node ID 238f4cb8391fc57fc6b5ec9589c0dda28ac755c0
# Parent  56dd7656a965e71b8edaa4e2f626ee7bc70e85ec
Minor: remove backup file with incorrect license info

diff -r 56dd7656a965 -r 238f4cb8391f e32tools/e32lib/e32image/Makefile.elftran.bak
--- a/e32tools/e32lib/e32image/Makefile.elftran.bak	Tue Jun 08 16:53:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Symbian Foundation License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-CXX	 = g++296
-CXXFLAGS = -D__SUPPORT_ELF_FILES__ -D__LINUX__ -D__GCC32__ -D__TOOLS__ -D EKA2 \
-		-I $(EPOCROOT)epoc32/include -I ../inc -I ../elftools/inc
-SOURCE	 = elf_file.cpp elf_dlld.cpp elf_imp.cpp elf_reloc.cpp elf_tran.cpp \
-	   e32uid.cpp \
-	   h_file.cpp h_mem.cpp h_utl.cpp \
-	   e32image.cpp tr_main.cpp imgdump.cpp \
-	   decode.cpp encode.cpp deflate.cpp inflate.cpp panic.cpp compress.cpp
-BLDDIR	 = ../build-elftran
-OBJECT   = $(addprefix $(BLDDIR)/, $(notdir $(SOURCE:.cpp=.o)))
-TARGET	 = $(BLDDIR)/elftran
-
-VPATH	 = ../host ../e32uid ../e32image ../e32image/deflate ../elftools/elftran
-
-_dummy := $(shell mkdir -p $(BLDDIR))
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECT)
-	$(CXX) $^ -o $@
-	strip $@
-	
-$(OBJECT): $(BLDDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-clean:
-	rm -f $(OBJECT) $(TARGET)
-	-rmdir $(BLDDIR)
-
-.PHONY: all clean
-
diff -r 56dd7656a965 -r 238f4cb8391f e32tools/elf2e32/source/h_utl.h.bak
--- a/e32tools/elf2e32/source/h_utl.h.bak	Tue Jun 08 16:53:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-// Contributors:
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-// Contributors:
-//
-
-
- #ifndef __H_UTL_H__
- #define __H_UTL_H__
-
-#include "e32defwrap.h"
-#include <e32err.h>
-#include <iostream>
-
-#ifdef __TOOLS2__
-#include <sstream>
-#include <fstream>
-using namespace std;
-#else
-#include <strstream.h>
-#endif
-
- /**
- Convert string to number.
- @internalComponent
- @released
- */
- template <class T>
- TInt Val(T& aVal, char* aStr)
- {
- 
- 
-	T x;
-	#ifdef __TOOLS2__
-	istringstream val(aStr);
-	#else
-	istrstream val(aStr,strlen(aStr));
-	#endif
-	val >> x;
-	if (!val.eof() || val.fail())
-		return KErrGeneral;
-	aVal=x;
-	return KErrNone;
-	
-     /*T x;
-     istrstream val(aStr,strlen(aStr));
-     val >> x;
-     if (!val.eof() || val.fail())
-         return KErrGeneral;
-     aVal=x;
-     return KErrNone;*/
- }
- 
- 
- //enum for decompose flag
- enum TDecomposeFlag
- {
-     EUidPresent=1,
-     EVerPresent=2
- };
- 
- /**
- class for FileNameInfo
- @internalComponent
- @released
- */
- class TFileNameInfo
- {
-     public:
-         TFileNameInfo(const char* aFileName, TBool aLookForUid);
-     public:
-         const char* iFileName;
-         TInt iTotalLength;
-         TInt iBaseLength;
-         TInt iExtPos;
-         TUint32 iUid3;
-         TUint32 iModuleVersion;
-         TUint32 iFlags;
- };
- 
- extern char* NormaliseFileName(const char* aName);
- 
- 
- 
- #ifdef __LINUX__ 
- // Case insensitive comparison functions are named differently on Linux
- #define stricmp strcasecmp 
- #define strnicmp strncasecmp 
- 
- // Convert the provided string to Uppercase
- char* strupr(char *a);
- #endif // __LINUX__
- 
- #endif // __H_UTL_H__
- 
- 
- 
- 
- 
-
-
-
-
diff -r 56dd7656a965 -r 238f4cb8391f imgtools/buildrom/tools/cdf.dtd.bak
--- a/imgtools/buildrom/tools/cdf.dtd.bak	Tue Jun 08 16:53:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<!--
- Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
-
--->
-<!ELEMENT component     (localisation?,file+)>
-<!ATTLIST component id  CDATA #REQUIRED >
-
-<!ELEMENT file          (source,        destination,
-                         localisation?, options? ,
-                         features?,     dynamicDependencies?)>
-<!ATTLIST file
-        id              CDATA #REQUIRED
-        customisable    (true|false) #IMPLIED
-        addressable     (xip|nonxip|dontcare) #IMPLIED
-        compress        (unchanged|compress|uncompress) #IMPLIED
-        type            (normal|bitmap|compressedbitmap|autobitmap|aif|plugin) #IMPLIED
-	plugin_name	CDATA #IMPLIED>
-
-<!ELEMENT source        (#PCDATA)>
-<!ELEMENT destination   (#PCDATA)>
-<!ELEMENT features      (supports?,prevents?)>
-<!ELEMENT supports      (feature+)>
-<!ELEMENT prevents      (feature+)>
-
-<!ELEMENT feature       EMPTY>
-<!ATTLIST feature uid   CDATA #IMPLIED
-                  name  CDATA #IMPLIED>
-
-<!ELEMENT dynamicDependencies (depend+)>
-<!ELEMENT depend        (#PCDATA)>
-<!ELEMENT localisation  (default, language*)>
-<!ELEMENT default       (#PCDATA)>
-<!ELEMENT language      (#PCDATA)>
-<!ELEMENT options       ((multilinguify | stack         | heapmin  |
-                          heapmax       | fixed         | priority |
-                          uid1          | uid2          | uid3     | 
-                          dll           | dlldatatop )+)>
-
-<!ELEMENT multilinguify (#PCDATA)>
-
-<!ELEMENT stack         (#PCDATA)>
-<!ELEMENT heapmin       (#PCDATA)>
-<!ELEMENT heapmax       (#PCDATA)>
-<!ELEMENT fixed         (#PCDATA)>
-<!ELEMENT priority      (#PCDATA)>
-<!ELEMENT uid1          (#PCDATA)>
-<!ELEMENT uid2          (#PCDATA)>
-<!ELEMENT uid3          (#PCDATA)>
-<!ELEMENT dll           (#PCDATA)>
-<!ELEMENT dlldatatop    (#PCDATA)>
diff -r 56dd7656a965 -r 238f4cb8391f imgtools/buildrom/tools/featuredatabase.dtd.bak
--- a/imgtools/buildrom/tools/featuredatabase.dtd.bak	Tue Jun 08 16:53:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!--
- Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
-
--->
-<!ELEMENT hrhmacro EMPTY>
-<!ATTLIST hrhmacro
-	exclude CDATA #IMPLIED
-	include CDATA #IMPLIED
-	infeaturesetiby CDATA #IMPLIED>
-	
-<!ELEMENT hfileheader (#PCDATA)>
-<!ATTLIST hfileheader
-	interfacestatus CDATA #REQUIRED
-	interfacevisibility CDATA #REQUIRED>
-	
-<!ELEMENT featureset ((hfileheader?, feature+))>
-<!ATTLIST featureset
-	hfilename CDATA #IMPLIED
-	ibyname CDATA #IMPLIED
-	namespace CDATA #IMPLIED>
-	
-<!ELEMENT featuredatabase ((featureset+, defaultfeaturerange*))>
-<!ELEMENT feature ((hrhmacro?, comment?))>
-<!ATTLIST feature
-	name CDATA #REQUIRED
-	statusflags CDATA #REQUIRED
-	uid CDATA #REQUIRED
-	userdata CDATA #IMPLIED>
-	
-<!ELEMENT defaultfeaturerange ((comment?))>
-<!ATTLIST defaultfeaturerange
-	higheruid CDATA #REQUIRED
-	loweruid CDATA #REQUIRED>
-	
-<!ELEMENT comment (#PCDATA)>
diff -r 56dd7656a965 -r 238f4cb8391f imgtools/buildrom/tools/featureuids.dtd.bak
--- a/imgtools/buildrom/tools/featureuids.dtd.bak	Tue Jun 08 16:53:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<!--
- Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
-
--->
-
-<!ELEMENT featureuids   (features,default)>
-<!ELEMENT features      (feature+)>
-<!ELEMENT feature       EMPTY>
-
-<!ATTLIST feature
-        name            CDATA #REQUIRED
-        uid             CDATA #REQUIRED
-        installable     (true|false) #IMPLIED>
-
-<!ELEMENT default       (range+)>
-<!ELEMENT range         EMPTY>
-<!ATTLIST range
-        min             CDATA #REQUIRED
-        max             CDATA #REQUIRED
-        support         (include|exclude) #REQUIRED>
-        
diff -r 56dd7656a965 -r 238f4cb8391f imgtools/buildrom/tools/imageContent.dtd.bak
--- a/imgtools/buildrom/tools/imageContent.dtd.bak	Tue Jun 08 16:53:13 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-<!--
- Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
- All rights reserved.
- This component and the accompanying materials are made available
- under the terms of the License "Symbian Foundation License v1.0"
- which accompanies this distribution, and is available
- at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-
- Initial Contributors:
- Nokia Corporation - initial contribution.
-
- Contributors:
-
- Description:
-
--->
-<!ELEMENT imageContent  (version?, romchecksum?, time?, 
-                         options?, romgeometry, romtarget, romscope?)+>
-
-<!ELEMENT version       (#PCDATA)>
-<!ELEMENT romchecksum   (#PCDATA)>
-<!ELEMENT time          (#PCDATA)>
-<!ELEMENT romgeometry   (image+)>
-<!ELEMENT romtarget     (target+)>
-<!ELEMENT romscope      ((obyFile|cdf)+)>
-
-<!ELEMENT options       ((binaryselectionorder | trace       | bootbinary    |
-                          dataaddress          | debugport   | 
-                          defaultstackreserve  | device      | 
-                          wrapper              | kernel      | primary+      | 
-                          secondary+           | romalign    | romlinearbase | 
-                          variant              | autosize    | extension     | coreimage)+)>
-
-<!ELEMENT binaryselectionorder (#PCDATA)>
-<!ELEMENT trace         (#PCDATA)>
-<!ELEMENT bootbinary    (#PCDATA)>
-<!ELEMENT wrapper       (#PCDATA)>
-<!ATTLIST wrapper type  (none|epoc|coff) #REQUIRED>
-
-<!ELEMENT kernel        (dataaddress, heapmax, heapmin, name, trace?)>
-<!ATTLIST kernel number (single|multi) #IMPLIED>
-
-<!ELEMENT heapmax   (#PCDATA)>
-<!ELEMENT heapmin   (#PCDATA)>
-<!ELEMENT name   (#PCDATA)>
-
-<!ELEMENT dataaddress   (#PCDATA)>
-<!ELEMENT debugport     (#PCDATA)>
-<!ELEMENT defaultstackreserve   (#PCDATA)>
-<!ELEMENT device        (file+)>
-<!ELEMENT primary       (file+)>
-<!ELEMENT secondary     (file+)>
-<!ELEMENT variant       (file+)>
-<!ELEMENT extension     (file+)>
-<!ELEMENT romalign      (#PCDATA)>
-<!ELEMENT romlinearbase (#PCDATA)>
-<!ELEMENT autosize      (#PCDATA)>
-<!ELEMENT coreimage     (#PCDATA)>
-
-<!ELEMENT file       (source,destination,fixed?)>
-<!ATTLIST file
-	   id CDATA #REQUIRED>
-<!ELEMENT source       (#PCDATA)>
-<!ELEMENT destination  (#PCDATA)>
-<!ELEMENT fixed	       (#PCDATA)>
-
-
-<!ELEMENT image         (partition?)>
-<!ATTLIST image
-        id              CDATA #REQUIRED
-        name            CDATA #REQUIRED
-        type            (xip|nonxip) #REQUIRED
-        compression     (compress|nocompress) #IMPLIED
-        extension       (yes|no) "no"
-        size            CDATA #REQUIRED>
-
-<!ELEMENT target        (include,exclude?)>
-<!ATTLIST target imageid CDATA #REQUIRED>
-<!--- target imageid of any allowed where it there is no constraints on 
-      which image the files should be placed. -->
-<!ELEMENT include       ((feature|obyFile|cdf)+)>
-<!ELEMENT exclude       (feature+)>
-<!ELEMENT partition     (#PCDATA)>
-<!ELEMENT feature       EMPTY>
-<!ATTLIST feature name  CDATA #IMPLIED
-                  uid   CDATA #IMPLIED>
-<!ELEMENT obyFile       (#PCDATA)>
-<!ELEMENT cdf           (#PCDATA)>
-<!ATTLIST cdf type      (file|dir) "file">