[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 0c9ed9c54cc6eed3428f3608c0ed62c239814657
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Mar 17 12:38:19 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 has been updated
via 0c9ed9c54cc6eed3428f3608c0ed62c239814657 (commit)
via 1161fb89f50d4d07ca3eca874f19141260095d89 (commit)
via 8bb5ef966223c44a3018329aabd0cd0e054e17be (commit)
via b13182497d93f3ee8a3333150863cf3ae09945b2 (commit)
via 589d3c11cd938d980781713c6b78577e4e9072cf (commit)
via bb434ff3a418f31a65c3bc1ca582440af593e06e (commit)
from b13448d5e44ff983d73e8e86aea68fbfacb42649 (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 0c9ed9c54cc6eed3428f3608c0ed62c239814657
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Mar 17 13:37:56 2010 +0100
Remove unwanted patch file.
commit 1161fb89f50d4d07ca3eca874f19141260095d89
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Mar 17 13:37:15 2010 +0100
Don't hardcode xulrunner version in wrapper script.
commit 8bb5ef966223c44a3018329aabd0cd0e054e17be
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Mar 17 12:41:57 2010 +0100
Refresh patches.
commit b13182497d93f3ee8a3333150863cf3ae09945b2
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Mar 17 12:24:27 2010 +0100
Add swt-compile-xpt.patch to build .xpt file if it does not exit.
commit 589d3c11cd938d980781713c6b78577e4e9072cf
Merge: bb434ff3a418f31a65c3bc1ca582440af593e06e b13448d5e44ff983d73e8e86aea68fbfacb42649
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Mar 17 11:58:54 2010 +0100
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/eclipse
commit bb434ff3a418f31a65c3bc1ca582440af593e06e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Mar 17 11:18:48 2010 +0100
Revert compile-xulfiles.patch.
-----------------------------------------------------------------------
Summary of changes:
build.xml | 6 +--
debian/extra/eclipse | 2 +-
debian/patches/compile-IPluginDescriptor.patch | 8 ++--
debian/patches/compile-xulfiles.patch | 18 ---------
debian/patches/series | 2 +-
debian/patches/swt-compile-xpt.patch | 48 ++++++++++++++++++++++++
debian/rules | 14 +++++--
patches/eclipse-swt-compile-xpt.patch | 31 +++++++++++++++
8 files changed, 96 insertions(+), 33 deletions(-)
diff --git a/build.xml b/build.xml
index 94c4f4a..1928430 100644
--- a/build.xml
+++ b/build.xml
@@ -260,6 +260,7 @@
<patch patchfile="${basedir}/patches/addEcfQualifiers.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.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,11 +349,6 @@
<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
- <echo message="build.xml: Recompiling ${buildDirectory}/plugins/org.eclipse.swt/components/external.xpt" />
- <exec dir="${buildDirectory}/plugins/org.eclipse.swt/components/" executable="${xul.compiler}"
- failonerror="true">
- <arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
- </exec>
<mkdir dir="${basedir}/temp/" />
<copy todir="${basedir}/temp/" >
<fileset dir="${basedir}/stubs/">
diff --git a/debian/extra/eclipse b/debian/extra/eclipse
index c155216..674b611 100644
--- a/debian/extra/eclipse
+++ b/debian/extra/eclipse
@@ -5,7 +5,7 @@
# https://bugs.launchpad.net/bugs/458703
export GDK_NATIVE_WINDOWS=true
-xuldir=/usr/lib/xulrunner-$(/usr/bin/xulrunner-1.9.1 --gre-version)
+xuldir=/usr/lib/xulrunner-$(@XULRUNNER@ --gre-version)
export LD_LIBRARY_PATH="$xuldir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index 3b01606..aff1af3 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,10 +4,10 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -353,6 +353,32 @@
- failonerror="true">
- <arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
- </exec>
+@@ -348,6 +348,32 @@
+ <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/">
diff --git a/debian/patches/compile-xulfiles.patch b/debian/patches/compile-xulfiles.patch
deleted file mode 100644
index bddd141..0000000
--- a/debian/patches/compile-xulfiles.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Ensures that *.xpt files are compiled from source.
-Author: Niels Thykier <niels at thykier.net>
-Forwarded: no
-
---- a/build.xml
-+++ b/build.xml
-@@ -348,6 +348,11 @@
- <zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
- basedir="${basedir}/temp/"/>
- <delete dir="${basedir}/temp/"/>
-+ <echo message="build.xml: Recompiling ${buildDirectory}/plugins/org.eclipse.swt/components/external.xpt" />
-+ <exec dir="${buildDirectory}/plugins/org.eclipse.swt/components/" executable="${xul.compiler}"
-+ failonerror="true">
-+ <arg line="-m typelib -I ${xul.include} -e external.xpt external.idl" />
-+ </exec>
- <!-- Create a stamp file -->
- <echo file="prebootstrap-stamp" />
- </target>
diff --git a/debian/patches/series b/debian/patches/series
index 1fbafe1..0c7262a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,6 @@ pdebuild-script.patch
pdebuild-path-copy-platform.patch
symlink-system-files.patch
compile-jarinjarloader.patch
-compile-xulfiles.patch
compile-IPluginDescriptor.patch
use-stable-xulrunner.patch
+swt-compile-xpt.patch
diff --git a/debian/patches/swt-compile-xpt.patch b/debian/patches/swt-compile-xpt.patch
new file mode 100644
index 0000000..91ed422
--- /dev/null
+++ b/debian/patches/swt-compile-xpt.patch
@@ -0,0 +1,48 @@
+Description: Build .xpt file if it does not exit
+Author: Benjamin Drung
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
+
+--- a/build.xml
++++ b/build.xml
+@@ -260,6 +260,7 @@
+ <patch patchfile="${basedir}/patches/addEcfQualifiers.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
++ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.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/eclipse-swt-compile-xpt.patch
+@@ -0,0 +1,31 @@
++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/debian/rules b/debian/rules
index e4d3eb8..f432a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,7 @@ override_dh_auto_clean:
ant distclean
override_dh_auto_build:
- ant -DbuildArch=$(ECLIPSE_BUILD_ARCH) \
- -Dxul.compiler=$$(pkg-config --variable=sdkdir libxul | sed "s/-devel//")/xpidl\
- -Dxul.include=$$(pkg-config --variable=idldir libxul)/unstable/
+ ant -DbuildArch=$(ECLIPSE_BUILD_ARCH)
override_dh_auto_install:
ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
@@ -101,6 +99,12 @@ LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launch
PDEBUILDVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/+repack.*$$//")
+XULVERSION := $(shell pkg-config --modversion libxul)
+XULVERSION_STRIPPED := $(shell echo $(XULVERSION) | sed "s/\.[^\.]*$$//")
+XULRUNNER := $(shell if which xulrunner-$(XULVERSION) > /dev/null 2>&1; then which xulrunner-$(XULVERSION); \
+ elif which xulrunner-$(XULVERSION_STRIPPED) > /dev/null 2>&1; then which xulrunner-$(XULVERSION_STRIPPED); \
+ else which xulrunner-$(shell echo $(XULVERSION) | sed "s/\.[^\.]*\.[^\.]*$$//"); fi)
+
override_dh_install:
# Turn all following commands into patches and send them to eclipse-build
# Remove some bad arguments that causes eclipse to fail
@@ -167,7 +171,9 @@ override_dh_install:
# remove extra licence file
rm -f debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
# wrapper script for setting LD_LIBRARY_PATH
- install -m 755 debian/extra/eclipse debian/tmp/usr/bin/eclipse
+ rm -f debian/tmp/usr/bin/eclipse
+ sed "s|@XULRUNNER@|$(XULRUNNER)|" debian/extra/eclipse > debian/tmp/usr/bin/eclipse
+ chmod 755 debian/tmp/usr/bin/eclipse
# Correct the profile in config.ini - else eclipse will refuse to open the update/install menus.
sed -i 's/SDKProfile/PlatformProfile/' debian/tmp/usr/lib/eclipse/configuration/config.ini
# Set a saner default file limit than "unlimited".
diff --git a/patches/eclipse-swt-compile-xpt.patch b/patches/eclipse-swt-compile-xpt.patch
new file mode 100644
index 0000000..3e0d348
--- /dev/null
+++ b/patches/eclipse-swt-compile-xpt.patch
@@ -0,0 +1,31 @@
+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`
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list