Sync build script for R1.6
diff --git a/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh b/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh
index 3d25b1c..3da201d 100644
--- a/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh
+++ b/plugins/org.eclipse.datatools.releng.builder/bootstrap.sh
@@ -1,239 +1,241 @@
-# User specific environment and startup programs
-umask 002
-
-BASE_PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/bin:/usr/X11R6/bin
-LD_LIBRARY_PATH=.
-BASH_ENV=$HOME/.bashrc
-USERNAME=`whoami`
-xhost +$HOSTNAME
-DISPLAY=:0.0
-export DISPLAY
-
-CVS_RSH=ssh
-ulimit -c unlimited
-export CVS_RSH USERNAME BASH_ENV LD_LIBRARY_PATH DISPLAY
-
-if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/usr/local/apache-ant-1.6.5; fi
-if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/usr/local/j2sdk1.4.2_13; fi
-export PATH=${PATH}:${ANT_HOME}/bin:/usr/local/bin
-
-proc=$$
-
-#notification list
-recipients=
-
-#sets skip.performance.tests Ant property
-skipPerf=""
-
-#sets skip.tests Ant property
-skipTest=""
-
-#sets sign Ant property
-sign=""
-
-tagMaps=""
-
-#sets fetchTag="HEAD" for nightly builds if required
-tag=""
-
-#buildProjectTags=v20060524
-buildProjectTags=v20060529
-
-#updateSite property setting
-updateSite=""
-
-#flag indicating whether or not mail should be sent to indicate build has started
-mail=""
-
-#flag used to build based on changes in map files
-compareMaps=""
-
-#buildId - build name
-buildId=""
-
-#buildLabel - name parsed in php scripts <buildType>-<buildId>-<datestamp>
-buildLabel=""
-
-# tag for build contribution project containing .map files
-mapVersionTag=HEAD
-
-# directory in which to export builder projects
-builderDir=/home/adb/releng.dtp/org.eclipse.datatools.releng.builder/
-
-# 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.dtp/output
-
-# flag to indicate if test build
-testBuild=""
-
-# path to javadoc executable
-javadoc=""
-
-# value used in buildLabel and for text replacement in index.php template file
-builddate=`date +%Y%m%d`
-buildtime=`date +%H%M`
-
-buildinfoDate=`date +%F%t%H:%M:%S`
-buildinfounivDate=`date +%c%z`
-
-timestamp=$builddate$buildtime
-
-echo "======[builddate]: $builddate " > adb.log
-echo "======[buildtime]: $buildtime " >> adb.log
-echo "======[timestamp]: $timestamp " >> adb.log
-
-# process command line arguments
-usage="usage: $0 [-notify emailaddresses][-test][-buildDirectory directory][-buildId name][-buildLabel directory name][-tagMapFiles][-mapVersionTag tag][-builderTag tag][-bootclasspath path][-compareMaps][-skipPerf] [-skipTest][-updateSite site][-sign] M|N|I|S|R"
-
-if [ $# -lt 1 ]
-then
- echo >&2 "$usage"
- exit 1
-fi
-
-while [ $# -gt 0 ]
-do
- case "$1" in
- -buildId) buildId="$2"; shift;;
- -buildLabel) buildLabel="$2"; shift;;
- -mapVersionTag) mapVersionTag="$2"; shift;;
- -tagMapFiles) tagMaps="-DtagMaps=true";;
- -skipPerf) skipPerf="-Dskip.performance.tests=true";;
- -skipTest) skipTest="-Dskip.tests=true";;
- -buildDirectory) builderDir="$2"; shift;;
- -notify) recipients="$2"; shift;;
- -test) postingDirectory="/builds/transfer/files/bogus/downloads/drops";testBuild="-Dtest=true";;
- -builderTag) buildProjectTags="$2"; shift;;
- -compareMaps) compareMaps="-DcompareMaps=true";;
- -updateSite) updateSite="-DupdateSite=$2";shift;;
- -sign) sign="-Dsign=true";;
- -*)
- echo >&2 $usage
- exit 1;;
- *) break;; # terminate while loop
- esac
- shift
-done
-
-# After the above the build type is left in $1.
-buildType=$1
-echo "======[buildType]: $buildType " >> adb.log
-
-# Set default buildId and buildLabel if none explicitly set
-if [ "$buildId" = "" ]
-then
- #buildId=$buildType$builddate-$buildtime
- buildId=v$builddate-$buildtime
-fi
-
-if [ "$buildLabel" = "" ]
-then
- buildLabel=$buildId
-fi
-echo "======[buildId]: $buildId " >> adb.log
-
-#Set the tag to HEAD for Nightly builds
-if [ "$buildType" = "N" ]
-then
- tag="-DfetchTag=HEAD"
- versionQualifier="-DforceContextQualifier=$buildId"
-fi
-
-echo "======[tag]: $tag" >> adb.log
-echo "======[versionQualifier]: $versionQualifier" >> adb.log
-
-# tag for eclipseInternalBuildTools on ottcvs1
-internalToolsTag=$buildProjectTags
-echo "======[internalToolsTag]: $internalToolsTag" >> adb.log
-
-# tag for exporting org.eclipse.releng.basebuilder
-baseBuilderTag=$buildProjectTags
-echo "======[baseBuilderTag]: $baseBuilderTag" >> adb.log
-
-# tag for exporting the custom builder
-customBuilderTag=$buildProjectTags
-echo "======[customBuilderTag]: $customBuilderTag" >> adb.log
-
-#if [ -e $builderDir ]
-#then
-# builderDir=$builderDir$timestamp
-#fi
-
-# directory where features and plugins will be compiled
-buildDirectory=/home/adb/releng.dtp/BIRT_Build_Dir
-
-echo "======[buildDirectory]: $buildDirectory" >> adb.log
-
-mkdir $builderDir
-cd $builderDir
-
-
-
-mkdir -p $postingDirectory/$buildLabel
-chmod -R 755 $builderDir
-
-#default value of the bootclasspath attribute used in ant javac calls.
-bootclasspath="/usr/local/j2sdk1.4.2_13/jre/lib/rt.jar:/usr/local/j2sdk1.4.2_13/jre/lib/jsse.jar:/usr/local/j2sdk1.4.2_13/jre/lib/jce.jar"
-#bootclasspath="/usr/local/j2sdk1.4.2_13/jre/lib/rt.jar:/usr/local/j2sdk1.4.2_13/jre/lib/jsse.jar"
-bootclasspath_15="/usr/local/jdk1.5.0_02/jre/lib/rt.jar:/usr/local/jdk1.5.0_02/jre/lib/jce.jar"
-jvm15_home="/usr/local/jdk1.5.0_02"
-
-cd /home/adb/releng.dtp/org.eclipse.datatools.releng.builder
-
-echo buildId=$buildId >> monitor.properties
-echo timestamp=$timestamp >> monitor.properties
-echo buildLabel=$buildLabel >> monitor.properties
-echo recipients=$recipients >> monitor.properties
-echo log=$postingDirectory/$buildLabel/index.php >> monitor.properties
-
-#the base command used to run AntRunner headless
-antRunner="/usr/local/j2sdk1.4.2_13/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"
-
-echo "==========[antRunner]: $antRunner" >> adb.log
-
-
-#/home/adb/releng.dtp/BIRTBuilder/replaceBuildInfo.sh $buildinfoDate $buildinfounivDate
-
-#clean drop directories
-
-#full command with args
-#buildId=v20080325-0953
-echo $tagMaps >> adb.log
-echo $compareMaps >> adb.log
-
-
-buildCommand="$antRunner -q -buildfile buildAll.xml $mail $testBuild $compareMaps \
--DmapVersionTag=$mapVersionTag -DpostingDirectory=$postingDirectory \
--Dbootclasspath=$bootclasspath -DbuildType=$buildType -D$buildType=true \
--DbuildId=$buildId -Dbuildid=$buildId -DbuildLabel=$buildId -Dtimestamp=$timestamp $skipPerf $skipTest $tagMaps \
--DJ2SE-1.5=$bootclasspath_15 -DlogExtension=.xml $javadoc $updateSite $sign \
--Djava15-home=$bootclasspath_15 -DbuildDirectory=/home/adb/releng.dtp/src \
--DbaseLocation=/home/adb/releng.dtp/baseLocation \
--DgroupConfiguration=true -DjavacVerbose=true \
--Dbasebuilder=/home/adb/releng.dtp/org.eclipse.releng.basebuilder \
--Djvm15_home=$jvm15_home -DmapTag.properties=/home/adb/releng.dtp/org.eclipse.datatools.releng.builder/mapTag.properties \
--Dbuild.date=$builddate -Dpackage.version=1.6M6-$timestamp \
--DmapCvsRoot=:ext:xgu@dev.eclipse.org:/cvsroot/datatools \
--DmapVersionTag=HEAD -DjavacTarget=1.4 -DjavacSource=1.4"
-
-#skipPreBuild
-
-#capture command used to run the build
-echo $buildCommand>command.txt
-
-#run the build
-$buildCommand >> adb.log
-#retCode=$?
-#
-#if [ $retCode != 0 ]
-#then
-# echo "Build failed (error code $retCode)."
-# exit -1
-#fi
-
-#clean up
-#rm -rf $builderDir
-#rm -rf /home/adb/releng.dtp/src/$buildId
+# User specific environment and startup programs
+umask 002
+
+BASE_PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/bin:/usr/X11R6/bin
+LD_LIBRARY_PATH=.
+BASH_ENV=$HOME/.bashrc
+USERNAME=`whoami`
+xhost +$HOSTNAME
+DISPLAY=:0.0
+export DISPLAY
+
+CVS_RSH=ssh
+ulimit -c unlimited
+export CVS_RSH USERNAME BASH_ENV LD_LIBRARY_PATH DISPLAY
+
+if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/usr/local/apache-ant-1.6.5; fi
+if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/usr/local/j2sdk1.4.2_13; fi
+export PATH=${PATH}:${ANT_HOME}/bin:/usr/local/bin
+
+proc=$$
+
+#notification list
+recipients=
+
+#sets skip.performance.tests Ant property
+skipPerf=""
+
+#sets skip.tests Ant property
+skipTest=""
+
+#sets sign Ant property
+sign=""
+
+tagMaps=""
+
+#sets fetchTag="HEAD" for nightly builds if required
+tag=""
+
+#buildProjectTags=v20060524
+buildProjectTags=v20060529
+
+#updateSite property setting
+updateSite=""
+
+#flag indicating whether or not mail should be sent to indicate build has started
+mail=""
+
+#flag used to build based on changes in map files
+compareMaps=""
+
+#buildId - build name
+buildId=""
+
+#buildLabel - name parsed in php scripts <buildType>-<buildId>-<datestamp>
+buildLabel=""
+
+# tag for build contribution project containing .map files
+mapVersionTag=HEAD
+
+# directory in which to export builder projects
+builderDir=/home/adb/releng.dtp/org.eclipse.datatools.releng.builder/
+
+# 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/dtp.output/1.6
+
+# flag to indicate if test build
+testBuild=""
+
+# path to javadoc executable
+javadoc=""
+
+# value used in buildLabel and for text replacement in index.php template file
+builddate=`date +%Y%m%d`
+buildtime=`date +%H%M`
+
+buildinfoDate=`date +%F%t%H:%M:%S`
+buildinfounivDate=`date +%c%z`
+
+timestamp=$builddate$buildtime
+
+echo "======[builddate]: $builddate " > adb.log
+echo "======[buildtime]: $buildtime " >> adb.log
+echo "======[timestamp]: $timestamp " >> adb.log
+
+# process command line arguments
+usage="usage: $0 [-notify emailaddresses][-test][-buildDirectory directory][-buildId name][-buildLabel directory name][-tagMapFiles][-mapVersionTag tag][-builderTag tag][-bootclasspath path][-compareMaps][-skipPerf] [-skipTest][-updateSite site][-sign] M|N|I|S|R"
+
+if [ $# -lt 1 ]
+then
+ echo >&2 "$usage"
+ exit 1
+fi
+
+while [ $# -gt 0 ]
+do
+ case "$1" in
+ -buildId) buildId="$2"; shift;;
+ -buildLabel) buildLabel="$2"; shift;;
+ -mapVersionTag) mapVersionTag="$2"; shift;;
+ -tagMapFiles) tagMaps="-DtagMaps=true";;
+ -skipPerf) skipPerf="-Dskip.performance.tests=true";;
+ -skipTest) skipTest="-Dskip.tests=true";;
+ -buildDirectory) builderDir="$2"; shift;;
+ -notify) recipients="$2"; shift;;
+ -test) postingDirectory="/builds/transfer/files/bogus/downloads/drops";testBuild="-Dtest=true";;
+ -builderTag) buildProjectTags="$2"; shift;;
+ -compareMaps) compareMaps="-DcompareMaps=true";;
+ -updateSite) updateSite="-DupdateSite=$2";shift;;
+ -sign) sign="-Dsign=true";;
+ -*)
+ echo >&2 $usage
+ exit 1;;
+ *) break;; # terminate while loop
+ esac
+ shift
+done
+
+# After the above the build type is left in $1.
+buildType=$1
+echo "======[buildType]: $buildType " >> adb.log
+
+# Set default buildId and buildLabel if none explicitly set
+if [ "$buildId" = "" ]
+then
+ #buildId=$buildType$builddate-$buildtime
+ buildId=v$builddate-$buildtime
+fi
+
+if [ "$buildLabel" = "" ]
+then
+ buildLabel=$buildId
+fi
+echo "======[buildId]: $buildId " >> adb.log
+
+#Set the tag to HEAD for Nightly builds
+if [ "$buildType" = "N" ]
+then
+ tag="-DfetchTag=HEAD"
+ versionQualifier="-DforceContextQualifier=$buildId"
+fi
+
+echo "======[tag]: $tag" >> adb.log
+echo "======[versionQualifier]: $versionQualifier" >> adb.log
+
+# tag for eclipseInternalBuildTools on ottcvs1
+internalToolsTag=$buildProjectTags
+echo "======[internalToolsTag]: $internalToolsTag" >> adb.log
+
+# tag for exporting org.eclipse.releng.basebuilder
+baseBuilderTag=$buildProjectTags
+echo "======[baseBuilderTag]: $baseBuilderTag" >> adb.log
+
+# tag for exporting the custom builder
+customBuilderTag=$buildProjectTags
+echo "======[customBuilderTag]: $customBuilderTag" >> adb.log
+
+#if [ -e $builderDir ]
+#then
+# builderDir=$builderDir$timestamp
+#fi
+
+# directory where features and plugins will be compiled
+buildDirectory=/home/adb/releng.dtp/BIRT_Build_Dir
+
+echo "======[buildDirectory]: $buildDirectory" >> adb.log
+
+mkdir $builderDir
+cd $builderDir
+
+
+
+mkdir -p $postingDirectory/$buildLabel
+chmod -R 755 $builderDir
+
+#default value of the bootclasspath attribute used in ant javac calls.
+bootclasspath="/usr/local/j2sdk1.4.2_13/jre/lib/rt.jar:/usr/local/j2sdk1.4.2_13/jre/lib/jsse.jar:/usr/local/j2sdk1.4.2_13/jre/lib/jce.jar"
+#bootclasspath="/usr/local/j2sdk1.4.2_13/jre/lib/rt.jar:/usr/local/j2sdk1.4.2_13/jre/lib/jsse.jar"
+bootclasspath_15="/usr/local/jdk1.5.0_02/jre/lib/rt.jar:/usr/local/jdk1.5.0_02/jre/lib/jce.jar"
+jvm15_home="/usr/local/jdk1.5.0_02"
+
+cd /home/adb/releng.dtp/org.eclipse.datatools.releng.builder
+
+echo buildId=$buildId >> monitor.properties
+echo timestamp=$timestamp >> monitor.properties
+echo buildLabel=$buildLabel >> monitor.properties
+echo recipients=$recipients >> monitor.properties
+echo log=$postingDirectory/$buildLabel/index.php >> monitor.properties
+
+#the base command used to run AntRunner headless
+antRunner="/usr/local/j2sdk1.4.2_13/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"
+
+echo "==========[antRunner]: $antRunner" >> adb.log
+
+
+#/home/adb/releng.dtp/BIRTBuilder/replaceBuildInfo.sh $buildinfoDate $buildinfounivDate
+
+#clean drop directories
+
+#full command with args
+#buildId=v20080325-0953
+echo $tagMaps >> adb.log
+echo $compareMaps >> adb.log
+
+
+cp /home/adb/releng.dtp/dtpURLmonitor.properties /home/adb/releng.230/src/
+
+buildCommand="$antRunner -q -buildfile buildAll.xml $mail $testBuild $compareMaps \
+-DmapVersionTag=$mapVersionTag -DpostingDirectory=$postingDirectory \
+-Dbootclasspath=$bootclasspath -DbuildType=$buildType -D$buildType=true \
+-DbuildId=$buildId -Dbuildid=$buildId -DbuildLabel=$buildId -Dtimestamp=$timestamp $skipPerf $skipTest $tagMaps \
+-DJ2SE-1.5=$bootclasspath_15 -DlogExtension=.xml $javadoc $updateSite $sign \
+-Djava15-home=$bootclasspath_15 -DbuildDirectory=/home/adb/releng.dtp/src \
+-DbaseLocation=/home/adb/releng.dtp/baseLocation -Dwtp.home=/home/adb/releng.dtp/baseLocation \
+-DgroupConfiguration=true -DjavacVerbose=true \
+-Dbasebuilder=/home/adb/releng.dtp/org.eclipse.releng.basebuilder \
+-Djvm15_home=$jvm15_home -DmapTag.properties=/home/adb/releng.dtp/org.eclipse.datatools.releng.builder/mapTag.properties \
+-Dbuild.date=$builddate -Dpackage.version=1.6RC4-$timestamp \
+-DmapCvsRoot=:ext:xgu@dev.eclipse.org:/cvsroot/datatools \
+-DmapVersionTag=HEAD -DjavacTarget=1.4 -DjavacSource=1.4"
+
+#skipPreBuild
+
+#capture command used to run the build
+echo $buildCommand>command.txt
+
+#run the build
+$buildCommand >> adb.log
+#retCode=$?
+#
+#if [ $retCode != 0 ]
+#then
+# echo "Build failed (error code $retCode)."
+# exit -1
+#fi
+
+#clean up
+#rm -rf $builderDir
+rm -rf /home/adb/releng.dtp/src/$buildId
diff --git a/plugins/org.eclipse.datatools.releng.builder/build.properties b/plugins/org.eclipse.datatools.releng.builder/build.properties
index 9711883..f5d4983 100644
--- a/plugins/org.eclipse.datatools.releng.builder/build.properties
+++ b/plugins/org.eclipse.datatools.releng.builder/build.properties
@@ -42,7 +42,7 @@
buildDirectory=/home/adb/releng.dtp/src
-postingDirectory=/home/adb/releng.dtp/output
+postingDirectory=/home/adb/releng.dtp/dtp.output/1.6
baseLocation=/home/adb/releng.dtp/baseLocation
@@ -53,3 +53,10 @@
eclipse.pdebuild.home=/home/adb/releng.dtp/org.eclipse.releng.basebuilder
+#####################################
+# DTP download setting #
+#####################################
+
+#file-prefix=dtp-sdk_1.6M5_
+#file-suffix=0.7.0.200602241
+#file-version=dtp-sdk_1.6M4d
diff --git a/plugins/org.eclipse.datatools.releng.builder/buildAll.xml b/plugins/org.eclipse.datatools.releng.builder/buildAll.xml
index 5bccda9..b07aa49 100644
--- a/plugins/org.eclipse.datatools.releng.builder/buildAll.xml
+++ b/plugins/org.eclipse.datatools.releng.builder/buildAll.xml
@@ -37,6 +37,7 @@
<target name="main" depends="init">
<antcall target="buildDtpSdkAllFeature"/>
<antcall target="buildDtpEnablementAllFeature"/>
+ <ant antfile="${eclipse.build.configs}/../helper.xml" target="verifyCompile" />
<antcall target="integrateDtpFeatures"/>
<antcall target="Package"/>
<antcall target="GenerateUpdateSite"/>
@@ -92,6 +93,16 @@
</target>
+ <target name="buildDtpEnablementFeature">
+ <ant antfile="build.xml" dir="${basedir}">
+ <property name="component" value="${eclipse.build.configs}/dtp.enablement" />
+ </ant>
+ </target>
+
+ <target name="buildUpdateSite" if="updateSite">
+ <ant antfile="${eclipse.build.configs}/../helper.xml" target="buildUpdateJars" />
+ </target>
+
<target name="integrateDtpFeatures">
<property name="tmpsite" value="${buildDirectory}/tmpsite" />
@@ -200,12 +211,15 @@
<mkdir dir="${postingDirectory}/${buildId}/UpdateSite"/>
<!-- replace the feature version in site.xml -->
- <copy file="${eclipse.build.configs}/../../extras/site.xml" tofile="${buildDirectory}/site.xml"/>
- <replace file="${buildDirectory}/site.xml" value="1.6M6" token="@RELEASE.VERSION@"/>
+ <copy file="${eclipse.build.configs}/../../extras/site.xml" tofile="${buildDirectory}/site.xml" overwrite="true"/>
+ <replace file="${buildDirectory}/site.xml" value="1.6RC4" token="@RELEASE.VERSION@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.connectivity.feature}" token="@org.eclipse.datatools.connectivity.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.connectivity.oda.designer.feature}" token="@org.eclipse.datatools.connectivity.oda.designer.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.connectivity.oda.feature}" token="@org.eclipse.datatools.connectivity.oda.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.doc.user}" token="@org.eclipse.datatools.doc.user@"/>
+ <replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.common.doc.user}" token="@org.eclipse.datatools.common.doc.user@"/>
+ <replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.connectivity.doc.user}" token="@org.eclipse.datatools.connectivity.doc.user@"/>
+ <replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.sqltools.doc.user}" token="@org.eclipse.datatools.sqltools.doc.user@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.enablement.apache.derby.feature}" token="@org.eclipse.datatools.enablement.apache.derby.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.enablement.feature}" token="@org.eclipse.datatools.enablement.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.enablement.hsqldb.feature}" token="@org.eclipse.datatools.enablement.hsqldb.feature@"/>
@@ -229,6 +243,7 @@
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.sqldevtools.feature}" token="@org.eclipse.datatools.sqldevtools.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.sqldevtools.parsers.feature}" token="@org.eclipse.datatools.sqldevtools.parsers.feature@"/>
<replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.sqldevtools.results.feature}" token="@org.eclipse.datatools.sqldevtools.results.feature@"/>
+ <replace file="${buildDirectory}/site.xml" value="${org.eclipse.datatools.sqldevtools.sqlbuilder.feature}" token="@org.eclipse.datatools.sqldevtools.sqlbuilder.feature@"/>
<!-- generate dtp.sc for Ganymede update site -->
<copy file="${eclipse.build.configs}/../../extras/dtp.sc.template" tofile="${buildDirectory}/dtp.sc"/>
@@ -236,6 +251,9 @@
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.connectivity.oda.designer.feature}" token="@org.eclipse.datatools.connectivity.oda.designer.feature@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.connectivity.oda.feature}" token="@org.eclipse.datatools.connectivity.oda.feature@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.doc.user}" token="@org.eclipse.datatools.doc.user@"/>
+ <replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.common.doc.user}" token="@org.eclipse.datatools.common.doc.user@"/>
+ <replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.sqltools.doc.user}" token="@org.eclipse.datatools.sqltools.doc.user@"/>
+ <replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.connectivity.doc.user}" token="@org.eclipse.datatools.connectivity.doc.user@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.enablement.apache.derby.feature}" token="@org.eclipse.datatools.enablement.apache.derby.feature@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.enablement.feature}" token="@org.eclipse.datatools.enablement.feature@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.enablement.hsqldb.feature}" token="@org.eclipse.datatools.enablement.hsqldb.feature@"/>
@@ -259,6 +277,7 @@
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.sqldevtools.feature}" token="@org.eclipse.datatools.sqldevtools.feature@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.sqldevtools.parsers.feature}" token="@org.eclipse.datatools.sqldevtools.parsers.feature@"/>
<replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.sqldevtools.results.feature}" token="@org.eclipse.datatools.sqldevtools.results.feature@"/>
+ <replace file="${buildDirectory}/dtp.sc" value="${org.eclipse.datatools.sqldevtools.sqlbuilder.feature}" token="@org.eclipse.datatools.sqldevtools.sqlbuilder.feature@"/>
<!-- push update site to output directory -->
<unzip src="${buildDirectory}/${buildId}/dtp-all-${package.version}.zip" dest="${postingDirectory}/${buildId}/UpdateSite"/>
diff --git a/plugins/org.eclipse.datatools.releng.builder/config.properties b/plugins/org.eclipse.datatools.releng.builder/config.properties
new file mode 100644
index 0000000..19bd03d
--- /dev/null
+++ b/plugins/org.eclipse.datatools.releng.builder/config.properties
@@ -0,0 +1,24 @@
+#Daily build can check the disk capacity._2.2.0
+##diskspace.warning.threshold is the minimum disk space.
+##diskspace.path is the path for the disk, can be c:\,c: etc for win32 environment.
+
+#Disk that needs to be checked.
+diskspace.warning.threshold=400
+
+########################################################################
+
+replyto.address=xgu@actuate.com
+QA.test.dir=\\\\qa-build\\BIRTOutput
+
+mail.port=5025
+mail.from=xgu@actuate.com
+
+
+BUILD.COMPLETE.members=xgu@actuate.com,lchan@actuate.com,brian.fitzpatrick@sybase.com
+
+COMPILE.ERROR.RECIPIENTS=yjiang@actuate.com,dtp-dev@eclipse.org,xgu@actuate.com
+#COMPILE.ERROR.RECIPIENTS=yjiang@actuate.com
+
+build.environment=Eclipse 3.4M5, EMF 2.2.2, GEF 3.4M5, WTP 3.0M5, JDK1.4.2_07
+rtn=\n
+
diff --git a/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.enablement.all/customTargets.xml b/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.enablement.all/customTargets.xml
index 38e1670..cd2b072 100644
--- a/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.enablement.all/customTargets.xml
+++ b/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.enablement.all/customTargets.xml
@@ -78,9 +78,9 @@
<target name="tagMapFiles" if="tagMaps">
<!-- Stores tag on the filesystem so map files can be compared -->
<echo file="${mapTag.properties}">
- lastMapTag=R320_${buildId}
+ lastMapTag=r16_${buildId}
</echo>
- <cvs dest="${buildDirectory}/maps/source" command="tag R320_${buildId}" />
+ <cvs dest="${buildDirectory}/maps/source" command="tag r16_${buildId}" />
</target>
<!-- ===================================================================== -->
diff --git a/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.sdk.all/customTargets.xml b/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.sdk.all/customTargets.xml
index d501d1d..2e9a8ac 100644
--- a/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.sdk.all/customTargets.xml
+++ b/plugins/org.eclipse.datatools.releng.builder/eclipse/buildConfigs/dtp.sdk.all/customTargets.xml
@@ -110,6 +110,9 @@
<replace dir="${buildDirectory}/plugins" value="1.6.0.${buildId}" token="@BUILD@">
<include name="**/about.mappings" />
</replace>
+ <replace dir="${buildDirectory}/features" value="1.6.0.${buildId}" token="@BUILD@">
+ <include name="**/about.mappings" />
+ </replace>
</target>
<!-- ===================================================================== -->
diff --git a/plugins/org.eclipse.datatools.releng.builder/eclipse/helper.xml b/plugins/org.eclipse.datatools.releng.builder/eclipse/helper.xml
index 32ed9ad..1812f5d 100644
--- a/plugins/org.eclipse.datatools.releng.builder/eclipse/helper.xml
+++ b/plugins/org.eclipse.datatools.releng.builder/eclipse/helper.xml
@@ -235,6 +235,7 @@
<exec executable="${eclipse.build.configs}/../../extras/verifyCompile.sh">
<arg value="${postingDirectory}/${buildId}/compilelogs"/>
</exec>
+ <echo message=" start check compile error"/>
<antcall target="checkCompileError"/>
</target>
@@ -798,10 +799,10 @@
</message>
<!--
<fileset dir="${test.dir}/unitTestReport/html">
- <!--
+
<include name="TESTS-EngineSmokeTests.html"/>
<include name="TESTS-DtESmokeTests.html"/>
- -->
+
<include name="org.eclipse.birt.report.tests.model.AllTests.html"/>
<include name="org.eclipse.birt.report.tests.engine.AllTests.html"/>
<include name="org.eclipse.birt.report.tests.chart.AllTests.html"/>
@@ -817,6 +818,8 @@
<condition property="has.compile.error" value="true">
<equals arg1="${compileHasError}" arg2="true" />
</condition>
+ <echo message="${has.compile.error}"/>
+ <echo message="monitor: ${eclipse.build.configs}/../../monitor.properties" />
</target>
<target name="checkCompileError" depends="checkErrorExist" if="has.compile.error" >
@@ -844,9 +847,11 @@
Have a nice day!
</message>
+ <attachments>
<fileset dir="${postingDirectory}/${buildId}/compilelogs/plugins">
<include name="*compilelog.html"/>
</fileset>
+ </attachments>
</mail>
</target>
diff --git a/plugins/org.eclipse.datatools.releng.builder/extras/dtp.sc.template b/plugins/org.eclipse.datatools.releng.builder/extras/dtp.sc.template
index b595027..dfd4927 100755
--- a/plugins/org.eclipse.datatools.releng.builder/extras/dtp.sc.template
+++ b/plugins/org.eclipse.datatools.releng.builder/extras/dtp.sc.template
@@ -21,6 +21,15 @@
name="org.eclipse.datatools.doc.user"
versionDesignator="[@org.eclipse.datatools.doc.user@]" />
<dependency
+ name="org.eclipse.datatools.common.doc.user"
+ versionDesignator="[@org.eclipse.datatools.common.doc.user@]" />
+ <dependency
+ name="org.eclipse.datatools.connectivity.doc.user"
+ versionDesignator="[@org.eclipse.datatools.connectivity.doc.user@]" />
+ <dependency
+ name="org.eclipse.datatools.sqltools.doc.user"
+ versionDesignator="[@org.eclipse.datatools.sqltools.doc.user@]" />
+ <dependency
name="org.eclipse.datatools.enablement.apache.derby.feature"
versionDesignator="[@org.eclipse.datatools.enablement.apache.derby.feature@]" />
<dependency
@@ -117,6 +126,9 @@
</public>
<public name="Database Development">
<attribute component="org.eclipse.datatools.doc.user" />
+ <attribute component="org.eclipse.datatools.common.doc.user" />
+ <attribute component="org.eclipse.datatools.connectivity.doc.user" />
+ <attribute component="org.eclipse.datatools.sqltools.doc.user" />
<attribute component="org.eclipse.datatools.enablement.feature" />
<attribute component="org.eclipse.datatools.intro" />
<attribute component="org.eclipse.datatools.sdk.feature" />
diff --git a/plugins/org.eclipse.datatools.releng.builder/extras/site.xml b/plugins/org.eclipse.datatools.releng.builder/extras/site.xml
index 8c2eb62..6354a9d 100644
--- a/plugins/org.eclipse.datatools.releng.builder/extras/site.xml
+++ b/plugins/org.eclipse.datatools.releng.builder/extras/site.xml
@@ -27,6 +27,15 @@
<feature url="features/org.eclipse.datatools.doc.user_@org.eclipse.datatools.doc.user@.jar" id="org.eclipse.datatools.doc.user" version="@org.eclipse.datatools.doc.user@">
<category name="Eclipse Data Tools Platform @RELEASE.VERSION@"/>
</feature>
+ <feature url="features/org.eclipse.datatools.common.doc.user_@org.eclipse.datatools.common.doc.user@.jar" id="org.eclipse.datatools.common.doc.user" version="@org.eclipse.datatools.common.doc.user@">
+ <category name="Eclipse Data Tools Platform @RELEASE.VERSION@"/>
+ </feature>
+ <feature url="features/org.eclipse.datatools.connectivity.doc.user_@org.eclipse.datatools.connectivity.doc.user@.jar" id="org.eclipse.datatools.connectivity.doc.user" version="@org.eclipse.datatools.connectivity.doc.user@">
+ <category name="Eclipse Data Tools Platform @RELEASE.VERSION@"/>
+ </feature>
+ <feature url="features/org.eclipse.datatools.sqltools.doc.user_@org.eclipse.datatools.sqltools.doc.user@.jar" id="org.eclipse.datatools.sqltools.doc.user" version="@org.eclipse.datatools.sqltools.doc.user@">
+ <category name="Eclipse Data Tools Platform @RELEASE.VERSION@"/>
+ </feature>
<feature url="features/org.eclipse.datatools.enablement.apache.derby.feature_@org.eclipse.datatools.enablement.apache.derby.feature@.jar" id="org.eclipse.datatools.enablement.apache.derby.feature" version="@org.eclipse.datatools.enablement.apache.derby.feature@">
<category name="Enabling Features for DTP@RELEASE.VERSION@"/>
</feature>
@@ -96,4 +105,7 @@
<feature url="features/org.eclipse.datatools.sqldevtools.results.feature_@org.eclipse.datatools.sqldevtools.results.feature@.jar" id="org.eclipse.datatools.sqldevtools.results.feature" version="@org.eclipse.datatools.sqldevtools.results.feature@">
<category name="Enabling Features for DTP@RELEASE.VERSION@"/>
</feature>
+ <feature url="features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature_@org.eclipse.datatools.sqldevtools.sqlbuilder.feature@.jar" id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" version="@org.eclipse.datatools.sqldevtools.sqlbuilder.feature@">
+ <category name="Enabling Features for DTP@RELEASE.VERSION@"/>
+ </feature>
</site>
diff --git a/plugins/org.eclipse.datatools.releng.builder/extras/verifyCompile.sh b/plugins/org.eclipse.datatools.releng.builder/extras/verifyCompile.sh
index 307a6c8..10ba749 100644
--- a/plugins/org.eclipse.datatools.releng.builder/extras/verifyCompile.sh
+++ b/plugins/org.eclipse.datatools.releng.builder/extras/verifyCompile.sh
@@ -1,50 +1,50 @@
-#!/bin/bash
-
-######################
-#rename compile log
-######################
-
-find $1 -name "*.html" > $1/compile.log
-
-awk -F "/" '{print "cp " $0 " "$1 FS $2 FS $3 FS $4 FS $5 FS $6 FS $7 FS $8 FS $9 FS $10 FS $11 FS"_compilelog.html" }' $1/compile.log > $1/plugins.rename
-chmod +x $1/plugins.rename
-$1/plugins.rename
-
-
-
-echo $1
-find $1 -name "*.html" -exec grep "ERROR in" -c {} \; -print > $1/error.plugins
-
-awk ' /\/org/ {print $1}' $1/error.plugins > $1/error.plugins.tmp
-mv $1/error.plugins.tmp $1/error.plugins
-
-######################################
-#Get compile error plugins total count
-######################################
-
-wc -l $1/error.plugins > $1/error.plugins.count
-count=`awk '{print $1}' $1/error.plugins.count`
-
-#############################################
-#found compile error, generate notify list
-#############################################
-
-if [ $count -gt 0 ] ; then
- echo "#Compile has error in $1" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
- awk -F "/" '{print "cp " $0 " "$1 FS $2 FS $3 FS $4 FS $5 FS $6 FS $7 FS $8 FS $9 FS $10 FS $11"_compilelog.html" }' $1/error.plugins > $1/error.plugins.rename
- chmod +x $1/error.plugins.rename
- $1/error.plugins.rename
-
- #set error plugins or notification
- awk -F "/" '{print $11}' $1/error.plugins > $1/notify.list
- awk -F "_" '{print " "$1"\\n\\"}' $1/notify.list > $1/notify.list.tmp
- mv $1/notify.list.tmp $1/notify.list
-
- echo "compileHasError=true" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
- echo "error.plugin.list=\\" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
- cat $1/notify.list >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
- echo " " >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
-else
- echo "#No compile error in $1" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
- echo "compileHasError=false" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
-fi
+#!/bin/bash
+
+######################
+#rename compile log
+######################
+
+find $1 -name "*.html" > $1/compile.log
+
+awk -F "/" '{print "cp " $0 " "$1 FS $2 FS $3 FS $4 FS $5 FS $6 FS $7 FS $8 FS $9 FS $10 FS $11 FS"_compilelog.html" }' $1/compile.log > $1/plugins.rename
+chmod +x $1/plugins.rename
+$1/plugins.rename
+
+
+
+echo $1
+find $1 -name "*.html" -exec grep "ERROR in" -c {} \; -print > $1/error.plugins
+
+awk ' /\/org/ {print $1}' $1/error.plugins > $1/error.plugins.tmp
+mv $1/error.plugins.tmp $1/error.plugins
+
+######################################
+#Get compile error plugins total count
+######################################
+
+wc -l $1/error.plugins > $1/error.plugins.count
+count=`awk '{print $1}' $1/error.plugins.count`
+
+#############################################
+#found compile error, generate notify list
+#############################################
+
+if [ $count -gt 0 ] ; then
+ echo "#Compile has error in $1" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+ awk -F "/" '{print "cp " $0 " "$1 FS $2 FS $3 FS $4 FS $5 FS $6 FS $7 FS $8 FS $9 FS $10 FS $11"_compilelog.html" }' $1/error.plugins > $1/error.plugins.rename
+ chmod +x $1/error.plugins.rename
+ $1/error.plugins.rename
+
+ #set error plugins or notification
+ awk -F "/" '{print $11}' $1/error.plugins > $1/notify.list
+ awk -F "_" '{print " "$1"\\n\\"}' $1/notify.list > $1/notify.list.tmp
+ mv $1/notify.list.tmp $1/notify.list
+
+ echo "compileHasError=true" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+ echo "error.plugin.list=\\" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+ cat $1/notify.list >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+ echo " " >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+else
+ echo "#No compile error in $1" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+ echo "compileHasError=false" >> /home/adb/releng.dtp/org.eclipse.datatools.releng.builder/monitor.properties
+fi
