diff options
Diffstat (limited to 'java/eclipse-devel/files/patch-build.xml')
| -rw-r--r-- | java/eclipse-devel/files/patch-build.xml | 109 |
1 files changed, 56 insertions, 53 deletions
diff --git a/java/eclipse-devel/files/patch-build.xml b/java/eclipse-devel/files/patch-build.xml index 11ae1b708495..aa74f0125b20 100644 --- a/java/eclipse-devel/files/patch-build.xml +++ b/java/eclipse-devel/files/patch-build.xml @@ -1,8 +1,16 @@ ---- build.xml.orig 2007-06-26 04:57:50.000000000 +0900 -+++ build.xml 2007-09-01 17:22:26.000000000 +0900 -@@ -16,6 +16,15 @@ - <ant antfile="fetch_org.eclipse.equinox.executable.xml" /> - <ant antfile="fetch_org.eclipse.sdk.xml" /> +--- build.xml.orig 2007-09-22 02:02:44.000000000 +0900 ++++ build.xml 2007-10-19 13:37:04.000000000 +0900 +@@ -10,6 +10,7 @@ + + <target name="fetch" depends="init" if="srcFetch"> + <touch file="${cvspass}" /> ++ + <property name="featureOnly" value="true" /> + <property name="featureAndPlugins" value="true" /> + <property name="featuresRecursively" value="true" /> +@@ -21,6 +22,17 @@ + <mkdir dir="${linux.motif.rootfiles}" /> + <copy tofile="${linux.motif.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86/about.html" /> + <!--copy freebsd gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time--> + <property name="freebsd.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86" /> @@ -12,73 +20,68 @@ + <!--copy freebsd gtk amd64 about_files to in temp location where it will be copied into root of eclipse at assembly time--> + <property name="freebsd.gtk.amd64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.amd64" /> + <mkdir dir="${freebsd.gtk.amd64.rootfiles}" /> -+ <copy tofile="${freebsd.gtk.amd64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.amd64/about.html" /> - <!--copy linux motif about_files to in temp location where it will be copied into root of eclipse at assembly time--> - <property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" /> - <mkdir dir="${linux.motif.rootfiles}" /> -@@ -45,7 +54,11 @@ - <fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64" includes=" - about_files/mpl-v11.txt" /> ++ <copy tofile="${freebsd.gtk.amd64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.amd64/about.html" /> ++ ++ + <!--copy linux gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time--> + <property name="linux.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86" /> + <mkdir dir="${linux.gtk.x86.rootfiles}" /> +@@ -108,11 +120,18 @@ </copy> -- -+ -+ <copy todir="${freebsd.gtk.amd64.rootfiles}"> -+ <fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.amd64" includes=" -+ about_files/mpl-v11.txt" /> -+ </copy> - </target> - - <!-- Fill in values for original timestamp in all about.mappings files --> -@@ -104,16 +117,15 @@ - </exec> - <move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" /> -- <!-- build liblocalfile --> -- <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" /> -- <move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}"> -+ <!-- build liblocalfile FreeBSD --> + <!-- build liblocalfile --> ++ <!-- + <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" /> + <move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}"> ++ --> + <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/freebsd" executable="make" failonerror="true" /> + <move file="plugins/org.eclipse.core.filesystem/natives/unix/freebsd/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.freebsd.${installArch}/os/freebsd/${installArch}"> </move> -- <!-- build libupdate --> -- <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> -- -- </target> -+ <!-- build libupdate FreeBSD --> + <!-- build libupdate --> ++ <!-- + <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> ++ --> + <ant dir="plugins/org.eclipse.update.core.freebsd/src" antfile="build.xml" /> + </target> -+ </target> - - <!--create an installable eclipse runtime--> - <target name="install" depends="init"> -@@ -302,8 +314,8 @@ +@@ -305,8 +324,16 @@ </fail> <property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" /> - <property name="javacSource" value="1.6" /> - <property name="javacTarget" value="1.6" /> -+ <property name="javacSource" value="1.6" /> -+ <property name="javacTarget" value="1.6" /> ++ <property name="javacSource" value="1.5" /> ++ <property name="javacTarget" value="1.5" /> ++ <!-- for jdk1.6 --> ++ <condition property="javacSource" value="1.6"> ++ <isset property="JavaSE-1.6"/> ++ </condition> ++ <condition property="javacTarget" value="1.6"> ++ <isset property="JavaSE-1.6"/> ++ </condition> ++ <property name="javacDebugInfo" value="true" /> <property name="javacFailOnError" value="true" /> -@@ -327,12 +339,17 @@ - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-ia64_32" /> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="solaris-gtk-x86" /> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-PA_RISC" /> -+ <equals arg1="${install0s}-${installWs}-${installArch}" arg2="freebsd-gtk-x86" /> -+ <equals arg1="${install0s}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64" /> - </or> - </condition> +@@ -322,6 +349,8 @@ + <!-- determines if libraries need to be recompiled for specific platforms --> + <condition property="libsconfig"> + <or> ++ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-x86" /> ++ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64" /> + <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc64" /> + <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86" /> + <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390" /> +@@ -335,7 +364,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> ++ <or> + <equals arg1="${installOs}" arg2="linux" /> ++ <equals arg1="${installOs}" arg2="freebsd" /> ++ </or> </condition> <property name="archive.format" value="zip" /> </target> + |