diff options
Diffstat (limited to 'java/eclipse-devel/files/patch-eclipse-build')
| -rw-r--r-- | java/eclipse-devel/files/patch-eclipse-build | 124 |
1 files changed, 92 insertions, 32 deletions
diff --git a/java/eclipse-devel/files/patch-eclipse-build b/java/eclipse-devel/files/patch-eclipse-build index 554cc2382e95..fd225a9ce180 100644 --- a/java/eclipse-devel/files/patch-eclipse-build +++ b/java/eclipse-devel/files/patch-eclipse-build @@ -53,7 +53,7 @@ $FreeBSD$ +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%% --- eclipse-build-0.5.0.orig/build.xml 2009-12-23 16:22:44.090824173 -0500 +++ eclipse-build-0.5.0/build.xml 2009-12-23 16:23:06.357147407 -0500 -@@ -117,11 +117,11 @@ +@@ -118,11 +118,11 @@ <target name="setLibDir" depends="setLib64Dir"> <property name="libDir" value="lib" /> @@ -67,7 +67,7 @@ $FreeBSD$ </target> <property name="doTests" value="true" /> -@@ -166,8 +166,7 @@ +@@ -167,8 +167,7 @@ <target name="copySource" unless="sdkSourcePresent"> <echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" /> <exec executable="cp" failonerror="true"> @@ -77,18 +77,61 @@ $FreeBSD$ <arg value="eclipse" /> <arg value="${buildDirectory}" /> </exec> -@@ -319,6 +318,10 @@ +@@ -309,12 +308,18 @@ + <!-- + <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" /> + --> +- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" /> +- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" /> +@@ -337,20 +342,30 @@ </replace> <patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" /> <patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p2" /> -+ <arg value="-i${basedir}/patches/freebsd-support.patch" /> -+ </exec> +- <patch patchfile="${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" dir="${buildDirectory}/plugins" strip="2" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins"> ++ <arg value="-p2" /> ++ <arg value="-i${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/remove-lucene-dependency.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p2" /> ++ <arg value="-i${basedir}/patches/freebsd-support.patch" /> ++ </exec> <echo file="patch-stamp" /> </target> -@@ -704,7 +707,7 @@ + <target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete"> + <patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> + <patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> +- <patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${testsBuildDirectory}"> ++ <arg value="-p0" /> ++ <arg value="-i${basedir}/patches/tests-BZ295666.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" /> + <patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> + <patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" /> +@@ -725,7 +729,7 @@ <target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete"> <echo message="Installing into: ${provisionDir}" /> <antcall target="provision"> @@ -97,7 +140,7 @@ $FreeBSD$ <param name="profileName" value="SDKProfile" /> </antcall> -@@ -829,7 +833,8 @@ +@@ -850,7 +854,8 @@ <!-- <echo message="Calling runtests with (debug, verbose) = (${testSwitches})" /> --> @@ -107,7 +150,7 @@ $FreeBSD$ <arg value="-t${timestamp}" /> <arg value="-a${buildArch}" /> <arg value="-o${buildOs}" /> -@@ -958,33 +963,29 @@ +@@ -1014,33 +1030,29 @@ <target name="installIntoDestDir"> <mkdir dir="${installationDir}" /> <exec executable="rsync" failonerror="true"> @@ -122,13 +165,13 @@ $FreeBSD$ - <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" /> - <!-- install Eclipse Java code formatter launcher --> - <property name="efj" value="${destDir}${prefix}/bin/efj"/> -- <copy file="efj.sh" todir="${efj}" /> -+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> +- <copy file="efj.sh" tofile="${efj}" /> ++ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> <fileset id="equinoxLauncher" dir="${installationDir}/plugins"> <include name="org.eclipse.equinox.launcher_*.jar" /> </fileset> <property name="launcherJar" refid="equinoxLauncher"/> -- <replace file="${efj}/efj.sh" token="@LAUNCHER@" value="${launcherJar}"/> +- <replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/> <!-- install icons --> - <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" /> - <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" /> @@ -149,7 +192,7 @@ $FreeBSD$ <!-- Create the "swt.jar" and friends symlinks --> <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> <property name="swtjarpath" refid="swtjar" /> -@@ -992,7 +993,7 @@ +@@ -1013,7 +1015,7 @@ <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/> <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/> @@ -158,16 +201,16 @@ $FreeBSD$ <!-- Extract SWT JNI .so files --> <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}"> -@@ -1031,7 +1032,7 @@ +@@ -1039,7 +1041,7 @@ - <!-- copy PDE and JDT to dropins --> + <!-- copy PDE and JDT to dropins --> <exec executable="rsync" failonerror="true"> - <arg value="-vrpl" /> + <arg value="-vrpL" /> <arg value="${provisionDir}/dropins/" /> <arg value="${installationDir}/dropins/" /> </exec> -@@ -1064,8 +1065,8 @@ +@@ -1072,8 +1074,8 @@ <arg value="s@/@_@g" /> </exec> <apply executable="sed" failonerror="true" verbose="true"> @@ -178,7 +221,7 @@ $FreeBSD$ <srcfile /> <fileset dir="${installationDir}"> <include name="metadata/content.xml" /> -@@ -1086,7 +1087,7 @@ +@@ -1094,7 +1096,7 @@ </fileset> </apply> <apply executable="sed" failonerror="true" verbose="true"> @@ -187,7 +230,7 @@ $FreeBSD$ <arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" /> <srcfile /> <fileset dir="${installationDir}/${profileDir}"> -@@ -1101,9 +1105,11 @@ +@@ -1109,9 +1111,11 @@ </apply> <!-- Move config file to /etc --> @@ -199,7 +242,7 @@ $FreeBSD$ </target> -@@ -1126,8 +1129,7 @@ +@@ -1156,8 +1164,7 @@ <!-- make a copy of the clean platform+CVS installation --> <exec executable="cp" failonerror="true"> @@ -209,7 +252,7 @@ $FreeBSD$ <arg value="${provisionDir}" /> <arg value="${platformAndCVSInstallation}" /> </exec> -@@ -1143,16 +1145,14 @@ +@@ -1173,16 +1180,14 @@ tofile="${jdtInstallation}"/> <!-- make a second copy of the clean JDT installation --> <exec executable="cp" failonerror="true"> @@ -228,7 +271,7 @@ $FreeBSD$ <arg value="${platformAndCVSInstallation}" /> <arg value="${provisionDir}" /> </exec> -@@ -1169,8 +1169,7 @@ +@@ -1199,8 +1204,7 @@ <!-- restore clean platform+CVS installation --> <exec executable="cp" failonerror="true"> @@ -257,11 +300,10 @@ $FreeBSD$ -os=linux +os=freebsd - buildId=3.7.0-I20110613-1736 - buildTag=3.7.0-I20110613-1736 --label=3.7.0-I20110613-1736 + buildId=R3_7_1 + buildTag=R3_7_1 + label=3.7.1 -bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar -+label=3.7.0 +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter @@ -330,20 +372,23 @@ $FreeBSD$ Categories=Development;IDE;Java; --- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties.orig Thu Jun 30 16:45:54 2011 +++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties Thu Jun 30 16:46:18 2011 -@@ -1,15 +1,15 @@ - com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar +@@ -1,5 +1,5 @@ + com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar -com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar +com.jcraft.jsch_0.1.41.v201101211617.jar=/usr/share/java/jsch.jar - javax.servlet_2.5.0.v201103041518.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar - javax.servlet.jsp_2.0.0.v201101211617.jar=/usr/share/java/tomcat6-jsp-2.1-api.jar:/usr/share/java/jsp-api-2.0.jar + javax.servlet_3.0.0.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar + javax.servlet.jsp_2.2.0.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar + javax.el_2.2.0.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar +@@ -7,13 +7,13 @@ + org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar + org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar -org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar -org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar +org.apache.commons.el_1.0.0.v201101211617.jar=/usr/share/java/commons-el.jar +org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar --org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar -+org.apache.jasper_5.5.17.v201101211617.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar + org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar -org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar @@ -357,3 +402,18 @@ $FreeBSD$ @@ -1,1 +1,1 @@ -org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar +org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar +--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh~ Mon Dec 19 16:40:57 2011 ++++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh Wed Feb 29 14:54:42 2012 +@@ -1,8 +1,8 @@ +-#! /bin/bash ++#! /bin/sh + label=$1 + + for f in `find ./build/eclipse-${label}-src/plugins -name build.xml`; do +- sed -i 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f} +- sed -i 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f} +- sed -i 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f} ++ sed -i .orig 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f} ++ sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f} ++ sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f} + done |