Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2008-12-06 21:04:09 +0000
committerspingel2008-12-06 21:04:09 +0000
commit313f2d4ba01cbe78873b8d8c9cb5e8413c801147 (patch)
tree456ad9100566cacd032e65389e0ccdf3d29cacb1
parent09b7ca7bae79e05686546cefab5f3f7703531813 (diff)
downloadorg.eclipse.mylyn-313f2d4ba01cbe78873b8d8c9cb5e8413c801147.tar.gz
org.eclipse.mylyn-313f2d4ba01cbe78873b8d8c9cb5e8413c801147.tar.xz
org.eclipse.mylyn-313f2d4ba01cbe78873b8d8c9cb5e8413c801147.zip
NEW - bug 257809: create update site for Galileo
https://bugs.eclipse.org/bugs/show_bug.cgi?id=257809
-rw-r--r--org.eclipse.mylyn.releng/build.xml58
-rw-r--r--org.eclipse.mylyn.releng/customTargets.xml4
-rw-r--r--org.eclipse.mylyn.releng/defaults.properties11
-rw-r--r--org.eclipse.mylyn.releng/scripts/buildHelper.xml98
4 files changed, 97 insertions, 74 deletions
diff --git a/org.eclipse.mylyn.releng/build.xml b/org.eclipse.mylyn.releng/build.xml
index 7e8467a0..a0a9095b 100644
--- a/org.eclipse.mylyn.releng/build.xml
+++ b/org.eclipse.mylyn.releng/build.xml
@@ -9,13 +9,13 @@
</target>
<target name="build" depends="init-build,init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="mylyn-build-helper"/>
</antcall>
</target>
<target name="mylyn-build-helper">
- <condition property="versionPostfix" value="e33" else="e3x"><equals arg1="${eclipse.version}" arg2="3.3"/></condition>
+ <condition property="versionPostfix" value="e33" else="e3x"><equals arg1="${build.target}" arg2="3.3"/></condition>
<antcall target="build-helper">
<param name="build.extraBuildArgs" value="-DmylynQualifier=${qualifier}"/>
<param name="build.forceContextQualifier" value="${qualifier}-${versionPostfix}"/>
@@ -26,7 +26,7 @@
</target>
<target name="standalone-tests" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="standalone-tests-helper"/>
</antcall>
</target>
@@ -39,7 +39,7 @@
<property name="timeout" value="3600000" />
<property name="eclipse.home" value="${eclipse.base}/test-${eclipse.sdk.version}/eclipse" />
<property name="vmargs" value=" -Xms40m -Xmx256m"/>
- <property name="log" value="${build.results}/test-standalone-${eclipse.version}.log" />
+ <property name="log" value="${build.results}/test-standalone-${build.target}.log" />
<path id="tests.classpath">
<fileset dir="${install.dir}">
<include name="plugins/*.jar"/>
@@ -50,18 +50,18 @@
</dirset>
<fileset dir="${eclipse.home}/plugins">
<include name="org.junit_*/junit.jar"/>
- <!--
<include name="org.eclipse.core.jobs_*.jar"/>
<include name="org.eclipse.core.net_*.jar"/>
<include name="org.eclipse.core.runtime_*.jar"/>
<include name="org.eclipse.equinox.common_*.jar"/>
<include name="org.eclipse.osgi_*.jar"/>
+ <!--
+ <include name="*.jar"/>
-->
- <include name="*.jar"/>
</fileset>
</path>
- <property name="output.dir" value="${build.results}/test-${eclipse.version}"/>
+ <property name="output.dir" value="${build.results}/test-${build.target}"/>
<mkdir dir="${output.dir}"/>
<echo message="Testing standalone ${version}.${qualifier} on Eclipse ${eclipse.sdk.version}" />
@@ -77,46 +77,46 @@
</target>
<target name="pack" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="pack-sites"/>
</antcall>
</target>
<target name="pack-sites" depends="init">
<antcall target="pack-helper">
- <param name="dir" value="${build.home}/${eclipse.version}/standardUpdateSite"/>
+ <param name="dir" value="${build.home}/${build.target}/standardUpdateSite"/>
</antcall>
<antcall target="pack-helper">
- <param name="dir" value="${build.home}/${eclipse.version}/extrasUpdateSite"/>
+ <param name="dir" value="${build.home}/${build.target}/extrasUpdateSite"/>
</antcall>
<antcall target="pack-helper">
- <param name="dir" value="${build.home}/${eclipse.version}/incubatorUpdateSite"/>
+ <param name="dir" value="${build.home}/${build.target}/incubatorUpdateSite"/>
</antcall>
</target>
<target name="generate-metadata" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="generate-metadata-sites"/>
</antcall>
</target>
<target name="generate-metadata-sites" depends="init">
<antcall target="generate-metadata-helper">
- <param name="dir" value="${build.home}/${eclipse.version}/standardUpdateSite"/>
- <param name="name" value="Mylyn Weekly for Eclipse ${eclipse.version}"/>
+ <param name="dir" value="${build.home}/${build.target}/standardUpdateSite"/>
+ <param name="name" value="Mylyn Weekly for Eclipse ${build.target}"/>
</antcall>
<antcall target="generate-metadata-helper">
- <param name="dir" value="${build.home}/${eclipse.version}/extrasUpdateSite"/>
+ <param name="dir" value="${build.home}/${build.target}/extrasUpdateSite"/>
<param name="name" value="Mylyn Weekly Extras"/>
</antcall>
<antcall target="generate-metadata-helper">
- <param name="dir" value="${build.home}/${eclipse.version}/incubatorUpdateSite"/>
+ <param name="dir" value="${build.home}/${build.target}/incubatorUpdateSite"/>
<param name="name" value="Mylyn Weekly Incubator"/>
</antcall>
</target>
<target name="publish" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="publish-helper"/>
<param name="skip3.3" value="true"/>
<param name="skip3.5" value="true"/>
@@ -126,21 +126,21 @@
<target name="publish-helper">
<antcall target="publish-helper-run">
<param name="file" value="org.eclipse.mylyn.tests.AllTests.xml"/>
- <param name="tag" value="[e${eclipse.version}][dflt]"/>
+ <param name="tag" value="[e${build.target}][dflt]"/>
</antcall>
<antcall target="publish-helper-run">
<param name="file" value="org.eclipse.mylyn.tests.AllPerformanceTests.xml"/>
- <param name="tag" value="[e${eclipse.version}][perf]"/>
+ <param name="tag" value="[e${build.target}][perf]"/>
</antcall>
<antcall target="publish-helper-run">
<param name="file" value="TEST-*.xml"/>
- <param name="tag" value="[e${eclipse.version}][stdl]"/>
+ <param name="tag" value="[e${build.target}][stdl]"/>
</antcall>
</target>
<target name="publish-helper-run">
<path id="file.id">
- <fileset dir="${build.results}/test-${eclipse.version}">
+ <fileset dir="${build.results}/test-${build.target}">
<include name="${file}"/>
</fileset>
</path>
@@ -194,6 +194,16 @@
</antcall>
</target>
+ <target name="sign" depends="init,init-scripts">
+ <exec executable="bin/sign-update-site.sh" failonerror="true">
+ <arg value="${version}"/>
+ <arg value="${qualifier}"/>
+ </exec>
+ </target>
+
+ <target name="galileo" depends="weekly,sign">
+ </target>
+
<target name="promote" depends="init">
<property name="dist.dir" value="${dist.home}/update-archive/${version}/${qualifier}" />
<property name="target.dir" value="${dist.home}/update/${target}" />
@@ -224,12 +234,14 @@
<target name="update-versions">
+ <fail message="Use -DoldVersion=x.y.z to set old version." unless="oldVersion"/>
+
<replace dir="..">
<replacefilter
- token="3.1.0.qualifier"
+ token="${oldVersion}.qualifier"
value="${version}.qualifier"/>
<replacefilter
- token="3.1.0.mylynQualifier"
+ token="${oldVersion}.mylynQualifier"
value="${version}.mylynQualifier"/>
<include name="org.eclipse.mylyn*/**/MANIFEST.MF"/>
<include name="org.eclipse.mylyn*/**/feature.xml"/>
diff --git a/org.eclipse.mylyn.releng/customTargets.xml b/org.eclipse.mylyn.releng/customTargets.xml
index f74cd23e..f015ee79 100644
--- a/org.eclipse.mylyn.releng/customTargets.xml
+++ b/org.eclipse.mylyn.releng/customTargets.xml
@@ -3,8 +3,8 @@
<target name="preBuild">
<delete>
- <fileset dir="${build.home}/${eclipse.version}/maps" includes="mylyn*.map">
- <exclude name="*${eclipse.version}.map"/>
+ <fileset dir="${build.home}/${build.target}/maps" includes="mylyn*.map">
+ <exclude name="*${build.target}.map"/>
</fileset>
</delete>
</target>
diff --git a/org.eclipse.mylyn.releng/defaults.properties b/org.eclipse.mylyn.releng/defaults.properties
index 32891467..88a02eca 100644
--- a/org.eclipse.mylyn.releng/defaults.properties
+++ b/org.eclipse.mylyn.releng/defaults.properties
@@ -2,7 +2,7 @@
version=3.1.0
# eclipse versions to build and test against
-eclipse=3.3,3.4,3.5
+targets=3.3,3.4,3.5
# base directory for eclipse sdk and eclipse test
eclipse.base=${basedir}/tools
@@ -14,20 +14,18 @@ build.timestamp=${build.home}/timestamp.properties
# distribution directory for update sites
dist.home=${basedir}/dist
-# credentials for test cases
-build.credentials=${basedir}/credentials.properties
+# unix group that needs write access to artifcats
+dist.group=mylynadmin
# test-reporter properties
build.reporter.config=${basedir}/repository.properties
build.reporter.jar=${basedir}/test-report.jar
build.reporter.jvm=${java.home}/bin/java
-# unix group that needs write access to artifcats
-dist.group=mylynadmin
-
# directory for build artifact
build.results=${basedir}/build-results
+# test parameter
build.host=default
build.assertAgainst=v20080619-1900
build.baseline=3.0_${build.assertAgainst}-${build.assertAgainst}
@@ -36,6 +34,7 @@ build.scenario=org.eclipse.mylyn
build.extraTestArgs=-Dmylyn.credentials=${build.credentials}
build.testxml=org.eclipse.mylyn.tests_0.0.0/test.xml
+# build environment
build.os=linux
build.ws=gtk
build.arch=x86
diff --git a/org.eclipse.mylyn.releng/scripts/buildHelper.xml b/org.eclipse.mylyn.releng/scripts/buildHelper.xml
index ec4ff01b..2ffc1fe4 100644
--- a/org.eclipse.mylyn.releng/scripts/buildHelper.xml
+++ b/org.eclipse.mylyn.releng/scripts/buildHelper.xml
@@ -4,9 +4,9 @@
<available classname="java.lang.Enum" property="java.isVersion5OrHigher"/>
- <condition property="skip3.3"><not><contains string="${eclipse}" substring="3.3"/></not></condition>
- <condition property="skip3.4"><not><contains string="${eclipse}" substring="3.4"/></not></condition>
- <condition property="skip3.5"><not><contains string="${eclipse}" substring="3.5"/></not></condition>
+ <condition property="skip3.3"><not><contains string="${targets}" substring="3.3"/></not></condition>
+ <condition property="skip3.4"><not><contains string="${targets}" substring="3.4"/></not></condition>
+ <condition property="skip3.5"><not><contains string="${targets}" substring="3.5"/></not></condition>
<available property="customTargets" file="${basedir}/customTargets.xml" value="${basedir}/customTargets.xml"/>
<property name="customTargets" location="${basedir}/scripts/customTargets.xml"/>
@@ -23,7 +23,7 @@
</target>
<target name="clean-build">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="clean-build-helper"/>
</antcall>
</target>
@@ -33,19 +33,19 @@
</target>
<target name="clean-tools">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="clean-tools-helper"/>
</antcall>
</target>
<target name="clean-tests">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="clean-tests-helper"/>
</antcall>
</target>
<target name="build" depends="init-build,init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="build-helper"/>
</antcall>
</target>
@@ -54,27 +54,27 @@
</target>
<target name="eclipse-tests" depends="init-tests">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="tests-helper"/>
<param name="test.target" value="run"/>
</antcall>
</target>
<target name="performance-tests" depends="init-tests">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="tests-helper"/>
<param name="test.target" value="performance"/>
</antcall>
</target>
<target name="package" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="package-helper"/>
</antcall>
</target>
<target name="report" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="report-helper"/>
</antcall>
</target>
@@ -101,25 +101,32 @@
</target>
<target name="init-build" depends="init-base">
- <antcall target="forEach">
+ <property file="${build.timestamp}" />
+ <antcall target="init-timestamp"/>
+ <antcall target="for-each-target">
<param name="call" value="get-build-dependencies-helper"/>
</antcall>
</target>
<target name="init-tests" depends="init">
- <antcall target="forEach">
+ <antcall target="for-each-target">
<param name="call" value="get-test-dependencies-helper"/>
</antcall>
</target>
<target name="init" depends="init-base">
<property file="${build.timestamp}" />
- <antcall target="init-timestamp"/>
- <property file="${build.timestamp}" />
- <echo message="Building ${version}.${qualifier}" />
+ <fail message="No qualifier specified. Please run build first." unless="qualifier"/>
+ <echo message="Building ${version}.${qualifier}" />
+ </target>
+
+ <target name="init-scripts">
+ <chmod perm="755">
+ <fileset dir="${basedir}/bin"/>
+ </chmod>
</target>
- <target name="forEach">
+ <target name="for-each-target">
<antcall target="e3.3"/>
<antcall target="e3.4"/>
<antcall target="e3.5"/>
@@ -127,30 +134,30 @@
<target name="e3.3" unless="skip3.3">
<antcall target="${call}">
- <param name="eclipse.version" value="3.3"/>
- <param name="eclipse.url" value="${eclipse.url.3.3}"/>
+ <param name="build.target" value="3.3"/>
+ <param name="eclipse.sdk.url" value="${eclipse.url.3.3}"/>
<param name="eclipse.sdk.version" value="${eclipse.sdk.3.3}"/>
</antcall>
</target>
<target name="e3.4" unless="skip3.4">
<antcall target="${call}">
- <param name="eclipse.version" value="3.4"/>
- <param name="eclipse.url" value="${eclipse.url.3.4}"/>
+ <param name="build.target" value="3.4"/>
+ <param name="eclipse.sdk.url" value="${eclipse.url.3.4}"/>
<param name="eclipse.sdk.version" value="${eclipse.sdk.3.4}"/>
</antcall>
</target>
<target name="e3.5" unless="skip3.5">
<antcall target="${call}">
- <param name="eclipse.version" value="3.5"/>
- <param name="eclipse.url" value="${eclipse.url.3.5}"/>
+ <param name="build.target" value="3.5"/>
+ <param name="eclipse.sdk.url" value="${eclipse.url.3.5}"/>
<param name="eclipse.sdk.version" value="${eclipse.sdk.3.5}"/>
</antcall>
</target>
<target name="copy-maps-helper">
- <copy todir="${build.home}/${eclipse.version}/maps">
+ <copy todir="${build.home}/${build.target}/maps">
<fileset dir="${basedir}/maps">
<include name="*.map"/>
</fileset>
@@ -171,10 +178,10 @@
</path>
<property name="pde.build.script" refid="pde.build.script.id"/>
<property name="build.forceContextQualifier" value="${qualifier}" />
- <property name="build.extraBuildArgs" value="-Dignore=" />
- <available property="builder" file="${basedir}/config/${eclipse.version}" value="${basedir}/config/${eclipse.version}"/>
+ <property name="build.extraBuildArgs" value="-Dnoextrabuildargs=true" />
+ <available property="builder" file="${basedir}/config/${build.target}" value="${basedir}/config/${build.target}"/>
<property name="builder" location="${basedir}/config"/>
- <property name="log" value="${build.results}/build-${eclipse.version}.log" />
+ <property name="log" value="${build.results}/build-${build.target}.log" />
<echo message="Building ${version}.${build.forceContextQualifier} on Eclipse ${eclipse.sdk.version}" />
<echo message="Output is logged to ${log}" />
@@ -193,7 +200,7 @@
<arg value="${pde.build.script}"/>
<arg value="-DbaseLocation=${eclipse.home}"/>
<arg value="-Dbuilder=${builder}"/>
- <arg value="-DbuildDirectory=${build.home}/${eclipse.version}"/>
+ <arg value="-DbuildDirectory=${build.home}/${build.target}"/>
<arg value="-DforceContextQualifier=${build.forceContextQualifier}"/>
<arg value="-DmajorVersion=${version}"/>
<arg value="${build.extraBuildArgs}"/>
@@ -201,7 +208,7 @@
</target>
<target name="clean-build-helper">
- <delete dir="${build.home}/${eclipse.version}" />
+ <delete dir="${build.home}/${build.target}" />
</target>
<target name="clean-tests-helper">
@@ -220,7 +227,7 @@
</target>
<target name="report-helper">
- <property name="results.home" value="${build.results}/test-${eclipse.version}" />
+ <property name="results.home" value="${build.results}/test-${build.target}" />
<mkdir dir="${results.home}" />
<xslt style="${basedir}/scripts/JUNIT.XSL" basedir="${results.home}" includes="org*.xml" destdir="${results.home}" />
@@ -254,11 +261,11 @@
<arg value="-current"/>
<arg value="${qualifier}"/>
<arg value="-config"/>
- <arg value="${build.host}-${eclipse.version}"/>
+ <arg value="${build.host}-${build.target}"/>
<arg value="-jvm"/>
<arg value="${java.version}"/>
<arg value="-output"/>
- <arg value="${build.results}/performance-${eclipse.version}"/>
+ <arg value="${build.results}/performance-${build.target}"/>
<arg value="-print"/>
<arg value="-scenario.pattern"/>
<arg value="${build.scenario}%"/>
@@ -271,10 +278,10 @@
<!-- extract sdk for building -->
<mkdir dir="${eclipse.base}/sdk-${eclipse.sdk.version}" />
- <basename property="file.sdk" file="${eclipse.url}"/>
+ <basename property="file.sdk" file="${eclipse.sdk.url}"/>
<antcall target="getBundle">
<param name="file" value="${file.sdk}" />
- <param name="url" value="${eclipse.url}"/>
+ <param name="url" value="${eclipse.sdk.url}"/>
</antcall>
<antcall target="unpackBundle">
<param name="file" value="${file.sdk}" />
@@ -296,6 +303,11 @@
<param name="unpackDest" value="${eclipse.base}/sdk-${eclipse.sdk.version}"/>
<param name="isUnpackedFile" value="${eclipse.base}/sdk-${eclipse.sdk.version}/eclipse/plugins/org.eclipse.pde.build.svn_1.0.1.v20070222.jar"/>
</antcall>
+ <available property="svn.exists" file="${eclipse.base}/sdk-${eclipse.sdk.version}/org.eclipse.releng.basebuilder"/>
+ <antcall target="get-build-dependencies-helper-svn-move"/>
+ </target>
+
+ <target name="get-build-dependencies-helper-svn-move" if="svn.exists">
<move todir="${eclipse.base}/sdk-${eclipse.sdk.version}/eclipse" failonerror="false">
<fileset dir="${eclipse.base}/sdk-${eclipse.sdk.version}/org.eclipse.releng.basebuilder">
<include name="**/*"/>
@@ -310,7 +322,7 @@
<!-- extract sdk for testing and install test framework -->
<mkdir dir="${eclipse.base}/test-${eclipse.sdk.version}" />
- <basename property="file.sdk" file="${eclipse.url}"/>
+ <basename property="file.sdk" file="${eclipse.sdk.url}"/>
<antcall target="unpackBundle">
<param name="file" value="${file.sdk}" />
<param name="unpackDest" value="${eclipse.base}/test-${eclipse.sdk.version}"/>
@@ -344,7 +356,7 @@
<target name="install-tests-helper">
<property name="eclipse.home" value="${eclipse.base}/test-${eclipse.sdk.version}/eclipse" />
- <condition property="install.dir" value="${eclipse.home}" else="${eclipse.home}/dropins/test"><equals arg1="${eclipse.version}" arg2="3.3"/></condition>
+ <condition property="install.dir" value="${eclipse.home}" else="${eclipse.home}/dropins/test"><equals arg1="${build.target}" arg2="3.3"/></condition>
<ant antfile="${customTargets}" target="preTestInstall" />
@@ -356,7 +368,7 @@
</delete>
<unzip dest="${install.dir}">
- <fileset dir="${build.home}/${eclipse.version}/dist">
+ <fileset dir="${build.home}/${build.target}/dist">
<include name="*.zip"/>
<exclude name="*sdk*"/>
</fileset>
@@ -375,8 +387,8 @@
</fileset>
</path>
<property name="library" refid="library.id"/>
- <condition property="script.test" value="${eclipse.home}/plugins/${build.testxml}" else="${eclipse.home}/dropins/test/plugins/${build.testxml}"><equals arg1="${eclipse.version}" arg2="3.3"/></condition>
- <property name="log" value="${build.results}/test-${test.target}-${eclipse.version}.log" />
+ <condition property="script.test" value="${eclipse.home}/plugins/${build.testxml}" else="${eclipse.home}/dropins/test/plugins/${build.testxml}"><equals arg1="${build.target}" arg2="3.3"/></condition>
+ <property name="log" value="${build.results}/test-${test.target}-${build.target}.log" />
<echo message="Testing ${test.target} against ${version}.${qualifier} on Eclipse ${eclipse.sdk.version}" />
<echo message="Output is logged to ${log}" />
@@ -401,13 +413,13 @@
<arg value="-DextraVMargs=
-ea
-Declipse.perf.dbloc=${build.db}
- -Declipse.perf.config=build=${qualifier};config=${build.host}-${eclipse.version};jvm=${java.version}
+ -Declipse.perf.config=build=${qualifier};config=${build.host}-${build.target};jvm=${java.version}
-Declipse.perf.assertAgainst=build=${build.assertAgainst}
${build.extraTestArgs}" />
<arg value="${test.target}"/>
</java>
- <copy todir="${build.results}/test-${eclipse.version}">
+ <copy todir="${build.results}/test-${build.target}">
<fileset dir="${eclipse.home}/results"/>
</copy>
</target>
@@ -433,7 +445,7 @@
<property name="application" value="org.eclipse.update.core.siteOptimizer" />
<property name="eclipse.home" value="${eclipse.base}/sdk-${eclipse.sdk.3.4}/eclipse" />
<property name="vmargs" value=" -Xms40m -Xmx512m"/>
- <property name="log" value="${build.results}/pack-${eclipse.version}.log" />
+ <property name="log" value="${build.results}/pack-${build.target}.log" />
<echo message="Packing update site ${dir}" />
<echo message="Output is logged to ${log}" />
@@ -506,7 +518,7 @@
</fileset>
</path>
<property name="pde.build.script" refid="pde.build.script.id"/>
- <property name="log" value="${build.results}/package-${eclipse.version}.log" />
+ <property name="log" value="${build.results}/package-${build.target}.log" />
<echo message="Packaging ${version}.${qualifier} on Eclipse ${eclipse.sdk.version}" />
<echo message="Output is logged to ${log}" />

Back to the top