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

Niels Thykier nthykier-guest at alioth.debian.org
Sun Feb 14 19:04:45 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  ee35fe338e1e2d8809e0bede308df294ed15b64a (commit)
       via  37cc6505f506de996df06b96eda787562dbdc0e8 (commit)
      from  648999a6f56bddbd1e6ff1bf5d4fe46df017a1cd (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 ee35fe338e1e2d8809e0bede308df294ed15b64a
Merge: 37cc6505f506de996df06b96eda787562dbdc0e8 648999a6f56bddbd1e6ff1bf5d4fe46df017a1cd
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Feb 14 20:04:42 2010 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-java/eclipse

commit 37cc6505f506de996df06b96eda787562dbdc0e8
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Feb 14 20:03:12 2010 +0100

    Added pdebuild and copy-platform to pde.
    Removed unused clean-override in debian/rules.

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

Summary of changes:
 debian/eclipse-pde.install           |    1 +
 debian/patches/pdebuild-script.patch |   33 +++++++++++++++++++++++++++++++++
 debian/patches/series                |    1 +
 debian/rules                         |   22 ++++++++++++++++++----
 pdebuild/eclipse-pdebuild.sh         |    8 ++++----
 5 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/debian/eclipse-pde.install b/debian/eclipse-pde.install
index 9df9620..cf0fb22 100644
--- a/debian/eclipse-pde.install
+++ b/debian/eclipse-pde.install
@@ -1,5 +1,6 @@
 usr/*/eclipse/features/org.eclipse.pde.source_*
 usr/*/eclipse/features/org.eclipse.pde_*
+usr/lib/eclipse/buildscripts
 usr/lib/eclipse/plugins/org.eclipse.pde.api.tools.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.pde.api.tools.ui.source_*.jar
 usr/lib/eclipse/plugins/org.eclipse.pde.api.tools.ui_*.jar
diff --git a/debian/patches/pdebuild-script.patch b/debian/patches/pdebuild-script.patch
new file mode 100644
index 0000000..1996388
--- /dev/null
+++ b/debian/patches/pdebuild-script.patch
@@ -0,0 +1,33 @@
+diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
+index 1011199..7ddf009 100755
+--- a/pdebuild/eclipse-pdebuild.sh
++++ b/pdebuild/eclipse-pdebuild.sh
+@@ -123,8 +123,8 @@ sourceDir=$PWD
+ buildDir=$PWD/build
+ SDK=$buildDir/SDK
+ homeDir=$buildDir/home
+-datadir=`rpm --eval "%{_libdir}"`
+-pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
++datadir=/usr/lib
++pdeBuildDir=$datadir/eclipse/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/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
++    -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+     $orbitDeps \
+     -Dtesting="$testing" \
+     $additionalArgs \
+@@ -292,7 +292,7 @@ else
+     -DbaseLocation=$SDK \
+     -DsourceDirectory=$sourceDir \
+     -DbuildDirectory=$buildDir \
+-    -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
++    -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+     $orbitDeps \
+     -Dtesting="$testing" \
+     $additionalArgs \
diff --git a/debian/patches/series b/debian/patches/series
index 4997a2a..7b4fd6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ swtbug291128.patch
 source-jars.patch
 install-icu4j-bundles.patch
 eclipse-manpage.patch
+pdebuild-script.patch
diff --git a/debian/rules b/debian/rules
index e2d424b..c0ce3e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,9 +63,6 @@ DEB_DH_SHLIBDEPS_ARGS_eclipse-rcp := \
 		$(JNI_SO_PATH)/libswt-glx-gtk-*.so \
 	-Tdebian/eclipse-rcp.substvars
 
-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)
@@ -91,9 +88,10 @@ RESULT_DIR := $(SOURCE_DIR)/installation/
 DEBIAN_PACK_LIBDIR := $(DEB_DESTDIR)/usr/lib/eclipse
 PROFILE_ID := PlatformProfile
 
-common-install-impl:: debian-install-stamp
+common-install-impl:: debian-install-stamp generate-pdebuild-scripts
 
 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.*$$//")
 
 debian-install-stamp:
@@ -172,3 +170,19 @@ debian-install-stamp:
 	chmod +x $(DEB_DESTDIR)usr/lib/eclipse/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
 	# Regenerate the eclipse.ini symlink - one of the eclipse runs above trashes it.
 	ln -sf /etc/eclipse.ini $(DEB_DESTDIR)usr/lib/eclipse/eclipse.ini
+	touch $@
+
+COPY_PLATFORM:=$(DEBIAN_PACK_LIBDIR)/buildscripts/copy-platform
+PDEBUILD:=$(DEBIAN_PACK_LIBDIR)/buildscripts/pdebuild
+
+generate-pdebuild-scripts: debian-install-stamp
+	@echo "*** generate-pdebuild-scripts ***"
+	mkdir -p `dirname $(COPY_PLATFORM)`
+	cp pdebuild/eclipse-copy-platform.sh $(COPY_PLATFORM)
+	( \
+	  cd $(DEBIAN_PACK_LIBDIR) ; \
+	  ls -d * | egrep -v '^(plugins|features|about_files|dropins|buildscripts)$$' ; \
+	  ls -d * plugins/* features/* ; \
+	) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM)
+	sed "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD)
+	chmod a+x $(PDEBUILD)
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index 1011199..7ddf009 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -123,8 +123,8 @@ sourceDir=$PWD
 buildDir=$PWD/build
 SDK=$buildDir/SDK
 homeDir=$buildDir/home
-datadir=`rpm --eval "%{_libdir}"`
-pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
+datadir=/usr/lib
+pdeBuildDir=$datadir/eclipse/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/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+    -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
     $orbitDeps \
     -Dtesting="$testing" \
     $additionalArgs \
@@ -292,7 +292,7 @@ else
     -DbaseLocation=$SDK \
     -DsourceDirectory=$sourceDir \
     -DbuildDirectory=$buildDir \
-    -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+    -Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
     $orbitDeps \
     -Dtesting="$testing" \
     $additionalArgs \


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

More information about the pkg-java-commits mailing list