update build script for Luna M6

build/org.eclipse.birt.releng.birtbuilder/build.properties

@@ -40,31 +40,31 @@ javacVerbose=true
 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
 #javacTarget=1.1
 
-buildDirectory=/home/adb/releng.230/src
+buildDirectory=/home/adb/releng.440/src
 
 postingDirectory=/home/adb/releng/BIRTOutput/BIRT2.3-download
 
-baseLocation=/home/adb/releng.230/baseLocation
+baseLocation=/home/adb/releng.440/baseLocation
 
-p4.home=/home/adb/releng.230/P4
+p4.home=/home/adb/releng.440/P4
 
-#basedir=/home/adb/releng.230/org.eclipse.releng.basebuilder
+#basedir=/home/adb/releng.440/org.eclipse.releng.basebuilder
 
-eclipse.pdebuild.scripts=/home/adb/releng.230/org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/scripts
+eclipse.pdebuild.scripts=/home/adb/releng.440/org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/scripts
 
-eclipse.pdebuild.templates=/home/adb/releng.230/src/org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/templates
+eclipse.pdebuild.templates=/home/adb/releng.440/src/org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build/templates
 
-eclipse.pdebuild.home=/home/adb/releng.230/org.eclipse.releng.basebuilder
+eclipse.pdebuild.home=/home/adb/releng.440/org.eclipse.releng.basebuilder
 
-test.dir=/home/adb/releng.230/unittest
+test.dir=/home/adb/releng.440/unittest
 
 #####################################
 #  DTP download setting             #
 #####################################
 
-file-prefix=dtp-1.6RC4-
+file-prefix=dtp-1.12.0M6-
 
-dtp.repository=/home/adb/releng/BIRTOutput/dtp.output/1.12
+dtp.repository=/home/adb/releng/BIRTOutput/dtp.output/1.12.0
 
 #file-suffix=0.7.0.200602241
 #file-version=dtp-sdk_1.6M5_20080215

build/org.eclipse.birt.releng.birtbuilder/replaceBuildInfo.sh

@@ -2,9 +2,11 @@
 # 
 #
 
-rm -f /home/adb/releng.230/PackageFiles/template/build_info_template_new.txt
+workspace=/home/adb/releng.440
 
-sed "s/#build_time#/$1 $2/g" /home/adb/releng.230/PackageFiles/template/build_info_template.txt > build_info_template_new.txt
+rm -f $workspace/PackageFiles/template/build_info_template_new.txt
 
-sed "s/#univBDate#/$3 $4 $5 $6 $7 $8 $9/g" build_info_template_new.txt > /home/adb/releng.230/PackageFiles/template/build_info_template_new.txt
+sed "s/#build_time#/$1 $2/g" $workspace/PackageFiles/template/build_info_template.txt > build_info_template_new.txt
+
+sed "s/#univBDate#/$3 $4 $5 $6 $7 $8 $9/g" build_info_template_new.txt > $workspace/PackageFiles/template/build_info_template_new.txt
 rm -f build_info_template_new.txt

build/org.eclipse.birt.releng.birtbuilder/updatedtp.sh

@@ -6,7 +6,7 @@ LD_LIBRARY_PATH=.
 BASH_ENV=$HOME/.bashrc
 USERNAME=`whoami`
 xhost +$HOSTNAME
-DISPLAY=:0.0
+DISPLAY=:1.0
 export DISPLAY
 
 CVS_RSH=ssh
@@ -20,19 +20,9 @@ export PATH=${PATH}:${ANT_HOME}/bin:/usr/local/bin
 proc=$$
 
 # directory in which to export builder projects
-builderDir=/home/adb/releng.250/org.eclipse.birt.releng.birtbuilder/
+workspace=/home/adb/releng.440
 
-# buildtype determines whether map file tags are used as entered or are replaced with HEAD
-buildType=I
-
-# directory where to copy build
-postingDirectory=/home/adb/releng/BIRTOutput/BIRT2.5-download
-
-# flag to indicate if test build
-testBuild=""
-
-# path to javadoc executable
-javadoc=""
+builderDir=$workspace/org.eclipse.birt.releng.birtbuilder/
 
 # value used in buildLabel and for text replacement in index.php template file
 builddate=`date +%Y%m%d`
@@ -75,10 +65,6 @@ baseBuilderTag=$buildProjectTags
 # tag for exporting the custom builder
 customBuilderTag=$buildProjectTags
 
-# directory where features and plugins will be compiled
-buildDirectory=/home/adb/farrah/BIRT_Build_Dir
-
-
 cd $builderDir
 
 chmod -R 755 $builderDir
@@ -88,7 +74,7 @@ bootclasspath="/usr/local/j2sdk1.4.2_13/jre/lib/rt.jar:/usr/local/j2sdk1.4.2_13/
 bootclasspath_15="/usr/local/jdk1.5.0_02/jre/lib/rt.jar"
 jvm15_home="/usr/local/jdk1.5.0_02"
 
-cd /home/adb/releng.250/org.eclipse.birt.releng.birtbuilder
+cd $workspace/org.eclipse.birt.releng.birtbuilder
 
 #the base command used to run AntRunner headless
 antRunner="/usr/local/jdk1.5.0_02/bin/java -Xmx500m -jar ../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc -application org.eclipse.ant.core.antRunner"