Use canonical capitalization of epoc32, PLATFORM, TARGET, etc. for SIS building
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestPKGViewPathHelper.java Wed Dec 09 09:01:42 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/TestPKGViewPathHelper.java Wed Dec 09 09:02:51 2009 -0600
@@ -134,7 +134,7 @@
assertNotNull(files);
assertEquals(files.length, NUMBER_OF_FILES);
- IPath path1 = new Path(config.getSDK().getEPOCROOT()).append("epoc32/release").append(config.getPlatformString()).append(config.getTargetString()).append("test.exe");
+ IPath path1 = new Path(config.getSDK().getEPOCROOT()).append("epoc32/release").append(config.getPlatformString().toLowerCase()).append(config.getTargetString().toLowerCase()).append("test.exe");
IPath path2 = project.getLocation().append("sis/test.txt");
IPath path3 = new Path("/Symbian/9.1/S60_3rd/file.txt");
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/PKGViewPathHelper.java Wed Dec 09 09:01:42 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/PKGViewPathHelper.java Wed Dec 09 09:02:51 2009 -0600
@@ -206,11 +206,11 @@
}
if (pathStr.contains(PKG_SYMBOL_PLATFORM)) {
- pathStr = pathStr.replace(PKG_SYMBOL_PLATFORM, platform);
+ pathStr = pathStr.replace(PKG_SYMBOL_PLATFORM, platform.toLowerCase());
}
if (pathStr.contains(PKG_SYMBOL_TARGET)) {
- pathStr = pathStr.replace(PKG_SYMBOL_TARGET, target);
+ pathStr = pathStr.replace(PKG_SYMBOL_TARGET, target.toLowerCase());
}
return new Path(pathStr);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Wed Dec 09 09:01:42 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Wed Dec 09 09:02:51 2009 -0600
@@ -1915,8 +1915,8 @@
pkgFileStr.contains(PKG_SYMBOL_TARGET) ) {
// need to create a new PKG file, resolved...
pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_EPOCROOT, context.getSDK().getEPOCROOT());
- pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_PLATFORM, context.getPlatformString());
- pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_TARGET, context.getTargetString());
+ pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_PLATFORM, context.getPlatformString().toLowerCase());
+ pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_TARGET, context.getTargetString().toLowerCase());
IPath tmpPKGPath = pkgFile.removeLastSegments(1);
if (tempPKGFileName == null){
--- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/ResourceListenerTest.java Wed Dec 09 09:01:42 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/ResourceListenerTest.java Wed Dec 09 09:02:51 2009 -0600
@@ -46,8 +46,8 @@
private static final String PROJECT_NAME = "TestProject1";
private static final String WORKSPACE_RELATIVE_BLDINF_PATH = "TestProject1/Group/bld.inf";
private static final String PROJECT_RELATIVE_BLDINF_PATH = "Group/bld.inf";
- private static final String WORKSPACE_RELATIVE_MMP1_PATH = "TestProject1/Group/Test1.mmp";
- private static final String WORKSPACE_RELATIVE_MMP2_PATH = "TestProject1/Group/Test2.mmp";
+ private static final String WORKSPACE_RELATIVE_MMP1_PATH = "TestProject1/Group/test1.mmp";
+ private static final String WORKSPACE_RELATIVE_MMP2_PATH = "TestProject1/Group/test2.mmp";
private IProject project;
--- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java Wed Dec 09 09:01:42 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java Wed Dec 09 09:02:51 2009 -0600
@@ -61,7 +61,7 @@
File testDataFile = pluginRelativeFile("Data/infImportData/infImportTestData.xml");
assertTrue("infImportTestData.xml file does not exist! Can't do test.", testDataFile.exists());
- BldInfFilesType bldInfData = BldInfImportDataLoader.loadBldInfImportData(testDataFile.toURL());
+ BldInfFilesType bldInfData = BldInfImportDataLoader.loadBldInfImportData(testDataFile.toURI().toURL());
assertNotNull("Error loading test bld.inf xml data.", bldInfData);
EList<BldInfFileType> infList = bldInfData.getBldInfFile();
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/sis/Basename.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/sis/Basename.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -26,7 +26,7 @@
; Files to install
; Symbols set up for the source location are Carbide.c++ specific symbols
"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
-"$(EPOCROOT)epoc32\data\z\private\10003a3f\import\apps\$(baseName)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_reg.rsc"
+"$(EPOCROOT)epoc32\data\z\private\10003a3f\import\apps\$(baseName$lower)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName$lower)_reg.rsc"
; required for application to be covered by backup/restore facility
"..\$(sisDir)\backup_registration.xml" -"!:\private\$(uid3-WITHOUT_0X)\backup_registration.xml"
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/sis/baseName.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/sis/baseName.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -24,10 +24,10 @@
;Files to install
;You should change the source paths to match that of your environment
;<source> <destination>
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName)_$(uid3).exe" -"!:\sys\bin\$(baseName)_$(uid3).exe"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).rsc" -"!:\resource\apps\$(baseName)_$(uid3).rsc"
-"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_$(uid3)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_$(uid3)_reg.rsc"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).mif" -"!:\resource\apps\$(baseName)_$(uid3).mif"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName)_$(uid3).exe" -"!:\sys\bin\$(baseName)_$(uid3).exe"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower)_$(uid3).rsc" -"!:\resource\apps\$(baseName)_$(uid3).rsc"
+"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_$(uid3)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_$(uid3)_reg.rsc"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName)_$(uid3).mif" -"!:\resource\apps\$(baseName)_$(uid3).mif"
$(buildHelpSISPrefix)"..\$(helpDir)\$(baseName)_$(uid3).hlp" -"!:\resource\help\$(baseName)_$(uid3).hlp"
; Add any installation notes if applicable
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -24,10 +24,10 @@
;Files to install
;You should change the source paths to match that of your environment
;<source> <destination>
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName)_$(uid3).exe" -"!:\sys\bin\$(baseName)_$(uid3).exe"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).rsc" -"!:\resource\apps\$(baseName)_$(uid3).rsc"
-"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_$(uid3)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_$(uid3)_reg.rsc"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).mif" -"!:\resource\apps\$(baseName)_$(uid3).mif"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName)_$(uid3).exe" -"!:\sys\bin\$(baseName)_$(uid3).exe"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower)_$(uid3).rsc" -"!:\resource\apps\$(baseName)_$(uid3).rsc"
+"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_$(uid3)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_$(uid3)_reg.rsc"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName)_$(uid3).mif" -"!:\resource\apps\$(baseName)_$(uid3).mif"
$(buildHelpSISPrefix)"..\$(helpDir)\$(baseName)_$(uid3).hlp" -"!:\resource\help\$(baseName)_$(uid3).hlp"
; Add any installation notes if applicable
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-DLL/sis/Basename_EKA1.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-DLL/sis/Basename_EKA1.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -18,4 +18,4 @@
;Unique Vendor name
:"Vendor"
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).dll" -"!:\system\libs\$(baseName).dll"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).dll" -"!:\system\libs\$(baseName).dll"
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-DLL/sis/Basename_EKA2.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-DLL/sis/Basename_EKA2.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -18,4 +18,4 @@
;Unique Vendor name
:"Vendor"
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).dll" -"!:\sys\bin\$(baseName).dll"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).dll" -"!:\sys\bin\$(baseName).dll"
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -20,5 +20,5 @@
;Unique Vendor name
;:"Vendor"
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\system\programs\$(baseName).exe"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\system\programs\$(baseName).exe"
\ No newline at end of file
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename_EKA1.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename_EKA1.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -18,5 +18,5 @@
;Unique Vendor name
;:"Vendor"
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\system\programs\$(baseName).exe"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\system\programs\$(baseName).exe"
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename_EKA2.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename_EKA2.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -20,5 +20,5 @@
;Unique Vendor name
:"Vendor"
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/sis/baseName.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/UIQ30-HelloWorld/sis/baseName.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -27,9 +27,9 @@
;Files to install
;You should change the source paths to match that of your environment
;<source> <destination>
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName).rsc" -"!:\resource\apps\$(baseName).rsc"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_loc.rsc" -"!:\resource\apps\$(baseName)_loc.rsc"
-"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_reg.rsc"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)AppIcon.mbm" -"!:\resource\apps\$(baseName)AppIcon.mbm"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower).rsc" -"!:\resource\apps\$(baseName).rsc"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower)_loc.rsc" -"!:\resource\apps\$(baseName)_loc.rsc"
+"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_reg.rsc"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName)AppIcon.mbm" -"!:\resource\apps\$(baseName)AppIcon.mbm"
--- a/uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/sis/baseName.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/uidesigner/com.nokia.carbide.cpp.uiq.ui/templates/UIQ v3.0/sis/baseName.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -26,15 +26,15 @@
;Files to install
;You should change the source paths to match that of your environment
;<source> <destination>
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName).r$(LANGUAGE_ID)" -"!:\resource\apps\$(baseName).r$(LANGUAGE_ID)"
-;"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_loc.rsc" -"!:\resource\apps\$(baseName)_loc.rsc"
-"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_reg.rsc"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower).r$(LANGUAGE_ID)" -"!:\resource\apps\$(baseName).r$(LANGUAGE_ID)"
+;"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower)_loc.rsc" -"!:\resource\apps\$(baseName)_loc.rsc"
+"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_reg.rsc" -"!:\private\10003a3f\import\apps\$(baseName)_reg.rsc"
"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName).mbm" -"!:\resource\apps\$(baseName).mbm"
; Add any installation notes if applicable
;"$(baseName).txt" -"!:\private\$(uid3)\$(baseName).txt"
-;"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName).r$(LANGUAGE_ID)" -"!:\resource\apps\$(baseName).r$(LANGUAGE_ID)"
-;"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_reg.r$(LANGUAGE_ID)" -"!:\private\10003a3f\import\apps\$(baseName)_reg.r$(LANGUAGE_ID)"
+;"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower).r$(LANGUAGE_ID)" -"!:\resource\apps\$(baseName).r$(LANGUAGE_ID)"
+;"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_reg.r$(LANGUAGE_ID)" -"!:\private\10003a3f\import\apps\$(baseName)_reg.r$(LANGUAGE_ID)"
;"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName)_aif.mif" -"!:\resource\apps\$(baseName)_aif.mif"
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/sis/baseName.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/sis/baseName.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -26,9 +26,9 @@
;Files to install
;You should change the source paths to match that of your environment
;<source> <destination>
-"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
-"$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName).r$(LANGUAGE_ID)" -"!:\resource\apps\$(baseName).r$(LANGUAGE_ID)"
-"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_reg.r$(LANGUAGE_ID)" -"!:\private\10003a3f\import\apps\$(baseName)_reg.r$(LANGUAGE_ID)"
+"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
+"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName$lower).r$(LANGUAGE_ID)" -"!:\resource\apps\$(baseName).r$(LANGUAGE_ID)"
+"$(EPOCROOT)epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_reg.r$(LANGUAGE_ID)" -"!:\private\10003a3f\import\apps\$(baseName)_reg.r$(LANGUAGE_ID)"
"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName)_aif.mif" -"!:\resource\apps\$(baseName)_aif.mif"
"$(EPOCROOT)epoc32\data\z\resource\apps\$(baseName).mbm" -"!:\resource\apps\$(baseName).mbm"
; Add any installation notes if applicable
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/sis/baseName.pkg Wed Dec 09 09:01:42 2009 -0600
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/sis/baseName.pkg Wed Dec 09 09:02:51 2009 -0600
@@ -19,7 +19,7 @@
;You should change the source paths to match that of your environment
;<source> <destination>
"$(EPOCROOT)\Epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe" -"!:\sys\bin\$(baseName).exe"
-"$(EPOCROOT)\Epoc32\data\z\resource\apps\$(baseName).r01" -"!:\resource\apps\$(baseName).r01"
-"$(EPOCROOT)\Epoc32\data\z\private\10003a3f\apps\$(baseName)_reg.r01" -"!:\private\10003a3f\import\apps\$(baseName)_reg.r01"
+"$(EPOCROOT)\Epoc32\data\z\resource\apps\$(baseName$lower).r01" -"!:\resource\apps\$(baseName).r01"
+"$(EPOCROOT)\Epoc32\data\z\private\10003a3f\apps\$(baseName$lower)_reg.r01" -"!:\private\10003a3f\import\apps\$(baseName)_reg.r01"
"$(EPOCROOT)\epoc32\data\z\resource\apps\$(baseName)_aif.mif" -"!:\resource\apps\$(baseName)_aif.mif"