1 files changed, 67 insertions, 77 deletions

diff --git a/java/eclipse-devel/files/eclipse-build-upstream.patch b/java/eclipse-devel/files/eclipse-build-upstream.patch
index 99bf3857f377..d393f7447deb 100644
--- a/java/eclipse-devel/files/eclipse-build-upstream.patch
+++ b/java/eclipse-devel/files/eclipse-build-upstream.patch
@@ -17,7 +17,7 @@ Index: build.xml
 ===================================================================
 --- build.xml	(revision 23733)
 +++ build.xml	(working copy)
-@@ -88,6 +88,7 @@
+@@ -130,6 +130,7 @@
  		<ant inheritall="false" antfile="pdebuild.xml">
  			<property name="buildId" value="${buildId}" />
  			<property name="buildArch" value="${buildArch}" />
@@ -25,7 +25,7 @@ Index: build.xml
  		</ant>
  	</target>
  
-@@ -264,7 +265,10 @@
+@@ -315,7 +316,10 @@
  		<!-- end back-ported patches -->
  		<!-- Only build for one target (bug #293952) -->
  		<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
@@ -34,10 +34,10 @@ Index: build.xml
 +			<replacefilter token="@build_arch@" value="${buildArch}" />
 +			<replacefilter token="@build_os@" value="${buildOs}" />
 +		</replace>
+ 		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
  		<echo file="patch-stamp" />
  	</target>
- 
-@@ -350,6 +354,7 @@
+@@ -399,6 +403,7 @@
  		<!--
  		<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
  			<property name="arch" value="${buildArch}"/>
@@ -45,7 +45,7 @@ Index: build.xml
  			<property name="builder" value="${buildConfig}" />
  		</ant>
  -->
-@@ -404,9 +409,9 @@
+@@ -462,9 +467,9 @@
  
  	<target name="compile.libgnomeproxy" if="build.libgnomeproxy">
  		<!-- build libgnomeproxy -->
@@ -58,7 +58,7 @@ Index: build.xml
  	</target>
  
  	<target name="compilelibs" unless="compilelibs.complete">
-@@ -418,16 +423,16 @@
+@@ -476,16 +481,16 @@
  				<include name="**/*.so" />
  			</fileset>
  		</delete>
@@ -78,14 +78,14 @@ Index: build.xml
  		<copy todir="${buildDirectory}/plugins/${launcherfragment}">
  			<fileset dir="${launcherlibs}/library/gtk">
  				<include name="**/*.so" />
-@@ -435,13 +440,13 @@
+@@ -493,13 +498,13 @@
  		</copy>
  
  		<!-- build liblocalfile -->
 -		<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
--		<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
+-		<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
 +		<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}" executable="make" failonerror="true" />
-+		<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.${buildOs}.${buildArch}/os/${buildOs}/${buildArch}">
++		<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.${buildOs}.${buildArch}/os/${buildOs}/${buildArch}">
  		</move>
  		<!-- build libgnomeproxy -->
  		<antcall target="compile.libgnomeproxy" />
@@ -95,7 +95,7 @@ Index: build.xml
  
  		<echo file="compilelibs-stamp" />
  	</target>
-@@ -544,7 +549,7 @@
+@@ -593,7 +598,7 @@
  			<arg line="-application org.eclipse.ant.core.antRunner " />
  			<arg line="-buildfile buildConfiguration.xml" />
  			<arg line="-propertyfile ${basedir}/build.properties " />
@@ -104,41 +104,41 @@ Index: build.xml
  			<arg line="-Dreposource=${reposource} " />
  			<arg line="-Dbasedir=${productFiles}/rcpConfig" />
  			<arg line="-DbuildId=${buildId} " />
-@@ -570,6 +575,7 @@
+@@ -631,6 +636,7 @@
  			<arg line="-buildfile publishProduct.xml" />
  			<arg line="-propertyfile ${basedir}/build.properties " />
  			<arg line="-DbuildArch=${buildArch} " />
 +			<arg line="-DbuildOs=${buildOs} " />
  			<arg line="-Dreposource=${reposource} " />
  			<arg line="-DbuildConfig=${buildConfig} " />
