From f7b1ab708fb7b5a8ecccc443248c9a8492a4f8f7 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 25 Jan 2008 12:23:19 +0000
Subject: [PATCH] Do not forceContextQualifier but
 genereateFeatureVersionSuffix

---
 releng/org.eclipse.tm.releng/buildAll.xml     |  4 ++-
 .../builder/doc/build.properties              |  2 ++
 .../builder/examples/build.properties         |  1 +
 .../builder/runtime/build.properties          |  1 +
 .../builder/sdk/build.properties              |  1 +
 .../builder/tests/build.properties            |  1 +
 .../tests/configs/local/customTest.xml        |  3 ++-
 .../tests/configs/local/relengbuildgtk.sh     |  2 +-
 .../builder/tests/customTargets.xml           | 26 ++++++++++++++++++-
 .../builder/tests/scripts/test.xml            | 11 +++++---
 10 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/releng/org.eclipse.tm.releng/buildAll.xml b/releng/org.eclipse.tm.releng/buildAll.xml
index 2a3af34c71c..36f6917f3ff 100644
--- a/releng/org.eclipse.tm.releng/buildAll.xml
+++ b/releng/org.eclipse.tm.releng/buildAll.xml
@@ -84,7 +84,7 @@ propertyName=propertyValue
 
 		<property name="buildAlias" value="${buildLabel}" />
 		<property name="buildId" value="${buildAlias}" />
-		<property name="forceContextQualifier" value="v${timestamp}"/>
+		<!-- <property name="forceContextQualifier" value="v${timestamp}"/> -->
 
 		<!--store the build label information in a file-->
 		<echo file="${buildDirectory}/label.properties" append="true" >
@@ -102,9 +102,11 @@ propertyName=propertyValue
 		<echo file="${buildDirectory}/label.properties" append="true">
 		buildAlias=${buildAlias}
 		</echo>
+		<!--
 		<echo file="${buildDirectory}/label.properties" append="true" >
 		forceContextQualifier=${forceContextQualifier}
 		</echo>
+		-->
 	</target>
 
 	<target name="run" depends="init">
diff --git a/releng/org.eclipse.tm.releng/builder/doc/build.properties b/releng/org.eclipse.tm.releng/builder/doc/build.properties
index 4de75becca6..ffd2815681e 100644
--- a/releng/org.eclipse.tm.releng/builder/doc/build.properties
+++ b/releng/org.eclipse.tm.releng/builder/doc/build.properties
@@ -22,3 +22,5 @@ zipargs=
 archivesFormat = *,*,*-antZip
 collectingFolder=eclipse
 archivePrefix=eclipse
+generateFeatureVersionSuffix=true
+generateVersionsList=true
diff --git a/releng/org.eclipse.tm.releng/builder/examples/build.properties b/releng/org.eclipse.tm.releng/builder/examples/build.properties
index 4de75becca6..fe16598ca9b 100644
--- a/releng/org.eclipse.tm.releng/builder/examples/build.properties
+++ b/releng/org.eclipse.tm.releng/builder/examples/build.properties
@@ -22,3 +22,4 @@ zipargs=
 archivesFormat = *,*,*-antZip
 collectingFolder=eclipse
 archivePrefix=eclipse
+generateFeatureVersionSuffix=true
\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/builder/runtime/build.properties b/releng/org.eclipse.tm.releng/builder/runtime/build.properties
index 4de75becca6..c9ada5ed3d3 100644
--- a/releng/org.eclipse.tm.releng/builder/runtime/build.properties
+++ b/releng/org.eclipse.tm.releng/builder/runtime/build.properties
@@ -22,3 +22,4 @@ zipargs=
 archivesFormat = *,*,*-antZip
 collectingFolder=eclipse
 archivePrefix=eclipse
+generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/sdk/build.properties b/releng/org.eclipse.tm.releng/builder/sdk/build.properties
index 4de75becca6..c9ada5ed3d3 100644
--- a/releng/org.eclipse.tm.releng/builder/sdk/build.properties
+++ b/releng/org.eclipse.tm.releng/builder/sdk/build.properties
@@ -22,3 +22,4 @@ zipargs=
 archivesFormat = *,*,*-antZip
 collectingFolder=eclipse
 archivePrefix=eclipse
+generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/tests/build.properties b/releng/org.eclipse.tm.releng/builder/tests/build.properties
index 4de75becca6..c9ada5ed3d3 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/build.properties
+++ b/releng/org.eclipse.tm.releng/builder/tests/build.properties
@@ -22,3 +22,4 @@ zipargs=
 archivesFormat = *,*,*-antZip
 collectingFolder=eclipse
 archivePrefix=eclipse
+generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml b/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
index f9d4022e7f9..45c594d9ad6 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
+++ b/releng/org.eclipse.tm.releng/builder/tests/configs/local/customTest.xml
@@ -24,7 +24,8 @@
 		<!-- TODO: if your project requires more dependencies for testing, add them here -->
 		<echo message="Copy EMF SDK + Eclipse SDK to ${executionDir}..."/>
 		<copy todir="${executionDir}">
