[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 797293058cee943ae8507282552ac5d0a79416a2
Niels Thykier
nthykier-guest at alioth.debian.org
Sat Feb 20 19:01:28 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 797293058cee943ae8507282552ac5d0a79416a2 (commit)
from decd3a1274ca2ef76b1e505a51122b12cf8ae63c (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 797293058cee943ae8507282552ac5d0a79416a2
Author: Niels Thykier <niels at thykier.net>
Date: Sat Feb 20 20:01:14 2010 +0100
Added helper package for plugin-building with partial helper rules for cdbs.
-----------------------------------------------------------------------
Summary of changes:
debian/control | 7 ++++
debian/eclipse-helper.install | 2 +
debian/helper/eclipse-vars.mk | 35 ++++++++++++++++++++
debian/helper/eclipse.mk | 38 ++++++++++++++++++++++
debian/patches/pdebuild-path-copy-platform.patch | 38 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 ++--
pdebuild/eclipse-pdebuild.sh | 16 ++++----
8 files changed, 132 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index 5a96fad..02b0e39 100644
--- a/debian/control
+++ b/debian/control
@@ -246,3 +246,10 @@ Description: Equinox OSGi framework
This package includes only the Eclipse Equinox OSGi framework, which can
be used outside Eclipse.
+Package: eclipse-helper
+Architecture: all
+Depends: eclipse-pde (= ${binary:Version}), ${misc:Depends}
+Description: Helper scripts for build eclipse plugins
+ Collection of scripts and makefile snippets to aid building of eclipse
+ plugins.
+
diff --git a/debian/eclipse-helper.install b/debian/eclipse-helper.install
new file mode 100644
index 0000000..37d19fa
--- /dev/null
+++ b/debian/eclipse-helper.install
@@ -0,0 +1,2 @@
+debian/helper/eclipse-vars.mk usr/share/eclipse-helper/
+debian/helper/eclipse.mk usr/share/eclipse-helper/
diff --git a/debian/helper/eclipse-vars.mk b/debian/helper/eclipse-vars.mk
new file mode 100644
index 0000000..c49cd62
--- /dev/null
+++ b/debian/helper/eclipse-vars.mk
@@ -0,0 +1,35 @@
+# Define eclipse / pdebuild related variables.
+
+
+ifndef _cdbs_class_eclipse_vars
+_cdbs_class_eclipse_vars = 1
+
+# Path to the pdebuild script.
+ECLIPSE_PDEBUILD ?= /usr/share/eclipse-helper/pdebuild
+
+# Options given to the underlying builder - to pass options to pdebuild
+# use ECLIPSE_PDEBUILD_ARGS
+ECLIPSE_PDEBUILD_OPTIONS ?= -DjavacTarget=1.5 -DjavacSource=1.5
+
+# ECLIPSE_PDEBUILD_VMARGS - JVM args
+# ECLIPSE_PDEBUILD_ARGS - arguments for pdebuild
+
+# Dir to build in
+ECLIPSE_PDEBUILD_DIR ?= $(CURDIR)/debian/.eclipse-build/
+
+# Files that should be a part of the build.
+ECLIPSE_PDEBUILD_BUILD_INCLUDE ?= org.eclipse.*
+
+# ECLIPSE_BUILD_LIST - list of things to build.
+# ECLIPSE_ORBIT_DEPS - passed to pdebuild via -o
+# ECLIPSE_PLUGIN_DEPS - passed to pdebuild via -d
+
+# Command used to invoke pdebuild.
+DEB_ECLIPSE_PDEBUILD_INVOKE ?= cd $(ECLIPSE_PDEBUILD_DIR) && $(ECLIPSE_PDEBUILD) $(ECLIPSE_PDEBUILD_ARGS) \
+ $(if $(ECLIPSE_PDEBUILD_OPTIONS), -a "$(ECLIPSE_PDEBUILD_OPTIONS)",) \
+ $(if $(ECLIPSE_PDEBUILD_VMARGS), -j "$(ECLIPSE_PDEBUILD_VMARGS)",) \
+ $(if $(ECLIPSE_ORBIT_DEPS), -o "$(ECLIPSE_ORBIT_DEPS)",) \
+ $(if $(ECLIPSE_PLUGIN_DEPS), -d "$(ECLIPSE_PLUGIN_DEPS)",)
+
+
+endif
diff --git a/debian/helper/eclipse.mk b/debian/helper/eclipse.mk
new file mode 100644
index 0000000..9d53745
--- /dev/null
+++ b/debian/helper/eclipse.mk
@@ -0,0 +1,38 @@
+# Define eclipse / pdebuild related rules.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+_eclipse_vars_path ?= /usr/share/eclipse-helper
+
+ifndef _cdbs_class_eclipse
+_cdbs_class_eclipse = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_eclipse_vars_path)/eclipse-vars.mk
+
+DEB_PHONY_RULES += eclipse-sanity-check
+
+common-build-arch common-build-indep:: debian/stamp-eclipse-build
+
+eclipse-sanity-check:
+ @if test "x" = "x$(ECLIPSE_PDEBUILD_DIR)" ; then \
+ echo "You must specify something to build in ECLIPSE_PDEBUILD_DIR" >&2 ;\
+ exit 1 ;\
+ fi
+
+# Build rule
+debian/stamp-eclipse-build: eclipse-sanity-check
+ (test -e $(ECLIPSE_PDEBUILD_DIR) && rm -fr $(ECLIPSE_PDEBUILD_DIR)) || true
+ mkdir -p $(ECLIPSE_PDEBUILD_DIR)
+ cp -a $(ECLIPSE_PDEBUILD_BUILD_INCLUDE) $(ECLIPSE_PDEBUILD_DIR)
+ for tobuild in $(ECLIPSE_BUILD_LIST) ; do \
+ $(DEB_ECLIPSE_PDEBUILD_INVOKE) -f $$tobuild || exit 1;\
+ done
+ touch debian/stamp-eclipse-build
+
+clean::
+ rm -f debian/stamp-eclipse-build
+ rm -fr $(ECLIPSE_PDEBUILD_DIR)
+
+endif
diff --git a/debian/patches/pdebuild-path-copy-platform.patch b/debian/patches/pdebuild-path-copy-platform.patch
new file mode 100644
index 0000000..2adf3fc
--- /dev/null
+++ b/debian/patches/pdebuild-path-copy-platform.patch
@@ -0,0 +1,38 @@
+Description: Substitute the path to copy-platform with a variable.
+ This patch is only of interest to Debian, as we want to install
+ pdebuild in a different path.
+Author: Niels Thykier <niels at thykier.net>
+Forwarded: not-needed
+
+diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
+index 7ddf009..cb69849 100755
+--- a/pdebuild/eclipse-pdebuild.sh
++++ b/pdebuild/eclipse-pdebuild.sh
+@@ -27,19 +27,19 @@ function copyPlatform {
+ # counting as arguments to copy-platform -- overholt, 2008-03
+ if [ -z "$dependencies" ]; then
+ if [ $verbose -eq 1 ]; then
+- echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
+- /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
++ echo "/bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse"
++ /bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse
+ else
+- echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
+- /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
++ echo "/bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse"
++ /bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse
+ fi
+ else
+ if [ $verbose -eq 1 ]; then
+- echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
+- /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
++ echo "/bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies"
++ /bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies
+ else
+- echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
+- /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
++ echo "/bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies"
++ /bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies
+ fi
+ fi
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 5dd6f3f..2641dfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ system-jars.patch
source-jars.patch
eclipse-manpage.patch
pdebuild-script.patch
+pdebuild-path-copy-platform.patch
diff --git a/debian/rules b/debian/rules
index d45c115..4092365 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,8 +175,8 @@ debian-install-stamp:
ln -sf /etc/eclipse.ini $(DEB_DESTDIR)usr/lib/eclipse/eclipse.ini
touch $@
-COPY_PLATFORM:=$(DEBIAN_PACK_LIBDIR)/buildscripts/copy-platform
-PDEBUILD:=$(DEBIAN_PACK_LIBDIR)/buildscripts/pdebuild
+COPY_PLATFORM:=debian/eclipse-helper/usr/share/eclipse-helper/copy-platform
+PDEBUILD:=debian/eclipse-helper/usr/share/eclipse-helper/pdebuild
generate-pdebuild-scripts: debian-install-stamp
@echo "*** generate-pdebuild-scripts ***"
@@ -187,5 +187,5 @@ generate-pdebuild-scripts: debian-install-stamp
ls -d * | egrep -v '^(plugins|features|about_files|dropins|buildscripts)$$' ; \
ls -d * plugins/* features/* ; \
) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >> $(COPY_PLATFORM)
- sed "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD)
+ sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e "s/@COPY_PLATFORM@/$(COPY_PLATFORM)/g" < pdebuild/eclipse-pdebuild.sh > $(PDEBUILD)
chmod a+x $(PDEBUILD)
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index 7ddf009..cb69849 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -27,19 +27,19 @@ function copyPlatform {
# counting as arguments to copy-platform -- overholt, 2008-03
if [ -z "$dependencies" ]; then
if [ $verbose -eq 1 ]; then
- echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
- /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
+ echo "/bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse"
+ /bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse
else
- echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse"
- /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse
+ echo "/bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse"
+ /bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse
fi
else
if [ $verbose -eq 1 ]; then
- echo "/bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
- /bin/sh -x $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
+ echo "/bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies"
+ /bin/sh -x @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies
else
- echo "/bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies"
- /bin/sh $datadir/eclipse/buildscripts/copy-platform $SDK $datadir/eclipse $dependencies
+ echo "/bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies"
+ /bin/sh @COPY_PLATFORM@ $SDK $datadir/eclipse $dependencies
fi
fi
}
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list