[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 576f64ec7d763a3c0b1f0c907f22ebe19ae04c57
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Oct 7 21:10:15 UTC 2009
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 has been updated
via 576f64ec7d763a3c0b1f0c907f22ebe19ae04c57 (commit)
from ca7c971b0c5b05583c2b2ff5fa768ff5ded6186d (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 576f64ec7d763a3c0b1f0c907f22ebe19ae04c57
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Oct 7 23:08:58 2009 +0200
Sync upstream changes (into eclipse-build.patch)
-----------------------------------------------------------------------
Summary of changes:
debian/patches/buildEquinoxInitializer.patch | 25 ++
debian/patches/eclipse-build.patch | 569 ++++++++++++++++++++++++++
debian/patches/fix-perm.patch | 12 +-
debian/patches/series | 2 +
debian/rules | 21 +-
5 files changed, 604 insertions(+), 25 deletions(-)
diff --git a/debian/patches/buildEquinoxInitializer.patch b/debian/patches/buildEquinoxInitializer.patch
new file mode 100644
index 0000000..9e08295
--- /dev/null
+++ b/debian/patches/buildEquinoxInitializer.patch
@@ -0,0 +1,25 @@
+https://bugs.eclipse.org/bugs/show_bug.cgi?id=291681
+--- a/build.xml (Revision 23377)
++++ b/build.xml (Arbeitskopie)
+@@ -480,6 +480,21 @@
+ <param name="p2.arch" value="${buildArch}" />
+ <param name="p2.repo" value="${reposource}" />
+ </antcall>
++ <java classname="org.eclipse.core.launcher.Main" dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer" fork="true">
++ <classpath>
++ <fileset dir="${buildDirectory}/installation/plugins">
++ <include name="org.eclipse.equinox.launcher_*.jar" />
++ </fileset>
++ </classpath>
++ <arg line="-application org.eclipse.ant.core.antRunner" />
++ <arg line="-f build.xml" />
++ <arg line="build.update.jar" />
++ </java>
++ <copy todir="${buildDirectory}/installation/plugins">
++ <fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
++ <include name="org.eclipse.equinox.initializer*.jar"/>
++ </fileset>
++ </copy>
+ <echo file="provision.sdk-stamp" />
+ </target>
+
diff --git a/debian/patches/eclipse-build.patch b/debian/patches/eclipse-build.patch
new file mode 100644
index 0000000..c7159cd
--- /dev/null
+++ b/debian/patches/eclipse-build.patch
@@ -0,0 +1,569 @@
+Description: Sync changes from eclipse-build
+diff -pruN eclipse-3.5.1/build.xml eclipse-3.5.1.new/build.xml
+--- eclipse-3.5.1/build.xml 2009-10-06 00:36:21.000000000 +0200
++++ eclipse-3.5.1.new/build.xml 2009-10-07 21:42:51.829624000 +0200
+@@ -191,13 +191,17 @@
+ </target>
+
+ <target name="applyPatches" depends="insertBuildId" unless="patch.complete">
++ <!-- eclipse-build-only patches -->
+ <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" />
+- <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
+- <patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.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/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
+ <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
++ <!-- end eclipse-build-only patches -->
++ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
++ <patch patchfile="${basedir}/patches/eclipse-help-toolbar.patch" dir="${buildDirectory}" strip="0" />
++ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307 -->
++ <patch patchfile="${basedir}/patches/gtk2.18zorder.patch" dir="${buildDirectory}/plugins/org.eclipse.swt" strip="0" />
+ <echo file="patch-stamp" />
+ </target>
+
+@@ -530,17 +534,43 @@
+ <echo message="###################################################################"/>
+ <echo message=""/>
+ <tstamp>
+- <format property="timestamp" pattern="yyyyMMddhhmmss"/>
++ <format property="timestamp" pattern="yyyyMMddHHmmss"/>
+ </tstamp>
+ <chmod perm="ugo+rx" file="${buildDirectory}/testsInstallation/runtests.sh" />
+ <exec executable="${buildDirectory}/testsInstallation/runtests.sh" dir="${buildDirectory}/testsInstallation">
+- <arg line="-t ${timestamp}"/>
++ <arg value="-t${timestamp}"/>
+ </exec>
+- <copy failonerror="false" todir="${basedir}/testResults-${timestamp}">
++ <property name="testResultDir" value="${basedir}/testResults-${timestamp}"/>
++ <copy failonerror="false" todir="${testResultDir}">
+ <fileset dir="${buildDirectory}/testsInstallation/results-${timestamp}">
+ <include name="**/*" />
+ </fileset>
+ </copy>
++ <!-- Copy over the XML to generate a top-level report for all of the tests -->
++ <mkdir dir="${testResultDir}/origXml"/>
++ <copy failonerror="false" todir="${testResultDir}/origXml">
++ <fileset dir="${testResultDir}/xml">
++ <include name="**/*" />
++ </fileset>
++ </copy>
++ <!-- Un-"collect" the results -->
++ <replace dir="${testResultDir}/origXml" value="">
++ <include name="**/*.xml"/>
++ <replacetoken><testsuites></replacetoken>
++ </replace>
++ <replace dir="${testResultDir}/origXml" value="">
++ <include name="**/*.xml"/>
++ <replacetoken></testsuites></replacetoken>
++ </replace>
++ <!-- Aggregate XML report files -->
++ <junitreport todir="${testResultDir}/xml" tofile="org.eclipse.sdk.tests.xml">
++ <fileset dir="${testResultDir}/origXml" includes="*.xml" />
++ </junitreport>
++ <!-- Generate top-level HTML report -->
++ <xslt style="${buildDirectory}/testsInstallation/eclipse/plugins/org.eclipse.test_3.2.0/JUNIT.XSL"
++ basedir="${testResultDir}/xml"
++ includes="org.eclipse.sdk.tests.xml"
++ destdir="${testResultDir}/html" />
+ </target>
+
+ <target name="run.director">
+@@ -629,7 +659,23 @@
+ tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png"
+ tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
++ <mkdir dir="${destDir}${prefix}/share/pixmaps"/>
++ <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" />
++ <!--shared dropins folder-->
++ <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
++ <!-- eclipse binary -->
++ <mkdir dir="${destDir}${prefix}/bin" />
++ <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
+ <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
+ </target>
+
++ <target name="package.extract.swt">
++ <exec executable="./swt_bundle.sh" failOnError="true" >
++ <arg value="${eclipse.rcp.package.root}" />
++ <arg value="${eclipse.swt.package.root}" />
++ <arg value="${prefix}" />
++ <arg value="${libdir}" />
++ </exec>
++ </target>
++
+ </project>
+diff -pruN eclipse-3.5.1/ChangeLog eclipse-3.5.1.new/ChangeLog
+--- eclipse-3.5.1/ChangeLog 2009-10-06 00:36:21.000000000 +0200
++++ eclipse-3.5.1.new/ChangeLog 2009-10-07 21:52:38.667578000 +0200
+@@ -1,7 +1,55 @@
++2009-10-07 Andrew Overholt <overholt at redhat.com>
++
++ * runtests.sh: Add missing line continuation.
++
++2009-10-07 Andrew Overholt <overholt at redhat.com>
++
++ Bug #291531 - Work courtesy Niels Thykier
++
++ * swt_bundle.sh: Initial checkin (Niels Thykier).
++ * build.xml: Add target to call script to extract SWT bundle for
++ standalone packaging (Niels Thykier).
++
++2009-10-07 Alexander Kurtakov <akurtako at redhat.com>
++
++ * build.xml: Install shared dropins folder.
++
++2009-10-07 Alexander Kurtakov <akurtako at redhat.com>
++
++ * build.xml: Install icon in /usr/share/pixmaps.
++
++2009-10-07 Alexander Kurtakov <akurtako at redhat.com>
++
++ * build.xml: Fix patch applying to unbreak build.
++
++2009-10-06 Andrew Overholt <overholt at redhat.com>
++
++ Bug #291504
++
++ * build.xml: Apply patch from Benjamin Drung to add link to the
++ launcher binary in the installation directory.
++
++2009-10-06 Andrew Overholt <overholt at redhat.com>
++
++ * patches/gtk2.18zorder.patch: Initial check-in of 3.5.1 back-port for
++ (https://bugs.eclipse.org/287307).
++ * build.xml: Apply GTK 2.18 z-order patch. Organize patch section a
++ bit.
++
++2009-10-05 Andrew Overholt <overholt at redhat.com>
++
++ * runtests.sh: Move option parsing out of function.
++ * build.xml: Generate top-level test report HTML file.
++
+ 2009-10-05 Alexander Kurtakov <akurtako at redhat.com>
+
+ * pdebuild.xml: Add macrodef for running the buildScripts generation.
+
++2009-10-04 Andrew Overholt <overholt at redhat.com>
++
++ * runtests.sh: Ignore missing SDK test properties file if not present
++ whem removing.
++
+ 2009-10-02 Alexander Kurtakov <akurtako at redhat.com>
+
+ * buildSDKSource.sh: Update ecf tag to the one used for 3.5.1.
+@@ -9,7 +57,7 @@
+ 2009-10-01 Alexander Kurtakov <akurtako at redhat.com>
+
+ * pdebuild.xml: Use buildTag variable instead of hard-coded value.
+-
++
+ 2009-10-01 Alexander Kurtakov <akurtako at redhat.com>
+
+ * pdebuild.properties: Sync buildId and buildTag with build.properties.
+@@ -19,7 +67,7 @@
+
+ * build.properties: Separate buildId and buildTag.
+ * build.xml: Likewise.
+-
++
+ 2009-09-30 Alexander Kurtakov <akurtako at redhat.com>
+
+ * eclipse-build-generatedScripts.tar.bz2: Regenerate for 3.5.1.
+@@ -52,7 +100,7 @@
+ * patches/tests-nostyletask.patch: New file.
+ * build.xml: Apply patch to not use deprecated ant task.
+ * junitHelper.xml: Likewise.
+-
++
+ 2009-09-25 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.xml: Delete testBuild folder in clean.
+diff -pruN eclipse-3.5.1/junitHelper.xml eclipse-3.5.1.new/junitHelper.xml
+--- eclipse-3.5.1/junitHelper.xml 2009-10-06 00:36:21.000000000 +0200
++++ eclipse-3.5.1.new/junitHelper.xml 2009-10-06 14:05:22.226682000 +0200
+@@ -20,4 +20,4 @@
+ <xslt style="${eclipse-home}/plugins/org.eclipse.test_3.2.0/JUNIT.XSL" basedir="${xmlDir}" destdir="${htmlDir}" />
+ </target>
+
+-</project>
+\ Kein Zeilenumbruch am Dateiende.
++</project>
+diff -pruN eclipse-3.5.1/patches/gtk2.18zorder.patch eclipse-3.5.1.new/patches/gtk2.18zorder.patch
+--- eclipse-3.5.1/patches/gtk2.18zorder.patch 1970-01-01 01:00:00.000000000 +0100
++++ eclipse-3.5.1.new/patches/gtk2.18zorder.patch 2009-10-06 17:06:09.903152000 +0200
+@@ -0,0 +1,218 @@
++### Eclipse Workspace Patch 1.0
++#P org.eclipse.swt
++Index: Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java,v
++retrieving revision 1.380.2.1
++diff -u -r1.380.2.1 Control.java
++--- Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java 7 Aug 2009 18:50:38 -0000 1.380.2.1
+++++ Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java 30 Sep 2009 16:19:55 -0000
++@@ -3332,6 +3332,30 @@
++ region = null;
++ }
++
+++void restackWindow (int /*long*/ window, int /*long*/ sibling, boolean above) {
+++ if (OS.GTK_VERSION >= OS.VERSION (2, 17, 11)) {
+++ OS.gdk_window_restack (window, sibling, above);
+++ } else {
+++ /*
+++ * Feature in X. If the receiver is a top level, XConfigureWindow ()
+++ * will fail (with a BadMatch error) for top level shells because top
+++ * level shells are reparented by the window manager and do not share
+++ * the same X window parent. This is the correct behavior but it is
+++ * unexpected. The fix is to use XReconfigureWMWindow () instead.
+++ * When the receiver is not a top level shell, XReconfigureWMWindow ()
+++ * behaves the same as XConfigureWindow ().
+++ */
+++ int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
+++ int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
+++ int xScreen = OS.XDefaultScreen (xDisplay);
+++ int flags = OS.CWStackMode | OS.CWSibling;
+++ XWindowChanges changes = new XWindowChanges ();
+++ changes.sibling = OS.gdk_x11_drawable_get_xid (sibling);
+++ changes.stack_mode = above ? OS.Above : OS.Below;
+++ OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+++ }
+++ }
+++
++ boolean sendDragEvent (int button, int stateMask, int x, int y, boolean isStateMask) {
++ Event event = new Event ();
++ event.button = button;
++@@ -3682,15 +3706,7 @@
++ if (!OS.GDK_WINDOWING_X11 ()) {
++ OS.gdk_window_raise (enableWindow);
++ } else {
++- int /*long*/ topWindow = OS.GTK_WIDGET_WINDOW (topHandle);
++- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (topWindow);
++- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
++- int xScreen = OS.XDefaultScreen (xDisplay);
++- int flags = OS.CWStackMode | OS.CWSibling;
++- XWindowChanges changes = new XWindowChanges ();
++- changes.sibling = OS.gdk_x11_drawable_get_xid (topWindow);
++- changes.stack_mode = OS.Above;
++- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+++ restackWindow (enableWindow, OS.GTK_WIDGET_WINDOW (topHandle), true);
++ }
++ if (OS.GTK_WIDGET_VISIBLE (topHandle)) OS.gdk_window_show_unraised (enableWindow);
++ }
++@@ -4170,29 +4186,12 @@
++ OS.gdk_window_lower (window);
++ }
++ } else {
++- XWindowChanges changes = new XWindowChanges ();
++- changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);
++- changes.stack_mode = above ? OS.Above : OS.Below;
++- if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;
++- int /*long*/ xDisplay = OS.gdk_x11_drawable_get_xdisplay (window);
++- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid (window);
++- int xScreen = OS.XDefaultScreen (xDisplay);
++- int flags = OS.CWStackMode | OS.CWSibling;
++- /*
++- * Feature in X. If the receiver is a top level, XConfigureWindow ()
++- * will fail (with a BadMatch error) for top level shells because top
++- * level shells are reparented by the window manager and do not share
++- * the same X window parent. This is the correct behavior but it is
++- * unexpected. The fix is to use XReconfigureWMWindow () instead.
++- * When the receiver is not a top level shell, XReconfigureWMWindow ()
++- * behaves the same as XConfigureWindow ().
++- */
++- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+++ int /*long*/ siblingW = siblingWindow != 0 ? siblingWindow : redrawWindow;
+++ boolean stack_mode = above;
+++ if (redrawWindow != 0 && siblingWindow == 0) stack_mode = false;
+++ restackWindow (window, siblingW, stack_mode);
++ if (enableWindow != 0) {
++- changes.sibling = OS.gdk_x11_drawable_get_xid (window);
++- changes.stack_mode = OS.Above;
++- xWindow = OS.gdk_x11_drawable_get_xid (enableWindow);
++- OS.XReconfigureWMWindow (xDisplay, xWindow, xScreen, flags, changes);
+++ restackWindow (enableWindow, window, true);
++ }
++ }
++ }
++Index: Eclipse SWT PI/gtk/library/os_stats.h
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h,v
++retrieving revision 1.180
++diff -u -r1.180 os_stats.h
++--- Eclipse SWT PI/gtk/library/os_stats.h 29 May 2009 21:30:13 -0000 1.180
+++++ Eclipse SWT PI/gtk/library/os_stats.h 30 Sep 2009 16:19:54 -0000
++@@ -511,6 +511,7 @@
++ _1gdk_1window_1raise_FUNC,
++ _1gdk_1window_1remove_1filter_FUNC,
++ _1gdk_1window_1resize_FUNC,
+++ _1gdk_1window_1restack_FUNC,
++ _1gdk_1window_1scroll_FUNC,
++ _1gdk_1window_1set_1accept_1focus_FUNC,
++ _1gdk_1window_1set_1back_1pixmap_FUNC,
++Index: Eclipse SWT PI/gtk/library/os_custom.h
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h,v
++retrieving revision 1.80
++diff -u -r1.80 os_custom.h
++--- Eclipse SWT PI/gtk/library/os_custom.h 29 May 2009 21:30:14 -0000 1.80
+++++ Eclipse SWT PI/gtk/library/os_custom.h 30 Sep 2009 16:19:54 -0000
++@@ -112,6 +112,7 @@
++ #define gtk_status_icon_set_tooltip_LIB "libgtk-x11-2.0.so.0"
++ #define gtk_window_get_group_LIB "libgtk-x11-2.0.so.0"
++ #define gtk_window_get_opacity_LIB "libgtk-x11-2.0.so.0"
+++#define gdk_window_restack_LIB "libgdk-x11-2.0.so.0"
++ #define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
++ #define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0"
++ #define gtk_window_set_opacity_LIB "libgtk-x11-2.0.so.0"
++Index: Eclipse SWT PI/gtk/library/os_stats.c
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c,v
++retrieving revision 1.180
++diff -u -r1.180 os_stats.c
++--- Eclipse SWT PI/gtk/library/os_stats.c 29 May 2009 21:30:13 -0000 1.180
+++++ Eclipse SWT PI/gtk/library/os_stats.c 30 Sep 2009 16:19:54 -0000
++@@ -8,7 +8,7 @@
++ * the LGPL accompanying this distribution and there is any conflict
++ * between the two license versions, the terms of the LGPL accompanying
++ * this distribution shall govern.
++- *
+++ *
++ * Contributors:
++ * IBM Corporation - initial API and implementation
++ *******************************************************************************/
++@@ -18,8 +18,8 @@
++
++ #ifdef NATIVE_STATS
++
++-int OS_nativeFunctionCount = 1291;
++-int OS_nativeFunctionCallCount[1291];
+++int OS_nativeFunctionCount = 1292;
+++int OS_nativeFunctionCallCount[1292];
++ char * OS_nativeFunctionNames[] = {
++ #ifndef JNI64
++ "Call__IIII",
++@@ -503,6 +503,7 @@
++ "_1gdk_1window_1raise",
++ "_1gdk_1window_1remove_1filter",
++ "_1gdk_1window_1resize",
+++ "_1gdk_1window_1restack",
++ "_1gdk_1window_1scroll",
++ "_1gdk_1window_1set_1accept_1focus",
++ "_1gdk_1window_1set_1back_1pixmap",
++Index: Eclipse SWT PI/gtk/library/os.c
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c,v
++retrieving revision 1.272
++diff -u -r1.272 os.c
++--- Eclipse SWT PI/gtk/library/os.c 29 May 2009 21:30:14 -0000 1.272
+++++ Eclipse SWT PI/gtk/library/os.c 30 Sep 2009 16:19:54 -0000
++@@ -5944,6 +5944,24 @@
++ }
++ #endif
++
+++#ifndef NO__1gdk_1window_1restack
+++JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1restack)
+++ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+++{
+++ OS_NATIVE_ENTER(env, that, _1gdk_1window_1restack_FUNC);
+++/*
+++ gdk_window_restack((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+++*/
+++ {
+++ LOAD_FUNCTION(fp, gdk_window_restack)
+++ if (fp) {
+++ ((void (CALLING_CONVENTION*)(GdkWindow *, GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (GdkWindow *)arg1, (gboolean)arg2);
+++ }
+++ }
+++ OS_NATIVE_EXIT(env, that, _1gdk_1window_1restack_FUNC);
+++}
+++#endif
+++
++ #ifndef NO__1gdk_1window_1scroll
++ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
++ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
++Index: Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
++===================================================================
++RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java,v
++retrieving revision 1.525.2.1
++diff -u -r1.525.2.1 OS.java
++--- Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 20 Aug 2009 19:16:37 -0000 1.525.2.1
+++++ Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 30 Sep 2009 16:19:55 -0000
++@@ -4887,6 +4887,21 @@
++ lock.unlock();
++ }
++ }
+++/**
+++ * @method flags=dynamic
+++ * @param window cast=(GdkWindow *)
+++ * @param sibling cast=(GdkWindow *)
+++ * @param above cast=(gboolean)
+++ */
+++public static final native void _gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above);
+++public static final void gdk_window_restack(int /*long*/ window, int /*long*/ sibling, boolean above) {
+++ lock.lock();
+++ try {
+++ _gdk_window_restack(window, sibling, above);
+++ } finally {
+++ lock.unlock();
+++ }
+++}
++ /** @param window cast=(GdkWindow *) */
++ public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
++ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {
+diff -pruN eclipse-3.5.1/README.mediawiki eclipse-3.5.1.new/README.mediawiki
+--- eclipse-3.5.1/README.mediawiki 2009-10-06 00:36:21.000000000 +0200
++++ eclipse-3.5.1.new/README.mediawiki 2009-10-06 18:19:12.204806000 +0200
+@@ -10,7 +10,7 @@ Tasks completed so far:
+ To test it do the following:
+
+ <!-- FIXME: Include SVN instructions as an alternative -->
+-* generate source using <tt>./buildSource.sh</tt> (alternatively, look for 3.5 sources here: http://download.eclipse.org/technology/linuxtools/eclipse-build/ -- get the tarball for 3.5: eclipse-I20090611-1540-fetched-src.tar.bz2 and verify its md5sum matches)
++* generate source using <tt>./buildSource.sh</tt> (alternatively, look for 3.5.1 sources here: http://download.eclipse.org/technology/linuxtools/eclipse-build/ -- get the tarball for 3.5.1: eclipse-R3_5_1-fetched-src.tar.bz2 and verify its md5sum matches)
+ ** <tt>./buildSource.sh -workdir /tmp/eclipseSDKBuild</tt>
+ * if you are using pre-generated source tarballs, check out basebuilder:
+ ** <tt>mkdir -p /tmp/eclipseSDKBuild; cd /tmp/eclipseSDKBuild; cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co -r R35_M7 org.eclipse.releng.basebuilder</tt>
+@@ -21,4 +21,4 @@ To test it do the following:
+ You should get:
+ <!-- Not anymore. We need to fix this.
+ * all the dependencies of pdebuild-ant in the bootstrap/plugins folder. -->
+-* working Eclipse SDK 3.5 build in build/(build Id)/installation directory
+\ Kein Zeilenumbruch am Dateiende.
++* working Eclipse SDK 3.5.1 build in build/(build Id)/installation directory
+\ Kein Zeilenumbruch am Dateiende.
+diff -pruN eclipse-3.5.1/runtests.sh eclipse-3.5.1.new/runtests.sh
+--- eclipse-3.5.1/runtests.sh 2009-10-06 00:36:21.000000000 +0200
++++ eclipse-3.5.1.new/runtests.sh 2009-10-07 21:52:38.667578000 +0200
+@@ -102,35 +102,6 @@ function init() {
+ fi
+ }
+
+-function processArgs() {
+- # Command-line arguments
+- while getopts “hgdbe:†OPTION
+- do
+- case $OPTION in
+- d)
+- debugTests=1
+- ;;
+- e)
+- eclipseHome=$OPTARG
+- ;;
+- g)
+- headless=0
+- ;;
+- t)
+- timestamp=$OPTARG
+- ;;
+- h)
+- usage
+- exit
+- ;;
+- ?)
+- usage
+- exit
+- ;;
+- esac
+- done
+-}
+-
+ function findXvncAndSetDisplay() {
+ if [ ${headless} == 1 ]; then
+ # Try to find Xvnc
+@@ -201,7 +172,7 @@ function runTestSuite() {
+ -propertyfile $properties \
+ -logger org.apache.tools.ant.DefaultLogger \
+ -vmargs \
+- -Duser.home=${homedir}
++ -Duser.home=${homedir} \
+ -Dosgi.os=linux \
+ -Dosgi.ws=gtk \
+ -Dosgi.arch=${arch}
+@@ -270,9 +241,31 @@ function genHtml() {
+ ant -Declipse-home=${eclipseHome} -Dresults=${results} -DxmlDir=${xmlDir} -f junitHelper.xml
+ }
+
++# Command-line arguments
++while getopts "de:gt:h" OPTION
++do
++ case $OPTION in
++ d)
++ debugTests=1
++ ;;
++ e)
++ eclipseHome=$OPTARG
++ ;;
++ g)
++ headless=0
++ ;;
++ t)
++ timestamp=$OPTARG
++ ;;
++ h)
++ usage
++ exit 1
++ ;;
++ esac
++done
++
+ init
+-processArgs
+ findXvncAndSetDisplay
+ setArch
+ findAndRunTestPlugins
+-cleanupXvnc
+\ Kein Zeilenumbruch am Dateiende.
++cleanupXvnc
+diff -pruN eclipse-3.5.1/swt_bundle.sh eclipse-3.5.1.new/swt_bundle.sh
+--- eclipse-3.5.1/swt_bundle.sh 1970-01-01 01:00:00.000000000 +0100
++++ eclipse-3.5.1.new/swt_bundle.sh 2009-10-07 21:42:51.829624000 +0200
+@@ -0,0 +1,49 @@
++#!/bin/sh
++#
++# Extracts the libswt bundle from extracted org.eclipse.ogsi/bundles/ wasteland.
++#
++# usage: swt_bundle.sh <from> <to>
++# Where <from> and <to> are the "root" of the "package dir".
++#
++# swt_bundle.sh debian/eclipse-rcp debian/libswt-gtk-3.5-jni
++#
++# This would move
++# debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/${swt_bundle}/
++# to
++# debian/libswt-gtk-3.5-jni/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/${swt_bundle}/
++#
++
++# Fail on first error.
++set -e
++
++FROM_PATH="$1"
++TO_PATH="$2"
++# allow special prefix and libdir.
++# We just add a / to ensure it ends with a slash.
++# We also remove existing trailing slashes to "prettify" the path.
++prefix=`echo "$3" | sed "s@/*\\$@@"`/
++libdir=`echo "$4" | sed "s@/*\\$@@"`/
++
++BUNDLES_PATH=`echo "${prefix}${libdir}eclipse/configuration/org.eclipse.osgi/bundles" | sed "s@^/*@@"`
++
++# Check the variables and that the from path exists.
++if [ "x$FROM_PATH" = x -o "x$TO_PATH" = x -o ! -d "$FROM_PATH" ] ; then
++ echo "Missing from/to path or from is not a dir." >&2
++ echo "FROM_PATH: ${FROM_PATH}" >&2
++ echo "TO_PATH: ${TO_PATH}" >&2
++ exit 1
++fi
++
++BUNDLE_ID=`ls "${FROM_PATH}/${BUNDLES_PATH}"/*/*/.cp/libswt-gtk-*.so | perl -ne 'print "$1\n" if(m@/bundles/(\d+)/@);'`
++
++if [ "x$BUNDLE_ID" = x ] ; then
++ echo "Cannot find swt's bundle ID please check the paths are correct." >&2
++ echo "From: ${FROM_PATH}/${BUNDLES_PATH}" >&2
++ echo "To: ${TO_PATH}/${BUNDLES_PATH}" >&2
++ exit 1
++fi
++
++# Create the base path if it does not exists.
++test -d "${TO_PATH}/${BUNDLES_PATH}" || mkdir -p "${TO_PATH}/${BUNDLES_PATH}"
++
++mv "${FROM_PATH}/${BUNDLES_PATH}/${BUNDLE_ID}" "${TO_PATH}/${BUNDLES_PATH}/"
diff --git a/debian/patches/fix-perm.patch b/debian/patches/fix-perm.patch
index 5d7aacf..998243b 100644
--- a/debian/patches/fix-perm.patch
+++ b/debian/patches/fix-perm.patch
@@ -1,12 +1,12 @@
Description: fix permission for ant executable files
Author: Benjamin Drung <bdrung at ubuntu.com>
-diff -Nur -x '*.orig' -x '*~' debian.git/build.xml debian.git.new/build.xml
---- debian.git/build.xml 2009-09-25 17:18:32.905565000 +0200
-+++ debian.git.new/build.xml 2009-09-25 17:22:40.005565674 +0200
-@@ -631,6 +631,10 @@
- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png"
- tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" />
+diff -pruN eclipse-3.5.1.new/build.xml eclipse-3.5.1.new2/build.xml
+--- eclipse-3.5.1.new/build.xml 2009-10-07 12:58:41.618257000 +0200
++++ eclipse-3.5.1.new2/build.xml 2009-10-07 13:49:10.077765545 +0200
+@@ -682,6 +682,10 @@
+ <mkdir dir="${destDir}${prefix}/bin" />
+ <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
<echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${destDir}${prefix}/share/eclipse/dropins"/>
+ <!-- fix permissions -->
+ <chmod perm="755" dir="${destDir}${prefix}/lib/eclipse/plugins" includes="org.apache.ant_*/bin/ant" />
diff --git a/debian/patches/series b/debian/patches/series
index d43ab77..3eb8642 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+eclipse-build.patch
+buildEquinoxInitializer.patch
fix-perm.patch
diff --git a/debian/rules b/debian/rules
index b708dc1..f74bb4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,24 +61,10 @@ RESULT_DIR := $(SOURCE_DIR)/installation/
DEBIAN_PACK_LIBDIR := $(DEB_DESTDIR)/usr/lib/eclipse
PROFILE_ID := PlatformProfile
-common-build-arch:: debian-build-stamp
-
common-install-arch:: debian-install-stamp
-debian-build-stamp:
- @echo "*** debian-build-stamp ***"
- dh_testdir
- ( eval LAUNCHERVERSION=`ls $(RESULT_DIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//'` && \
- cd "$(SOURCE_DIR)/plugins/org.eclipse.equinox.initializer" && \
- java -cp "$(RESULT_DIR)"/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -f build.xml build.update.jar && \
- cp org.eclipse.equinox.initializer*.jar "$(RESULT_DIR)/plugins" )
- touch $@
-
## This target does not work yet.
-debian-install-stamp: debian-build-stamp
+debian-install-stamp:
@echo "*** debian-install-stamp ***"
dh_testdir
@@ -128,7 +114,7 @@ debian-install-stamp: debian-build-stamp
-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
-destination $(DEBIAN_PACK_LIBDIR) \
-bundlepool $(DEBIAN_PACK_LIBDIR)
- # Extra the swt libraries.
+ # Extract the swt libraries.
cd $(DEB_DESTDIR) && \
java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
-cp usr/lib/eclipse/startup.jar \
@@ -153,6 +139,3 @@ debian-install-stamp: debian-build-stamp
TO_CORRECT=`echo $(CURDIR)/debian/tmp | sed s@/@_ at g` ; grep -l -I -r debian_tmp debian/tmp/ | xargs sed -i s@$${TO_CORRECT}@@g
# remove extra licence file
rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
- # eclipse binary
- mkdir -p $(DEB_DESTDIR)usr/bin
- ln -s ../lib/eclipse/eclipse $(DEB_DESTDIR)usr/bin/eclipse
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list