[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. e57b7c6ef53799ddc6c2199d2e2a510d2c86e4a7
Niels Thykier
nthykier-guest at alioth.debian.org
Fri Jun 11 23:26:20 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-cdt - Plug-in for eclipse to handle C/C++ - Debian package.".
The branch, master has been updated
via e57b7c6ef53799ddc6c2199d2e2a510d2c86e4a7 (commit)
from ba1a88701c2f6ea0b75734fcb93f3e866e05634d (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 e57b7c6ef53799ddc6c2199d2e2a510d2c86e4a7
Author: Niels Thykier <niels at thykier.net>
Date: Sat Jun 12 01:26:17 2010 +0200
Initial build and imported to patches from Fedora. Currently the build fails due to imcomplete source files. Waiting for Fedora to fix their fetch-cdt script.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
debian/control | 2 +-
debian/patches/Fedora-disable-mylyn.patch | 13 +++
debian/patches/Fedora-no-cvs2.patch | 123 +++++++++++++++++++++++++++++
debian/rules | 57 +++++++++++++-
platform/customTargets.xml | 26 ++++++
sdk/customTargets.xml | 26 ++++++
testing/customTargets.xml | 25 ++++++
8 files changed, 271 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 11cc96e..fee72cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eclipse-cdt (6.0.1-1) UNRELEASED; urgency=low
+eclipse-cdt (6.0.2-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 0b63ffc..2b40bbf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Niels Thykier <niels at thykier.net>,
Benjamin Drung <bdrung at ubuntu.com>,
Adrian Perez <adrianperez.deb at gmail.com>
-Build-Depends: debhelper (>> 5), eclipse (>= 3.5.1), default-jdk, bzip2, sharutils
+Build-Depends: debhelper (>= 7.0.50~), eclipse-pde (>= 3.5.2), default-jdk, javahelper, eclipse-rse, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, zip, unzip
Build-Conflicts: eclipse-cdt
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-java/eclipse-cdt.git
diff --git a/debian/patches/Fedora-disable-mylyn.patch b/debian/patches/Fedora-disable-mylyn.patch
new file mode 100644
index 0000000..88c79b1
--- /dev/null
+++ b/debian/patches/Fedora-disable-mylyn.patch
@@ -0,0 +1,13 @@
+--- a/results/features/org.eclipse.cdt.master/feature.xml 2009-06-23 23:07:50.000000000 +0300
++++ b/results/features/org.eclipse.cdt.master/feature.xml 2009-10-28 12:46:20.635310276 +0200
+@@ -74,10 +74,6 @@
+ version="0.0.0"/>
+
+ <includes
+- id="org.eclipse.cdt.mylyn"
+- version="0.0.0"/>
+-
+- <includes
+ id="org.eclipse.cdt.gnu.dsf"
+ version="0.0.0"/>
+
diff --git a/debian/patches/Fedora-no-cvs2.patch b/debian/patches/Fedora-no-cvs2.patch
new file mode 100644
index 0000000..1e69c7e
--- /dev/null
+++ b/debian/patches/Fedora-no-cvs2.patch
@@ -0,0 +1,123 @@
+--- a/platform/customTargets.xml 2004-07-23 12:53:33.000000000 -0600
++++ b/platform/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
+@@ -4,13 +4,39 @@
+ <!-- Run a given ${target} on all elements being built -->
+ <!-- Add on <ant> task for each top level element being built. -->
+ <!-- ===================================================================== -->
++
+ <target name="allElements">
++ <antcall target="${target}ForAllElements"/>
++</target>
++
++<target name="fetchElementForAllElements" unless="dontFetchAnything">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="generateScriptForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="processElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="assembleElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="cleanElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="genericAllElements">
+ <ant antfile="${genericTargets}" target="${target}" >
+ <property name="type" value="feature" />
+ <property name="id" value="org.eclipse.cdt" />
+ </ant>
+ </target>
+
++
+ <!-- ===================================================================== -->
+ <!-- Targets to assemble the built elements for particular configurations -->
+ <!-- These generally call the generated assemble scripts (named in -->
+--- a/sdk/customTargets.xml 2004-07-23 12:53:33.000000000 -0600
++++ b/sdk/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
+@@ -10,12 +10,38 @@
+ <!-- Add on <ant> task for each top level element being built. -->
+ <!-- ===================================================================== -->
+ <target name="allElements">
++ <antcall target="${target}ForAllElements"/>
++</target>
++
++<target name="fetchElementForAllElements" unless="dontFetchAnything">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="generateScriptForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="processElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="assembleElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="cleanElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="genericAllElements">
+ <ant antfile="${genericTargets}" target="${target}" >
+ <property name="type" value="feature" />
+ <property name="id" value="org.eclipse.cdt.sdk" />
+ </ant>
+ </target>
+
++
++
+ <!-- ===================================================================== -->
+ <!-- Targets to assemble the built elements for particular configurations -->
+ <!-- These generally call the generated assemble scripts (named in -->
+--- a/testing/customTargets.xml 2004-03-08 11:41:52.000000000 -0700
++++ b/testing/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
+@@ -10,12 +10,37 @@
+ <!-- Add on <ant> task for each top level element being built. -->
+ <!-- ===================================================================== -->
+ <target name="allElements">
++ <antcall target="${target}ForAllElements"/>
++</target>
++
++<target name="fetchElementForAllElements" unless="dontFetchAnything">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="generateScriptForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="processElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="assembleElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="cleanElementForAllElements">
++ <antcall target="genericAllElements"/>
++</target>
++
++<target name="genericAllElements">
+ <ant antfile="${genericTargets}" target="${target}" >
+ <property name="type" value="feature" />
+ <property name="id" value="org.eclipse.cdt.testing" />
+ </ant>
+ </target>
+
++
+ <!-- ===================================================================== -->
+ <!-- Targets to assemble the built elements for particular configurations -->
+ <!-- These generally call the generated assemble scripts (named in -->
diff --git a/debian/rules b/debian/rules
index 6f3f979..9e42a7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,60 @@
#!/usr/bin/make -f
+export JAVA_HOME:=/usr/lib/jvm/default-java
+
+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
+
+ECLIPSE_HOME:=/usr/lib/eclipse
+ORBIT_ECLIPSE:=$(CURDIR)/debian/.eclipse-build/SDK
+
%:
- dh --with eclipse-helper $@
+ dh $@
+
+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/
diff --git a/platform/customTargets.xml b/platform/customTargets.xml
index 70812da..29ef16e 100644
--- a/platform/customTargets.xml
+++ b/platform/customTargets.xml
@@ -4,13 +4,39 @@
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
+
<target name="allElements">
+ <antcall target="${target}ForAllElements"/>
+</target>
+
+<target name="fetchElementForAllElements" unless="dontFetchAnything">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="generateScriptForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="processElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="assembleElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="cleanElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="genericAllElements">
<ant antfile="${genericTargets}" target="${target}" >
<property name="type" value="feature" />
<property name="id" value="org.eclipse.cdt" />
</ant>
</target>
+
<!-- ===================================================================== -->
<!-- Targets to assemble the built elements for particular configurations -->
<!-- These generally call the generated assemble scripts (named in -->
diff --git a/sdk/customTargets.xml b/sdk/customTargets.xml
index e677c1d..3b61bac 100644
--- a/sdk/customTargets.xml
+++ b/sdk/customTargets.xml
@@ -10,12 +10,38 @@
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
<target name="allElements">
+ <antcall target="${target}ForAllElements"/>
+</target>
+
+<target name="fetchElementForAllElements" unless="dontFetchAnything">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="generateScriptForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="processElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="assembleElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="cleanElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="genericAllElements">
<ant antfile="${genericTargets}" target="${target}" >
<property name="type" value="feature" />
<property name="id" value="org.eclipse.cdt.sdk" />
</ant>
</target>
+
+
<!-- ===================================================================== -->
<!-- Targets to assemble the built elements for particular configurations -->
<!-- These generally call the generated assemble scripts (named in -->
diff --git a/testing/customTargets.xml b/testing/customTargets.xml
index e053e59..b06d38b 100644
--- a/testing/customTargets.xml
+++ b/testing/customTargets.xml
@@ -10,12 +10,37 @@
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
<target name="allElements">
+ <antcall target="${target}ForAllElements"/>
+</target>
+
+<target name="fetchElementForAllElements" unless="dontFetchAnything">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="generateScriptForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="processElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="assembleElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="cleanElementForAllElements">
+ <antcall target="genericAllElements"/>
+</target>
+
+<target name="genericAllElements">
<ant antfile="${genericTargets}" target="${target}" >
<property name="type" value="feature" />
<property name="id" value="org.eclipse.cdt.testing" />
</ant>
</target>
+
<!-- ===================================================================== -->
<!-- Targets to assemble the built elements for particular configurations -->
<!-- These generally call the generated assemble scripts (named in -->
hooks/post-receive
--
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.
More information about the pkg-java-commits
mailing list