# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1266369860 28800
# Node ID 679b51600107022bd844ccce9d1aee3132620efd
# Parent  e01adc30c935b19e45c6cc11a35297fde4be788d# Parent  41625e35ada1158a5b91b86cd1ffb20b6045aa8c
Heads merge

diff -r e01adc30c935 -r 679b51600107 scripts/build.properties
--- a/scripts/build.properties	Tue Feb 16 17:20:28 2010 -0800
+++ b/scripts/build.properties	Tue Feb 16 17:24:20 2010 -0800
@@ -25,7 +25,8 @@
 
 ############# PRODUCT/PACKAGING CONTROL #############
 # product=/plugin or feature id/path/to/.product
-product=/home/symbian/scratch/build_dir/046/workspace/wrttools/org.symbian.tools.wrttools.product/wrt-ide.product
+product=${sourceDirectory}/org.symbian.tools.wrttools.product/wrt-ide.product
+
 runPackager=true
 
 #Set the name of the archive that will result from the product build.
@@ -41,23 +42,9 @@
 # value is a '&' separated list of ',' separate triples.  For example, 
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
-configs = *, *, *
-#configs=win32, win32, x86 & \
-#	win32,win32,x86_64 & \
-#	win32,win32,wpf & \
-#	linux, gtk, ppc & \
-#	linux, gtk, x86 & \
-#	linux, gtk, x86_64 & \
-#	linux, motif, x86 & \
-#	solaris, motif, sparc & \
-#	solaris, gtk, sparc & \
-#	aix, motif, ppc & \
-#	hpux, motif, ia64_32 & \
-#	macosx, carbon, ppc & \
-#	macosx, carbon, x86 & \
-#	macosx, cocoa, ppc & \
-#	macosx, cocoa, x86 & \
-#	macosx, cocoa, x86_64
+#configs = *, *, *
+configs=win32, win32, x86 & \
+	linux, gtk, x86 
 
 # By default PDE creates one archive (result) per entry listed in the configs property.
 # Setting this value to true will cause PDE to only create one output containing all 
@@ -121,11 +108,11 @@
 ############## BUILD NAMING CONTROL ################
 # The directory into which the build elements are fetched and where
 # the build takes place.
-buildDirectory=${user.home}/eclipse.build
+buildDirectory=/home/symbian/scratch/build_dir/048/eclipse.build
 
 # Type of build.  Used in naming the build output.  Typically this value is
 # one of I, N, M, S, ...
-buildType=R
+buildType=N
 
 # ID of the build.  Used in naming the build output.
 buildId=TestBuild
@@ -151,7 +138,7 @@
 # in most RCP app or a plug-in,  the baseLocation should be the location of a previously
 # installed Eclipse against which the application or plug-in code will be compiled and the RCP delta pack.
 
-base=/usr/eclipse/JEE/
+base=/usr/eclipse/JEE
 baseLocation=${base}/eclipse
 
 eclipseLocation=/usr/eclipse
@@ -164,8 +151,8 @@
 #transformedRepoLocation=${base}/transformedRepos
 
 #Os/Ws/Arch/nl of the eclipse specified by baseLocation
-baseos=win32
-basews=win32
+baseos=linux
+basews=GTK
 basearch=x86
 
 #this property indicates whether you want the set of plug-ins and features to be considered during the build to be limited to the ones reachable from the features / plugins being built
diff -r e01adc30c935 -r 679b51600107 scripts/build.xml
--- a/scripts/build.xml	Tue Feb 16 17:20:28 2010 -0800
+++ b/scripts/build.xml	Tue Feb 16 17:24:20 2010 -0800
@@ -37,11 +37,12 @@
         into the appropriate build directory folders.
     -->
 
-   <property name="sourceDirectory" location="/home/symbian/wrttools/" />
+
    <target name="init">
         <mkdir dir="${buildDirectory}" />
         <mkdir dir="${buildDirectory}/plugins" />
-	<echo message="${sourceDirectory}" />
+	<echo message="source dir: ${sourceDirectory}" />
+	<echo message="build dir: ${buildDirectory} " />
         <copy todir="${buildDirectory}/plugins">
             <fileset dir="${sourceDirectory}">
                 <include name="org.chromium**/**/*" />
@@ -65,12 +66,16 @@
     -->
     <target name="pde-build">
         <echo message="Executing ${eclipseLocation}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherPluginVersion}.jar"/>
+	<echo message="source dir: ${sourceDirectory}" />
+	<echo message="build dir: ${buildDirectory} " />
         <java classname="org.eclipse.equinox.launcher.Main" fork="true" failonerror="true">
             <arg value="-application" />
             <arg value="org.eclipse.ant.core.antRunner" />
             <arg value="-buildfile" />
             <arg value="${eclipseLocation}/plugins/org.eclipse.pde.build_${pdeBuildPluginVersion}/scripts/productBuild/productBuild.xml" />
             <arg value="-Dtimestamp=${timestamp}" />
