# HG changeset patch
# User John Kern <johnk@symbian.org>
# Date 1266363235 28800
# Node ID eea70b5d3a93b98eea1bbc53757a3360d3d58eac
# Parent  c68f6790ea554638232ab36c4b6db3c4cae0d756
bug 1901 - fix for nightly build

diff -r c68f6790ea55 -r eea70b5d3a93 scripts/build.properties
--- a/scripts/build.properties	Tue Feb 16 13:04:55 2010 -0800
+++ b/scripts/build.properties	Tue Feb 16 15:33:55 2010 -0800
@@ -41,23 +41,11 @@
 # 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 & \
+ 	macos, cocoa, 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 
@@ -125,7 +113,7 @@
 
 # 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 +139,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 +152,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 c68f6790ea55 -r eea70b5d3a93 scripts/shepard.sh
--- a/scripts/shepard.sh	Tue Feb 16 13:04:55 2010 -0800
+++ b/scripts/shepard.sh	Tue Feb 16 15:33:55 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
-