-			<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile}"/>
+			<!--<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${wtpFile},${orbitFile}"/>-->
+			<fileset dir="${downloadsDir}" includes="${emfFile},${eclipseFile},${orbitFile}"/>
 		</copy>
 		<property name="shell" value="relengbuildgtk.sh"/>
 	
diff --git a/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh b/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh
index 9e5abf1034d..0bf2744c26e 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh
+++ b/releng/org.eclipse.tm.releng/builder/tests/configs/local/relengbuildgtk.sh
@@ -64,7 +64,7 @@ execCmd ()
 	echo ""; echo "[relengbuild] [`date +%H\:%M\:%S`]"; 
 	echo "  $1" | perl -pe "s/ -/\n  -/g";
 	if [ "x$2" != "x" ]; then
-		$1 | tee $2;
+		$1 2>&1 | tee $2;
 	else
 		$1;
 	fi
diff --git a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml b/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
index 55bbbfe15a3..ab528c060c8 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
@@ -67,6 +67,28 @@
 <!-- Steps to do after setup but before starting the build proper -->
 <!-- ===================================================================== -->
 <target name="postSetup">
+		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
+			<property name="url" value="${eclipseURL}" />
+			<property name="file" value="${eclipseFile}" />
+			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/plugin.xml" />
+		</ant>
+		<ant target="getDependency" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependencies.xml">
+			<property name="url" value="${emfURL}" />
+			<property name="file" value="${emfFile}" />
+			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" />
+		</ant>
+		<!-- Important: This must be the last dependency downloaded, because the
+					                getDependency target strips versions from all plug-ins -->
+		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
+			<property name="url" value="${orbitURL}" />
+			<property name="file" value="${orbitFile}" />
+		</ant>
+		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
+			<patternset>
+				<include name="**/org.apache.oro*.jar" />
+				<include name="**/org.apache.commons.net*.jar" />
+			</patternset>
+		</unzip>
 </target>
 
 <!-- ===================================================================== -->
@@ -167,7 +189,9 @@
 	<!--unzip the junit tests-->
     <mkdir dir="${workingDirectory}/eclipse" />
 	<unzip dest="${workingDirectory}" overwrite="true">
-		<fileset dir="${buildDirectory}/${buildLabel}"><include name="**/RSE-junit-tests*.zip"/></fileset>
+		<fileset dir="${buildDirectory}/${buildLabel}">
+			<include name="**/RSE-junit-tests*.zip"/>
+		</fileset>
 	</unzip>
 	
 	<!-- create top level testing directory-->    
diff --git a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml b/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
index 1d252548581..0f246c1f52a 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
+++ b/releng/org.eclipse.tm.releng/builder/tests/scripts/test.xml
@@ -35,6 +35,11 @@
 			<property name="file" value="${emfFile}" />
 			<property name="unpackDest" value="${install}"/>
 		</ant>
+		<ant target="getTestDependency" antfile="${getTestDependencies.xml}" dir="${common.releng.dir}">
+			<property name="url" value="${orbitURL}" />
+			<property name="file" value="${orbitFile}" />
+			<property name="unpackDest" value="${install}"/>
+		</ant>
 
 		<property name="dir" location="."/>
 		<echo message="Unpack SDK + JUnit Tests (${dir}/RSE-*.zip) ..."/>		
@@ -46,11 +51,11 @@
 	<target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin.  Requires a property value setting for testPlugin only if test.properties is not available.  The property testPlugin represents a directory name made up of the plugin id and plugin version.  This directory must contain a valid test.xml.">
 		<!-- TODO: if your test plugin is jarred, do nothing here
 		     TODO: if your test plugin is NOT a jarred plugin, uncomment the next line and comment out the 4 lines thereafter -->
-		<echo message="${eclipse-home}/plugins/${testPlugin} is not a jarred plugin. No unpack required!"/>
-		<!-- <echo message="Unpack ${eclipse-home}/plugins/${testPlugin}.jar to ${eclipse-home}/plugins/${testPlugin} ... "/>
+		<!-- <echo message="${eclipse-home}/plugins/${testPlugin} is not a jarred plugin. No unpack required!"/> -->
+		<echo message="Unpack ${eclipse-home}/plugins/${testPlugin}.jar to ${eclipse-home}/plugins/${testPlugin} ... "/>
 		<move file="${eclipse-home}/plugins/${testPlugin}.jar" tofile="${eclipse-home}/plugins/${testPlugin}_.jar"/>
 		<unjar src="${eclipse-home}/plugins/${testPlugin}_.jar" dest="${eclipse-home}/plugins/${testPlugin}"/>
-		<delete file="${eclipse-home}/plugins/${testPlugin}_.jar"/> -->
+		<delete file="${eclipse-home}/plugins/${testPlugin}_.jar"/>
 		
 		<echo message="Running test.xml from jarfile ${eclipse-home}/plugins/${testPlugin} ... "/>
 		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}"/>