diff options
Diffstat (limited to 'java/eclipse/files/patch-eclipse-build')
| -rw-r--r-- | java/eclipse/files/patch-eclipse-build | 359 |
1 files changed, 225 insertions, 134 deletions
diff --git a/java/eclipse/files/patch-eclipse-build b/java/eclipse/files/patch-eclipse-build index f85e592a15f1..fd225a9ce180 100644 --- a/java/eclipse/files/patch-eclipse-build +++ b/java/eclipse/files/patch-eclipse-build @@ -1,48 +1,38 @@ $FreeBSD$ ---- eclipse-build-0.5.0.orig/ChangeLog 2009-11-11 07:59:07.000000000 -0500 -+++ eclipse-build-0.5.0/ChangeLog 2009-12-23 16:23:06.355139641 -0500 -@@ -1,7 +1,3 @@ --2009-11-11 Alexander Kurtakov <akurtako@redhat.com> -- -- * pdebuild/eclipse-pdebuild.sh: Do not escape $orbitDepsDir. -- - 2009-11-05 Alexander Kurtakov <akurtako@redhat.com> - Fix for bug #294264. - * build.xml: Use ${buildWorkspace} instead of $HOME/workspace. --- eclipse-build-0.5.0.orig/build.properties 2009-09-30 14:07:21.000000000 -0400 +++ eclipse-build-0.5.0/build.properties 2009-12-23 16:23:06.355139641 -0500 -@@ -26,7 +26,7 @@ +@@ -28,7 +28,7 @@ collectingFolder=eclipse archivePrefix=eclipse generateFeatureVersionSuffix=true --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 +-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 +bootclasspath=%%BOOTCLASSPATH%% build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter JavaSE-1.6=${bootclasspath} CDC-1.0/Foundation-1.0=${bootclasspath} -@@ -47,21 +47,21 @@ +@@ -49,21 +49,21 @@ CDC-1.1/PersonalBasis-1.1=${bootclasspath} CDC-1.1/PersonalJava-1.1=${bootclasspath} # Somehow bootclasspath isn't expanded when used by antRunner --JavaSE-1.6=/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 --CDC-1.0/Foundation-1.0=/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 --CDC-1.1/Foundation-1.1=/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 --OSGi/Minimum-1.0=/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 --OSGi/Minimum-1.1=/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 --OSGi/Minimum-1.2=/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 --JRE-1.1=/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 --J2SE-1.2=/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 --J2SE-1.3=/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 --J2SE-1.4=/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 --J2SE-1.5=/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 --JavaSE-1.6=/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 --PersonalJava-1.1=/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 --PersonalJava-1.2=/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 --CDC-1.0/PersonalBasis-1.0=/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 --CDC-1.0/PersonalJava-1.0=/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 --CDC-1.1/PersonalBasis-1.1=/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 --CDC-1.1/PersonalJava-1.1=/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 +-JavaSE-1.6=/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 +-CDC-1.0/Foundation-1.0=/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 +-CDC-1.1/Foundation-1.1=/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 +-OSGi/Minimum-1.0=/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 +-OSGi/Minimum-1.1=/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 +-OSGi/Minimum-1.2=/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 +-JRE-1.1=/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 +-J2SE-1.2=/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 +-J2SE-1.3=/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 +-J2SE-1.4=/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 +-J2SE-1.5=/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 +-JavaSE-1.6=/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 +-PersonalJava-1.1=/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 +-PersonalJava-1.2=/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 +-CDC-1.0/PersonalBasis-1.0=/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 +-CDC-1.0/PersonalJava-1.0=/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 +-CDC-1.1/PersonalBasis-1.1=/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 +-CDC-1.1/PersonalJava-1.1=/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 +JavaSE-1.6=%%BOOTCLASSPATH%% +CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%% +CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%% @@ -63,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" /> @@ -77,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"> @@ -87,49 +77,70 @@ $FreeBSD$ <arg value="eclipse" /> <arg value="${buildDirectory}" /> </exec> -@@ -292,8 +291,10 @@ - <target name="applyPatches" depends="insertBuildId" unless="patch.complete"> - <!-- eclipse-build-only patches --> - <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" /> -- <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" /> +@@ -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-swt-buildagainstxulrunner.patch" /> ++ <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" /> -@@ -306,9 +307,15 @@ - <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" /> - <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" /> - <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" /> -- <patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p0" /> -+ <arg value="-i${basedir}/patches/bz318912.patch" /> -+ </exec> - <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" /> -- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p1" /> -+ <arg value="-i${basedir}/patches/eclipse-swt-compile-xpt.patch" /> -+ </exec> - <replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" /> - <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" /> - <!-- end eclipse-build-only patches --> -@@ -321,6 +328,10 @@ - <replacefilter token="@build_os@" value="${buildOs}" /> + <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/java-home.patch" dir="${buildDirectory}" strip="2" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p2" /> -+ <arg value="-i${basedir}/patches/freebsd-support.patch" /> -+ </exec> + <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" /> +- <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> -@@ -804,7 +815,8 @@ + <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"> +- <param name="p2.director.installIU" value="org.eclipse.sdk.ide" /> ++ <param name="p2.director.installIU" value="org.eclipse.sdk.ide,org.eclipse.equinox.initializer" /> + <param name="profileName" value="SDKProfile" /> + </antcall> + +@@ -850,7 +854,8 @@ <!-- <echo message="Calling runtests with (debug, verbose) = (${testSwitches})" /> --> @@ -139,24 +150,28 @@ $FreeBSD$ <arg value="-t${timestamp}" /> <arg value="-a${buildArch}" /> <arg value="-o${buildOs}" /> -@@ -906,26 +918,25 @@ - +@@ -1014,33 +1030,29 @@ <target name="installIntoDestDir"> <mkdir dir="${installationDir}" /> -- <exec executable="cp" failonerror="true"> -- <arg value="-rd" /> -- <arg value="--no-target-directory" /> -- <arg value="${provisionDir}" /> -- <arg value="${installationDir}" /> -+ <exec executable="cp" failonerror="true"> -+ <arg value="-RL" /> -+ <arg value="${provisionDir}/" /> -+ <arg value="${installationDir}" /> - </exec> + <exec executable="rsync" failonerror="true"> +- <arg value="-vrpl" /> ++ <arg value="-vrpL" /> + <arg value="--exclude=dropins" /> + <arg value="${provisionDir}/" /> + <arg value="${installationDir}/" /> + </exec> <!-- install desktop file --> - <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" /> -+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> +- <!-- install Eclipse Java code formatter launcher --> +- <property name="efj" value="${destDir}${prefix}/bin/efj"/> +- <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}" 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" /> @@ -165,28 +180,37 @@ $FreeBSD$ + <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/%%PORTNAME%%.png" /> + <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/%%PORTNAME%%.png" /> <mkdir dir="${destDir}${prefix}/share/pixmaps" /> -- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" /> -+ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" /> +- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" overwrite="true"/> ++ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" overwrite="true"/> <!--shared dropins folder for architecture-independent plugins--> - <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" /> + <mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" /> <!-- eclipse binary --> <mkdir dir="${destDir}${prefix}/bin" /> -- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" /> -+ <symlink link="${destDir}${prefix}/bin/%%PORTNAME%%" resource="../${libDir}/%%PORTNAME%%/eclipse" /> - <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated --> - <!-- Create the "startup.jar" symlink --> - <fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" /> -@@ -938,7 +949,7 @@ - <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" /> - <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" /> +- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/> ++ <symlink link="${destDir}${prefix}/bin/%%PORTNAME%%" resource="../${libDir}/%%PORTNAME%%/eclipse" overwrite="true"/> + <!-- 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" /> +@@ -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"/> - <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" /> + <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" /> <!-- Extract SWT JNI .so files --> <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}"> -@@ -990,8 +1001,8 @@ +@@ -1039,7 +1041,7 @@ + + <!-- 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> +@@ -1072,8 +1074,8 @@ <arg value="s@/@_@g" /> </exec> <apply executable="sed" failonerror="true" verbose="true"> @@ -197,7 +221,7 @@ $FreeBSD$ <srcfile /> <fileset dir="${installationDir}"> <include name="metadata/content.xml" /> -@@ -1012,7 +1023,7 @@ +@@ -1094,7 +1096,7 @@ </fileset> </apply> <apply executable="sed" failonerror="true" verbose="true"> @@ -206,18 +230,57 @@ $FreeBSD$ <arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" /> <srcfile /> <fileset dir="${installationDir}/${profileDir}"> -@@ -1027,9 +1038,11 @@ +@@ -1109,9 +1111,11 @@ </apply> <!-- Move config file to /etc --> + <!-- <mkdir dir="${destDir}/etc" /> <move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" /> - <symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" /> + <symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" overwrite="true"/> + --> </target> +@@ -1156,8 +1164,7 @@ + + <!-- make a copy of the clean platform+CVS installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${provisionDir}" /> + <arg value="${platformAndCVSInstallation}" /> + </exec> +@@ -1173,16 +1180,14 @@ + tofile="${jdtInstallation}"/> + <!-- make a second copy of the clean JDT installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${jdtInstallation}" /> + <arg value="${jdtInstallation}.orig" /> + </exec> + + <!-- restore clean platform+CVS installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${platformAndCVSInstallation}" /> + <arg value="${provisionDir}" /> + </exec> +@@ -1199,8 +1204,7 @@ + + <!-- restore clean platform+CVS installation --> + <exec executable="cp" failonerror="true"> +- <arg value="-rd" /> +- <arg value="--no-target-directory" /> ++ <arg value="-R" /> + <arg value="${platformAndCVSInstallation}" /> + <arg value="${provisionDir}" /> + </exec> --- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh 2009-11-11 07:59:07.000000000 -0500 +++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh 2009-12-23 16:23:06.357147407 -0500 @@ -230,7 +230,7 @@ @@ -237,11 +300,10 @@ $FreeBSD$ -os=linux +os=freebsd - buildId=M20100211-1343 - buildTag=vM20100211-1343 --label=3.6.0 --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 -+label=3.6.2 + 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 +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter @@ -250,25 +312,24 @@ $FreeBSD$ CDC-1.1/PersonalBasis-1.1=${bootclasspath} CDC-1.1/PersonalJava-1.1=${bootclasspath} # Somehow bootclasspath isn't expanded when used by antRunner --JavaSE-1.6=/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 --CDC-1.0/Foundation-1.0=/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 --CDC-1.1/Foundation-1.1=/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 --OSGi/Minimum-1.0=/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 --OSGi/Minimum-1.1=/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 --OSGi/Minimum-1.2=/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 --JRE-1.1=/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 --J2SE-1.2=/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 --J2SE-1.3=/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 --J2SE-1.4=/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 --J2SE-1.5=/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 --JavaSE-1.6=/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 --PersonalJava-1.1=/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 --PersonalJava-1.2=/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 --CDC-1.0/PersonalBasis-1.0=/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 --CDC-1.0/PersonalJava-1.0=/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 --CDC-1.1/PersonalBasis-1.1=/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 --CDC-1.1/PersonalJava-1.1=/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 -\ No newline at end of file +-JavaSE-1.6=/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 +-CDC-1.0/Foundation-1.0=/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 +-CDC-1.1/Foundation-1.1=/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 +-OSGi/Minimum-1.0=/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 +-OSGi/Minimum-1.1=/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 +-OSGi/Minimum-1.2=/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 +-JRE-1.1=/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 +-J2SE-1.2=/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 +-J2SE-1.3=/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 +-J2SE-1.4=/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 +-J2SE-1.5=/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 +-JavaSE-1.6=/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 +-PersonalJava-1.1=/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 +-PersonalJava-1.2=/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 +-CDC-1.0/PersonalBasis-1.0=/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 +-CDC-1.0/PersonalJava-1.0=/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 +-CDC-1.1/PersonalBasis-1.1=/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 +-CDC-1.1/PersonalJava-1.1=/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 +JavaSE-1.6=%%BOOTCLASSPATH%% +CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%% +CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%% @@ -289,10 +350,10 @@ $FreeBSD$ +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%% --- eclipse-build-0.5.0.orig/pdebuild.xml 2009-12-23 16:22:44.090824173 -0500 +++ eclipse-build-0.5.0/pdebuild.xml 2009-12-23 16:24:47.491322864 -0500 -@@ -200,6 +200,7 @@ +@@ -206,6 +206,7 @@ <arg line="-DbuildOs=${buildOs} " /> <arg line="-DbuildId=${buildId} " /> - <arg line="-debug -consolelog " /> + <arg line="-debug -consolelog" /> + <arg line="-vmargs -Xmx1024 " /> </java> <taskdef name="eclipse.versionReplacer" @@ -309,20 +370,50 @@ $FreeBSD$ +Exec=%%PORTNAME%% Terminal=false Categories=Development;IDE;Java; ---- eclipse-build-0.6.1/dependencies.properties.orig 2010-08-11 22:29:29.000000000 +0200 -+++ eclipse-build-0.6.1/dependencies.properties 2011-04-28 09:23:04.000000000 +0200 -@@ -2,11 +2,11 @@ - com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar - javax.servlet_2.5.0.v200910301333.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar - javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar --org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar +--- 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,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_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.codec_1.3.0.v20100518-1140.jar=/usr/share/java/commons-codec.jar -+org.apache.commons.el_1.0.0.v201004212143.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.logging_1.0.4.v201005080501.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.v201004212143.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar - org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar - org.apache.lucene.analysis_1.9.1.v20100518-1140.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 +-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_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 +-org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar ++org.mortbay.jetty.util_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar ++org.mortbay.jetty.server_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar + org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar + org.sat4j.pb_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar +--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties.orig Fri Jul 1 20:12:45 2011 ++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties Fri Jul 1 20:16:04 2011 +@@ -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 |