+	    <arg value="-DbuildDirectory=${buildDirectory}" />
+            <arg value="-DsourceDirectory=${sourceDirectory}" />
             <classpath>
                 <pathelement location="${eclipseLocation}/plugins/org.eclipse.equinox.launcher_${equinoxLauncherPluginVersion}.jar" />
             </classpath>
diff -r e01adc30c935 -r 679b51600107 scripts/shepard.sh
--- a/scripts/shepard.sh	Tue Feb 16 17:20:28 2010 -0800
+++ b/scripts/shepard.sh	Tue Feb 16 17:24:20 2010 -0800
@@ -3,76 +3,29 @@
 set -x 
 
 SCRIPTS_DIR=/home/symbian/wrttools/scripts
-BUILD_DIR=/home/symbian/scratch/build_dir
+BASE_DIR=/home/symbian/scratch/build_dir
 DAY_OF_YEAR=`date +%j`
 HG_CMD=/usr/local/bin/hg
-
-export PATH=.:/usr/java/jdk1.6.0_18/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ANT_CMD=/usr/local/apache-ant-1.8.0/bin/ant
 
-export WS_DIR=${BUILD_DIR}/${DAY_OF_YEAR}/workspace/wrttools
-LINUX_PROD_DIR=${BUILD_DIR}/${DAY_OF_YEAR}/linux
-LINUX_EXPORT_DIR=/home/symbian/scratch/025
-WIN32_PROD_DIR=${BUILD_DIR}/${DAY_OF_YEAR}/win32
-WIN32_EXPORT_DIR=/home/symbian/buildsFromEugene/win32.win32.x86
-MACOSX_PROD_DIR=${BUILD_DIR}/${DAY_OF_YEAR}/macosx
-MACOSX_EXPORT_DIR=/home/symbian/buildsFromEugene/macosx.cocoa.x86
+export PATH=.:/usr/java/jdk1.6.0_18/bin:/usr/local/apache-ant-1.8.0/bin/ant:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+export SOURCE_DIR=${BASE_DIR}/${DAY_OF_YEAR}/workspace/wrttools
+export BUILD_DIR=${BASE_DIR}/${DAY_OF_YEAR}/eclipse.build
 
 # display date and time 
 date
 
 # create build structure
 
-mkdir -p ${WS_DIR}
-mkdir -p ${LINUX_PROD_DIR}
-mkdir -p ${WIN32_PROD_DIR}
-mkdir -p ${MACOSX_PROD_DIR}
+mkdir -p ${BASE_DIR}/${DAY_OF_YEAR}/workspace
+mkdir -p ${BASE_DIR}
 
 # check out the code.
-cd ${BUILD_DIR}/${DAY_OF_YEAR}/workspace
+cd ${BASE_DIR}/${DAY_OF_YEAR}/workspace
 ${HG_CMD} clone http://sym-mrswitch:8000 wrttools 
 
-# generate scripts
-sh ${SCRIPTS_DIR}/runGen.sh ${SCRIPTS_DIR}/genBuildScripts.xml
-
-# build it. 
-sh ${SCRIPTS_DIR}/runAnt.sh ${WS_DIR}
-
-# create product 
-# Linux 
-cp -pr ${LINUX_EXPORT_DIR}/eclipse ${LINUX_PROD_DIR}
-for j in `find ${WS_DIR} -name 'org.chromium*.jar' -o -name 'org.symbian*.jar'`
-do  
-	cp -p $j ${LINUX_PROD_DIR}/eclipse/plugins/
-done
-cp -p ${SCRIPTS_DIR}/supporting/* ${LINUX_PROD_DIR}/eclipse/
-
-# package it up. 
-
-cd ${LINUX_PROD_DIR}
-tar -czvf webruntime${DAY_OF_YEAR}.linux.tar eclipse
+cd ${SOURCE_DIR}/scripts
 
-# Mac OSX
-cp -pr ${MACOSX_EXPORT_DIR}/eclipse ${MACOSX_PROD_DIR}
-for j in `find ${WS_DIR} -name 'org.chromium*.jar' -o -name 'org.symbian*.jar'`
-do  
-	cp -p $j ${MACOSX_PROD_DIR}/eclipse/plugins/
-done
-cp -p ${SCRIPTS_DIR}/supporting/* ${MACOSX_PROD_DIR}/eclipse/
-
-# package it up. 
-cd ${MACOSX_PROD_DIR}
-tar -czvf  webruntime${DAY_OF_YEAR}.macosx.tar eclipse
+${ANT_CMD} -DbuildDirectory=${BUILD_DIR} -DsourceDirectory=${SOURCE_DIR}
 
-# Win32
-cp -pr ${WIN32_EXPORT_DIR}/eclipse ${WIN32_PROD_DIR}
-for j in `find ${WS_DIR} -name 'org.chromium*.jar' -o -name 'org.symbian*.jar'`
-do  
-	cp -p $j ${WIN32_PROD_DIR}/eclipse/plugins/
-done
-cp -p ${SCRIPTS_DIR}/supporting/* ${WIN32_PROD_DIR}/eclipse/
-
-# package it up. 
-
-cd ${WIN32_PROD_DIR}
-tar -czvf  webruntime${DAY_OF_YEAR}.win32.tar eclipse
-