# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1264816210 28800
# Node ID b8ed1f0fff0555cfdef245d7e964d3ba465ac70b
# Parent  558819056485602656029dc84f63cafe283dead0# Parent  040d2c998a7b28a50b81a5e50b86566b9d7961af
Merging heads

diff -r 558819056485 -r b8ed1f0fff05 scripts/genBuildScripts.xml
--- a/scripts/genBuildScripts.xml	Fri Jan 29 17:49:30 2010 -0800
+++ b/scripts/genBuildScripts.xml	Fri Jan 29 17:50:10 2010 -0800
@@ -1,6 +1,6 @@
 <project >
  <property name="buildDirectory" 
-	location="/home/symbian/workspace/wrttools-fc/wrttools" />
+	location="/home/symbian/scratch/029/wrttools" />
  <property name="baseLocation" location="" /> 
  <eclipse.buildScript 
         elements="feature@org.symbian.tools.wrttools"
@@ -8,3 +8,4 @@
 	pluginPath="/usr/eclipse/JEE/eclipse/plugins"
  />
 </project>
+
diff -r 558819056485 -r b8ed1f0fff05 scripts/runAnt.sh
--- a/scripts/runAnt.sh	Fri Jan 29 17:49:30 2010 -0800
+++ b/scripts/runAnt.sh	Fri Jan 29 17:50:10 2010 -0800
@@ -2,10 +2,12 @@
 PDE_ECLIPSE_DIR=/usr/eclipse
 PDE_VER=3.5.1.R35x_20090820
 EQUINOX_VER=1.0.201.R35x_v20090715
-BUILD_CONF_DIR=/home/symbian/workspace/wrttools-fc/wrttools/org.symbian.tools.wrttools.feature
+WS_DIR=/home/symbian/scratch/029/wrttools
+BUILD_CONF_DIR=${WS_DIR}/org.symbian.tools.wrttools.feature
 JAVA_CMD=/usr/java/jdk1.6.0_18/bin/java
 BUILD_FILE=${PDE_ECLIPSE_DIR}/plugins/org.eclipse.pde.build_${PDE_VER}/scripts/productBuild/productBuild.xml 
+SOURCE_LEVEL=1.5
 
 cd ${BUILD_CONF_DIR}
-${JAVA_CMD} -jar ${PDE_ECLIPSE_DIR}/plugins/org.eclipse.equinox.launcher_${EQUINOX_VER}.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+${JAVA_CMD} -jar -source ${SOURCE_LEVEL} -target ${SOURCE_LEVEL} ${PDE_ECLIPSE_DIR}/plugins/org.eclipse.equinox.launcher_${EQUINOX_VER}.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
 
diff -r 558819056485 -r b8ed1f0fff05 scripts/runGen.sh
--- a/scripts/runGen.sh	Fri Jan 29 17:49:30 2010 -0800
+++ b/scripts/runGen.sh	Fri Jan 29 17:50:10 2010 -0800
@@ -3,6 +3,7 @@
 PDE_VER=3.5.1.R35x_20090820
 EQUINOX_VER=1.0.201.R35x_v20090715
 JAVA_CMD=/usr/java/jdk1.6.0_18/bin/java
+WS_DIR=/home/symbian/scratch/029/wrttools
 
-${JAVA_CMD} -jar ${ECLIPSE_DIR}/plugins/org.eclipse.equinox.launcher_${EQUINOX_VER}.jar -application org.eclipse.ant.core.antRunner -buildfile ~/bin/genBuildScripts.xml
+${JAVA_CMD} -jar ${ECLIPSE_DIR}/plugins/org.eclipse.equinox.launcher_${EQUINOX_VER}.jar -application org.eclipse.ant.core.antRunner -buildfile ${WS_DIR}/scripts/genBuildScripts.xml