[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 6f54dabbeac67e0c3cd42f81654eca0637149d9b
Niels Thykier
nthykier-guest at alioth.debian.org
Tue Oct 13 11:54:35 UTC 2009
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 6f54dabbeac67e0c3cd42f81654eca0637149d9b (commit)
from 6bf22188e2fff362a99706b4ecc246a0fd89477d (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 6f54dabbeac67e0c3cd42f81654eca0637149d9b
Author: Niels Thykier <niels at thykier.net>
Date: Tue Oct 13 13:54:28 2009 +0200
Updated patches and TODO.
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 14 -------------
debian/patches/bashisms.patch | 42 +++++++++++++++++++++++++++-------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/debian/TODO b/debian/TODO
index afa8dcf..b72d90f 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -11,17 +11,3 @@ Things that needs fixing:
- Check upstream build system for other archs and check Fedora's "multi-arch" hacks.
- Expose certain eclipse jars to the world (see below).
-Expose eclipse jars:
-
- libjibx-java depends on some eclipse jars (beyond what is available in libecj-java).
-
- org.eclipse.core.contenttype.jar
- org.eclipse.core.jobs.jar
- org.eclipse.core.resources.jar
- org.eclipse.core.runtime.jar
- org.eclipse.equinox.common.jar
- org.eclipse.equinox.preferences.jar
- org.eclipse.jdt.core.jar
- org.eclipse.jdt.core.manipulation.jar
- org.eclipse.osgi.jar
- org.eclipse.text.jar
diff --git a/debian/patches/bashisms.patch b/debian/patches/bashisms.patch
index cec4176..6b13e87 100644
--- a/debian/patches/bashisms.patch
+++ b/debian/patches/bashisms.patch
@@ -2,16 +2,18 @@ Index: patches/eclipse-pde.build-add-package-build.patch
===================================================================
--- a/patches/eclipse-pde.build-add-package-build.patch (revision 23419)
+++ b/patches/eclipse-pde.build-add-package-build.patch (working copy)
-@@ -6,7 +6,7 @@
+@@ -6,8 +6,9 @@
diff -N templates/package-build/prepare-build-dir.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/package-build/prepare-build-dir.sh 1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,105 @@
-+@@ -0,0 +1,111 @@
++@@ -0,0 +1,112 @@
+#!/bin/sh
+++set -e
+
+if [ $# -lt 2 ]; then
-@@ -23,6 +23,12 @@
+ + echo "usage: $0 <path to source dir> <path to build dir>"
+@@ -23,6 +24,12 @@
+BUILDDIR=$2
+TESTING=$3
+
@@ -24,7 +26,7 @@ Index: patches/eclipse-pde.build-add-package-build.patch
+echo "preparing files in $1 for buildfile generation ..."
+mkdir -p $BUILDDIR
+
-@@ -53,12 +59,12 @@
+@@ -53,12 +60,12 @@
+ PROJECTDIR=$(dirname "$f")
+ inSDK=1
+ inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
@@ -40,16 +42,16 @@ Index: patches/eclipse-pde.build-add-package-build.patch
+ exit 1
+ else
+ ERROR="yes"
-@@ -66,7 +72,7 @@
+@@ -66,7 +73,7 @@
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
-++ if [ $TESTING -ne 0 ] || echo $PROJECTNAME | grep "org.eclipse"` >/dev/null 2>&1 ; then
+++ if [ $TESTING -ne 0 ] || echo $PROJECTNAME | grep "org.eclipse" >/dev/null 2>&1 ; then
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
-@@ -81,7 +87,7 @@
+@@ -81,7 +88,7 @@
+ ERROR=""
+ inSDK=1
+ inSDK=$(echo $dir | grep -c $BUILDDIR)
@@ -58,7 +60,7 @@ Index: patches/eclipse-pde.build-add-package-build.patch
+ if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ elif [ -e "$dir/plugin.xml" ]; then
-@@ -92,7 +98,7 @@
+@@ -92,7 +99,7 @@
+
+ if [ -z "$PROJECTNAME" ]; then
+ echo "ERROR: could not determine the plugin or fragment id for $dir"
@@ -67,7 +69,7 @@ Index: patches/eclipse-pde.build-add-package-build.patch
+ exit 1
+ else
+ ERROR="yes"
-@@ -100,7 +106,7 @@
+@@ -100,7 +107,7 @@
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
@@ -76,30 +78,42 @@ Index: patches/eclipse-pde.build-add-package-build.patch
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ fi
-@@ -212,10 +218,10 @@
+@@ -212,10 +219,10 @@
+ plugin projects to be in the 'plugins' directory. The build infrastructure
+ normally arranges the projects during the fetch stage. Since we aren't doing
+ the fetch stage, we have to manually arrange the files -->
-+ <exec dir="${builder}" executable="/bin/sh">
+-+ <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />
++ <exec dir="${builder}" executable="/bin/sh" failOnError="true">
- + <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />
+++ <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} false" />
+ </exec>
-+ <exec dir="${builder}" executable="/bin/sh">
++ <exec dir="${builder}" executable="/bin/sh" failOnError="true" >
+ <arg line="symlink-deps.sh ${buildDirectory} ${orbitDepsDir}" />
+ </exec>
+
-@@ -316,7 +322,8 @@
+@@ -315,8 +322,10 @@
+ diff -N templates/package-build/symlink-deps.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ templates/package-build/symlink-deps.sh 1 Jan 1970 00:00:00 -0000
- @@ -0,0 +1,21 @@
+-@@ -0,0 +1,21 @@
-+#!/bin/sh -x
++@@ -0,0 +1,27 @@
++#!/bin/sh
++set -x
+++set -e
+
+if [ $# -ne 2 ]; then
+ echo "usage: $0 <path to build dir> <dependencies>"
-@@ -331,9 +338,8 @@
+@@ -328,12 +337,16 @@
+ + exit 1
+ +fi
+ +
+++if [ x"$2" = x -o x"$2" = x'${orbitDepsDir}' ] ; then
+++ echo "Nothing to do [depends was: ${2}]."
+++ exit 0
+++fi
+++
+BUILDDIR=$1
+DEPENDENCIESDIR=$2
+
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list