[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. afe4caec21125fd9a4ac4145bca3557795406e59

[Niels Thykier]

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-cdt - Plug-in for eclipse to handle C/C++ - Debian package.".

The branch, master has been updated
       via  afe4caec21125fd9a4ac4145bca3557795406e59 (commit)
      from  a749c82321df0d939d51a65a0c83bcc22368ea8f (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 afe4caec21125fd9a4ac4145bca3557795406e59
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 29 17:34:33 2010 +0200

    Renamed package back to eclipse-cdt and made it use eclipse-helper for the build.

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

Summary of changes:
 debian/control             |    5 +++--
 debian/eclipse-cdt.install |    2 --
 debian/eclipse.orbitdeps   |    1 +
 debian/rules               |   41 ++++++++++++++---------------------------
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/debian/control b/debian/control
index 2b40bbf..1b72a61 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,10 @@ Vcs-Git: git://git.debian.org/git/pkg-java/eclipse-cdt.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse-cdt.git
 Homepage: http://www.eclipse.org/cdt/
 
-Package: eclipse-plugin-cdt
+Package: eclipse-cdt
 Architecture: any
-Depends: ${shlibs:Depends}, eclipse-platform (>= 3.5.1), gcc, make, exuberant-ctags | ctags
+Depends: ${shlibs:Depends}, ${orbit:Depends}, eclipse-platform (>= 3.5.2),
+ gcc, make, exuberant-ctags | ctags
 Suggests: g++
 Description: C/C++ Development Tools for Eclipse
  The eclipse-cdt package contains Eclipse features and plugins that are
diff --git a/debian/eclipse-cdt.install b/debian/eclipse-cdt.install
deleted file mode 100644
index 013f0e2..0000000
--- a/debian/eclipse-cdt.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/eclipse/features usr/lib/eclipse
-debian/tmp/usr/lib/eclipse/plugins usr/lib/eclipse
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 3e7eb94..e7a08ae 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,3 +1,4 @@
 commons-codec
 commons-httpclient
 commons-lang
+#lpg-java-runtime
diff --git a/debian/rules b/debian/rules
index 9e42a7b..1eeca9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME:=/usr/lib/jvm/default-java
+BUILD_ID:=201002161416
 
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),i386 i486 i586 i686))
@@ -25,36 +26,22 @@ ifeq ($(ECLIPSE_BUILD_ARCH),)
 	ECLIPSE_BUILD_ARCH=$(DEB_HOST_ARCH_CPU)
 endif
 
-ECLIPSE_HOME:=/usr/lib/eclipse
-ORBIT_ECLIPSE:=$(CURDIR)/debian/.eclipse-build/SDK
+BUILD_DIR:=$(CURDIR)/debian/.eclipse-build
 
 %:
-	dh $@
+	dh $@ --with eclipse-helper
 
+override_dh_auto_clean:
+	# Do not use the auto-clean with ant.
 override_dh_auto_build:
 	# Do not use the auto-build with ant.
-	jh_setupenvironment
-	rm -fr debian/.eclipse-build/mylyn/
-	mkdir -p debian/.eclipse-build/home
-	# Copy-platform is not a "sane" script; we cannot rely on the return code from it.
-	cd debian/.eclipse-build && $(ECLIPSE_HOME)/buildscripts/copy-platform SDK $(ECLIPSE_HOME) rse || true
-	jh_generateorbitdir --orbit-dir debian/orb
-	mv debian/orb/* debian/.eclipse-build/SDK/plugins/
-	cd debian/.eclipse-build/results/plugins/org.eclipse.cdt.core.linux/library && \
-		make JAVA_HOME="$(JAVA_HOME)" ARCH=$(ECLIPSE_BUILD_ARCH) CC='gcc -D_GNU_SOURCE' CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-	cd debian/.eclipse-build/ && \
-		java -cp $(ORBIT_ECLIPSE)/startup.jar \
-			-Duser.home=home \
-			-Dosgi.install.area=$(ECLIPSE_HOME) \
-			-Dorg.eclipse.core.runtime.ignoreLockFile=true \
-			org.eclipse.core.launcher.Main \
-			-application org.eclipse.ant.core.antRunner \
-			-DjavacFailOnError=true \
-			-DdontUnzip=true \
-			-DbaseLocation=$(ORBIT_ECLIPSE) \
-			-Dpde.build.scripts=`ls -d $(ORBIT_ECLIPSE)/plugins/org.eclipse.pde.build_*/scripts` \
-			-DdontFetchAnything=true
 
-override_dh_auto_clean:
-	jh_clean
-	rm -fr debian/orb/
+override_jh_compilefeatures:
+	cd $(BUILD_DIR)/results/plugins/org.eclipse.cdt.core.linux/library && \
+		make JAVA_HOME="$(JAVA_HOME)" ARCH=$(ECLIPSE_BUILD_ARCH) CC='gcc -D_GNU_SOURCE' CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -fPIC"
+	jh_compilefeatures --build-opts="-DjavacTarget=1.5 -DjavacSource=1.5 -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)";
+
+override_dh_install:
+	dh_install -peclipse-cdt $(BUILD_DIR)/results/plugins/org.eclipse.cdt.core.linux.$(ECLIPSE_BUILD_ARCH)/os/linux/$(ECLIPSE_BUILD_ARCH)/*.so usr/lib/jni/
+	dh_install --remaining-packages
+


hooks/post-receive
-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.