[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 2c1bdaac7f7a503704b7498cdd937eb4d11b8090

[Benjamin Drung]

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  2c1bdaac7f7a503704b7498cdd937eb4d11b8090 (commit)
       via  41652a973aa25b66bd4a8b457b4d9392ed052a1f (commit)
       via  99caea5a175a38c8265df82a05d2b392b97f9a38 (commit)
      from  e5d2136f74bce1f7742855d9336d07caa7adf5de (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 2c1bdaac7f7a503704b7498cdd937eb4d11b8090
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 01:39:14 2009 +0200

    Split long command list into single commands.

commit 41652a973aa25b66bd4a8b457b4d9392ed052a1f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 01:36:32 2009 +0200

    Add debug information.

commit 99caea5a175a38c8265df82a05d2b392b97f9a38
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Oct 17 01:34:35 2009 +0200

    Move arch independent rules into arch dependent rules.

-----------------------------------------------------------------------

Summary of changes:
 debian/rules |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/rules b/debian/rules
index 88e1db1..355a36f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,10 +50,12 @@ clean::
 	rm -f *.cdbs-config_list
 
 install/eclipse-platform::
+	@echo "*** install/eclipse-platform ***"
 	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar /usr/lib/eclipse/plugins)
 	$(if $(wildcard debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar),dh_install -peclipse-platform debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux.*.jar /usr/lib/eclipse/plugins)
 
 binary-post-install/libequniox-osgi-java::
+	@echo "*** binary-post-install/libequniox-osgi-java ***"
 	# Do the linking.
 	mkdir -p debian/libequniox-osgi-java/usr/share/java
 	cd debian/libequniox-osgi-java/usr/share/java && \
@@ -65,6 +67,7 @@ binary-post-install/libequniox-osgi-java::
 	dh_link -plibequniox-osgi-java
 
 binary-post-install/eclipse-rcp::
+	@echo "*** binary-post-install/eclipse-rcp ***"
 	# This script is stored in a patch, so the exec bit is not set the first time.
 	test -x swt_bundle.sh || chmod a+x swt_bundle.sh
 	# Extract swt's bundle from eclipse-rcp where all the other bundles are installed.
@@ -77,10 +80,6 @@ binary-post-install/eclipse-rcp::
 
 # TODO: Turn all commands below this comment into patches and send them to eclipse-build.
 
-# move images from /usr/lib to /usr/share
-common-install-indep::
-	find debian/tmp/usr/lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec sh debian/extra/imagemv.sh '{}' \;
-
 BUILD_TAG := $(shell grep ^buildTag= build.properties | sed "s/^buildTag=//")
 SOURCE_DIR := $(CURDIR)/build/eclipse-$(BUILD_TAG)-fetched-src
 RESULT_DIR := $(SOURCE_DIR)/installation/
@@ -89,18 +88,22 @@ PROFILE_ID := PlatformProfile
 
 common-install-arch:: debian-install-stamp
 
+LAUNCHERVERSION = $(shell ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
+
 ## This target does not work yet.
 debian-install-stamp:
 	@echo "*** debian-install-stamp ***"
 	dh_testdir
+	# move images from /usr/lib to /usr/share
+	find debian/tmp/usr/lib/ -type f \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec sh debian/extra/imagemv.sh '{}' \;
 	rm -fr $(DEBIAN_PACK_LIBDIR)/p2/
 	# Generate metadata and extract the swt libraries.
-	eval LAUNCHERVERSION=$$(ls $(DEBIAN_PACK_LIBDIR)/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//') && \
-		cd $(DEB_DESTDIR) && java \
-			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \
+	cd $(DEB_DESTDIR) && java \
+			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
 			org.eclipse.core.launcher.Main \
 			-application \
 			org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+			-debug -consolelog \
 			-metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-source $(DEBIAN_PACK_LIBDIR) \
@@ -111,11 +114,11 @@ debian-install-stamp:
 			-data $(CURDIR)/workspace \
 			-append \
 			-artifactRepositoryName "Eclipse Platform" \
-			-metadataRepositoryName "Eclipse Platform" && \
-		java \
+			-metadataRepositoryName "Eclipse Platform"
+	cd $(DEB_DESTDIR) && java \
 			-Declipse.p2.data.area=file:$(DEBIAN_PACK_LIBDIR)/p2 \
 			-Declipse.p2.MD5Check=false \
-			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \
+			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
 			org.eclipse.core.launcher.Main \
 			-application \
 			org.eclipse.equinox.p2.director \
@@ -132,9 +135,9 @@ debian-install-stamp:
 			-metadataRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-artifactRepository file:$(DEBIAN_PACK_LIBDIR)/metadata/ \
 			-destination $(DEBIAN_PACK_LIBDIR) \
-			-bundlepool $(DEBIAN_PACK_LIBDIR) && \
-		java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
-			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$$LAUNCHERVERSION \
+			-bundlepool $(DEBIAN_PACK_LIBDIR)
+	cd $(DEB_DESTDIR) && java -Dosgi.sharedConfiguration.area=$(DEBIAN_PACK_LIBDIR)/configuration \
+			-cp $(DEBIAN_PACK_LIBDIR)/plugins/org.eclipse.equinox.launcher_$(LAUNCHERVERSION) \
 			org.eclipse.core.launcher.Main \
 			-debug -consolelog \
 			-data $(CURDIR)/workspace \


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.