Clean up licenses and remove .bak files (cf changes 56dd7656a965 and 238f4cb8391f)
--- a/e32tools/e32lib/e32image/Makefile.elftran.bak Thu Jun 24 14:16:43 2010 +0100
+++ /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
-
--- a/e32tools/elf2e32/source/h_utl.h.bak Thu Jun 24 14:16:43 2010 +0100
+++ /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__
-
-
-
-
-
-
-
-
-
--- a/imgtools/buildrom/tools/cdf.dtd.bak Thu Jun 24 14:16:43 2010 +0100
+++ /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)>
--- a/imgtools/buildrom/tools/featuredatabase.dtd.bak Thu Jun 24 14:16:43 2010 +0100
+++ /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)>
--- a/imgtools/buildrom/tools/featureuids.dtd.bak Thu Jun 24 14:16:43 2010 +0100
+++ /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>
-
--- a/imgtools/buildrom/tools/imageContent.dtd.bak Thu Jun 24 14:16:43 2010 +0100
+++ /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">
--- a/imgtools/imaker/buildrom_plugins/group/bld.inf Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/group/bld.inf Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
* Copyright (c) 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/imgtools/imaker/buildrom_plugins/hide.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/hide.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/buildrom_plugins/localise.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/localise.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/buildrom_plugins/localise_all_resources.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/localise_all_resources.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/buildrom_plugins/obyparse.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/obyparse.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/buildrom_plugins/override.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/override.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/buildrom_plugins/plugincommon.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/buildrom_plugins/plugincommon.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_image_conf_buildinfo.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_image_conf_buildinfo.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_image_conf_naming.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_image_conf_naming.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_image_conf_platform.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_image_conf_platform.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_image_conf_product.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_image_conf_product.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_imaker_extension.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_imaker_extension.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_language_variant.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_language_variant.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/example_system_languages.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/example_system_languages.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/config/group/bld.inf Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/config/group/bld.inf Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
* Copyright (c) 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/imgtools/imaker/group/bld.inf Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/group/bld.inf Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
* Copyright (c) 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker.cmd Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker.cmd Thu Jun 24 14:23:13 2010 +0100
@@ -3,9 +3,9 @@
rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
rem All rights reserved.
rem This component and the accompanying materials are made available
-rem under the terms of the License "Symbian Foundation License v1.0"
+rem under the terms of the License "Eclipse Public License v1.0"
rem which accompanies this distribution, and is available
-rem at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
rem
rem Initial Contributors:
rem Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker.pl Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker.pl Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker.pm Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker.pm Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_core.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_core.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_help.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_help.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_image.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_image.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_minienv.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_minienv.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_odp.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_odp.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_public.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_public.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_rofs2.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_rofs2.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_rofs3.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_rofs3.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_rofs4.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_rofs4.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_tools.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_tools.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_uda.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_uda.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_variant.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_variant.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/imgtools/imaker/src/imaker_version.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/imgtools/imaker/src/imaker_version.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/sbsv2/raptor/bin/sbs_check_exports.py Thu Jun 24 14:16:43 2010 +0100
+++ b/sbsv2/raptor/bin/sbs_check_exports.py Thu Jun 24 14:23:13 2010 +0100
@@ -1,101 +1,101 @@
-#!/usr/bin/python
-
-# Copyright (c) 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:
-#
-
-import re
-import sys
-
-# there are no options, so print help if any are passed
-if len(sys.argv) > 1:
- print "usage:", sys.argv[0], "(The log data is read from stdin)"
- sys.exit(0)
-
-whatlogRE = re.compile("<whatlog.*bldinf='([^']*)'")
-exportRE = re.compile("<export destination='(.*)' source='(.*)'")
-
-bldinf = "unknown"
-sources = {} # lookup from source to destination
-destinations = {} # lookup from destination to source
-
-chains = 0
-repeats = 0
-conflicts = []
-
-# read stdin a line at a time and soak up all the exports
-line = " "
-while line:
- line = sys.stdin.readline()
-
- whatlogMatch = whatlogRE.search(line)
- if whatlogMatch:
- bldinf = whatlogMatch.group(1).lower()
- continue
-
- exportMatch = exportRE.search(line)
- if exportMatch:
- destination = exportMatch.group(1).lower()
- source = exportMatch.group(2).lower()
-
- if destination in destinations:
- (otherSource, otherBldinf) = destinations[destination]
-
- # same source and destination but different bld.inf => repeat
- if source == otherSource and bldinf != otherBldinf:
- # only interested in the number for now
- repeats += 1
-
- # different source but same destination => conflict
- if source != otherSource:
- conflict = (source, destination, bldinf, otherSource, otherBldinf)
- tcilfnoc = (otherSource, destination, otherBldinf, source, bldinf)
-
- if conflict in conflicts or tcilfnoc in conflicts:
- # seen this conflict before
- pass
- else:
- print "CONFLICT:", destination, \
- "FROM", source, \
- "IN", bldinf, \
- "AND FROM", otherSource, \
- "IN", otherBldinf
- conflicts.append(conflict)
- else:
- sources[source] = [destination, bldinf]
- destinations[destination] = [source, bldinf]
-
-# now check for destinations which were also sources => chains
-for destination in destinations:
- if destination in sources:
- (nextDestination, inf2) = sources[destination]
- (source, inf1) = destinations[destination]
- print "CHAIN:", source, \
- "TO", destination, \
- "IN", inf1, \
- "THEN TO", nextDestination, \
- "IN", inf2
- chains += 1
-
-# print a summary
-print "Total exports = ", len(destinations.keys())
-print "Chained exports = ", chains
-print "Repeated exports = ", repeats
-print "Conflicting exports = ", len(conflicts)
-
-# return the error code
-if conflicts:
- sys.exit(1)
-sys.exit(0)
-
+#!/usr/bin/python
+
+# Copyright (c) 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 "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:
+#
+
+import re
+import sys
+
+# there are no options, so print help if any are passed
+if len(sys.argv) > 1:
+ print "usage:", sys.argv[0], "(The log data is read from stdin)"
+ sys.exit(0)
+
+whatlogRE = re.compile("<whatlog.*bldinf='([^']*)'")
+exportRE = re.compile("<export destination='(.*)' source='(.*)'")
+
+bldinf = "unknown"
+sources = {} # lookup from source to destination
+destinations = {} # lookup from destination to source
+
+chains = 0
+repeats = 0
+conflicts = []
+
+# read stdin a line at a time and soak up all the exports
+line = " "
+while line:
+ line = sys.stdin.readline()
+
+ whatlogMatch = whatlogRE.search(line)
+ if whatlogMatch:
+ bldinf = whatlogMatch.group(1).lower()
+ continue
+
+ exportMatch = exportRE.search(line)
+ if exportMatch:
+ destination = exportMatch.group(1).lower()
+ source = exportMatch.group(2).lower()
+
+ if destination in destinations:
+ (otherSource, otherBldinf) = destinations[destination]
+
+ # same source and destination but different bld.inf => repeat
+ if source == otherSource and bldinf != otherBldinf:
+ # only interested in the number for now
+ repeats += 1
+
+ # different source but same destination => conflict
+ if source != otherSource:
+ conflict = (source, destination, bldinf, otherSource, otherBldinf)
+ tcilfnoc = (otherSource, destination, otherBldinf, source, bldinf)
+
+ if conflict in conflicts or tcilfnoc in conflicts:
+ # seen this conflict before
+ pass
+ else:
+ print "CONFLICT:", destination, \
+ "FROM", source, \
+ "IN", bldinf, \
+ "AND FROM", otherSource, \
+ "IN", otherBldinf
+ conflicts.append(conflict)
+ else:
+ sources[source] = [destination, bldinf]
+ destinations[destination] = [source, bldinf]
+
+# now check for destinations which were also sources => chains
+for destination in destinations:
+ if destination in sources:
+ (nextDestination, inf2) = sources[destination]
+ (source, inf1) = destinations[destination]
+ print "CHAIN:", source, \
+ "TO", destination, \
+ "IN", inf1, \
+ "THEN TO", nextDestination, \
+ "IN", inf2
+ chains += 1
+
+# print a summary
+print "Total exports = ", len(destinations.keys())
+print "Chained exports = ", chains
+print "Repeated exports = ", repeats
+print "Conflicting exports = ", len(conflicts)
+
+# return the error code
+if conflicts:
+ sys.exit(1)
+sys.exit(0)
+
--- a/sbsv2/raptor/bin/sbs_filter.py Thu Jun 24 14:16:43 2010 +0100
+++ b/sbsv2/raptor/bin/sbs_filter.py Thu Jun 24 14:23:13 2010 +0100
@@ -1,88 +1,88 @@
-#!/usr/bin/python
-
-# Copyright (c) 2010 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:
-#
-
-import os
-import sys
-import traceback
-
-# intercept the -h option
-if "-h" in sys.argv or "--help" in sys.argv:
- print "usage:", sys.argv[0], "[sbs options]"
- print " The log data is read from stdin."
- print " Type 'sbs -h' for a list of sbs options."
- sys.exit(0)
-
-# get the absolute path to this script
-script = os.path.abspath(sys.argv[0])
-
-# add the Raptor python directory to the PYTHONPATH
-sys.path.append(os.path.join(os.path.dirname(script), "..", "python"))
-
-# now we should be able to find the raptor modules
-import raptor
-import pluginbox
-
-# make sure that HOSTPLATFORM is set
-if not "HOSTPLATFORM" in os.environ:
- sys.stderr.write("HOSTPLATFORM is not set ... try running gethost.sh\n")
- sys.exit(1)
-
-if not "HOSTPLATFORM_DIR" in os.environ:
- sys.stderr.write("HOSTPLATFORM_DIR is not set ... try running gethost.sh\n")
- sys.exit(1)
-
-# construct a Raptor object from our command-line (less the name of this script)
-the_raptor = raptor.Raptor.CreateCommandlineAnalysis(sys.argv[1:])
-
-# from Raptor.OpenLog()
-try:
- # Find all the raptor plugins and put them into a pluginbox.
- if not the_raptor.systemPlugins.isAbsolute():
- the_raptor.systemPlugins = the_raptor.home.Append(the_raptor.systemPlugins)
-
- pbox = pluginbox.PluginBox(str(the_raptor.systemPlugins))
- raptor_params = raptor.BuildStats(the_raptor)
-
- # Open the requested plugins using the pluginbox
- the_raptor.out.open(raptor_params, the_raptor.filterList, pbox)
-
-except Exception, e:
- sys.stderr.write("error: problem while creating filters %s\n" % str(e))
- traceback.print_exc()
- sys.exit(1)
-
-# read stdin a line at a time and pass it to the Raptor object
-try:
- line = " "
- while line:
- line = sys.stdin.readline()
- the_raptor.out.write(line)
-except Exception,e:
- sys.stderr.write("error: problem while filtering: %s\n" % str(e))
- traceback.print_exc()
- sys.exit(1)
-
-
-# Print the summary (this can't return errors)
-the_raptor.out.summary()
-
-if not the_raptor.out.close():
- the_raptor.errorCode = 2
-
-# return the error code
-sys.exit(the_raptor.errorCode)
-
+#!/usr/bin/python
+
+# Copyright (c) 2010 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 "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:
+#
+
+import os
+import sys
+import traceback
+
+# intercept the -h option
+if "-h" in sys.argv or "--help" in sys.argv:
+ print "usage:", sys.argv[0], "[sbs options]"
+ print " The log data is read from stdin."
+ print " Type 'sbs -h' for a list of sbs options."
+ sys.exit(0)
+
+# get the absolute path to this script
+script = os.path.abspath(sys.argv[0])
+
+# add the Raptor python directory to the PYTHONPATH
+sys.path.append(os.path.join(os.path.dirname(script), "..", "python"))
+
+# now we should be able to find the raptor modules
+import raptor
+import pluginbox
+
+# make sure that HOSTPLATFORM is set
+if not "HOSTPLATFORM" in os.environ:
+ sys.stderr.write("HOSTPLATFORM is not set ... try running gethost.sh\n")
+ sys.exit(1)
+
+if not "HOSTPLATFORM_DIR" in os.environ:
+ sys.stderr.write("HOSTPLATFORM_DIR is not set ... try running gethost.sh\n")
+ sys.exit(1)
+
+# construct a Raptor object from our command-line (less the name of this script)
+the_raptor = raptor.Raptor.CreateCommandlineAnalysis(sys.argv[1:])
+
+# from Raptor.OpenLog()
+try:
+ # Find all the raptor plugins and put them into a pluginbox.
+ if not the_raptor.systemPlugins.isAbsolute():
+ the_raptor.systemPlugins = the_raptor.home.Append(the_raptor.systemPlugins)
+
+ pbox = pluginbox.PluginBox(str(the_raptor.systemPlugins))
+ raptor_params = raptor.BuildStats(the_raptor)
+
+ # Open the requested plugins using the pluginbox
+ the_raptor.out.open(raptor_params, the_raptor.filterList, pbox)
+
+except Exception, e:
+ sys.stderr.write("error: problem while creating filters %s\n" % str(e))
+ traceback.print_exc()
+ sys.exit(1)
+
+# read stdin a line at a time and pass it to the Raptor object
+try:
+ line = " "
+ while line:
+ line = sys.stdin.readline()
+ the_raptor.out.write(line)
+except Exception,e:
+ sys.stderr.write("error: problem while filtering: %s\n" % str(e))
+ traceback.print_exc()
+ sys.exit(1)
+
+
+# Print the summary (this can't return errors)
+the_raptor.out.summary()
+
+if not the_raptor.out.close():
+ the_raptor.errorCode = 2
+
+# return the error code
+sys.exit(the_raptor.errorCode)
+
--- a/srctools/cmaker/cmaker_readme.txt Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/cmaker_readme.txt Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
* Copyright (c) 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/srctools/cmaker/cmaker_version.txt Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/cmaker_version.txt Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
* Copyright (c) 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/srctools/cmaker/group/bld.inf Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/group/bld.inf Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
* Copyright (c) 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
--- a/srctools/cmaker/makefile Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/makefile Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/cmaker.cmd Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/cmaker.cmd Thu Jun 24 14:23:13 2010 +0100
@@ -3,9 +3,9 @@
REM Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
REM All rights reserved.
REM This component and the accompanying materials are made available
-REM under the terms of the License "Symbian Foundation License v1.0"
+REM under the terms of the License "Eclipse Public License v1.0"
REM which accompanies this distribution, and is available
-REM at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+REM at the URL "http://www.eclipse.org/legal/epl-v10.html".
REM
REM Initial Contributors:
REM Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/env.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/env.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/functions.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/functions.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/include_template.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/include_template.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/settings.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/settings.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/tools.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/tools.mk Thu Jun 24 14:23:13 2010 +0100
@@ -3,9 +3,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/srctools/cmaker/src/utils.mk Thu Jun 24 14:16:43 2010 +0100
+++ b/srctools/cmaker/src/utils.mk Thu Jun 24 14:23:13 2010 +0100
@@ -2,9 +2,9 @@
# Copyright (c) 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"
+# under the terms of the License "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.