# HG changeset patch
# User timkelly
# Date 1280266233 18000
# Node ID ddfcc3a97d22c3239a589515cc1dedd85ee70595
# Parent  3ecac009d20bd9c8178cc0e07b39b41858b401ca
clean up code by remove EKA1 functionality. Essentially removing dead code as there is no pre-os 9 functionality supported.

diff -r 3ecac009d20b -r ddfcc3a97d22 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Tue Jul 27 16:14:29 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Tue Jul 27 16:30:33 2010 -0500
@@ -776,16 +776,6 @@
 											path = sdk.getReleaseRoot().append(releasePlatform.toLowerCase()).append(buildConfig.getTargetString().toLowerCase());
 										}
 
-										// if targetpath is non-null and this is an EKA1 emulator config then add it
-										if (buildConfig.getPlatformString().toUpperCase().equals(ISBSv1BuildContext.EMULATOR_PLATFORM)) {
-											if (buildConfig.getSDK().getOSVersion().getMajor() < 9) {
-												String targetPath = mmpData.getSingleArgumentSettings().get(EMMPStatement.TARGETPATH);
-												if (targetPath != null) {
-													path = path.append("z").append(targetPath); //$NON-NLS-1$
-												}
-											}
-										}
-
 										// adapt to variant, if needed
 										IPath targetPath = path.append(exePath);
 										if (isVariantBldInf(buildConfig.getCarbideProject().getAbsoluteBldInfPath()) || isFeatureVariantMMP(mmpData, info.getProject())) {
@@ -1131,12 +1121,8 @@
 		if (targetPathStr != null) {
 			targetPath = PathUtils.createPath(targetPathStr).makeAbsolute();
 		} else {
-			// for EKA1 just leave empty.  for EKA2 use sys\bin\
-			if (buildConfig.getSDK().getOSVersion().getMajor() > 8) {
-				targetPath = new Path("/sys/bin/"); //$NON-NLS-1$
-			} else {
-				targetPath = Path.ROOT; //$NON-NLS-1$
-			}
+			//for EKA2 use sys\bin\
+			targetPath = new Path("/sys/bin/"); //$NON-NLS-1$
 		}
 	
 		IPath dataZDir = buildConfig.getSDK().getReleaseRoot().removeLastSegments(1).append("/data/z/"); //$NON-NLS-1$
diff -r 3ecac009d20b -r ddfcc3a97d22 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Tue Jul 27 16:14:29 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Tue Jul 27 16:30:33 2010 -0500
@@ -653,12 +653,8 @@
 						IPath targetP = new Path(targetPath).makeRelative().addTrailingSeparator();
 						targetPath = targetP.toOSString();
 					} else {
-						// for EKA1 just leave empty.  for EKA2 use sys\bin\
-						if (buildConfig.getSDK().getOSVersion().getMajor() > 8) {
-							targetPath = "sys\\bin\\"; //$NON-NLS-1$
-						} else {
-							targetPath = ""; //$NON-NLS-1$
-						}
+						// for EKA2 use sys\bin\
+						targetPath = "sys\\bin\\"; //$NON-NLS-1$
 					}
 
 					String dataZDir = buildConfig.getSDK().getReleaseRoot().removeLastSegments(1).toOSString() + "\\Data\\z\\"; //$NON-NLS-1$
diff -r 3ecac009d20b -r ddfcc3a97d22 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename.pkg
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename.pkg	Tue Jul 27 16:14:29 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-; Installation file for $(baseName) EXE
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-;
-
-;
-; UID is the exe's UID
-;
-#{"$(baseName) EXE"},($(uid3)),1,0,0
-
-; the vendor names are required for EKA2 so uncomment
-; these two lines for S60 3.0 and UIQ 3.x.
-;Localised Vendor name
-%{"Vendor-EN"}
-
-;Unique Vendor name
-;:"Vendor"
-
-"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe"		  -"!:\system\programs\$(baseName).exe"
-	
\ No newline at end of file
diff -r 3ecac009d20b -r ddfcc3a97d22 templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename_EKA1.pkg
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/sis/Basename_EKA1.pkg	Tue Jul 27 16:14:29 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-; Installation file for ARMI & THUMB Build for generic EKA1 console application
-; Installation file for $(baseName) application
-;
-; This is an auto-generated PKG file by Carbide.
-; This file uses variables specific to Carbide builds that will not work
-; on command-line builds. If you want to use this generated PKG file from the
-; command-line tools you will need to modify the variables with the appropriate
-; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
-;
-;
-; UID is the exe's UID
-;
-#{"$(baseName) EXE"},(0x0),1,0,0
-
-;Localised Vendor name
-;%{"Vendor-EN"}
-
-;Unique Vendor name
-;:"Vendor"
-
-"$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\$(baseName).exe"		  -"!:\system\programs\$(baseName).exe"
-