Author: tgg
Date: 2008-05-11 15:29:12 +0000 (Sun, 11 May 2008)
New Revision: 6458
Modified:
trunk/eclipse-cdt/debian/changelog
trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-on-sparc-s390.patch
trunk/eclipse-cdt/debian/rules
Log:
add another missing patch. copy ia64 results/ into missing ones.
Modified: trunk/eclipse-cdt/debian/changelog
===================================================================
--- trunk/eclipse-cdt/debian/changelog 2008-05-11 12:16:24 UTC (rev 6457)
+++ trunk/eclipse-cdt/debian/changelog 2008-05-11 15:29:12 UTC (rev 6458)
@@ -1,4 +1,4 @@
-eclipse-cdt (3.1.2-3) UNRELEASED; urgency=low
+eclipse-cdt (3.1.2-3) unstable; urgency=low
* New patch, eclipse-cdt-build-on-sparc-s390.patch to build eclipse-cdt on
sparc and s390 arches. Thanks to Martin Zobel-Helas for the bug report
Modified: trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-on-sparc-s390.patch
===================================================================
--- trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-on-sparc-s390.patch
2008-05-11 12:16:24 UTC (rev 6457)
+++ trunk/eclipse-cdt/debian/patches/eclipse-cdt-build-on-sparc-s390.patch
2008-05-11 15:29:12 UTC (rev 6458)
@@ -92,3 +92,42 @@
<target name="assemble.org.eclipse.cdt.linux.gtk.ia64">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
<property name="archiveName"
value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
+--- orig/org.eclipse.cdt.releng/sdk/customTargets.xml
++++ mod/org.eclipse.cdt.releng/sdk/customTargets.xml
+@@ -73,6 +73,36 @@
+ </ant>
+ </target>
+
++<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc64">
++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
++ <property name="archiveName"
value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc64.tar.gz"/>
++ </ant>
++</target>
++
++<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.s390">
++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
++ <property name="archiveName"
value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.s390.tar.gz"/>
++ </ant>
++</target>
++
++<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.s390x">
++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
++ <property name="archiveName"
value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.s390x.tar.gz"/>
++ </ant>
++</target>
++
++<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.sparc">
++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
++ <property name="archiveName"
value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.sparc.tar.gz"/>
++ </ant>
++</target>
++
++<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.sparc64">
++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
++ <property name="archiveName"
value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.sparc64.tar.gz"/>
++ </ant>
++</target>
++
+ <target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64">
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+ <property name="archiveName"
value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
Modified: trunk/eclipse-cdt/debian/rules
===================================================================
--- trunk/eclipse-cdt/debian/rules 2008-05-11 12:16:24 UTC (rev 6457)
+++ trunk/eclipse-cdt/debian/rules 2008-05-11 15:29:12 UTC (rev 6458)
@@ -8,7 +8,7 @@
SOURCE=$(shell echo upstream/*.tar.bz2)
SOURCE_TREE=source-tree
-JAVA_HOME=/usr/lib/jvm/java-gcj
+JAVA_HOME=/usr/lib/jvm/default-java
export JAVA_HOME
JAVA_RUN=$(JAVA_HOME)/bin/java
ANT_RUN=ant
@@ -17,8 +17,6 @@
ECLIPSE_PLATFORM=$(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-RELENG_PLUGIN=org.eclipse.cdt.releng
-
ifeq ($(DEB_HOST_ARCH),i386)
ECLIPSE_PLATFORM=x86
endif
@@ -35,6 +33,10 @@
ECLIPSE_PLATFORM=s390
endif
+RELENG := org.eclipse.cdt.releng
+PLUGINS := $(SOURCE_TREE)/$(RELENG)/results/plugins
+CDT_LNX := $(PLUGINS)/org.eclipse.cdt.core.linux
+
PATCHES = \
eclipse-cdt-build-linux \
eclipse-cdt-build-on-sparc-s390 \
@@ -68,7 +70,7 @@
dh_testdir
# This patch system was orginally copied off of the one found in cdbs.
- @cd $(SOURCE_TREE)/$(RELENG_PLUGIN); \
+ @cd $(SOURCE_TREE)/$(RELENG); \
test $$(find $(CURDIR)/debian/patches/ -maxdepth 1 -name '*.patch' | wc
-l) -eq 0 && exit 0; \
for patchname in $(PATCHES); do \
patch=$(CURDIR)/debian/patches/$$patchname.patch; \
@@ -91,29 +93,41 @@
fi; \
done
- sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i
$(CURDIR)/$(SOURCE_TREE)/$(RELENG_PLUGIN)/platform/build.properties
- sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i
$(CURDIR)/$(SOURCE_TREE)/$(RELENG_PLUGIN)/sdk/build.properties
+ sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i
$(CURDIR)/$(SOURCE_TREE)/$(RELENG)/platform/build.properties
+ sed -e "s/@ARCH@/$(ECLIPSE_PLATFORM)/" -i
$(CURDIR)/$(SOURCE_TREE)/$(RELENG)/sdk/build.properties
touch patch-stamp
+prepare: prepare-stamp
+prepare-stamp: patch-stamp
+ dh_testdir
+ # Copy ia64 configuration for unsupported arches. Based on eclipse
trick.
+ for arch in ppc64 s390 s390x sparc sparc64 ; do \
+ cp -a $(CDT_LNX).ia64 $(CDT_LNX).$$arch ; \
+ rm -Rf $(CDT_LNX).$$arch/os/linux/ia64 ; \
+ mkdir $(CDT_LNX).$$arch/os/linux/$$arch ; \
+ find $(CDT_LNX).$$arch -type f -exec sed --in-place "s,ia64,$$arch,g"
"{}" \; ; \
+ done
+
+ touch $@
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: prepare-stamp
dh_testdir
# Create home.
mkdir -p home
# build native code.
- cd
$(SOURCE_TREE)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/library
&& \
- make ARCH=$(ECLIPSE_PLATFORM) CC='gcc -D_GNU_SOURCE'
+ cd $(PLUGINS)/org.eclipse.cdt.core.linux/library && make
ARCH=$(ECLIPSE_PLATFORM) CC='gcc -D_GNU_SOURCE'
# add a missing icon before launching the build
uudecode -o /dev/stdout debian/eclipse-cdt-target_filter.gif.gz.uu | \
- gzip -dc - >
$(SOURCE_TREE)/$(RELENG_PLUGIN)/results/plugins/org.eclipse.cdt.make.ui/icons/dtool16/eclipse-cdt-target_filter.gif
+ gzip -dc - >
$(SOURCE_TREE)/$(RELENG)/results/plugins/org.eclipse.cdt.make.ui/icons/dtool16/eclipse-cdt-target_filter.gif
# Call eclipse headless to process CDT releng build scripts
- cd $(SOURCE_TREE)/$(RELENG_PLUGIN) && \
+ cd $(SOURCE_TREE)/$(RELENG) && \
$(JAVA_RUN) -cp $(ECLIPSE_BASE)/startup.jar \
-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration \
-Duser.home=$(homedir) \
@@ -139,7 +153,7 @@
# Install the tar file into our destination directory.
install -d debian/tmp/$(ECLIPSE_BASE)
- tar xzf
$(SOURCE_TREE)/$(RELENG_PLUGIN)/results/I.*/org.eclipse.cdt.sdk*.$(ECLIPSE_PLATFORM).tar.gz
-C debian/tmp/$(ECLIPSE_BASE)/..
+ tar xzf
$(SOURCE_TREE)/$(RELENG)/results/I.*/org.eclipse.cdt.sdk*.$(ECLIPSE_PLATFORM).tar.gz
-C debian/tmp/$(ECLIPSE_BASE)/..
dh_installdirs
dh_install
@@ -175,3 +189,4 @@
binary: binary-indep binary-arch
+.PHONY: binary binary-arch binary-indep install clean build prepare uncompress
patch
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
