. Update to 3.7.1.

Submitted by:	tg@

1 files changed, 29 insertions, 14 deletions

diff --git a/java/eclipse-devel/files/eclipse-build-upstream.patch b/java/eclipse-devel/files/eclipse-build-upstream.patch
index 69bee7f18dea..d4c5991762b7 100644
--- a/java/eclipse-devel/files/eclipse-build-upstream.patch
+++ b/java/eclipse-devel/files/eclipse-build-upstream.patch
@@ -17,11 +17,13 @@ Index: build.xml
 ===================================================================
 --- build.xml	(revision 23733)
 +++ build.xml	(working copy)
-@@ -130,6 +130,7 @@
+@@ -131,7 +131,8 @@
  		<ant inheritall="false" antfile="pdebuild.xml">
  			<property name="buildId" value="${buildId}" />
  			<property name="buildArch" value="${buildArch}" />
+-			<property name="buildDirectory" value="../../" />
 +			<property name="buildOs" value="${buildOs}" />
++			<property name="buildDirectory" value="../../" />
  		</ant>
  	</target>
  
@@ -148,7 +150,7 @@ Index: build.xml
  		<property name="swtjarpath" refid="swtjar" />
  		<symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" />
  		<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
-@@ -1023,7 +1027,7 @@
+@@ -1061,7 +1074,7 @@
                          <param name="p2.director.profile" value="PlatformProfile" />
                          <param name="p2.director.install.path" value="${installationDir}" />
                          <param name="p2.director.extraArgs" value="-purgeHistory" />
@@ -161,16 +163,16 @@ Index: pdebuild.xml
 ===================================================================
 --- pdebuild.xml	(revision 23733)
 +++ pdebuild.xml	(working copy)
-@@ -78,7 +78,7 @@
- 		<file name="org.eclipse.help.base" />
- 	</filelist>
- 	<filelist id="depsDirs2" dir="${sdkSource}/plugins">
--		<file name="org.eclipse.swt.gtk.linux.${buildArch}" />
-+		<file name="org.eclipse.swt.gtk.${buildOs}.${buildArch}" />
- 		<file name="org.eclipse.core.filesystem" />
- 		<file name="org.eclipse.core.resources" />
- 		<file name="org.eclipse.core.commands" />
-@@ -164,12 +164,14 @@
+@@ -88,7 +88,7 @@
+ 	<filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/>
+ 	
+ 	<property name="depsDirs2Property"
+-		value="org.eclipse.swt.gtk.linux.${buildArch}
++		value="org.eclipse.swt.gtk.${buildOs}.${buildArch}
+ 		       org.eclipse.core.filesystem
+ 		       org.eclipse.core.resources
+ 		       org.eclipse.core.commands
+@@ -214,12 +214,14 @@
  		<subant>
  			<property name="buildId" value="${buildId}" />
  			<property name="buildArch" value="${buildArch}" />
@@ -185,14 +187,27 @@ Index: pdebuild.xml
  			<property file="pdebuild.properties" />
  			<filelist refid="helpDirs" />
  		</subant>
-@@ -195,6 +197,7 @@
+@@ -245,6 +247,7 @@
  			<arg line="-application org.eclipse.ant.core.antRunner " />
  			<arg line="-buildfile ../pdebuild.xml generateScripts2" />
  			<arg line="-DbuildArch=${buildArch} " />
 +			<arg line="-DbuildOs=${buildOs} " />
  			<arg line="-DbuildId=${buildId} " />
- 			<arg line="-debug -consolelog " />
+ 			<arg line="-debug -consolelog" />
  		</java>
+@@ -287,10 +288,10 @@
+ 	<target name="removeGeneratedBuildXMLs" depends="zipPlugins2">
+ 		<fileset id="buildXMLsToKeep" dir="${sdkSource}/plugins"
+ 			excludes="**/org.eclipse.swt.gtk.*/*,
+-			**/org.eclipse.update.core.linux/**/*,
++			**/org.eclipse.update.core.${buildOs}/**/*,
+ 			**/org.eclipse.pde.build/scripts/*,
+ 			**/org.eclipse.jdt.core/scripts/*,
+-			**/org.eclipse.update.core.linux/src/*,
++			**/org.eclipse.update.core.${buildOs}/src/*,
+ 			**/org.eclipse.jdt.doc.isv/*,
+ 			**/org.eclipse.swt/*,
+ 			**/org.eclipse.jdt.doc.user/*"
 Index: publishProduct.xml
 ===================================================================
 --- publishProduct.xml	(revision 23733)