- 			<arg line="-DproductFiles=${productFiles} " />
-@@ -587,7 +593,7 @@
- 			<param name="p2.director.profile" value="SDKProfile" />
- 			<param name="p2.director.install.path" value="${buildDirectory}/installation" />
+ 			<arg line="-DproductFile=${productFile} " />
+@@ -721,7 +727,7 @@
+ 			<param name="p2.director.profile" value="${profileName}" />
+ 			<param name="p2.director.install.path" value="${provisionDir}" />
  			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
 -			<param name="p2.os" value="linux" />
 +			<param name="p2.os" value="${buildOs}" />
  			<param name="p2.ws" value="gtk" />
  			<param name="p2.arch" value="${buildArch}" />
  			<param name="p2.repo" value="${reposource}" />
-@@ -647,6 +653,8 @@
- 		<chmod perm="ugo+rx" file="${basedir}/runtests.sh" />
+@@ -800,6 +806,8 @@
+ 		-->
  		<exec executable="${basedir}/runtests.sh" dir="${basedir}">
  			<arg value="-t${timestamp}" />
 +			<arg value="-a${buildArch}" />
 +			<arg value="-o${buildOs}" />
- 		</exec>
- 		<property name="testResultDir" value="${basedir}/tests_${timestamp}/results" />
- 		<!-- Copy over the XML to generate a top-level report for all of the tests -->
-@@ -772,7 +780,7 @@
+ 			<arg value="-b ${testsBuildDirectory}" />
+ 			<arg value="-p ${provisionDir}" />
+ 			<arg value="${testSwitches}" />
+@@ -924,7 +932,7 @@
  		<property name="startupjarpath" refid="startupjar" />
- 		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" />
+ 		<symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" />
  		<!-- Create the "swt.jar" and friends symlinks  -->
--		<fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
-+		<fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
+-		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
++		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
  		<property name="swtjarpath" refid="swtjar" />
- 		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" />
- 		<symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk.jar" resource="plugins/${swtjarpath}" />
+ 		<symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" />
+ 		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
 Index: pdebuild.xml
 ===================================================================
 --- pdebuild.xml	(revision 23733)
@@ -179,10 +179,10 @@ Index: publishProduct.xml
 ===================================================================
 --- publishProduct.xml	(revision 23733)
 +++ publishProduct.xml	(working copy)
-@@ -2,7 +2,7 @@
+@@ -1,7 +1,7 @@
+ <project name="Eclipse SDK build" default="publish" basedir=".">
  	<target name="publish">
- 	        <echo message="Calling p2.publish.product with repository=${reposource} and productFile=${productFiles}/sdk/sdk.product"/>
- 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFiles}/sdk/sdk.product" compress="true">
+ 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFile}" compress="true">
 -			<config os="linux" ws="gtk" arch="${buildArch}" />
 +			<config os="${buildOs}" ws="gtk" arch="${buildArch}" />
  			<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" />
@@ -192,24 +192,25 @@ Index: runtests.sh
 ===================================================================
 --- runtests.sh	(revision 23733)
 +++ runtests.sh	(working copy)
-@@ -14,6 +14,8 @@
-    -g      Don't run the tests headless
-    -d      Allow remote connection to test runs' JVM
+@@ -16,6 +16,8 @@
+    -b      Tests build directory
+    -p      Clean installation directory to copy for running test suites
     -t      Timestamp string with which to tag the results
 +   -a      Architecture to run the tests on
 +   -o      OS to run the tests on
+    -v      Make test runs output to the console
  _EOF_
  }
+@@ -83,6 +85,8 @@
+ 		headless=1
+ 	fi
  
-@@ -72,6 +74,7 @@
- 	# Defaults
- 	debugTests=0
- 	headless=1
 +	buildOs=linux
