[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-99-g4c1e991
Benjamin Drung
bdrung-guest at alioth.debian.org
Mon Jul 5 18:33:28 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master-3.6 has been updated
via 4c1e991854c72168377ea0934ab7f62372ea09bb (commit)
via 8fa2fe00aafcb952f6bca74ab4f61e2082756a5e (commit)
via 8ba2be44ee0b8565b6cabe84fde23263a2b39756 (commit)
via 66fa20e801be512c35e74cfb33c1d42902cb8ef6 (commit)
via f14af072718e4a59ea3628896219e30d0ab6f0ee (commit)
from 82a3179e04d2566cd07935eef170050088a4e70b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4c1e991854c72168377ea0934ab7f62372ea09bb
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Jul 5 20:33:08 2010 +0200
Drop backported fix-tooltip-color.patch.
commit 8fa2fe00aafcb952f6bca74ab4f61e2082756a5e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Jul 5 20:13:53 2010 +0200
Drop all patches that are accepted upstream.
commit 8ba2be44ee0b8565b6cabe84fde23263a2b39756
Merge: 66fa20e f14af07
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Jul 5 20:11:13 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
commit 66fa20e801be512c35e74cfb33c1d42902cb8ef6
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Mon Jul 5 20:11:04 2010 +0200
Unapply all patches.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 31 +
build.properties | 1 +
build.xml | 85 +---
buildSDKSource.sh | 3 +
debian/patches/fix-tooltip-color.patch | 65 --
debian/patches/java-home.patch | 32 -
debian/patches/refresh-patches.patch | 511 ----------------
debian/patches/series | 4 -
debian/patches/update-dependency.patch | 12 -
dependencies.properties | 14 +-
eclipse.1.xml | 616 --------------------
eclipse/features/org.eclipse.platform/feature.xml | 8 -
.../internal/jsp/jasper/JspClassLoader.java | 15 -
.../org.eclipse.help.base/META-INF/MANIFEST.MF | 4 +-
.../jdt/internal/compiler/batch/GCCMain.java | 501 ----------------
.../internal/compiler/batch/messages.properties | 5 -
nonosgidependencies.properties | 5 -
patches/eclipse-pde.build-add-package-build.patch | 8 +-
patches/eclipse-swt-buildagainstxulrunner.patch | 4 +-
patches/eclipse-swt-compile-xpt.patch | 31 -
patches/junit4-nochecksum.patch | 12 +-
patches/osgi-services-build.patch | 58 --
patches/tooltip-color.patch | 47 --
pdebuild.xml | 3 +-
pdebuild/eclipse-pdebuild.sh | 24 +-
regenerateBootstrapFiles.sh | 14 +-
stubs/org/eclipse/core/runtime/CoreException.java | 4 -
stubs/org/eclipse/core/runtime/IExtension.java | 2 -
.../org/eclipse/core/runtime/IExtensionPoint.java | 2 -
stubs/org/eclipse/core/runtime/ILibrary.java | 2 -
stubs/org/eclipse/core/runtime/IPath.java | 2 -
.../eclipse/core/runtime/IPluginPrerequisite.java | 2 -
stubs/org/eclipse/core/runtime/Plugin.java | 2 -
.../core/runtime/PluginVersionIdentifier.java | 2 -
34 files changed, 74 insertions(+), 2057 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e5b53dd..5f0540a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
+
+ * buildSDKSource.sh: Remove *.orig files. (Benjamin Drung bz#316525)
+
+2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
+
+ * patches/java-home.patch: New file.
+ * build.xml: Do not blindly override JAVA_HOME.
+ * dependencies.properties: Add icu4j for Debian (Benjamin Drung).
+
+2010-07-05 Alexander Kurtakov <akurtako at redhat.com>
+ Refresh all patches. (Benjamin Drung)
+ * build.xml: Make every patch applies in build directory.
+ * dependencies.properties: Remove my testing leftovers.
+ * patches/donotsetjavahomeandoptimizeliblocalfile.patch: Update patch for Helios.
+ * patches/donotstorebuildlogsinfiles.patch: Likewise.
+ * patches/eclipse-add-archs-executable.patch: Likewise.
+ * patches/eclipse-add-archs-filesystem.patch: Likewise.
+ * patches/eclipse-add-archs-swt.patch: Likewise.
+ * patches/eclipse-add-ppc64-sparc64-s390-s390x.patch: Likewise.
+ * patches/eclipse-addArchesAnd64bitSWT.patch: Likewise.
+ * patches/eclipse-buildswtnatives.patch: Likewise.
+ * patches/eclipse-no-jetty5.patch: Likewise.
+ * patches/eclipse-nosourcebundlesfordependencies.patch: Likewise.
+ * patches/eclipse-pde.build-add-package-build.patch: Likewise.
+ * patches/eclipse-swt-buildagainstxulrunner.patch: Likewise.
+ * patches/eclipse-use-newer-commons-codec.patch: Likewise.
+ * patches/gnomeproxy-makefile.patch: Likewise.
+ * patches/junit4-nochecksum.patch: Likewise.
+ * patches/osgi-util.patch: Likewise.
+
2010-06-23 Alexander Kurtakov <akurtako at redhat.com>
* dependencies.properties: Fix jetty and jetty utils lists.
diff --git a/build.properties b/build.properties
index ec76547..b243dfb 100644
--- a/build.properties
+++ b/build.properties
@@ -10,6 +10,7 @@ featureToBuild=eclipse-build-feature
skipBase=true
skipFetch=true
individualSourceBundles=true
+buildArch=x86
ws=gtk
os=linux
includeLaunchers=true
diff --git a/build.xml b/build.xml
index 378cb58..ebedc0d 100644
--- a/build.xml
+++ b/build.xml
@@ -21,7 +21,7 @@
</or>
</condition>
- <available file="${basedir}/debian/eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
+ <available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
<available file="eclipse-sdktests-${label}-src.tar.bz2" property="testsSourcePresent" value="true" />
<available file="eclipse-sdktests-${label}-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
@@ -31,7 +31,6 @@
<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
<uptodate property="symlinks.complete" srcfile="patch-stamp" targetfile="symlinks-stamp" />
- <uptodate property="prebootstrap.complete" srcfile="symlinks-stamp" targetfile="prebootstrap-stamp" />
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
@@ -53,30 +52,6 @@
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
- <!-- Determine host architecture -->
- <exec executable="uname" outputproperty="uname-m">
- <arg line="-m" />
- </exec>
- <condition property="hostArch" value="arm">
- <matches pattern="^arm.*" string="${uname-m}"/>
- </condition>
- <condition property="hostArch" value="x86">
- <matches pattern="i[0-9]*86" string="${uname-m}"/>
- </condition>
- <condition property="hostArch" value="PA_RISC">
- <matches pattern="^parisc.*" string="${uname-m}"/>
- </condition>
- <condition property="hostArch" value="sparc">
- <matches pattern="sparcv9" string="${uname-m}"/>
- </condition>
- <condition property="hostArch" value="${uname-m}">
- <not><isset property="hostArch" /></not>
- </condition>
- <condition property="buildArch" value="${hostArch}">
- <not><isset property="buildArch" /></not>
- </condition>
- <echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
-
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
<!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
@@ -134,7 +109,7 @@
</target>
<target name="extractBuildXmls" if="scriptsPresent">
- <untar compression="bzip2" dest="${basedir}/build/eclipse-${label}-src" src="${basedir}/debian/eclipse-build-generatedScripts.tar.bz2" />
+ <untar compression="bzip2" dest="${basedir}/build/eclipse-${label}-src" src="${basedir}/eclipse-build-generatedScripts.tar.bz2" />
<!--
<fail message="Build scripts to bootstrap PDE Build must be generated and present in eclipse-build-generatedScripts.tar.bz2. See pdebuild.xml for details."/>
-->
@@ -273,17 +248,12 @@
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
<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" />
- <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
<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="1" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
- <symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
- <patch patchfile="${basedir}/patches/tooltip-color.patch" dir="${buildDirectory}" strip="1" />
<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 -->
@@ -348,50 +318,7 @@
<echo file="symlinks-stamp" />
</target>
- <target name="prebootstrap" depends="symlinkDeps" unless="prebootstrap.complete">
- <mkdir dir="${basedir}/temp/" />
- <javac destdir="${basedir}/temp"
- srcdir="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar in jar loader/"
- source="1.3"
- target="1.1"
- debug="true"
- optimize="true"
- fork="true"
- compiler="modern" />
- <zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
- basedir="${basedir}/temp/"/>
- <delete dir="${basedir}/temp/"/>
- <mkdir dir="${basedir}/temp/" />
- <copy todir="${basedir}/temp/" >
- <fileset dir="${basedir}/stubs/">
- <include name="**/*.java" />
- </fileset>
- </copy>
- <copy todir="${basedir}/temp" >
- <fileset dir="${buildDirectory}/plugins/org.eclipse.core.runtime/src/">
- <include name="org/eclipse/core/runtime/IPluginDescriptor.java" />
- </fileset>
- </copy>
- <javac destdir="${basedir}/temp"
- srcdir="${basedir}/temp"
- source="1.3"
- target="1.1"
- debug="true"
- optimize="true"
- fork="true"
- compiler="modern" />
- <mkdir dir="${buildDirectory}/plugins/org.eclipse.core.runtime.compatibility.registry/classes/org/eclipse/core/runtime/" />
- <copy todir="${buildDirectory}/plugins/org.eclipse.core.runtime.compatibility.registry/classes/" >
- <fileset dir="${basedir}/temp/">
- <include name="org/eclipse/core/runtime/IPluginDescriptor.class" />
- </fileset>
- </copy>
- <delete dir="${basedir}/temp/"/>
- <!-- Create a stamp file -->
- <echo file="prebootstrap-stamp" />
- </target>
-
- <target name="build" depends="applyPatches,symlinkDeps,prebootstrap,bootstrap,compilelibs" unless="build.complete">
+ <target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
<echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
<classpath>
@@ -822,12 +749,6 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
- <!-- eclipse manpage -->
- <mkdir dir="${destDir}${prefix}/share/man/man1" />
- <exec executable="docbook2x-man" failonerror="true">
- <arg value="eclipse.1.xml" />
- </exec>
- <move file="eclipse.1" tofile="${destDir}${prefix}/share/man/man1/eclipse.1" />
<!-- Create the "startup.jar" symlink -->
<fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
<property name="startupjarpath" refid="startupjar" />
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index 31ebe98..fbbf5dd 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -182,6 +182,9 @@ rm fetch_*
rm -rf features/org.eclipse.sdk.examples
rm -rf plugins/*.examples*
+# Remove temporary files
+find -name '*.orig' -delete
+
# Remove empty directories
find -type d -empty -delete
diff --git a/debian/patches/fix-tooltip-color.patch b/debian/patches/fix-tooltip-color.patch
deleted file mode 100644
index 0d3ea32..0000000
--- a/debian/patches/fix-tooltip-color.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Backported fix for LP: #540332, poor tooltip text colors
- with certain themes.
-Origin: Upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=309907
-Bug-Ubuntu: https://launchpad.net/bugs/540332
-
---- a/build.xml
-+++ b/build.xml
-@@ -283,6 +283,7 @@
- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
- <symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
-+ <patch patchfile="${basedir}/patches/tooltip-color.patch" dir="${buildDirectory}" strip="1" />
- <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 -->
---- /dev/null
-+++ b/patches/tooltip-color.patch
-@@ -0,0 +1,47 @@
-+diff -u -r1.25 ToolTip.java
-+--- a/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 2 Dec 2009 15:52:39 -0000
-++++ b/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 13 May 2010 15:59:10 -0000
-+@@ -48,6 +48,7 @@
-+ TrayItem item;
-+ int x, y, timerId;
-+ int /*long*/ layoutText = 0, layoutMessage = 0;
-++ Color layoutTextColor, layoutMessageColor;
-+ int [] borderPolygon;
-+ boolean spikeAbove, autohide;
-+
-+@@ -498,6 +499,9 @@
-+ x += IMAGE_SIZE;
-+ }
-+ x += INSET;
-++ if (layoutTextColor != null) {
-++ OS.gdk_gc_set_foreground(gdkGC, layoutTextColor.handle);
-++ }
-+ OS.gdk_draw_layout (window, gdkGC, x, y, layoutText);
-+ int [] w = new int [1], h = new int [1];
-+ OS.pango_layout_get_size (layoutText, w, h);
-+@@ -505,6 +509,9 @@
-+ }
-+ if (layoutMessage != 0) {
-+ x = BORDER + PADDING + INSET;
-++ if (layoutMessageColor != null) {
-++ OS.gdk_gc_set_foreground(gdkGC, layoutMessageColor.handle);
-++ }
-+ OS.gdk_draw_layout (window, gdkGC, x, y, layoutMessage);
-+ }
-+ OS.g_object_unref (gdkGC);
-+@@ -708,6 +715,7 @@
-+ if (layoutMessage != 0) OS.g_object_unref (layoutMessage);
-+ layoutMessage = 0;
-+ if (message.length () != 0) {
-++ layoutMessageColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
-+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
-+ layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
-+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
-+@@ -739,6 +747,7 @@
-+ if (layoutText != 0) OS.g_object_unref (layoutText);
-+ layoutText = 0;
-+ if (text.length () != 0) {
-++ layoutTextColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
-+ byte [] buffer = Converter.wcsToMbcs (null, text, true);
-+ layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
-+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
diff --git a/debian/patches/java-home.patch b/debian/patches/java-home.patch
deleted file mode 100644
index 0939ebe..0000000
--- a/debian/patches/java-home.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Do not overwrite exported JAVA_HOME variable
-Author: Benjamin Drung <bdrung at ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317372
-
---- a/build.xml
-+++ b/build.xml
-@@ -286,6 +286,7 @@
- <!-- Only build for one target (bug #293952) -->
- <copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
- <replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
-+ <patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
- <echo file="patch-stamp" />
- </target>
-
---- /dev/null
-+++ b/patches/java-home.patch
-@@ -0,0 +1,15 @@
-+Description: Do not overwrite exported JAVA_HOME variable
-+Author: Benjamin Drung <bdrung at ubuntu.com>
-+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317634
-+
-+--- eclipse-3.6.0.orig/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
-++++ eclipse-3.6.0/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
-+@@ -155,7 +155,7 @@ DEFAULT_OS_ARCH="$defaultOSArch"
-+ DEFAULT_WS="$defaultWS"
-+ DEFAULT_JAVA=$defaultJava
-+
-+-if [ -n $javaHome ]; then
-++if [ -z "$JAVA_HOME" -a -n $javaHome ]; then
-+ JAVA_HOME=$javaHome
-+ export JAVA_HOME
-+ fi
diff --git a/debian/patches/refresh-patches.patch b/debian/patches/refresh-patches.patch
deleted file mode 100644
index 745abc5..0000000
--- a/debian/patches/refresh-patches.patch
+++ /dev/null
@@ -1,511 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -238,22 +238,21 @@
-
- <target name="applyPatches" depends="insertBuildId" unless="patch.complete">
- <!-- eclipse-build-only patches -->
-- <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" />
-- <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" />
-- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="6" />
-- <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" />
-- <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" />
--
-- <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}/features/org.eclipse.equinox.executable" strip="0" />
-- <patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="0" />
-- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
-- <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="0" />
-- <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
-+ <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" />
-+ <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
-+ <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
-+ <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" />
-+ <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" />
- <patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
-- <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="0" />
-- <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" />
-+ <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" />
-+ <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="1" />
- <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
- <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" />
---- a/patches/donotsetjavahomeandoptimizeliblocalfile.patch
-+++ b/patches/donotsetjavahomeandoptimizeliblocalfile.patch
-@@ -1,6 +1,6 @@
----- ./plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile.orig 2007-12-06 20:30:00.000000000 +0100
--+++ ./plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile 2009-08-26 23:12:41.594611729 +0200
--@@ -20,10 +20,10 @@ LIB_NAME_FULL = libunixfile_1_0_0.so
-+--- a/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-++++ b/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-+@@ -20,10 +20,10 @@
- OS_TYPE = linux
-
- #Set this to be the location of your JRE
---- a/patches/donotstorebuildlogsinfiles.patch
-+++ b/patches/donotstorebuildlogsinfiles.patch
-@@ -1,7 +1,6 @@
--diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml
----- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml 2009-04-28 18:53:02.000000000 +0200
--+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml 2009-08-26 23:13:02.158691612 +0200
--@@ -63,7 +63,7 @@
-+--- a/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml
-++++ b/plugins/org.eclipse.jdt.core/scripts/ikvm_script.xml
-+@@ -64,7 +64,7 @@
- </target>
-
- <target name="ecj">
-@@ -10,10 +9,9 @@
- <arg line="-out:ecj.exe -main:org.eclipse.jdt.internal.compiler.batch.Main -recurse:./*.class -recurse:./*.properties -recurse:./*.rsc"/>
- </exec>
- <copy file="${ikvm_home}/bin/IKVM.Runtime.dll" todir="${dest}" />
--diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
----- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2007-11-29 15:16:54.000000000 +0100
--+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2009-08-26 23:13:03.342691628 +0200
--@@ -74,7 +74,7 @@
-+--- a/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
-++++ b/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
-+@@ -65,7 +65,7 @@
- <delete dir="reference/api"/>
- <mkdir dir="reference/api"/>
-
-@@ -21,8 +19,8 @@
- + <exec dir="." executable="${javadoc}" >
- <arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
- </exec>
-- <antcall target="generateJdtAptJavadoc" />
--@@ -100,7 +100,7 @@
-+
-+@@ -98,7 +98,7 @@
- <delete dir="reference/apt" />
- <mkdir dir="reference/apt" />
-
-@@ -30,11 +28,10 @@
- + <exec dir="." executable="${javadoc15}" >
- <arg line="@${basedir}/${jdtaptoptionsFile} -J-Xmx500M" />
- </exec>
-- </target>
--diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml
----- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2009-06-05 16:48:40.000000000 +0200
--+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2009-08-26 23:13:02.194691701 +0200
--@@ -63,7 +63,7 @@
-+
-+--- a/plugins/org.eclipse.pde.doc.user/buildDoc.xml
-++++ b/plugins/org.eclipse.pde.doc.user/buildDoc.xml
-+@@ -65,7 +65,7 @@
- <delete dir="reference/api"/>
- <mkdir dir="reference/api"/>
-
-@@ -42,11 +39,10 @@
- + <exec dir="." executable="${javadoc}" >
- <arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
- </exec>
-- </target>
--diff -pruN debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
----- debian.git/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2009-01-26 18:12:18.000000000 +0100
--+++ debian.git.new/build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2009-08-26 23:13:02.698691170 +0200
--@@ -118,7 +118,7 @@
-+
-+--- a/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
-++++ b/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
-+@@ -119,7 +119,7 @@
- <delete dir="reference/api"/>
- <mkdir dir="reference/api"/>
-
---- a/patches/eclipse-add-archs-executable.patch
-+++ b/patches/eclipse-add-archs-executable.patch
-@@ -1,6 +1,6 @@
----- target.build.properties.orig 2010-02-04 21:48:35.000000000 +0200
--+++ target.build.properties 2010-04-13 18:22:19.420042896 +0300
--@@ -22,10 +22,47 @@ root.win32.wpf.x86=file:bin/wpf/win32/x8
-+--- a/features/org.eclipse.equinox.executable/target.build.properties
-++++ b/features/org.eclipse.equinox.executable/target.build.properties
-+@@ -22,10 +22,47 @@
- root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
- root.linux.gtk.x86.permissions.755=libcairo-swt.so
-
-@@ -48,15 +48,8 @@
-
- root.macosx.carbon.ppc=bin/carbon/macosx/ppc
- root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
--@@ -57,4 +94,4 @@ root.linux.gtk.x86_64.permissions.755=li
-- root.qnx.photon.x86=bin/photon/qnx/x86
--
-- root.linux.motif.x86=bin/motif/linux/x86,motif_root
---root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
--\ No newline at end of file
--+root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
----- feature.xml.orig 2009-10-20 19:03:15.000000000 +0300
--+++ feature.xml 2010-04-13 18:32:05.844795100 +0300
-+--- a/features/org.eclipse.equinox.executable/feature.xml
-++++ b/features/org.eclipse.equinox.executable/feature.xml
- @@ -88,6 +88,66 @@
- version="0.0.0"
- fragment="true"/>
---- a/patches/eclipse-add-archs-filesystem.patch
-+++ b/patches/eclipse-add-archs-filesystem.patch
-@@ -1,8 +1,8 @@
----- ./features/org.eclipse.platform/feature.xml.orig 2009-10-29 20:07:20.000000000 +0100
--+++ ./features/org.eclipse.platform/feature.xml 2009-10-29 20:16:08.000000000 +0100
--@@ -432,6 +432,66 @@
-+--- a/features/org.eclipse.platform/feature.xml
-++++ b/features/org.eclipse.platform/feature.xml
-+@@ -441,6 +441,66 @@
- unpack="false"/>
--
-+
- <plugin
- + id="org.eclipse.core.filesystem.linux.alpha"
- + os="linux"
-@@ -67,7 +67,7 @@
- id="org.eclipse.core.filesystem.linux.ppc"
- os="linux"
- arch="ppc"
--@@ -440,6 +500,56 @@
-+@@ -449,6 +509,56 @@
- version="0.0.0"
- fragment="true"
- unpack="false"/>
---- a/patches/eclipse-add-archs-swt.patch
-+++ b/patches/eclipse-add-archs-swt.patch
-@@ -1,6 +1,6 @@
----- ./features/org.eclipse.rcp/feature.xml.orig 2009-10-25 09:34:48.000000000 +0100
--+++ ./features/org.eclipse.rcp/feature.xml 2009-10-29 20:13:44.000000000 +0100
--@@ -217,10 +217,87 @@
-+--- a/features/org.eclipse.rcp/feature.xml
-++++ b/features/org.eclipse.rcp/feature.xml
-+@@ -206,10 +206,87 @@
- unpack="false"/>
-
- <plugin
-@@ -90,7 +90,7 @@
- download-size="0"
- install-size="0"
- version="0.0.0"
--@@ -250,8 +327,8 @@
-+@@ -239,8 +316,8 @@
- unpack="false"/>
-
- <plugin
-@@ -101,7 +101,7 @@
- ws="gtk"
- arch="sparc"
- download-size="0"
--@@ -259,12 +336,12 @@
-+@@ -248,12 +325,12 @@
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-@@ -118,7 +118,7 @@
- download-size="0"
- install-size="0"
- version="0.0.0"
--@@ -272,10 +349,10 @@
-+@@ -261,10 +338,10 @@
- unpack="false"/>
-
- <plugin
---- a/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
-+++ b/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch
-@@ -1,5 +1,5 @@
----- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java.orig 2009-10-25 09:34:49.000000000 +0100
--+++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2009-10-29 20:24:58.000000000 +0100
-+--- a/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
-++++ b/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
- @@ -48,6 +48,14 @@
- Platform.ARCH_X86, //
- Platform.ARCH_AMD64, //
-@@ -15,8 +15,8 @@
- Platform.ARCH_IA64_32};
-
- // debug support: set in loadOptions()
----- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2009-10-25 09:34:49.000000000 +0100
--+++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2009-10-29 20:25:41.000000000 +0100
-+--- a/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
-++++ b/plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
- @@ -349,6 +349,15 @@
- * @since 3.1
- */
-@@ -33,9 +33,9 @@
-
- /**
- * Constant string (value "win32") indicating the platform is running on a
----- ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java.orig 2009-10-25 09:34:54.000000000 +0100
--+++ ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 2009-10-29 20:23:01.000000000 +0100
--@@ -64,7 +64,7 @@
-+--- a/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
-++++ b/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java
-+@@ -63,7 +63,7 @@
- private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$
- private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$
- private static PluginConverterImpl instance;
-@@ -44,9 +44,9 @@
- static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$
- static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$
- static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
----- ./plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig 2009-10-25 09:34:54.000000000 +0100
--+++ ./plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 2009-10-29 20:24:10.000000000 +0100
--@@ -153,6 +153,14 @@
-+--- a/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
-++++ b/plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java
-+@@ -160,6 +160,14 @@
- */
- public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$
-
---- a/patches/eclipse-addArchesAnd64bitSWT.patch
-+++ b/patches/eclipse-addArchesAnd64bitSWT.patch
-@@ -1,5 +1,5 @@
----- ./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2009-12-08 09:00:12.000000000 +0200
--+++ ./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2010-04-13 17:24:11.418047380 +0300
-+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2009-12-08 09:00:12.000000000 +0200
-++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2010-04-13 17:24:11.418047380 +0300
- @@ -63,6 +63,18 @@ if [ "${MODEL}" = "" ]; then
- fi
- fi
---- a/patches/eclipse-buildswtnatives.patch
-+++ b/patches/eclipse-buildswtnatives.patch
-@@ -1,6 +1,6 @@
----- ./plugins/org.eclipse.swt/buildFragment.xml.orig 2010-03-30 18:07:02.000000000 +0300
--+++ ./plugins/org.eclipse.swt/buildFragment.xml 2010-04-13 16:36:57.319044426 +0300
--@@ -545,4 +545,28 @@
-+--- a/plugins/org.eclipse.swt/buildFragment.xml
-++++ b/plugins/org.eclipse.swt/buildFragment.xml
-+@@ -558,4 +558,28 @@
- extraManifests="${extraManifests}"
- extraSourceLocations="${extraSourceLocations}"/>
- </target>
---- a/patches/eclipse-no-jetty5.patch
-+++ b/patches/eclipse-no-jetty5.patch
-@@ -1,5 +1,3 @@
--diff --git a/eclipse/features/master-equinox/feature.xml b/eclipse/features/master-equinox/feature.xml
--index ff7ccf1..d89663d 100644
- --- a/features/master-equinox/feature.xml
- +++ b/features/master-equinox/feature.xml
- @@ -39,14 +39,14 @@
-@@ -19,8 +17,6 @@
- <plugin
- id="org.eclipse.equinox.http.jetty"
- download-size="0"
--diff --git a/eclipse/features/master-jetty/feature.xml b/eclipse/features/master-jetty/feature.xml
--index a23c475..d33099e 100644
- --- a/features/master-jetty/feature.xml
- +++ b/features/master-jetty/feature.xml
- @@ -17,14 +17,14 @@
---- a/patches/eclipse-nosourcebundlesfordependencies.patch
-+++ b/patches/eclipse-nosourcebundlesfordependencies.patch
-@@ -1,16 +1,15 @@
--diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nosourcebundlesfordependencies ./features/org.eclipse.platform/sourceTemplateFeature/build.properties
----- ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nosourcebundlesfordependencies 2010-02-26 13:45:43.000000000 -0500
--+++ ./features/org.eclipse.platform/sourceTemplateFeature/build.properties 2010-02-26 13:46:34.000000000 -0500
--@@ -15,7 +15,7 @@ feature.xml,\
-+--- a/features/org.eclipse.platform/sourceTemplateFeature/build.properties
-++++ b/features/org.eclipse.platform/sourceTemplateFeature/build.properties
-+@@ -15,7 +15,7 @@
- feature.properties,\
- license.html
-
---generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.0.1.qualifier;unpack="false"
-+-generate.feature at org.eclipse.rcp.source=org.eclipse.rcp,plugin at com.ibm.icu.source;version=4.2.1.qualifier;unpack="false"
- +generate.feature at org.eclipse.rcp.source=org.eclipse.rcp
- generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
- plugin at org.eclipse.ecf.source;version=3.0.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.ssl.source;version=1.0.0.qualifier;unpack="false",\
--@@ -24,9 +24,7 @@ generate.feature at org.eclipse.equinox.p2.
-+@@ -24,9 +24,7 @@
- plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=3.0.0.qualifier;unpack="false",\
-@@ -21,17 +20,9 @@
-
-
-
--@@ -35,4 +33,4 @@ generate.feature at org.eclipse.equinox.p2.
--
--
--
---
--\ No newline at end of file
--+
--diff -up ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependencies ./features/org.eclipse.sdk/build.properties
----- ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependencies 2010-02-26 13:45:53.000000000 -0500
--+++ ./features/org.eclipse.sdk/build.properties 2010-02-26 13:47:39.000000000 -0500
--@@ -11,26 +11,14 @@
-+--- a/features/org.eclipse.sdk/build.properties
-++++ b/features/org.eclipse.sdk/build.properties
-+@@ -11,27 +11,14 @@
- bin.includes=epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html
-
- generate.feature at org.eclipse.platform.source=org.eclipse.platform,feature at org.eclipse.rcp.source,feature at org.eclipse.equinox.p2.user.ui.source;optional="true",plugin at org.eclipse.platform.doc.isv;unpack="false",\
-@@ -41,9 +32,10 @@
-
- generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false",\
- -plugin at org.junit.source;version=3.8.2.qualifier;unpack="false",\
-+-plugin at org.junit.source;version=4.8.1.qualifier;unpack="false",\
- -plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
- -exclude at org.eclipse.jdt.doc.user
---generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.1.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
-+-generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.2.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
- +exclude at org.eclipse.jdt.doc.user,\
- +exclude at org.junit4
- +generate.feature at org.eclipse.pde.source=org.eclipse.pde,exclude at org.eclipse.pde.doc.user
-@@ -57,10 +49,9 @@
- - plugin at org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
- - plugin at org.apache.lucene.source;version=1.9.1.qualifier;unpack="false",\
- - plugin at org.apache.lucene.analysis.source;version=1.9.1.qualifier;unpack="false",\
--- plugin at org.mortbay.jetty.util.source;version=6.1.15.qualifier;unpack="false",\
--- plugin at org.mortbay.jetty.server.source;version=6.1.15.qualifier;unpack="false"
-+- plugin at org.mortbay.jetty.util.source;version=6.1.23.qualifier;unpack="false",\
-+- plugin at org.mortbay.jetty.server.source;version=6.1.23.qualifier;unpack="false"
- +generate.feature at org.eclipse.help.source=org.eclipse.help
-
---generatedVersionLength=45
-+ generatedVersionLength=45
- \ No newline at end of file
--+generatedVersionLength=45
---- a/patches/eclipse-pde.build-add-package-build.patch
-+++ b/patches/eclipse-pde.build-add-package-build.patch
-@@ -1,11 +1,7 @@
- ### Eclipse Workspace Patch 1.0
- #P org.eclipse.pde.build
--Index: templates/package-build/prepare-build-dir.sh
--===================================================================
--RCS file: templates/package-build/prepare-build-dir.sh
--diff -N templates/package-build/prepare-build-dir.sh
----- /dev/null 1 Jan 1970 00:00:00 -0000
--+++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000
-+--- /dev/null
-++++ b/plugins/org.eclipse.pde.build/templates/package-build/prepare-build-dir.sh
- @@ -0,0 +1,105 @@
- +#!/bin/sh
- +
-@@ -112,12 +108,8 @@
- +
- +rm -rf $BUILDDIR/tmp
- +echo done
--Index: templates/package-build/customTargets-assemble-target.xml
--===================================================================
--RCS file: templates/package-build/customTargets-assemble-target.xml
--diff -N templates/package-build/customTargets-assemble-target.xml
----- /dev/null 1 Jan 1970 00:00:00 -0000
--+++ templates/package-build/customTargets-assemble-target.xml 1 Jan 1970 00:00:00 -0000
-+--- /dev/null
-++++ b/plugins/org.eclipse.pde.build/templates/package-build/customTargets-assemble-target.xml
- @@ -0,0 +1,15 @@
- +<project>
- + <!-- ===================================================================== -->
-@@ -134,12 +126,8 @@
- + <ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
- + </target>
- +</project>
--Index: templates/package-build/customTargets.xml
--===================================================================
--RCS file: templates/package-build/customTargets.xml
--diff -N templates/package-build/customTargets.xml
----- /dev/null 1 Jan 1970 00:00:00 -0000
--+++ templates/package-build/customTargets.xml 1 Jan 1970 00:00:00 -0000
-+--- /dev/null
-++++ b/plugins/org.eclipse.pde.build/templates/package-build/customTargets.xml
- @@ -0,0 +1,154 @@
- +<project name="Build specific targets and properties" default="noDefault">
- +
-@@ -295,12 +283,8 @@
- + </target>
- +
- +</project>
--Index: templates/package-build/build.properties
--===================================================================
--RCS file: templates/package-build/build.properties
--diff -N templates/package-build/build.properties
----- /dev/null 1 Jan 1970 00:00:00 -0000
--+++ templates/package-build/build.properties 1 Jan 1970 00:00:00 -0000
-+--- /dev/null
-++++ b/plugins/org.eclipse.pde.build/templates/package-build/build.properties
- @@ -0,0 +1,12 @@
- +buildDirectory=${sourceDirectory}/build
- +buildLabel=rpmBuild
---- a/patches/eclipse-swt-buildagainstxulrunner.patch
-+++ b/patches/eclipse-swt-buildagainstxulrunner.patch
-@@ -5,9 +5,9 @@
- RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh,v
- retrieving revision 1.54
- diff -u -r1.54 build.sh
----- Eclipse SWT PI/gtk/library/build.sh 29 May 2009 21:30:14 -0000 1.54
--+++ Eclipse SWT PI/gtk/library/build.sh 1 Jun 2009 18:44:43 -0000
--@@ -106,19 +106,19 @@
-+--- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 29 May 2009 21:30:14 -0000 1.54
-++++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 1 Jun 2009 18:44:43 -0000
-+@@ -120,19 +120,19 @@
- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
- export MOZILLA_INCLUDES
- export MOZILLA_LIBS
---- a/patches/eclipse-use-newer-commons-codec.patch
-+++ b/patches/eclipse-use-newer-commons-codec.patch
-@@ -1,5 +1,5 @@
----- features/org.eclipse.equinox.p2.user.ui/feature.xml.orig 2010-04-06 06:12:02.000000000 +0300
--+++ features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-06-10 10:48:14.803076479 +0300
-+--- a/features/org.eclipse.equinox.p2.user.ui/feature.xml
-++++ b/features/org.eclipse.equinox.p2.user.ui/feature.xml
- @@ -298,21 +298,21 @@
- id="org.apache.commons.codec"
- download-size="0"
---- a/patches/gnomeproxy-makefile.patch
-+++ b/patches/gnomeproxy-makefile.patch
-@@ -1,6 +1,6 @@
----- ./plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 22:36:19.965754808 +0200
--+++ ./plugins/org.eclipse.core.net/natives/unix/linux/makefile 2009-10-12 23:01:39.375006881 +0200
--@@ -20,7 +20,8 @@ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
-+--- a/plugins/org.eclipse.core.net/natives/unix/linux/makefile
-++++ b/plugins/org.eclipse.core.net/natives/unix/linux/makefile
-+@@ -20,7 +20,8 @@
-
- OS_TYPE = linux
- JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
---- a/patches/junit4-nochecksum.patch
-+++ b/patches/junit4-nochecksum.patch
-@@ -1,14 +1,15 @@
----- ./plugins/org.junit_4.8.1.v4_8_1_v20100114-1600/META-INF/MANIFEST.MF.sav 2010-03-07 22:38:26.000000000 +0200
--+++ ./plugins/org.junit_4.8.1.v4_8_1_v20100114-1600/META-INF/MANIFEST.MF 2010-04-20 23:23:36.962959283 +0300
--@@ -29,18 +29,4 @@ Export-Package: junit.extensions;version
-- Bundle-Version: 4.8.1.v4_8_1_v20100114-1600
-+--- a/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
-++++ b/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
-+@@ -28,19 +28,3 @@
-+ ers.model;version="4.8.1"
-+ Bundle-Version: 4.8.1.v4_8_1_v20100427-1100
- Bundle-ManifestVersion: 2
--
-+-
- -Name: META-INF/eclipse.inf
- -SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
- -
- -Name: junit.jar
---SHA1-Digest: XIT/0/dzpzuuA72Vv7gtkiGAY6k=
-+-SHA1-Digest: zPmrTAyba4ZMLFgf8QAHILhgZ9o=
- -
- -Name: about_files/cpl-v10.html
- -SHA1-Digest: REygXYi+T14Sj1v8XnnKycNjpN4=
-@@ -17,5 +18,5 @@
- -SHA1-Digest: w3lIEWRkSmgtAui4qxGRJmqgDw4=
- -
- -Name: plugin.properties
---SHA1-Digest: yg4cr1Fc8Pkzv804Pu1BHvrWCC4=
--
-+-SHA1-Digest: f1fR+Wdi2X4qLQSIBEgwenAuk2c=
-+-
---- a/patches/osgi-util.patch
-+++ b/patches/osgi-util.patch
-@@ -1,8 +1,6 @@
--diff --git a/eclipse/plugins/org.eclipse.osgi.util/build.properties b/eclipse/plugins/org.eclipse.osgi.util/build.properties
--index 2a015f5..270afcd 100644
- --- a/plugins/org.eclipse.osgi.util/build.properties
- +++ b/plugins/org.eclipse.osgi.util/build.properties
--@@ -12,10 +12,10 @@ bin.includes = plugin.properties,\
-+@@ -12,10 +12,10 @@
- org/,\
- about.html,\
- META-INF/,\
diff --git a/debian/patches/series b/debian/patches/series
index e555afa..fb63646 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
-refresh-patches.patch
build-arch.patch
-java-home.patch
regenerateBootstrapFiles.patch
-update-dependency.patch
swt-compile-xpt.patch
eclipse-manpage.patch
osgi-services.patch
@@ -20,4 +17,3 @@ fix-shell-script-perm.patch
pdebuild-path-copy-platform.patch
pdebuild-script.patch
symlink-system-files.patch
-fix-tooltip-color.patch
diff --git a/debian/patches/update-dependency.patch b/debian/patches/update-dependency.patch
deleted file mode 100644
index 42e8cf2..0000000
--- a/debian/patches/update-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Update the dependency list for jetty
-Author: Benjamin Drung <bdrung at ubuntu.com>
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317370
-
---- a/dependencies.properties
-+++ b/dependencies.properties
-@@ -1,4 +1,4 @@
--com.ibm.icu_4.2.1.v20100412.jar=/home/akurtakov/orbit/icu.jar:/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar::/usr/share/java/com.ibm.icu.jar
-+com.ibm.icu_4.2.1.v20100412.jar=/home/akurtakov/orbit/icu.jar:/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/share/java/com.ibm.icu-4.2.jar:/usr/share/java/com.ibm.icu.jar
- com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
- javax.servlet_2.5.0.v200910301333.jar=/home/akurtakov/orbit/servlet.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
diff --git a/dependencies.properties b/dependencies.properties
index 8418dea..06ce276 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -1,6 +1,6 @@
-com.ibm.icu_4.2.1.v20100412.jar=/home/akurtakov/orbit/icu.jar:/usr/lib/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.0.1.v20090415.jar:/usr/share/java/com.ibm.icu-4.2.jar:/usr/share/java/com.ibm.icu.jar
+com.ibm.icu_4.2.1.v20100412.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.2.1.v20100412.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.2.1.v20100412.jar:/usr/share/java/com.ibm.icu-4.2.jar:/usr/share/java/com.ibm.icu.jar
com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
-javax.servlet_2.5.0.v200910301333.jar=/home/akurtakov/orbit/servlet.jar:/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.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
org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
@@ -10,8 +10,8 @@ org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache
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.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
-org.mortbay.jetty.util_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty-util.jar:/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
-org.mortbay.jetty.server_6.1.23.v201004211559.jar=/home/akurtakov/orbit/jetty.jar:/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
-org.objectweb.asm_3.2.0.v200909071300.jar=/home/akurtakov/orbit/asm.jar:/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
-org.sat4j.core_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.core.jar:/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
-org.sat4j.pb_2.2.0.v20100429.jar=/home/akurtakov/orbit/org.sat4j.pb.jar:/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.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.objectweb.asm_3.2.0.v200909071300.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
+org.sat4j.core_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+org.sat4j.pb_2.2.0.v20100429.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar
diff --git a/eclipse.1.xml b/eclipse.1.xml
deleted file mode 100644
index 1d93aaf..0000000
--- a/eclipse.1.xml
+++ /dev/null
@@ -1,616 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<!-- lifted from troff+man by doclifter -->
-<refentry id='eclipse1'>
-<refmeta>
-<refentrytitle>eclipse</refentrytitle>
-<manvolnum>1</manvolnum>
-</refmeta>
-<refnamediv id='name'>
-<refname>eclipse</refname>
-<refpurpose>extensible tool platform and Java IDE</refpurpose>
-</refnamediv>
-<!-- body begins here -->
-<refsynopsisdiv id='synopsis'>
-<cmdsynopsis>
- <command>eclipse</command>
- <arg choice='opt'><arg choice='plain'><replaceable>platform</replaceable></arg><arg choice='plain'><replaceable>options</replaceable></arg></arg>
- <arg choice='opt'><arg choice='plain'><option>-vmargs </option></arg><arg choice='opt'><arg choice='plain'><replaceable>Java</replaceable></arg><arg choice='plain'><replaceable>VM</replaceable></arg><arg choice='plain'><replaceable>arguments</replaceable></arg></arg></arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id='description'><title>DESCRIPTION</title>
-<para>
-The <command>Eclipse</command> Platform is an open and
- extensible platform for anything and yet nothing in particular. It provides a
- foundation for constructing and running integrated software-development tools.
- The <command>Eclipse</command> Platform allows tool builders
- to independently develop tools that integrate with other people's tools so
- seamlessly you can't tell where one tool ends and another starts.</para>
-
- <para>When invoked without selecting any particular application, the <command>eclipse</command>
- command will start the <command>Eclipse</command> Platform with the Java Development
- Tools (JDT) functionality enabled and ready to use.</para>
-
-<para>This manual page documents the command-line arguments for the
-<command>Eclipse</command> Platform and it is based on the
-Runtime Options help item in the <command>Eclipse</command>
-<ulink url="#authors" xrefstyle="AUTHORS">online help</ulink><!-- (see xref endterm="authors" linkend="authors" xrefstyle="AUTHORS"></xref> AUTHORS below)-->.</para>
-
-</refsect1>
-
-<refsect1 id='platform_options'><title>PLATFORM OPTIONS</title>
-<para> Listed below are the command line arguments processed by various parts of the
-<command>Eclipse</command> runtime.
-Many of these values can also be specified using System properties either on the command line
-using <command>-D VM</command> arguments, by specifying their values in a <filename>config.ini</filename> file or by using a
-<filename><launcher>.ini</filename> file. Using the two latter techniques it is possible to customize
-<command>Eclipse</command> without using command line arguments at all.</para>
-
-<para>For each argument in the list, its corresponding System property key is given (in {}). Also
-given is the <command>Eclipse</command> runtime layer in which the
-command line argument is processed (in ()). </para>
-
-<variablelist remap='TP'>
-
-<varlistentry>
- <term><option>
- -application <id> (Runtime)
- </option></term>
- <listitem>
- <para>
- The identifier of the application to run. The value given here
- overrides any application defined by the product being run.</para>
- <para>
- This is equivalent to setting the property
- <emphasis>eclipse.application</emphasis> to
- <id>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -arch <architecture> (OSGi)
- </option></term>
- <listitem>
- <para>The processor architecture value.</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.arch</emphasis> to
- <architecture>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -clean (OSGi)
- </option></term>
- <listitem>
- <para>
- Wipe clean any cached data used by the OSGi
- framework and <command>eclipse</command> runtime. This will clean
- the caches used to store bundle dependency resolution and <command>eclipse</command>
- extension registry data. Using this option will force <command>eclipse</command> to
- reinitialize these caches.
- </para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.clean</emphasis> to
- "true".
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -configuration <location> (Main)
- </option></term>
- <listitem>
- <para>The configuration location for this run of the platform. The
- configuration determines what plug-ins will run as well as various
- other system settings. See the On-line Help for details (SEE ALSO below).</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.configuration.area</emphasis>
- to <location>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -console [port] (OSGi)
- </option></term>
- <listitem>
- <para>Enable the OSGi console (if installed). If the [port] value is a suitable integer, it is interpreted as
- the port on which the console listens and directs its output to the
- given port. Handy for investigating the state of the system.</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.console</emphasis> to [port] or the
- empty string if the default port is to be used (i.e., when the port is not specified).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -consoleLog (Runtime)
- </option></term>
- <listitem>
- <para>Any log output is also sent to Java's
- System.out (typically back to the command shell if any). Handy when
- combined with <command>-debug</command>.</para>
- <para>
- This is equivalent to setting the property <emphasis>eclipse.consoleLog</emphasis> to
- "true".
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -data <location> (OSGi)<literallayout></literallayout>
- </option></term>
- <listitem>
- <para>The instance data location for this session. Plug-ins use this
- location to store their data. For example, the Resources plug-in
- uses this as the default location for projects (aka the workspace).
- See the On-line Help for details (SEE ALSO below).
- </para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.instance.area</emphasis> to
- <location>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -debug [options file] (OSGi)
- </option></term>
- <listitem>
- <para>Put the platform in debug mode. If [options file] is given, it is interpreted as the location of the
- <filename>.options</filename> file. This file indicates what debug points are available
- for a plug-in and whether or not they are enabled. If a location is
- not specified, the platform searches for the<filename> .options</filename> file under
- the install directory.</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.debug</emphasis> to
- [options file] or the empty string to simply enable debug (i.e., if
- the options file location is not specified).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -dev [entries] (OSGi)
- </option></term>
- <listitem>
- <para>Turn on dev mode. If given, [entries] should be a comma-separated class path entries
- which are added to the class path of each plug-in or a URL to a
- Java properties file containing custom classpath additions for a
- set of plug-ins. For each plug-in requiring a customized dev time
- classpath the file will contain an entry of the
- form.</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.dev</emphasis> to
- [entries] or the empty string to simply enable dev mode (i.e., if
- entries are not specified).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -eclipse.keyring <file path> (Equinox)
- </option></term>
- <listitem>
- <para>
- Set to override location of the default secure storage.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -eclipse.password <file path> (Equinox)
- </option></term>
- <listitem>
- <para>
- If specified, the secure storage treats contents of the file as a
- default password. When not set, password providers are used to
- obtain a password.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -feature <feature id> (Runtime)
- </option></term>
- <listitem>
- <para>
- Set the identifier of the product being run. This controls various
- branding information and what application is used.
- </para>
- <para>
- This is equivalent to setting the property <emphasis>eclipse.product</emphasis> to <feature
- id>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -framework <location> (Main)
- </option></term>
- <listitem>
- <para>
- Set the URL location of the OSGi framework. Useful if the <command>Eclipse</command>
- install is disjoint. See the On-line Help for details (SEE ALSO below).</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.framework</emphasis> to
- <location>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -initialize (Main)
- </option></term>
- <listitem>
- <para>
- Initializes the configuration being run. All runtime related data
- structures and caches are refreshed. Any user/plug-in defined
- configuration data is not purged. No application is run, any
- product specifications are ignored and no UI is presented (e.g.,
- the splash screen is not drawn).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -install <location> (Main)
- </option></term>
- <listitem>
- <para>Set the install location of the platform. This option indicates the
- location of the basic <command>Eclipse</command> plug-ins and is useful if the <command>Eclipse</command>
- install is disjoint.</para>
- <para>
- This is equivalent to setting the property <emphasis>osgi.install.area</emphasis> to
- <location>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -keyring <location> (Runtime)
- </option></term>
- <listitem>
- <para>
- The location of the authorization database on disk. This argument
- has to be used together with the <command>-password</command> argument.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- --launcher.library <location> (Executable)
- </option></term>
- <listitem>
- <para>
- The location of the <command>eclipse</command> executable's companion shared
- library. If not specified the executable looks in the plugins
- directory for the appropriate
- <emphasis>org.eclipse.equinox.launcher.[platform] fragment</emphasis> with the highest
- version and uses the shared library named <filename>eclipse_*</filename> inside.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- --launcher.ini <location> (Executable)
- </option></term>
- <listitem>
- <para>
- The location of the product .ini file to use. If not
- specified the executable will look for a file beside the launcher
- with the same name and the extension <filename>.ini</filename>. (ie., <filename>/usr/bin/eclipse</filename>
- looks for <filename>eclipse.ini</filename>, <filename>/opt/product</filename> looks for
- <filename>product.ini</filename>).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- --launcher.suppressErrors (Executable)
- </option></term>
- <listitem>
- <para>
- If specified the executable will not display any error or message
- dialogs. This is useful if the executable is being used in an
- unattended situation.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- --launcher.XXMaxPermSize <value> (Executable)
- </option></term>
- <listitem>
- <para>
- If specified, and the executable detects that the VM being used is
- a Sun VM, then the launcher will automatically add the
- <option>-XX:MaxPermSize=<value></option> vm argument. The executable is
- not capable of detecting Sun VMs on all
- platforms.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -name <string>
- </option></term>
- <listitem>
- <para>
- The name to be displayed in task bar item when the application
- starts up. When not set, the name is the name of the executable.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -nl <locale> (OSGi)
- </option></term>
- <listitem>
- <para>
- The name of the locale on which <command>Eclipse</command> platform will run. NL
- values should follow the standard Java locale naming conventions.
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>osgi.nl</emphasis> to
- <locale>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -noExit (OSGi)
- </option></term>
- <listitem>
- <para>
- Disable automatic termination of the VM after the <command>eclipse</command>
- application has ended. This is useful for examining the OSGi
- framework after the <command>eclipse</command> application has ended.
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>osgi.noShutdown</emphasis> to
- "true".
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -noLazyRegistryCacheLoading (Runtime)
- </option></term>
- <listitem>
- <para>
- Deactivate the platform's plug-in registry cache loading
- optimization. By default, configuration elements are
- loaded from the registry cache (when available) only on demand,
- reducing memory footprint. This option forces the registry cache to
- be fully loaded at startup.
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>eclipse.noLazyRegistryCacheLoading</emphasis>
- to "true".
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -noRegistryCache (Runtime)
- </option></term>
- <listitem>
- <para>
- The internal extension registry cache will
- neither be read nor written.
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>eclipse.noRegistryCache</emphasis>
- to "true".
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -noSplash (Executable, Main)
- </option></term>
- <listitem>
- <para>
- Controls whether or not the splash screen is shown.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -os <operating system> (OSGi)
- </option></term>
- <listitem>
- <para>
- The operating system value. The value should be one of the <command>Eclipse</command>
- processor architecture names known to <command>Eclipse</command> (e.g., x86, sparc,
- ...).
- </para> <para>
- This is equivalent to setting the property
- <emphasis>osgi.os</emphasis> to
- <operating system>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -password <password> (Runtime)
- </option></term>
- <listitem>
- <para>
- The password for the authorization database.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -pluginCustomization <location> (Runtime)
- </option></term>
- <listitem>
- <para>
- The file system location of a properties file containing default
- settings for plug-in preferences. These default settings override
- default settings specified in the primary feature. Relative paths
- are interpreted relative to the current working directory for
- <command>eclipse</command> itself.
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>eclipse.pluginCustomization</emphasis>
- to <location>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -product <id> (OSGi)
- </option></term>
- <listitem>
- <para>
- The identifier of the product being run. This controls various
- branding information and what application is used.
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>eclipse.product</emphasis> to <id>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -showSplash <bitmap> (Executable, Main)
- </option></term>
- <listitem>
- <para>
- Specifies the bitmap to use in the splash screen. If specified, the
- launcher may be able to show the splash screen before starting the
- Java VM. If not specified, Main will find the bitmap using
- the <emphasis>osgi.splashLocation</emphasis> and <emphasis>osgi.splashPath</emphasis>
- properties.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -startup <location> (Executable)
- </option></term>
- <listitem>
- <para>
- The location of jar used to startup <command>eclipse</command>. The jar referred to
- should have the <emphasis>Main-Class</emphasis> attribute set to
- <emphasis>org.eclipse.equinox.launcher.Main</emphasis>. If this parameter is not set,
- the executable will look in the plugins directory for
- the <emphasis>org.eclipse.equinox.launcher bundle</emphasis> with the highest
- version.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -user <location> (OSGi)
- </option></term>
- <listitem>
- <para>
- Set the location of the user area. The user area contains data (e.g.,
- preferences) specific to the OS user and independent of any <command>Eclipse</command>
- install, configuration or instance. See the On-line Help for details (SEE ALSO below).
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>osgi.user.area</emphasis> to
- <location>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -vm <path to java vm> (Executable, Main)
- </option></term>
- <listitem>
- <para>
- When passed to the <command>Eclipse</command> executable, this option is used to
- locate the Java VM to use to run <command>Eclipse</command>. It should be the full
- file system path to an appropriate: Java<filename> jre/bin</filename> directory, Java
- Executable, Java shared library (<filename>libjvm.so</filename>), or a Java
- VM Execution Environment description file. If not specified,
- the <command>Eclipse</command> executable uses a search algorithm to locate a suitable
- VM. In any event, the executable then passes the path to the actual
- VM used to Java Main using the <command>-vm</command> argument. Java Main then stores
- this value in <emphasis>eclipse.vm</emphasis>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -vmargs [vmargs*] (Executable, Main)
- </option></term>
- <listitem>
- <para>
- when passed to the <command>Eclipse</command>, this option is used to customize the
- operation of the Java VM to use to run <command>Eclipse</command>. If specified, this
- option must come at the end of the command line. Even if not
- specified on the executable command line, the executable will
- automatically add the relevant arguments (including the class being
- launched) to the command line passed into Java using the <command>-vmargs</command>
- argument. Java Main then stores this value in
- <emphasis>eclipse.vmargs</emphasis>.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>
- -ws <window system> (OSGi)
- </option></term>
- <listitem>
- <para>
- Set the window system value. The value should be one of the <command>Eclipse</command>
- window system names known to <command>Eclipse</command> (e.g., win32, motif, ...).
- </para>
- <para>
- This is equivalent to setting the property
- <emphasis>osgi.ws</emphasis> to
- <window system>.
- </para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-</refsect1>
-
-<refsect1 id='see_also'><title>SEE ALSO</title>
-<para><citerefentry><refentrytitle>java</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>ecj</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-<para><command>Eclipse</command> On-line Help <ulink url='http://help.eclipse.org/'>http://help.eclipse.org/</ulink>
-<glossterm>Platform Plug-in Developer Guide</glossterm> > <glossterm>Reference</glossterm> > <glossterm>Other reference information</glossterm> >
-<glossterm>Runtime Options</glossterm>.</para>
-
-</refsect1>
-
-<refsect1 id='files'><title>FILES</title>
-<para>The system wide config.ini file is <filename>/etc/eclipse.ini</filename>. User level Configuration file is
-<filename>$HOME/.eclipse/org.eclipse.platform_<version>_<id>/configuration/config.ini</filename>.</para>
-</refsect1>
-
-<refsect1 XrefLabel="AUTHORS" id="authors"><title>AUTHORS</title>
-<para>
-The <command>Eclipse</command> Project was originally created by IBM in November 2001 and
-supported by a consortium of software vendors. The <command>Eclipse</command> Foundation was
-created in January 2004 as an independent not-for-profit corporation to act as the steward of the
-<command>Eclipse</command> community.
-</para>
-<para>This manual page was semi-automatically transformed from the
-Runtime Options HTML help using <command>pandoc</command> and
-<command>docbook2x-man</command> by Pablo Duboue <pablo.duboue at gmail.com>.</para>
-
-</refsect1>
-</refentry>
diff --git a/eclipse/features/org.eclipse.platform/feature.xml b/eclipse/features/org.eclipse.platform/feature.xml
index 84e2d9f..65e6d99 100644
--- a/eclipse/features/org.eclipse.platform/feature.xml
+++ b/eclipse/features/org.eclipse.platform/feature.xml
@@ -620,12 +620,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.equinox.concurrent"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
</feature>
diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
index 61cb9c0..3303026 100644
--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
@@ -20,7 +20,6 @@ import java.util.Enumeration;
import java.util.StringTokenizer;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
/**
@@ -76,20 +75,6 @@ public class JspClassLoader extends URLClassLoader {
private void addBundleClassPathJars(Bundle bundle) {
Dictionary headers = bundle.getHeaders();
String classPath = (String) headers.get(Constants.BUNDLE_CLASSPATH);
- BundleContext context = bundle.getBundleContext();
- Bundle[] inner = context.getBundles();
- for(int i = 0 ; i < inner.length ; i++){
- String loc = inner[i].getLocation();
- if(loc.startsWith("reference:file:plugins/")){
- String p = loc.replaceFirst("^reference:file:", "file:///usr/lib/eclipse/");
- try {
- URL u = new URL(p);
- super.addURL(u);
- } catch(Exception e){
- e.printStackTrace();
- }
- }
- }
if (classPath != null) {
StringTokenizer tokenizer = new StringTokenizer(classPath, ","); //$NON-NLS-1$
while (tokenizer.hasMoreTokens()) {
diff --git a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
index 0072534..a1e43d5 100644
--- a/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -39,8 +39,8 @@ Export-Package: org.apache.lucene.demo.html;x-internal:=true,
org.eclipse.help.search,
org.eclipse.help.server,
org.eclipse.help.standalone
-Require-Bundle: org.apache.lucene;visibility:=reexport,
- org.apache.lucene.analysis;visibility:=reexport,
+Require-Bundle: org.apache.lucene;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
+ org.apache.lucene.analysis;bundle-version="[1.9.1,2.0.0)";visibility:=reexport,
org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
diff --git a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
deleted file mode 100644
index 2bba4b0..0000000
--- a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/**
- *
- */
-package org.eclipse.jdt.internal.compiler.batch;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.zip.CRC32;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.jdt.internal.compiler.ClassFile;
-import org.eclipse.jdt.internal.compiler.CompilationResult;
-import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
-import org.eclipse.jdt.internal.compiler.env.AccessRule;
-import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-import org.eclipse.jdt.internal.compiler.util.Messages;
-import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
-
-/**
- * This is an alternate entry point for the command-line compiler which
- * is simpler to integrate into GCC. In particular the option processing
- * is more GNU-like and the recognized options are similar to those supported
- * by other GCC front ends.
- */
-public class GCCMain extends Main {
-
- // All the compilation units specified on the command line.
- private HashSet commandLineCompilationUnits = new HashSet();
- // True if we are only checking syntax.
- private boolean syntaxOnly;
- // If not null, the name of the output zip file.
- // If null, we are generating class files in the file system,
- // not a zip file.
- private String zipDestination;
- // The zip stream to which we're writing, or null if it hasn't been opened.
- private ZipOutputStream zipStream;
-
- // If not null, the name of the zip file to which dependency class files
- // should be written.
- private String zipDependencyDestination;
- // The zip stream to which dependency files should be written.
- private ZipOutputStream zipDependencyStream;
-
- public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
- boolean systemExitWhenFinished) {
- super(outWriter, errWriter, systemExitWhenFinished);
- this.logger.setEmacs();
- }
-
- public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
- boolean systemExitWhenFinished, Map customDefaultOptions) {
- super(outWriter, errWriter, systemExitWhenFinished,
- customDefaultOptions);
- this.logger.setEmacs();
- }
-
- private void fail(Exception t) {
- t.printStackTrace();
- this.logger.logException(t);
- System.exit(1);
- }
-
- public CompilationUnit[] getCompilationUnits() {
- CompilationUnit[] units = super.getCompilationUnits();
- for (int i = 0; i < units.length; ++i)
- this.commandLineCompilationUnits.add(units[i]);
- return units;
- }
-
- private String combine(char[] one, char[] two) {
- StringBuffer b = new StringBuffer();
- b.append(one);
- b.append(two);
- return b.toString();
- }
-
- private ZipOutputStream getZipOutput() throws IOException {
- if (this.zipDestination != null && this.zipStream == null) {
- OutputStream os;
- if ("-".equals(this.zipDestination)) { //$NON-NLS-1$
- os = System.out;
- } else {
- os = new FileOutputStream(this.zipDestination);
- }
- zipStream = new ZipOutputStream(new BufferedOutputStream(os));
- zipStream.setMethod(ZipOutputStream.STORED);
- // Sun/OpenJDK require at least one entry in the zip file.
- ZipEntry entry = new ZipEntry(".dummy");
- byte[] contents = new byte[0];
- CRC32 crc = new CRC32();
- crc.update(contents);
- entry.setSize(contents.length);
- entry.setCrc(crc.getValue());
- zipStream.putNextEntry(entry);
- zipStream.write(contents);
- zipStream.closeEntry();
- }
- return zipStream;
- }
-
- private ZipOutputStream getDependencyOutput() throws IOException {
- if (this.zipDependencyDestination != null && this.zipDependencyStream == null) {
- OutputStream os = new FileOutputStream(zipDependencyDestination);
- zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os));
- zipDependencyStream.setMethod(ZipOutputStream.STORED);
- // Sun/OpenJDK require at least one entry in the zip file.
- ZipEntry entry = new ZipEntry(".dummy");
- byte[] contents = new byte[0];
- CRC32 crc = new CRC32();
- crc.update(contents);
- entry.setSize(contents.length);
- entry.setCrc(crc.getValue());
- zipDependencyStream.putNextEntry(entry);
- zipDependencyStream.write(contents);
- zipDependencyStream.closeEntry();
- }
- return zipDependencyStream;
- }
-
- public void outputClassFiles(CompilationResult unitResult) {
- if (this.syntaxOnly) {
- return;
- }
- if (this.zipDestination == null) {
- // Nothing special to do here.
- super.outputClassFiles(unitResult);
- return;
- }
- if (unitResult == null || unitResult.hasErrors()) {
- return;
- }
-
- // If we are compiling with indirect dispatch, we don't need
- // any dependent classes. If we are using the C++ ABI, then we
- // do need the dependencies in order to do proper layout.
- boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit());
- if (this.zipDependencyDestination == null && !gcjCompile) {
- return;
- }
-
- try {
- ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput();
- ClassFile[] classFiles = unitResult.getClassFiles();
- for (int i = 0; i < classFiles.length; ++i) {
- ClassFile classFile = classFiles[i];
- String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class);
- if (this.verbose)
- this.out.println(
- Messages.bind(
- Messages.compilation_write,
- new String[] {
- String.valueOf(this.exportedClassFilesCounter+1),
- filename
- }));
- ZipEntry entry = new ZipEntry(filename);
- byte[] contents = classFile.getBytes();
- CRC32 crc = new CRC32();
- crc.update(contents);
- entry.setSize(contents.length);
- entry.setCrc(crc.getValue());
- dest.putNextEntry(entry);
- dest.write(contents);
- dest.closeEntry();
- }
- } catch (IOException err) {
- fail(err);
- }
- }
-
- private String getArgument(String option) {
- int index = option.indexOf('=');
- return option.substring(index + 1);
- }
-
- private void addPath(ArrayList result, String currentClasspathName) {
- String customEncoding = null;
- AccessRule[] accessRules = new AccessRule[0];
- AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, AccessRestriction.COMMAND_LINE, currentClasspathName);
- FileSystem.Classpath currentClasspath = FileSystem
- .getClasspath(currentClasspathName,
- customEncoding, accessRuleSet);
- if (currentClasspath != null) {
- result.add(currentClasspath);
- }
- }
-
- private void parsePath(ArrayList result, String path) {
- StringTokenizer iter = new StringTokenizer(path, File.pathSeparator);
- while (iter.hasMoreTokens()) {
- addPath(result, iter.nextToken());
- }
- }
-
- protected void handleWarningToken(String token, boolean isEnabling) {
- // Recognize this for compatibility with older versions of gcj.
- if ("deprecated".equals(token)) //$NON-NLS-1$
- token = "deprecation"; //$NON-NLS-1$
- else if ("static-access".equals(token) //$NON-NLS-1$
- || "dep-ann".equals(token) //$NON-NLS-1$
- || "over-ann".equals(token)) { //$NON-NLS-1$
- // Some exceptions to the warning naming rule.
- } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$
- // Compatibility with earlier versions of gcj.
- token = "semicolon"; //$NON-NLS-1$
- } else {
- // Turn "foo-bar-baz" into eclipse-style "fooBarBaz".
- StringBuffer newToken = new StringBuffer(token.length());
- StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$
- boolean first = true;
- while (t.hasMoreTokens()) {
- String next = t.nextToken();
- if (first) {
- newToken.append(next);
- first = false;
- } else {
- newToken.append(Character.toUpperCase(next.charAt(0)));
- newToken.append(next.substring(1));
- }
- }
- token = newToken.toString();
- }
- super.handleWarningToken(token, isEnabling);
- }
-
- private void turnWarningsToErrors() {
- Object[] entries = this.options.entrySet().toArray();
- for (int i = 0, max = entries.length; i < max; i++) {
- Map.Entry entry = (Map.Entry) entries[i];
- if (!(entry.getKey() instanceof String))
- continue;
- if (!(entry.getValue() instanceof String))
- continue;
- if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) {
- this.options.put(entry.getKey(), CompilerOptions.ERROR);
- }
- }
- }
-
- /**
- * Set the debug level to the indicated value. The level should be
- * between 0 and 2, inclusive, but this is not checked.
- * @param level the debug level
- */
- private void setDebugLevel(int level) {
- this.options.put(
- CompilerOptions.OPTION_LocalVariableAttribute,
- level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
- this.options.put(
- CompilerOptions.OPTION_LineNumberAttribute,
- level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
- this.options.put(
- CompilerOptions.OPTION_SourceFileAttribute,
- CompilerOptions.GENERATE);
- }
-
- private void readFileList(String file, ArrayList result) {
- try {
- BufferedReader b = new BufferedReader(new FileReader(file));
- String line;
- while ((line = b.readLine()) != null) {
- if (line.endsWith(SUFFIX_STRING_java))
- result.add(line);
- }
- b.close();
- } catch (IOException err) {
- fail(err);
- }
- }
-
- private void readAllFileListFiles(ArrayList fileList, ArrayList result) {
- Iterator it = fileList.iterator();
- while (it.hasNext()) {
- readFileList((String) it.next(), result);
- }
- }
-
- private void handleWall(boolean enable) {
- // A somewhat arbitrary list. We use the GCC names
- // here, and the local handleWarningToken translates
- // for us.
- handleWarningToken("constructor-name", enable);
- handleWarningToken("pkg-default-method", enable);
- handleWarningToken("masked-catch-block", enable);
- handleWarningToken("all-deprecation", enable);
- handleWarningToken("unused-local", enable);
- handleWarningToken("unused-label", enable);
- handleWarningToken("static-receiver", enable);
- handleWarningToken("indirect-static", enable);
- handleWarningToken("no-effect-assign", enable);
- handleWarningToken("char-concat", enable);
- handleWarningToken("useless-type-check", enable);
- handleWarningToken("final-bound", enable);
- handleWarningToken("assert-identifier", enable);
- handleWarningToken("enum-identifier", enable);
- handleWarningToken("finally", enable);
- handleWarningToken("varargs-cast", enable);
- handleWarningToken("unused", enable);
- handleWarningToken("forbidden", enable);
- }
-
- public void configure(String[] argv) {
- if ((argv == null) || (argv.length == 0)) {
- // This is a "can't happen".
- System.exit(1);
- }
-
- ArrayList files = new ArrayList();
- ArrayList otherFiles = new ArrayList();
- String classpath = null;
- boolean haveFileList = false;
- boolean inhibitAllWarnings = false;
- boolean treatWarningsAsErrors = false;
-
- for (int i = 0; i < argv.length; ++i) {
- String currentArg = argv[i];
-
- if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$
- // Simply accept the last one.
- String encoding = getArgument(currentArg);
- try { // ensure encoding is supported
- new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
- } catch (UnsupportedEncodingException e) {
- throw new IllegalArgumentException(
- this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
- }
- this.options.put(CompilerOptions.OPTION_Encoding, encoding);
- } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
- String arg = getArgument(currentArg);
- if (this.destinationPath != null) {
- StringBuffer errorMessage = new StringBuffer();
- errorMessage.append("-d"); //$NON-NLS-1$
- errorMessage.append(' ');
- errorMessage.append(arg);
- throw new IllegalArgumentException(
- this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
- }
- this.setDestinationPath(arg);
- } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
- classpath = getArgument(currentArg);
- } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
- ++i;
- if (i >= argv.length)
- throw new IllegalArgumentException(this.bind("gcc.zipArg")); //$NON-NLS-1$
- this.zipDestination = argv[i];
- } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
- ++i;
- if (i >= argv.length)
- throw new IllegalArgumentException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$
- this.zipDependencyDestination = argv[i];
- } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
- if (currentArg.equals("-g0")) { //$NON-NLS-1$
- setDebugLevel(0);
- } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
- || currentArg.equals("-g")) { //$NON-NLS-1$
- setDebugLevel(2);
- } else {
- // Handle -g1 but also things like -gstabs.
- setDebugLevel(1);
- }
- } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$
- treatWarningsAsErrors = true;
- } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$
- treatWarningsAsErrors = false;
- } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$
- handleWall(true);
- } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$
- handleWall(false);
- } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
- handleWarningToken(currentArg.substring(5), false);
- } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
- handleWarningToken(currentArg.substring(2), true);
- } else if (currentArg.equals("-w")) { //$NON-NLS-1$
- inhibitAllWarnings = true;
- } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
- // Ignore.
- } else if (currentArg.equals("-v")) { //$NON-NLS-1$
- this.verbose = true;
- } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$
- this.syntaxOnly = true;
- } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$
- currentArg = getArgument(currentArg);
- if (currentArg.equals("1.3")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
- } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
- } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
- } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
- } else {
- throw new IllegalArgumentException(this.bind("configure.source", currentArg)); //$NON-NLS-1$
- }
- } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
- currentArg = getArgument(currentArg);
- if (currentArg.equals("1.1")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1);
- } else if (currentArg.equals("1.2")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2);
- } else if (currentArg.equals("1.3")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
- } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
- } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
- } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
- } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
- this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
- } else {
- throw new IllegalArgumentException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
- }
- } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
- haveFileList = true;
- } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
- files.add(currentArg);
- } else if (currentArg.charAt(0) == '-'){
- // FIXME: error if not a file?
- } else {
- otherFiles.add(currentArg);
- }
- }
-
- // Read the file list file. We read them all, but really there
- // will only be one.
- if (haveFileList)
- readAllFileListFiles(otherFiles, files);
-
- this.filenames = (String[]) files.toArray(new String[0]);
- this.encodings = new String[this.filenames.length];
- this.destinationPaths = new String[this.filenames.length];
- for (int i = 0; i < this.filenames.length; ++i)
- this.destinationPaths[i] = this.destinationPath;
-
- // Classpath processing.
- ArrayList result = new ArrayList();
- if (classpath == null)
- throw new IllegalArgumentException(this.bind("gcc.noClasspath")); //$NON-NLS-1$
- parsePath(result, classpath);
-
- // We must always create both output files, even if one is not used.
- // That way we will always pass valid zip file on to jc1.
- try {
- getZipOutput();
- getDependencyOutput();
- } catch (IOException err) {
- fail(err);
- }
-
- if (inhibitAllWarnings)
- disableWarnings();
- if (treatWarningsAsErrors)
- turnWarningsToErrors();
-
- this.checkedClasspaths = new FileSystem.Classpath[result.size()];
- result.toArray(this.checkedClasspaths);
-
- this.logger.logCommandLineArguments(argv);
- this.logger.logOptions(this.options);
- this.logger.logClasspath(this.checkedClasspaths);
-
- this.maxRepetition = 1;
- }
-
- public boolean compile(String[] argv) {
- boolean result = super.compile(argv);
- try {
- if (zipStream != null) {
- zipStream.finish();
- zipStream.close();
- }
- if (zipDependencyStream != null) {
- zipDependencyStream.finish();
- zipDependencyStream.close();
- }
- } catch (IOException err) {
- fail(err);
- }
- return result;
- }
-
- public static void main(String[] argv) {
- boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv);
- System.exit(result ? 0 : 1);
- }
-}
diff --git a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
index 72d155e..48f7ba8 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
@@ -334,8 +334,3 @@ misc.usage.warn = {1} {2}\n\
\ uselessTypeCheck unnecessary cast/instanceof operation\n\
\ varargsCast + varargs argument need explicit cast\n\
\ warningToken + unsupported or unnecessary @SuppressWarnings\n
-
-# GCCMain messages.
-gcc.zipArg=-fzip-target requires argument
-gcc.zipDepArg=-fzip-dependency requires argument
-gcc.noClasspath=no classpath specified
diff --git a/nonosgidependencies.properties b/nonosgidependencies.properties
index e163887..f038604 100644
--- a/nonosgidependencies.properties
+++ b/nonosgidependencies.properties
@@ -19,8 +19,3 @@ org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-tra
org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar=/usr/share/java/junit.jar
org.junit4/junit.jar=/usr/share/java/junit4.jar
org.junit_4.8.1.v4_8_1_v20100427-1100/junit.jar=/usr/share/java/junit4.jar
-org.apache.ant_1.7.1.v20100518-1145/bin/ant=/usr/share/ant/bin/ant
-org.apache.ant_1.7.1.v20100518-1145/bin/antRun=/usr/share/ant/bin/antRun
-org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
-org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
-org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl=/usr/share/ant/bin/runant.pl
diff --git a/patches/eclipse-pde.build-add-package-build.patch b/patches/eclipse-pde.build-add-package-build.patch
index a7039c5..d9de2e0 100644
--- a/patches/eclipse-pde.build-add-package-build.patch
+++ b/patches/eclipse-pde.build-add-package-build.patch
@@ -49,7 +49,7 @@
+ PROJECTDIR=$(dirname "$f")
+ inSDK=1
+ inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
-+ if [ $inSDK = 0 ]; then
++ if [ $inSDK == 0 ]; then
+ PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ ERROR=""
+ if [ -z "$PROJECTNAME" ]; then
@@ -62,7 +62,7 @@
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
@@ -77,7 +77,7 @@
+ ERROR=""
+ inSDK=1
+ inSDK=$(echo $dir | grep -c $BUILDDIR)
-+ if [ $inSDK = 0 ]; then
++ if [ $inSDK == 0 ]; then
+ if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ elif [ -e "$dir/plugin.xml" ]; then
@@ -96,7 +96,7 @@
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ fi
diff --git a/patches/eclipse-swt-buildagainstxulrunner.patch b/patches/eclipse-swt-buildagainstxulrunner.patch
index 62eb47e..9d3a5ea 100644
--- a/patches/eclipse-swt-buildagainstxulrunner.patch
+++ b/patches/eclipse-swt-buildagainstxulrunner.patch
@@ -23,8 +23,8 @@ diff -u -r1.54 build.sh
elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
- XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
- XULRUNNER_LIBS=`pkg-config --libs libxul`
-+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-+ XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue"
++ XULRUNNER_INCLUDES=`pkg-config --cflags libxul-unstable`
++ XULRUNNER_LIBS="`pkg-config --libs libxul-unstable` -lxpcomglue"
export XULRUNNER_INCLUDES
export XULRUNNER_LIBS
- MAKE_MOZILLA=make_xulrunner
diff --git a/patches/eclipse-swt-compile-xpt.patch b/patches/eclipse-swt-compile-xpt.patch
deleted file mode 100644
index 3e0d348..0000000
--- a/patches/eclipse-swt-compile-xpt.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Build .xpt file if it does not exit
-Author: Benjamin Drung
-Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305569
-
---- a/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
-+++ b/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
-@@ -24,6 +24,24 @@ if [ "${CC}" = "" ]; then
- export CC
- fi
-
-+COMPONENTS_DIR=$(pwd)/../../org.eclipse.swt/components
-+# Check if we have to compile external.xpt from external.idl
-+if test ! -f ${COMPONENTS_DIR}/external.xpt; then
-+ if test ! -f ${COMPONENTS_DIR}/external.idl; then
-+ echo "Can't find ${COMPONENTS_DIR}/external.idl"
-+ exit 1
-+ fi
-+
-+ IDLDIR=$(pkg-config --variable=idldir libxul | sed 's@/stable$@@')/unstable
-+ if test ! -d ${IDLDIR}; then
-+ IDLDIR=$(pkg-config --variable=idldir libxul)
-+ fi
-+ XPIDL=$(pkg-config --variable=sdkdir libxul)/bin/xpidl
-+
-+ echo "${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl"
-+ ${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl
-+fi
-+
- # Determine which OS we are on
- if [ "${OS}" = "" ]; then
- OS=`uname -s`
diff --git a/patches/junit4-nochecksum.patch b/patches/junit4-nochecksum.patch
index 5a2e25d..72d7684 100644
--- a/patches/junit4-nochecksum.patch
+++ b/patches/junit4-nochecksum.patch
@@ -1,15 +1,15 @@
--- a/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
+++ b/plugins/org.junit_4.8.1.v4_8_1_v20100427-1100/META-INF/MANIFEST.MF
@@ -28,19 +28,3 @@
- ers.model;version="4.8.1"
- Bundle-Version: 4.8.1.v4_8_1_v20100427-1100
+ ers.model;version="4.8.1"
+ Bundle-Version: 4.8.1.v4_8_1_v20100427-1100
Bundle-ManifestVersion: 2
--
+-
-Name: META-INF/eclipse.inf
-SHA1-Digest: u+F8j/GAE8tzrDry9+wT3Cvg81Y=
-
-Name: junit.jar
--SHA1-Digest: zPmrTAyba4ZMLFgf8QAHILhgZ9o=
+-SHA1-Digest: zPmrTAyba4ZMLFgf8QAHILhgZ9o=
-
-Name: about_files/cpl-v10.html
-SHA1-Digest: REygXYi+T14Sj1v8XnnKycNjpN4=
@@ -18,5 +18,5 @@
-SHA1-Digest: w3lIEWRkSmgtAui4qxGRJmqgDw4=
-
-Name: plugin.properties
--SHA1-Digest: f1fR+Wdi2X4qLQSIBEgwenAuk2c=
--
+-SHA1-Digest: f1fR+Wdi2X4qLQSIBEgwenAuk2c=
+-
diff --git a/patches/osgi-services-build.patch b/patches/osgi-services-build.patch
deleted file mode 100644
index 03cc43b..0000000
--- a/patches/osgi-services-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/eclipse/plugins/org.eclipse.osgi.services/build.properties b/eclipse/plugins/org.eclipse.osgi.services/build.properties
-index 7962dc5..ca55afb 100644
---- a/plugins/org.eclipse.osgi.services/build.properties
-+++ b/plugins/org.eclipse.osgi.services/build.properties
-@@ -11,11 +11,11 @@
- bin.includes = plugin.properties,\
- about.html,\
- META-INF/,\
-- org/,\
-+ bin/,\
-+ about_files/,\
-+ .
-+src.includes = about.html,\
- about_files/
--src.includes = src.zip,\
-- about.html,\
-- about_files/
--source.. = .
-+source.. = src/
- output.. = .
- customBuildCallbacks=customBuildCallbacks.xml
-diff --git a/eclipse/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml b/eclipse/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml
-index 9187112..dbd6075 100644
---- a/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml
-+++ b/plugins/org.eclipse.osgi.services/customBuildCallbacks.xml
-@@ -104,6 +104,7 @@
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
-+ <delete dir="${target.folder}/javax" />
- </target>
-
- <!-- ===================================================================== -->
-@@ -120,8 +121,7 @@
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.sources">
-- <unzip src="${target.folder}/src.zip" dest="${target.folder}" overwrite="false"/>
-- <delete file="${destination.temp.folder}/src.zip" />
-+ <delete dir="${destination.temp.folder}/javax" />
- </target>
-
- <!-- ===================================================================== -->
-@@ -146,7 +146,6 @@
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.clean">
-- <move file="src.zip" tofile="services_src.zip"/>
- </target>
-
- <!-- ===================================================================== -->
-@@ -157,6 +156,5 @@
- <!-- temp.folder - temporary folder -->
- <!-- ===================================================================== -->
- <target name="post.clean">
-- <move file="services_src.zip" tofile="src.zip"/>
- </target>
- </project>
diff --git a/patches/tooltip-color.patch b/patches/tooltip-color.patch
deleted file mode 100644
index 3edcbd4..0000000
--- a/patches/tooltip-color.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -u -r1.25 ToolTip.java
---- a/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 2 Dec 2009 15:52:39 -0000
-+++ b/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 13 May 2010 15:59:10 -0000
-@@ -48,6 +48,7 @@
- TrayItem item;
- int x, y, timerId;
- int /*long*/ layoutText = 0, layoutMessage = 0;
-+ Color layoutTextColor, layoutMessageColor;
- int [] borderPolygon;
- boolean spikeAbove, autohide;
-
-@@ -498,6 +499,9 @@
- x += IMAGE_SIZE;
- }
- x += INSET;
-+ if (layoutTextColor != null) {
-+ OS.gdk_gc_set_foreground(gdkGC, layoutTextColor.handle);
-+ }
- OS.gdk_draw_layout (window, gdkGC, x, y, layoutText);
- int [] w = new int [1], h = new int [1];
- OS.pango_layout_get_size (layoutText, w, h);
-@@ -505,6 +509,9 @@
- }
- if (layoutMessage != 0) {
- x = BORDER + PADDING + INSET;
-+ if (layoutMessageColor != null) {
-+ OS.gdk_gc_set_foreground(gdkGC, layoutMessageColor.handle);
-+ }
- OS.gdk_draw_layout (window, gdkGC, x, y, layoutMessage);
- }
- OS.g_object_unref (gdkGC);
-@@ -708,6 +715,7 @@
- if (layoutMessage != 0) OS.g_object_unref (layoutMessage);
- layoutMessage = 0;
- if (message.length () != 0) {
-+ layoutMessageColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
- byte [] buffer = Converter.wcsToMbcs (null, message, true);
- layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
- if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
-@@ -739,6 +747,7 @@
- if (layoutText != 0) OS.g_object_unref (layoutText);
- layoutText = 0;
- if (text.length () != 0) {
-+ layoutTextColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
- byte [] buffer = Converter.wcsToMbcs (null, text, true);
- layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
- if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
diff --git a/pdebuild.xml b/pdebuild.xml
index 5a4b3e4..d585267 100644
--- a/pdebuild.xml
+++ b/pdebuild.xml
@@ -30,8 +30,6 @@
<file name="org.eclipse.equinox.preferences" />
<file name="org.eclipse.core.runtime.compatibility.auth" />
<file name="org.eclipse.core.contenttype" />
- <file name="org.eclipse.equinox.transforms.hook" />
- <file name="org.eclipse.osgi.services" />
<file name="org.eclipse.equinox.app" />
<file name="org.eclipse.core.runtime" />
<file name="org.eclipse.core.variables" />
@@ -66,6 +64,7 @@
<file name="org.eclipse.equinox.p2.updatesite" />
<file name="org.eclipse.pde.build" />
<file name="org.eclipse.equinox.launcher" />
+ <file name="org.eclipse.osgi.services" />
<file name="org.eclipse.equinox.p2.console" />
<file name="org.eclipse.equinox.p2.director.app" />
<file name="org.eclipse.update.core" />
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index bf9f039..71cc3be 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -27,19 +27,19 @@ function copyPlatform {
# counting as arguments to copy-platform -- overholt, 2008-03
if [ -z "$dependencies" ]; then
if [ $verbose -eq 1 ]; then
- echo "/bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse"
- /bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse
+ echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
+ /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
else
- echo "/bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse"
- /bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse
+ echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
+ /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
fi
else
if [ $verbose -eq 1 ]; then
- echo "/bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies"
- /bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies
+ echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
+ /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
else
- echo "/bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies"
- /bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies
+ echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
+ /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
fi
fi
}
@@ -123,8 +123,8 @@ sourceDir=$PWD
buildDir=$PWD/build
SDK=$buildDir/SDK
homeDir=$buildDir/home
-datadir=/usr/lib
-pdeBuildDir=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
+datadir=`rpm --eval "%{_libdir}"`
+pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
featureId=
dependencies=
@@ -273,7 +273,7 @@ if [ $testing != true ]; then
-DbaseLocation=$SDK \
-DsourceDirectory=$sourceDir \
-DbuildDirectory=$buildDir \
- -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+ -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
$orbitDeps \
-Dtesting="$testing" \
$additionalArgs \
@@ -293,7 +293,7 @@ else
-DbaseLocation=$SDK \
-DsourceDirectory=$sourceDir \
-DbuildDirectory=$buildDir \
- -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+ -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
$orbitDeps \
-Dtesting="$testing" \
$additionalArgs \
diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
index 0ad4078..ebb7187 100644
--- a/regenerateBootstrapFiles.sh
+++ b/regenerateBootstrapFiles.sh
@@ -1,5 +1,4 @@
-#!/bin/sh
-set -e
+#!/bin/bash
baseDir=$(pwd)
workDirectory=
@@ -11,17 +10,8 @@ eclipseBuilderTag="R3_5_2"
fetchTests="no"
ecfTag="v20090604-1131"
-if ls /usr/lib/eclipse/plugins/org.eclipse.equinox.launcher_*.jar > /dev/null 2>&1; then
- launcherDir=/usr/lib/eclipse/plugins
-elif ls /home/akurtakov/opt/eclipse/plugins/org.eclipse.equinox.launcher_*.jar > /dev/null 2>&1; then
- launcherDir=/home/akurtakov/opt/eclipse/plugins
-else
- echo "E: No org.eclipse.equinox.launcher_*.jar file found. Please specify one in this script." >&2
- exit 1
-fi
-
java -jar \
-$launcherDir/org.eclipse.equinox.launcher_*.jar \
+/home/akurtakov/opt/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
-consolelog \
-data build/eclipse-3.6.0-src \
-application org.eclipse.ant.core.antRunner \
diff --git a/stubs/org/eclipse/core/runtime/CoreException.java b/stubs/org/eclipse/core/runtime/CoreException.java
deleted file mode 100644
index ff18293..0000000
--- a/stubs/org/eclipse/core/runtime/CoreException.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.eclipse.core.runtime;
-public class CoreException extends Exception {
- private static final long serialVersionUID = 1L;
-}
diff --git a/stubs/org/eclipse/core/runtime/IExtension.java b/stubs/org/eclipse/core/runtime/IExtension.java
deleted file mode 100644
index 499a7a4..0000000
--- a/stubs/org/eclipse/core/runtime/IExtension.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public interface IExtension{}
diff --git a/stubs/org/eclipse/core/runtime/IExtensionPoint.java b/stubs/org/eclipse/core/runtime/IExtensionPoint.java
deleted file mode 100644
index bbcc421..0000000
--- a/stubs/org/eclipse/core/runtime/IExtensionPoint.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public interface IExtensionPoint{}
diff --git a/stubs/org/eclipse/core/runtime/ILibrary.java b/stubs/org/eclipse/core/runtime/ILibrary.java
deleted file mode 100644
index f6662d6..0000000
--- a/stubs/org/eclipse/core/runtime/ILibrary.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public interface ILibrary{}
diff --git a/stubs/org/eclipse/core/runtime/IPath.java b/stubs/org/eclipse/core/runtime/IPath.java
deleted file mode 100644
index 80ede8b..0000000
--- a/stubs/org/eclipse/core/runtime/IPath.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public interface IPath extends Cloneable{};
diff --git a/stubs/org/eclipse/core/runtime/IPluginPrerequisite.java b/stubs/org/eclipse/core/runtime/IPluginPrerequisite.java
deleted file mode 100644
index d857663..0000000
--- a/stubs/org/eclipse/core/runtime/IPluginPrerequisite.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public interface IPluginPrerequisite {}
diff --git a/stubs/org/eclipse/core/runtime/Plugin.java b/stubs/org/eclipse/core/runtime/Plugin.java
deleted file mode 100644
index 60936c1..0000000
--- a/stubs/org/eclipse/core/runtime/Plugin.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public abstract class Plugin {}
diff --git a/stubs/org/eclipse/core/runtime/PluginVersionIdentifier.java b/stubs/org/eclipse/core/runtime/PluginVersionIdentifier.java
deleted file mode 100644
index 7f91189..0000000
--- a/stubs/org/eclipse/core/runtime/PluginVersionIdentifier.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package org.eclipse.core.runtime;
-public final class PluginVersionIdentifier {}
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list