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

Benjamin Drung bdrung-guest at alioth.debian.org
Sat Sep 19 19:53:23 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  ee3c710a3500b7197262e8e4f6e33c9f81ffb8f6 (commit)
       via  3747af9accd14490a615ad669c85d4f0375b4c18 (commit)
       via  a7aacbd3a96b25548aa467a58fd321829fc31082 (commit)
       via  8be9796e32901b105af2820481e6c83a65febece (commit)
      from  094c0d61b38cf25437dc568944292ae4decdb2d7 (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 ee3c710a3500b7197262e8e4f6e33c9f81ffb8f6
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Sep 19 21:52:54 2009 +0200

    fix typo

commit 3747af9accd14490a615ad669c85d4f0375b4c18
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Sep 19 21:52:04 2009 +0200

    move debian/eclipsebuild-vars.mk back into debian/rules

commit a7aacbd3a96b25548aa467a58fd321829fc31082
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Sep 19 21:47:23 2009 +0200

    update TODO list

commit 8be9796e32901b105af2820481e6c83a65febece
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Sep 19 21:41:39 2009 +0200

    remove get-orig-source target, it does not produce the correct source tarball

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

Summary of changes:
 debian/TODO                 |    7 +----
 debian/eclipsebuild-vars.mk |   24 --------------------
 debian/rules                |   51 +++++++++++++++++++++++++-----------------
 3 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index af6a975..c3e8007 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -7,14 +7,11 @@ debian/control:
 
 Things that needs fixing:
 	- Create and "fill" the separate packages (eclipse-platform, eclipse-pde, etc...)
-	- Turn anything but "ant" calls in debian/rules into patches and send them to 
-          eclipse-build.
+	- debian/rules: Turn all calls in debian-build-stamp and debian-install-stamp
+	  into patches and send them to eclipse-build.
 	- Figure out if the executable could be stuffed into eclipse-platform rather than
 	  eclipse.
 	- Clean up Ubuntu/LP bugs against eclipse. (?)
         - Create patches to deal with "uname", so we don't have to use a wrapper.
-	- Write an "install target"-patch and send it upstream.
 	- Check upstream build system for other archs and check Fedora's "multi-arch" hacks.
 
-debian/*.install:
-   - Check for duplicate entries in packages.
\ No newline at end of file
diff --git a/debian/eclipsebuild-vars.mk b/debian/eclipsebuild-vars.mk
deleted file mode 100644
index 342b34a..0000000
--- a/debian/eclipsebuild-vars.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#-*- mode: Makefile -*-
-BUILD_ID=I20090611-1540
-SOURCE_DIR=$(CURDIR)/build/eclipse-$(BUILD_ID)-fetched-src
-RESULT_DIR=$(SOURCE_DIR)/installation/
-
-DEBIAN_PACK_LIBDIR=$(DEB_DESTDIR)/usr/lib/eclipse
-
-PROFILE_ID=PlatformProfile
-
-ifeq ($(DEB_HOST_ARCH_CPU),i386)
-	ECLIPSE_BUILD_ARCH=x86
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),lpia)
-	ECLIPSE_BUILD_ARCH=x86
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-	ECLIPSE_BUILD_ARCH=x86_64
-endif
-ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
-	ECLIPSE_BUILD_ARCH=ppc
-endif
-ifeq ($(ECLIPSE_BUILD_ARCH),)
-	ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
-endif
diff --git a/debian/rules b/debian/rules
index 6e9769e..4d0943b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,27 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include debian/eclipsebuild-vars.mk
 
 DEB_ANT_CLEAN_TARGET := distclean
 DEB_ANT_BUILD_TARGET := provision.sdk
 DEB_ANT_INSTALL_TARGET := install -Dprefix=/usr -DdestDir=$(DEB_DESTDIR)
 
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+	ECLIPSE_BUILD_ARCH=x86
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),lpia)
+	ECLIPSE_BUILD_ARCH=x86
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),amd64)
+	ECLIPSE_BUILD_ARCH=x86_64
+endif
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+	ECLIPSE_BUILD_ARCH=ppc
+endif
+ifeq ($(ECLIPSE_BUILD_ARCH),)
+	ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
+endif
+
 ANT_ARGS := -DbuildArch=$(ECLIPSE_BUILD_ARCH)
 DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni
 
@@ -34,10 +49,6 @@ DEB_DH_SHLIBDEPS_ARGS_libswt-gtk-3.5-jni := \
 		debian/libswt-gtk-3.5-jni/usr/lib/jni/libswt-glx-gtk-*.so \
 	-Tdebian/libswt-gtk-3.5-jni.substvars
 
-common-build-arch:: debian-build-stamp
-
-common-install-arch:: debian-install-stamp
-
 clean::
 	rm -f *.cdbs-config_list
 
@@ -45,6 +56,18 @@ clean::
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: binary-install/%:
 	$(if $(wildcard debian/$(cdbs_curpkg)/usr/lib),find debian/$(cdbs_curpkg)/usr/lib/ \( -name '*.bmp' -o -name '*.gif' -o -name '*.jpg' -o -name '*.png' \) -exec debian/extra/imagemv.sh $(cdbs_curpkg) '{}' \; ; dh_link -p$(cdbs_curpkg))
 
+# TODO: Turn all commands below this comment into patches and send them to eclipse-build.
+
+BUILD_ID=I20090611-1540
+SOURCE_DIR=$(CURDIR)/build/eclipse-$(BUILD_ID)-fetched-src
+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
@@ -66,7 +89,7 @@ debian-install-stamp: debian-build-stamp
 	cp build/eclipse-I20090611-1540-fetched-src/buildRepo/plugins/org.eclipse.core.net.linux*.jar $(DEBIAN_PACK_LIBDIR)/plugins
 	cp build/eclipse-I20090611-1540-fetched-src/buildRepo/plugins/org.eclipse.update.core.linux_*.jar $(DEBIAN_PACK_LIBDIR)/plugins
 
-	# Make a link callde "startup.jar" for backwards compatibility.
+	# Make a link called "startup.jar" for backwards compatibility.
 	cd $(DEBIAN_PACK_LIBDIR) && \
 		eval LAUNCHERNAME=$$(ls plugins | grep equinox.launcher_) && \
 		ln -s plugins/$$LAUNCHERNAME startup.jar
@@ -123,23 +146,9 @@ debian-install-stamp: debian-build-stamp
 	# Copy SWT jar file
 	cp $(SOURCE_DIR)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_BUILD_ARCH)/swt.jar \
 		 $(DEB_DESTDIR)/swt-gtk-3.5.jar
-	# Die fiend of the old ages.
+	# Die friend of the old ages.
 	rm -f debian/*/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/1/.cp/libswt-mozilla-gcc3-gtk-*.so
 	# Normalize the paths.
 	grep -l -I -r debian/tmp debian/tmp/ | xargs sed -i s@$(CURDIR)/debian/tmp@@g
 	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
 
-MIRROR := ftp://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/technology/linuxtools/eclipse-build
-EBUILD := eclipse-build-R0_3_0
-TMPDIR := /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-
-get-orig-source:
-	rm -rf $(TMPDIR)
-	mkdir $(TMPDIR)
-	cd $(TMPDIR) && wget $(MIRROR)/eclipse-$(BUILD_ID)-fetched-src.tar.bz2
-	cd $(TMPDIR) && wget $(MIRROR)/$(EBUILD).tar.gz
-	tar -xf $(TMPDIR)/$(EBUILD).tar.gz -C $(TMPDIR)
-	mv $(TMPDIR)/$(EBUILD)/* $(TMPDIR)
-	rm -rf $(TMPDIR)/$(EBUILD) $(TMPDIR)/$(EBUILD).tar.gz
-	tar -cf - --transform='s|^tmp/||' $(TMPDIR) | gzip -cn9 > ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	rm -rf $(TMPDIR)


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



More information about the pkg-java-commits mailing list