Releng: use test versions from finalPluginsVersions.properties
diff --git a/releng/build-scripts/build/build.xml b/releng/build-scripts/build/build.xml
index 4c943a7..a5e3f2f 100644
--- a/releng/build-scripts/build/build.xml
+++ b/releng/build-scripts/build/build.xml
@@ -29,37 +29,38 @@
<loadproperties srcfile="${OTScriptDir}/buildVersions.properties" />
<loadproperties srcfile="${builder}/build.properties" />
- <target name="main">
- <!--Default values for required properties-->
- <property name="buildDirectory" value="${build.root.dir}/src" />
- <echo message="BUILDDIR: ${buildDirectory}" />
- <delete failonerror="true" dir="${buildDirectory}" />
- <antcall target="create.label.properties" />
- <property file="${buildDirectory}/label.properties" />
+ <target name="main">
+ <!--Default values for required properties-->
+ <property name="buildDirectory" value="${build.root.dir}/src" />
+ <echo message="BUILDDIR: ${buildDirectory}" />
+ <delete failonerror="true" dir="${buildDirectory}" />
+ <antcall target="create.label.properties" />
+ <property file="${buildDirectory}/label.properties" />
- <!--fetch the HEAD stream of all projects if build type specified as N-->
- <condition property="fetchTag" value="HEAD">
- <equals arg1="${buildType}" arg2="N" />
- </condition>
- <property name="fetchTag" value="" />
+ <!--fetch the HEAD stream of all projects if build type specified as N-->
+ <condition property="fetchTag" value="HEAD">
+ <equals arg1="${buildType}" arg2="N" />
+ </condition>
+ <property name="fetchTag" value="" />
- <!--set the compiler and compiler arguments-->
- <!--the default compiler is set to the one used by eclipse rel. eng. -->
- <loadproperties srcfile="${OTScriptDir}/compiler.${component.short}.properties" />
- <echo message="javacSource=${javacSource}" />
-
- <!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
- <property name="buildingOSGi" value="true" />
-
- <!--let ecotj be generated into a "safe" location: -->
- <property name="postingDirectory" value="${build.root.dir}/../ecj" />
+ <!--set the compiler and compiler arguments-->
+ <!--the default compiler is set to the one used by eclipse rel. eng. -->
+ <loadproperties srcfile="${OTScriptDir}/compiler.${component.short}.properties" />
+ <echo message="javacSource=${javacSource}" />
- <!--run the pde-build for the specified ${builder} (OT-Compiler or OTDT-Build) -->
- <ant antfile="build.xml" dir="${baseLocation}/${run.eclipseScriptDir}" />
+ <!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
+ <property name="buildingOSGi" value="true" />
- </target>
+ <!--let ecotj be generated into a "safe" location: -->
+ <property name="postingDirectory" value="${build.root.dir}/../ecj" />
+
+ <!--run the pde-build for the specified ${builder} (OT-Compiler or OTDT-Build) -->
+ <ant antfile="build.xml" dir="${baseLocation}/${run.eclipseScriptDir}" />
+
+ </target>
- <target name="create.label.properties" unless="label.properties.exists">
+
+ <target name="create.label.properties" unless="label.properties.exists">
<mkdir dir="${buildDirectory}" />
<tstamp/>
<property name="date" value="${DSTAMP}" />
@@ -85,17 +86,6 @@
</echo>
<available file="${buildDirectory}/label.properties" property="label.properties.exists" />
-
- <!-- ======== Insert SDK build qualifier and current qualifier into our configuration file: ======== -->
- <copy file="${OTScriptDir}/test.properties.in" tofile="${OTScriptDir}/test.properties">
- <filterset>
- <filter token="SDK_QUALIFIER" value="${eclipse.sdk.qualifier}"/>
- <filter token="QUALIFIER" value="${timestamp}"/>
- </filterset>
- </copy>
-
- <!-- versions of test plugins: -->
- <loadproperties srcfile="${OTScriptDir}/test.properties" />
</target>
</project>
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 9ba145b..9c4980c 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -69,7 +69,15 @@
<filter token="SDK_QUALIFIER" value="${eclipse.sdk.qualifier}"/>
</filterset>
</copy>
- <!-- Note: test.properites.in is now processed in build.xml:create.label.properties -->
+ <!-- Insert SDK build qualifier into our configuration file: -->
+ <copy file="${OTScriptDir}/test.properties.in" tofile="${OTScriptDir}/test.properties" overwrite="true">
+ <filterset>
+ <filter token="SDK_QUALIFIER" value="${eclipse.sdk.qualifier}"/>
+ </filterset>
+ </copy>
+
+ <!-- versions of test plugins: -->
+ <loadproperties srcfile="${OTScriptDir}/test.properties" />
<!-- ======== More Configuration Details: ======== -->
<!-- maybe obsolete: file prefix to distinguish output files. -->
@@ -237,7 +245,6 @@
<arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
<arg value="-DmapVersionTag=${mapVersionTag}"/>
<arg value="-Dmap.file.path=${map.file.path}"/>
- <arg value="-Declipse.sdk.qualifier=${eclipse.sdk.qualifier}"/>
<arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
<arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
<!--arg value="-verbose" /-->
@@ -315,7 +322,6 @@
<arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
<arg value="-Dmap.file.path=${map.file.path}"/>
<arg value="-DmapVersionTag=${mapVersionTag}"/>
- <arg value="-Declipse.sdk.qualifier=${eclipse.sdk.qualifier}"/>
<arg value="-Ddo.run.tests=${do.run.tests}"/>
<arg value="-Ddo.build.all=${do.build.all}"/>
<arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
diff --git a/releng/build-scripts/build/test.properties.in b/releng/build-scripts/build/test.properties.in
index 6e10853..ee278c6 100644
--- a/releng/build-scripts/build/test.properties.in
+++ b/releng/build-scripts/build/test.properties.in
@@ -1,21 +1,19 @@
# versions of test plugins:
-# ----
-org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.8.2.@SDK_QUALIFIER@
-org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.8.100.@SDK_QUALIFIER@
-org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.9.1.@QUALIFIER@
-org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.9.0.@QUALIFIER@
-org.eclipse.test.performance=org.eclipse.test.performance_3.7.0.@SDK_QUALIFIER@
+# ---- versions of test bundles compiled from an existing GIT tag: ----
+org.eclipse.jdt.core.tests.builder=3.8.2.@SDK_QUALIFIER@
+org.eclipse.jdt.debug.tests=3.8.100.@SDK_QUALIFIER@
+#org.eclipse.jdt.ui.tests=3.9.1.@SDK_QUALIFIER@
+#org.eclipse.jdt.ui.tests.refactoring=3.9.0.@SDK_QUALIFIER@
+org.eclipse.test.performance=3.7.0.@SDK_QUALIFIER@
# ----
-# tests with OT modifications:
-org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.9.2.@QUALIFIER@
-org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.9.2.@QUALIFIER@
+# versions for test bundles not listed here are taken from build-root/src/finalPluginsVersions.properties
-org.eclipse.objectteams.otdt.tests=org.eclipse.objectteams.otdt.tests_2.0.0
-org.eclipse.objectteams.otdt.ui.tests=org.eclipse.objectteams.otdt.ui.tests_2.0.0
-org.eclipse.objectteams.otdt.ui.tests.dom=org.eclipse.objectteams.otdt.ui.tests.dom_2.0.0
-org.eclipse.objectteams.otdt.debug.tests=org.eclipse.objectteams.otdt.debug.tests_2.0.0
-org.eclipse.objectteams.otdt.ui.tests.refactoring=org.eclipse.objectteams.otdt.ui.tests.refactoring_2.0.0
-org.eclipse.objectteams.otdt.test.builder=org.eclipse.objectteams.otdt.test.builder_2.0.0
+#org.eclipse.objectteams.otdt.tests=2.0.0
+#org.eclipse.objectteams.otdt.ui.tests=2.0.0
+#org.eclipse.objectteams.otdt.ui.tests.dom=2.0.0
+#org.eclipse.objectteams.otdt.debug.tests=2.0.0
+#org.eclipse.objectteams.otdt.ui.tests.refactoring=2.0.0
+#org.eclipse.objectteams.otdt.test.builder=2.0.0
diff --git a/releng/build-scripts/build/test.xml b/releng/build-scripts/build/test.xml
index 1582008..e67e9c9 100644
--- a/releng/build-scripts/build/test.xml
+++ b/releng/build-scripts/build/test.xml
@@ -16,6 +16,7 @@
<!--properties file containing the build information-->
<property file="src/label.properties" />
+ <property file="src/finalPluginsVersions.properties" />
<target name="readFlags">
<condition property="really.build.all">
@@ -70,19 +71,19 @@
<target name="otdt_tests" description="Runs the org.eclipse.objectteams.otdt.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.objectteams.otdt.tests}" />
+ <param name="testPlugin" value="org.eclipse.objectteams.otdt.tests_${org.eclipse.objectteams.otdt.tests}" />
</antcall>
</target>
<target name="jdtcore_compiler_tests" description="Runs the org.eclipse.jdt.core.tests.compiler test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jdt.core.tests.compiler}" />
+ <param name="testPlugin" value="org.eclipse.jdt.core.tests.compiler_${org.eclipse.jdt.core.tests.compiler}" />
</antcall>
</target>
<target name="jdtcore_model_tests" description="Runs the org.eclipse.jdt.core.tests.model test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jdt.core.tests.model}" />
+ <param name="testPlugin" value="org.eclipse.jdt.core.tests.model_${org.eclipse.jdt.core.tests.model}" />
</antcall>
</target>
@@ -90,26 +91,26 @@
<property name="library-file"
value="${test.root.dir}/library.xml"/>
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jdt.core.tests.builder}" />
+ <param name="testPlugin" value="org.eclipse.jdt.core.tests.builder_${org.eclipse.jdt.core.tests.builder}" />
</antcall>
</target>
<target name="otdt_ui_tests" description="Runs the org.eclipse.objectteams.otdt.ui.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.objectteams.otdt.ui.tests}" />
+ <param name="testPlugin" value="org.eclipse.objectteams.otdt.ui.tests_${org.eclipse.objectteams.otdt.ui.tests}" />
</antcall>
</target>
<target name="otdt_dom_tests" description="Runs the org.eclipse.objectteams.otdt.ui.tests.dom test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.objectteams.otdt.ui.tests.dom}" />
+ <param name="testPlugin" value="org.eclipse.objectteams.otdt.ui.tests.dom_${org.eclipse.objectteams.otdt.ui.tests.dom}" />
</antcall>
</target>
<target name="otdt_ref_tests" description="Runs the org.eclipse.objectteams.otdt.ui.tests.refactoring test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.objectteams.otdt.ui.tests.refactoring}" />
+ <param name="testPlugin" value="org.eclipse.objectteams.otdt.ui.tests.refactoring_${org.eclipse.objectteams.otdt.ui.tests.refactoring}" />
</antcall>
</target>
@@ -117,7 +118,7 @@
<property name="library-file"
value="${test.root.dir}/library.xml"/>
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jdt.ui.tests}" />
+ <param name="testPlugin" value="org.eclipse.jdt.ui.tests_${org.eclipse.jdt.ui.tests}" />
</antcall>
</target>
@@ -125,7 +126,7 @@
<property name="library-file"
value="${test.root.dir}/library.xml"/>
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jdt.ui.tests.refactoring}" />
+ <param name="testPlugin" value="org.eclipse.jdt.ui.tests.refactoring_${org.eclipse.jdt.ui.tests.refactoring}" />
</antcall>
</target>
@@ -133,19 +134,19 @@
<property name="library-file"
value="${test.root.dir}/library.xml"/>
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jdt.debug.tests}" />
+ <param name="testPlugin" value="org.eclipse.jdt.debug.tests_${org.eclipse.jdt.debug.tests}" />
</antcall>
</target>
<target name="otdt_debug_tests" description="Runs the org.eclipse.objectteams.otdt.debug.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.objectteams.otdt.debug.tests}" />
+ <param name="testPlugin" value="org.eclipse.objectteams.otdt.debug.tests_${org.eclipse.objectteams.otdt.debug.tests}" />
</antcall>
</target>
<target name="otdt_builder_tests" description="Runs the org.eclipse.objectteams.otdt.test.builder test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.objectteams.otdt.test.builder}" />
+ <param name="testPlugin" value="org.eclipse.objectteams.otdt.test.builder_${org.eclipse.objectteams.otdt.test.builder}" />
</antcall>
</target>