[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 0aada9a1d097ef4bc8f893645d7484988e6846a4
Niels Thykier
nthykier-guest at alioth.debian.org
Sat Mar 13 14:53:03 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 0aada9a1d097ef4bc8f893645d7484988e6846a4 (commit)
from fd6c432ddc15ee1287efab6d95d32a5d00bc76a2 (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 0aada9a1d097ef4bc8f893645d7484988e6846a4
Author: Niels Thykier <niels at thykier.net>
Date: Sat Mar 13 15:52:46 2010 +0100
Restructured d/rules to ensure variables are set before they are used.
-----------------------------------------------------------------------
Summary of changes:
debian/rules | 103 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/debian/rules b/debian/rules
index 392195d..988ea5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,59 @@
#!/usr/bin/make -f
+# **** VARIABLES **** #
+
export JAVA_HOME=/usr/lib/jvm/default-java
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
+LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
+# We need this for overriding uname, upstream expects a slightly
+# different behaviour than Debian's uname.
+export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
+
+# This has to go in an arch package, as some of the version numbers
+# depend on which arch it was build one.
+COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
+COPY_PLATFORM_INSTALL:=debian/tmp$(COPY_PLATFORM)
+PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build
+
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
+BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
+SOURCE_DIR := $(CURDIR)/build/eclipse-$(UPSTREAM_VERSION)-src
+RESULT_DIR := $(SOURCE_DIR)/installation/
+DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
+PROFILE_ID := PlatformProfile
+
+LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+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.*$$//")
+
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
+ ECLIPSE_BUILD_ARCH=x86
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),arm))
+ ECLIPSE_BUILD_ARCH=arm
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+ ECLIPSE_BUILD_ARCH=x86_64
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),mips))
+ ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH)
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),parisc parisc64))
+ ECLIPSE_BUILD_ARCH=PA_RISC
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+ ECLIPSE_BUILD_ARCH=ppc
+endif
+ifeq ($(ECLIPSE_BUILD_ARCH),)
+ ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
+endif
+
+# **** TARGETS **** #
+
%:
dh --with xulrunner $@
@@ -14,9 +66,6 @@ override_dh_auto_build:
override_dh_auto_install:
ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-JNI_SO_PATH = debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp
-LAUNCHER_LIB = debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
override_dh_shlibdeps:
dh_shlibdeps -peclipse-rcp -l$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
@@ -35,30 +84,6 @@ override_dh_shlibdeps:
$(JNI_SO_PATH)/libswt-glx-gtk-*.so
dh_shlibdeps --remaining-packages
-# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
-
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
- ECLIPSE_BUILD_ARCH=x86
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),arm))
- ECLIPSE_BUILD_ARCH=arm
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
- ECLIPSE_BUILD_ARCH=x86_64
-endif
-ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),mips))
- ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH)
-endif
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),parisc parisc64))
- ECLIPSE_BUILD_ARCH=PA_RISC
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
- ECLIPSE_BUILD_ARCH=ppc
-endif
-ifeq ($(ECLIPSE_BUILD_ARCH),)
- ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
-endif
-
unapply-patches:
for P in `tac debian/patches/series` ; do \
patch -p1 -R < debian/patches/$$P || exit 1;\
@@ -76,31 +101,9 @@ refresh-patches: unapply-patches
done
rm -fr .pc
-# We need this for overriding uname, upstream expects a slightly
-# different behaviour than Debian's uname.
-export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
-
-# This has to go in an arch package, as some of the version numbers
-# depend on which arch it was build one.
-COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
-COPY_PLATFORM_INSTALL:=debian/tmp$(COPY_PLATFORM)
-PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build
-
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
-SOURCE_DIR := $(CURDIR)/build/eclipse-$(UPSTREAM_VERSION)-src
-RESULT_DIR := $(SOURCE_DIR)/installation/
-DEBIAN_PACK_LIBDIR := $(CURDIR)/debian/tmp/usr/lib/eclipse
-PROFILE_ID := PlatformProfile
-
-LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-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.*$$//")
+# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
override_dh_install:
- # Turn all following commands into patches and send them to eclipse-build
# Remove some bad arguments that causes eclipse to fail
perl -i -ne 'print $$_ unless(m/^-XX/);' debian/tmp/etc/eclipse.ini
# Replace symlink with a copy - The absolute symlink causes eclipse to fail
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list