[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. eclipse-ppa/maverick-23-g90c8c34

Sun Jun 20 23:56:04 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  90c8c342237b4cacc8a8cc661e3ab46daa58de56 (commit)
      from  5348434cf90a1566dff28f710d50c9c537999879 (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 90c8c342237b4cacc8a8cc661e3ab46daa58de56
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jun 21 01:55:58 2010 +0200

    Determine build architecture automatically.

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

Summary of changes:
 build.properties                |    1 -
 build.xml                       |   24 ++++++++++++++++++
 debian/patches/build-arch.patch |   47 +++++++++++++++++++++++++++++++++++
 debian/patches/series           |    1 +
 debian/rules                    |   51 ++++++++++++++++++--------------------
 5 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/build.properties b/build.properties
index 28e73d6..41a89a3 100644
--- a/build.properties
+++ b/build.properties
@@ -10,7 +10,6 @@ featureToBuild=eclipse-build-feature
 skipBase=true
 skipFetch=true
 individualSourceBundles=true
-buildArch=x86
 ws=gtk
 os=linux
 includeLaunchers=true
diff --git a/build.xml b/build.xml
index d3f5c90..1bd5fd2 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,30 @@
 	<property name="productFiles" value="${buildConfig}/productFiles" />
 	<property name="reposource" value="${buildDirectory}/reposource" />
 
+	<!-- Determine host architecture -->
+	<exec executable="uname" outputproperty="uname-m">
+		<arg line="-m" />
+	</exec>
+	<condition property="hostArch" value="arm">
+		<matches pattern="arm*" string="${uname-m}"/>
+	</condition>
+	<condition property="hostArch" value="x86">
+		<matches pattern="i[0-9]*86" string="${uname-m}"/>
+	</condition>
+	<condition property="hostArch" value="PA_RISC">
+		<matches pattern="parisc*" string="${uname-m}"/>
+	</condition>
+	<condition property="hostArch" value="sparc">
+		<matches pattern="sparcv9" string="${uname-m}"/>
+	</condition>
+	<condition property="hostArch" value="${uname-m}">
+		<not><isset property="hostArch" /></not>
+	</condition>
+	<condition property="buildArch" value="${hostArch}">
+		<not><isset property="buildArch" /></not>
+	</condition>
+	<echo message="Build on ${hostArch} for ${buildArch}."/>
+
 	<property name="destDir" value="" />
 	<property name="prefix" value="/usr/local" />
 	<!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
diff --git a/debian/patches/build-arch.patch b/debian/patches/build-arch.patch
new file mode 100644
index 0000000..997dab7
--- /dev/null
+++ b/debian/patches/build-arch.patch
@@ -0,0 +1,47 @@
+Description: Determine build architecture automatically
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=317391
+
+--- eclipse-3.5.2.orig/build.xml
++++ eclipse-3.5.2/build.xml
+@@ -53,6 +53,30 @@
+ 	<property name="productFiles" value="${buildConfig}/productFiles" />
+ 	<property name="reposource" value="${buildDirectory}/reposource" />
+ 
++	<!-- Determine host architecture -->
++	<exec executable="uname" outputproperty="uname-m">
++		<arg line="-m" />
++	</exec>
++	<condition property="hostArch" value="arm">
++		<matches pattern="arm*" string="${uname-m}"/>
++	</condition>
++	<condition property="hostArch" value="x86">
++		<matches pattern="i[0-9]*86" string="${uname-m}"/>
++	</condition>
++	<condition property="hostArch" value="PA_RISC">
++		<matches pattern="parisc*" string="${uname-m}"/>
++	</condition>
++	<condition property="hostArch" value="sparc">
++		<matches pattern="sparcv9" string="${uname-m}"/>
++	</condition>
++	<condition property="hostArch" value="${uname-m}">
++		<not><isset property="hostArch" /></not>
++	</condition>
++	<condition property="buildArch" value="${hostArch}">
++		<not><isset property="buildArch" /></not>
++	</condition>
++	<echo message="Build on ${hostArch} for ${buildArch}."/>
++
+ 	<property name="destDir" value="" />
+ 	<property name="prefix" value="/usr/local" />
+ 	<!-- Do we want /usr/lib64 if it's a 64-bit architecture? -->
+--- eclipse-3.5.2.orig/build.properties
++++ eclipse-3.5.2/build.properties
+@@ -10,7 +10,6 @@ featureToBuild=eclipse-build-feature
+ skipBase=true
+ skipFetch=true
+ individualSourceBundles=true
+-buildArch=x86
+ ws=gtk
+ os=linux
+ includeLaunchers=true
diff --git a/debian/patches/series b/debian/patches/series
index 9d32dde..3c6dd73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ fix-help-contents.patch
 fix-tooltip-color.patch
 bp-hover-visability.patch
 fix-bashism.patch
+build-arch.patch
diff --git a/debian/rules b/debian/rules
index a9ec059..a11c1c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,40 +6,14 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 # different behaviour than Debian's uname.
 export PATH:=$(CURDIR)/debian/extra/bin:$(PATH)
 
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-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
-
 %:
 	dh --with xulrunner $@
 
 override_dh_auto_clean:
 	ant distclean
 
-override_dh_auto_build:
-	ant -DbuildArch=$(ECLIPSE_BUILD_ARCH)
-
 override_dh_auto_install:
-	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp -DbuildArch=$(ECLIPSE_BUILD_ARCH)
+	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp
 
 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
@@ -109,6 +83,29 @@ XULRUNNER_PATH := $(shell if test -d /usr/lib/xulrunner-$(shell $(XULRUNNER) --g
 	then echo '/usr/lib/xulrunner-$$($(XULRUNNER) --gre-version)'; \
 	else pkg-config --variable=sdkdir libxul | sed "s/-devel//"; fi)
 
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+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
+
 override_dh_install:
 	# Turn all following commands into patches and send them to eclipse-build
 	# Remove some bad arguments that causes eclipse to fail


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