- 	testFramework=org.eclipse.test_3.2.0
- 	if [ -z ${timestamp} ]; then
- 		timestamp=$(date "+%Y%m%d%H%M%S")
-@@ -116,21 +119,16 @@
++
+ 	label=$(grep label build.properties | sed s/label=//)
+ 	testframework=$(grep ^testframework build.properties | sed s/testframework=//)
+ 	
+@@ -142,21 +146,16 @@
  	if [ ${headless} == 1 ]; then
  		# Try to find Xvnc
  		xvnc=
@@ -238,7 +239,7 @@ Index: runtests.sh
  	fi
  }
  
-@@ -139,9 +137,11 @@
+@@ -165,9 +164,11 @@
  	port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
  	echo localhost > Xvnc.cfg
  	echo "Setting up Xvnc on port ${port} with password VNCpassword1"
@@ -252,7 +253,7 @@ Index: runtests.sh
  }
  
  function setArch() {
-@@ -160,13 +160,15 @@
+@@ -186,13 +187,15 @@
  	    		arch=ia64 ;;
  	    	ppc)
  	    		arch=ppc ;;
@@ -269,36 +270,36 @@ Index: runtests.sh
  	fi
  }
  
-@@ -177,7 +179,7 @@
- 	-application org.eclipse.ant.core.antRunner \
- 	-file $testDriver \
- 	-Declipse-home=${eclipseHome} \
--	-Dos=linux \
-+	-Dos=${buildOs} \
- 	-Dws=gtk \
- 	-Darch=${arch} \
- 	-Dlibrary-file=$libraryXml \
-@@ -185,7 +187,7 @@
- 	-logger org.apache.tools.ant.DefaultLogger \
- 	-vmargs \
- 	-Duser.home=${homedir} \
--	-Dosgi.os=linux \
-+	-Dosgi.os=${buildOs} \
- 	-Dosgi.ws=gtk \
- 	-Dosgi.arch=${arch}
- }
-@@ -288,7 +290,7 @@
+@@ -206,7 +209,7 @@
+ 		-application org.eclipse.ant.core.antRunner \
+ 		-file $testDriver \
+ 		-Declipse-home=${eclipseHome} \
+-		-Dos=linux \
++		-Dos=${buildOs} \
+ 		-Dws=gtk \
+ 		-Darch=${arch} \
+ 		-Dlibrary-file=$libraryXml \
+@@ -214,7 +217,7 @@
+ 		-logger org.apache.tools.ant.DefaultLogger \
+ 		-vmargs \
+ 		-Duser.home=${homedir} \
+-		-Dosgi.os=linux \
++		-Dosgi.os=${buildOs} \
+ 		-Dosgi.ws=gtk \
+ 		-Dosgi.arch=${arch}
+ 	else
+@@ -348,7 +351,7 @@
  }
  
  # Command-line arguments
--while getopts "de:gt:h" OPTION
-+while getopts "de:gt:a:o:h" OPTION
+-while getopts "vde:gb:p:t:h" OPTION
++while getopts "vde:gb:p:t:a:o:h" OPTION
  do
       case $OPTION in
           d)
-@@ -300,6 +302,12 @@
-          t)
-              timestamp=$OPTARG
+@@ -366,6 +369,12 @@
+          p)
+              provisionDir=$OPTARG
               ;;
 +         a)
 +             buildArch=$OPTARG
@@ -309,14 +310,3 @@ Index: runtests.sh
           h)
               usage
               exit 1
-Index: build.sh
-===================================================================
---- build.sh	(revision 23733)
-+++ build.sh	(working copy)
-@@ -38,5 +38,5 @@
- esac
- DATE=`date +%Y%m%d%H%M%S`
- 
--ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log
-+ant -DbuildArch=${arch} -DbuildOs=linux 2>&1 | tee build_${DATE}.log
- echo "Build log is available in build_${DATE}.log"