[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. d107f251312b0d2f101a332ed0ef6b0ee5a19ff8

Benjamin Drung bdrung-guest at alioth.debian.org
Tue Feb 16 15:30:43 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  d107f251312b0d2f101a332ed0ef6b0ee5a19ff8 (commit)
      from  b4d63f00f72cf29673203fa915d52d461c4df584 (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 d107f251312b0d2f101a332ed0ef6b0ee5a19ff8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Feb 16 16:30:22 2010 +0100

    Update symlink-system-jars

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

Summary of changes:
 debian/patches/system-jars.patch |   47 ++++++++++++++++++++++---------------
 symlink-system-jars              |   27 ++++++++++++---------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index e2ba2aa..af96cb2 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -4,8 +4,10 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=280688
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/453036
 Applied-Upstream: no
 
---- eclipse-3.5.1+repack.orig/build.xml
-+++ eclipse-3.5.1+repack/build.xml
+Index: eclipse-3.5.1+repack/build.xml
+===================================================================
+--- eclipse-3.5.1+repack.orig/build.xml	2010-02-16 16:26:45.670204067 +0100
++++ eclipse-3.5.1+repack/build.xml	2010-02-16 16:26:48.220203761 +0100
 @@ -30,6 +30,7 @@
  	<uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
  	<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
@@ -58,9 +60,11 @@ Applied-Upstream: no
  		<echo file="provision.sdk-stamp" />
  	</target>
  
---- /dev/null
-+++ eclipse-3.5.1+repack/symlink-system-jars
-@@ -0,0 +1,98 @@
+Index: eclipse-3.5.1+repack/symlink-system-jars
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ eclipse-3.5.1+repack/symlink-system-jars	2010-02-16 16:28:12.440203433 +0100
+@@ -0,0 +1,101 @@
 +#!/bin/sh
 +set -e
 +
@@ -81,7 +85,7 @@ Applied-Upstream: no
 +		;;
 +	v)	VERBOSE=1
 +		;;
-+	\?)	echo "Unknown pption \"-$OPTARG\"." >&2
++	\?)	echo "Unknown option \"-$OPTARG\"." >&2
 +		exit $EXIT_ERROR
 +		;;
 +	:)	echo "Option \"-$OPTARG\" requires an argument." >&2
@@ -110,26 +114,29 @@ Applied-Upstream: no
 +			echo "I: column2: $COLUMN2"
 +		fi
 +
++		# search for existing jar file or files listed in the removed-jar file
++		EXISTING_JAR=$(ls -1 $COLUMN1 2> /dev/null || true)
++		GREP_PATTERN=$(echo "$COLUMN1" | sed "s/*/\.*/")
++		REMOVED_JAR=$(cat removed-jars | grep "${GREP_PATTERN}" || true)
++		ECLIPSE_JAR=$(echo "$EXISTING_JAR\n$REMOVED_JAR" | sort -u | sed '/^$/d')
++
 +		# sanity check if the to-be-replaced jar exits
-+		if ls $COLUMN1 > /dev/null 2>&1; then
-+			ECLIPSE_JAR=$(ls -1 $COLUMN1)
-+			if test ! -f "$ECLIPSE_JAR"; then
++		if test -n "$ECLIPSE_JAR"; then
++			if test $(echo "$ECLIPSE_JAR" | wc -l) -gt 1; then
 +				echo "E: $COLUMN1 is ambiguous. Found following jar files:" > /dev/stdout
 +				echo "$ECLIPSE_JAR" > /dev/stdout
 +				exit 1
 +			fi
-+			if test "xdelete" = "x$COLUMN2" ; then
-+				if test -n "$VERBOSE"; then
-+					echo "I: rm $ECLIPSE_JAR"
-+				fi
-+				rm "$ECLIPSE_JAR"
-+				continue
-+			fi
 +
 +			# search for system jars
 +			SYSTEM_JAR=$(ls -1 $(echo "$COLUMN2" | sed "s/,/ /g") 2> /dev/null || true)
 +			if test -z "$SYSTEM_JAR"; then
