3 files changed, 49 insertions, 18 deletions
diff --git a/java/eclipse/files/patch-build b/java/eclipse/files/patch-build
index 21a526f1b77f..3dbdaaa59210 100644
--- a/java/eclipse/files/patch-build
+++ b/java/eclipse/files/patch-build
@@ -1,22 +1,11 @@
---- build.orig	Thu Sep 16 15:50:23 2004
-+++ build	Sat Oct 23 06:19:32 2004
-@@ -1,6 +1,6 @@
- #! /bin/sh
- 
--export ANT_OPTS=-Xmx1000M
-+export ANT_OPTS=-Xmx128M
- 
- bootclasspath=$JAVA_HOME/jre/lib/rt.jar
- os=""
-@@ -51,9 +51,9 @@
+--- build.orig	Wed Jul 13 00:45:46 2005
++++ build	Wed Jul 13 00:46:02 2005
+@@ -52,7 +52,7 @@
  	exit 1
  fi
  
--if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-amd64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] ||[ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ]
-+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-amd64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] ||[ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-motif-x86" ]
+-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ]
++if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-motif-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ]
  then
--	ant -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch -Dbootclasspath=$bootclasspath -DjavacTarget=1.2
-+	ant -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch -Dbootclasspath=$bootclasspath -DjavacTarget=1.4
- else
- 	echo "The os-ws-arch combination of $os-$ws-$arch is not valid."
- 	exit 1
+ 		 ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH		 
+ 		 ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
diff --git a/java/eclipse/files/patch-build.bat b/java/eclipse/files/patch-build.bat
new file mode 100644
index 000000000000..27006ce8beda
--- /dev/null
+++ b/java/eclipse/files/patch-build.bat
@@ -0,0 +1,12 @@
+--- build.bat.orig	Mon Jun 27 21:55:26 2005
++++ build.bat	Sun Jul 17 18:21:31 2005
+@@ -44,6 +44,9 @@
+ if %os%-%ws%-%arch%==qnx-photon-x86 goto run
+ if %os%-%ws%-%arch%==hpux-motif-ia64_32 goto run
+ if %os%-%ws%-%arch%==macosx-carbon-ppc goto run
++if %os%-%ws%-%arch%==freebsd-motif-x86 goto run
++if %os%-%ws%-%arch%==freebsd-gtk-x86 goto run
++if %os%-%ws%-%arch%==freebsd-gtk-amd64 goto run
+ 
+ ECHO The ws os arch combination entered is not valid.
+ goto end
diff --git a/java/eclipse/files/patch-build.xml b/java/eclipse/files/patch-build.xml
new file mode 100644
index 000000000000..d9b351762b89
--- /dev/null
+++ b/java/eclipse/files/patch-build.xml
@@ -0,0 +1,30 @@
+--- build.xml.orig	Mon Jun 27 21:55:26 2005
++++ build.xml	Sun Jul 17 18:50:50 2005
+@@ -63,11 +63,11 @@
+ 		<!--unzip launcher -->
+ 		<property name="launcherlibs" value="${buildDirectory}/launchertmp" />
+ 		<mkdir dir="${launcherlibs}" />
+-		<unzip dest="${launcherlibs}">
+-			<fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/">
+-				<include name="org.eclipse.platform_*/launchersrc.zip" />
++		<copy todir="${launcherlibs}">
++			<fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers">
++				<include name ="**"/>
+ 			</fileset>
+-		</unzip>
++		</copy>
+		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
+ 			<arg line="build.sh" />
+ 		</exec>
+@@ -265,7 +265,10 @@
+ 
+ 		<!--used to add doc plug-ins to result after initial assembly-->
+ 		<condition property="archive.format" value="tar">
+-			<equals arg1="${installOs}" arg2="linux" />
++			<or>
++				<equals arg1="${installOs}" arg2="linux" />
++				<equals arg1="${installOs}" arg2="freebsd" />
++			</or>
+ 		</condition>
+ 		<property name="archive.format" value="zip" />
+ 	</target>