-+				echo "W: No system jar file found for $ECLIPSE_JAR."
++				if test -f $ECLIPSE_JAR; then
++					echo "W: No system jar file found for $ECLIPSE_JAR."
++				else
++					echo "E: No system jar file found for $ECLIPSE_JAR."
++					exit 4
++				fi
 +			else
 +				if test ! -f "$SYSTEM_JAR"; then
 +					echo "E: $COLUMN2 is ambiguous. Found following system jar files:" > /dev/stdout
@@ -159,8 +166,10 @@ Applied-Upstream: no
 +if test ! -z "$JARS"; then
 +	echo "W: These jars should be deleted and symlinked to system jars:\n$JARS"
 +fi
---- /dev/null
-+++ eclipse-3.5.1+repack/system-jars.csv
+Index: eclipse-3.5.1+repack/system-jars.csv
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ eclipse-3.5.1+repack/system-jars.csv	2010-02-16 16:26:48.220203761 +0100
 @@ -0,0 +1,47 @@
 +plugins/org.apache.ant_*/bin/ant;/usr/share/ant/bin/ant
 +plugins/org.apache.ant_*/bin/antRun;/usr/share/ant/bin/antRun
diff --git a/symlink-system-jars b/symlink-system-jars
index 083a3a8..a2050fb 100755
--- a/symlink-system-jars
+++ b/symlink-system-jars
@@ -18,7 +18,7 @@ while getopts 'c:if:v' OPTION; do
 		;;
 	v)	VERBOSE=1
 		;;
-	\?)	echo "Unknown pption \"-$OPTARG\"." >&2
+	\?)	echo "Unknown option \"-$OPTARG\"." >&2
 		exit $EXIT_ERROR
 		;;
 	:)	echo "Option \"-$OPTARG\" requires an argument." >&2
@@ -47,26 +47,29 @@ for line in $CSV_FILE_CONTENT; do
 			echo "I: column2: $COLUMN2"
 		fi
 
+		# search for existing jar file or files listed in the removed-jar file
+		EXISTING_JAR=$(ls -1 $COLUMN1 2> /dev/null || true)
+		GREP_PATTERN=$(echo "$COLUMN1" | sed "s/*/\.*/")
+		REMOVED_JAR=$(cat removed-jars | grep "${GREP_PATTERN}" || true)
+		ECLIPSE_JAR=$(echo "$EXISTING_JAR\n$REMOVED_JAR" | sort -u | sed '/^$/d')
+
 		# sanity check if the to-be-replaced jar exits
-		if ls $COLUMN1 > /dev/null 2>&1; then
-			ECLIPSE_JAR=$(ls -1 $COLUMN1)
-			if test ! -f "$ECLIPSE_JAR"; then
+		if test -n "$ECLIPSE_JAR"; then
+			if test $(echo "$ECLIPSE_JAR" | wc -l) -gt 1; then
 				echo "E: $COLUMN1 is ambiguous. Found following jar files:" > /dev/stdout
 				echo "$ECLIPSE_JAR" > /dev/stdout
 				exit 1
 			fi
-			if test "xdelete" = "x$COLUMN2" ; then
-				if test -n "$VERBOSE"; then
-					echo "I: rm $ECLIPSE_JAR"
-				fi
-				rm "$ECLIPSE_JAR"
-				continue
-			fi
 
 			# search for system jars
 			SYSTEM_JAR=$(ls -1 $(echo "$COLUMN2" | sed "s/,/ /g") 2> /dev/null || true)
 			if test -z "$SYSTEM_JAR"; then
-				echo "W: No system jar file found for $ECLIPSE_JAR."
+				if test -f $ECLIPSE_JAR; then
+					echo "W: No system jar file found for $ECLIPSE_JAR."
+				else
+					echo "E: No system jar file found for $ECLIPSE_JAR."
+					exit 4
+				fi
 			else
 				if test ! -f "$SYSTEM_JAR"; then
 					echo "E: $COLUMN2 is ambiguous. Found following system jar files:" > /dev/stdout


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

More information about the pkg-java-commits mailing list