[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 198f0c0cdb83cf296ab20f0c19caf0d26bc4344e
Benjamin Drung
bdrung-guest at alioth.debian.org
Thu Nov 19 20:13:43 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 198f0c0cdb83cf296ab20f0c19caf0d26bc4344e (commit)
from 83e2701ac62f612eeb7f10ee02f8bb56a34e5a81 (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 198f0c0cdb83cf296ab20f0c19caf0d26bc4344e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Thu Nov 19 21:13:09 2009 +0100
Symlink system jar files.
-----------------------------------------------------------------------
Summary of changes:
build.xml | 15 ++++++++++-
debian/control | 16 ++++++++++-
debian/patches/series | 1 +
symlink-system-jars | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
system-jars.csv | 41 ++++++++++++++++++++++++++++
5 files changed, 140 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 0a574a4..16c8b9d 100644
--- a/build.xml
+++ b/build.xml
@@ -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" />
<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
+ <uptodate property="symlinkSystemJARs.complete" srcfile="patch-stamp" targetfile="symlink-stamp" />
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
@@ -265,13 +266,22 @@
<echo file="patch-stamp" />
</target>
+ <target name="symlinkSystemJARs" depends="applyPatches" unless="symlinkSystemJARs.complete">
+ <!-- symlink system jars -->
+ <chmod perm="+x" file="symlink-system-jars" />
+ <exec executable="./symlink-system-jars" failonerror="true">
+ <arg line="${buildDirectory}" />
+ </exec>
+ <echo file="symlink-stamp" />
+ </target>
+
<target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete">
<patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" />
<patch patchfile="${basedir}/patches/tests-nostyletask.patch" dir="${testsBuildDirectory}" strip="0" />
<echo file="testspatch-stamp" />
</target>
- <target name="build" depends="applyPatches,bootstrap,compilelibs" unless="build.complete">
+ <target name="build" depends="symlinkSystemJARs,bootstrap,compilelibs" unless="build.complete">
<echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
<classpath>
@@ -573,6 +583,9 @@
<filename name="org.eclipse.*.jar" />
</fileset>
</copy>
+ <exec executable="./symlink-system-jars" failonerror="true">
+ <arg line="${buildDirectory}/installation" />
+ </exec>
<echo file="provision.sdk-stamp" />
</target>
diff --git a/debian/control b/debian/control
index a4aa3e5..3d90240 100644
--- a/debian/control
+++ b/debian/control
@@ -10,19 +10,31 @@ Build-Depends: ant (>= 1.7.1),
cdbs,
debhelper (>= 7),
default-jdk,
+ junit,
junit4,
libatk1.0-dev,
libcairo2-dev,
+ libcommons-codec-java,
+ libcommons-el-java,
+ libcommons-httpclient-java,
+ libcommons-logging-java,
libgl1-mesa-dev | libgl-dev,
libglu1-mesa-dev | libglu-dev,
- libgnomeui-dev,
libgnome-vfsmm-2.6-dev,
+ libgnomeui-dev,
libgtk2.0-dev,
+ libhamcrest-java,
+ libjetty6-java,
+ libjsch-java,
+ liblucene2-java,
libpango1.0-dev,
- libxtst-dev,
+ libservlet2.4-java,
+ libservlet2.5-java,
libxt-dev,
+ libxtst-dev,
lsb-release,
pkg-config,
+ sat4j,
unzip,
xulrunner-dev (>= 1.9.1),
zip
diff --git a/debian/patches/series b/debian/patches/series
index 23f2b43..3dc3e18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix-perm.patch
remove-eclipse-version.patch
move-config-file-to-etc.patch
fix-directory-in-eclipse-ini.patch
+debian-changes-3.5.1+repack-1
diff --git a/symlink-system-jars b/symlink-system-jars
new file mode 100755
index 0000000..b5c6f69
--- /dev/null
+++ b/symlink-system-jars
@@ -0,0 +1,70 @@
+#!/bin/sh
+set -e
+
+# File format for system-jars.csv:
+# The column are separated with semicolons. Here is a description of each column:
+# 1. The to-be-replaced jar file in the eclipse source directory
+# 2. Comma separated list of locations, where the system jar files can be found
+
+CVS_FILE=$(dirname $0)/system-jars.csv
+if test -n "$2"; then
+ CVS_FILE="$2"
+fi
+CVS_FILE_CONTENT=$(cat $CVS_FILE)
+
+if test -n "$1"; then
+ cd "$1"
+fi
+
+# Remove signatures for JARs
+find \( -iname '*.sf' -o -iname '*.rsa' \) -delete
+
+for line in $CVS_FILE_CONTENT; do
+ if test "$(echo $line | cut -c 1)" != "#"; then
+ COLUMN1=$(echo $line | sed "s/;/\n/g" | sed -n "1p")
+ COLUMN2=$(echo $line | sed "s/;/\n/g" | sed -n "2p")
+
+ if test -n "$VERBOSE"; then
+ echo "I: line: $line"
+ echo "I: column1: $COLUMN1"
+ echo "I: column2: $COLUMN2"
+ fi
+
+ # 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
+ echo "E: $COLUMN1 is ambiguous. Found following jar files:" > /dev/stdout
+ echo "$ECLIPSE_JAR" > /dev/stdout
+ exit 1
+ fi
+ else
+ echo "E: No matching jar file for $COLUMN1 found." > /dev/stdout
+ exit 2
+ 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."
+ else
+ if test ! -f "$SYSTEM_JAR"; then
+ echo "E: $COLUMN2 is ambiguous. Found following system jar files:" > /dev/stdout
+ echo "$SYSTEM_JAR" > /dev/stdout
+ exit 3
+ fi
+
+ if test -n "$VERBOSE"; then
+ echo "I: ln -sf $SYSTEM_JAR $ECLIPSE_JAR"
+ fi
+ # link to system jar file
+ ln -sf $SYSTEM_JAR $ECLIPSE_JAR
+ fi
+ fi
+done
+
+# Make sure there are no jars left
+JARS=$(find * -iname '*.jar' -type f | sort)
+if test ! -z "$JARS"; then
+ echo "W: These jars should be deleted and symlinked to system jars:\n$JARS"
+fi
diff --git a/system-jars.csv b/system-jars.csv
new file mode 100644
index 0000000..b6aeb13
--- /dev/null
+++ b/system-jars.csv
@@ -0,0 +1,41 @@
+plugins/org.apache.ant_*/lib/ant-antlr.jar;/usr/share/java/ant-antlr.jar,uieiuo,uiao
+plugins/org.apache.ant_*/lib/ant-apache-bcel.jar;/usr/share/java/ant-apache-bcel.jar
+plugins/org.apache.ant_*/lib/ant-apache-bsf.jar;/usr/share/java/ant-apache-bsf.jar
+plugins/org.apache.ant_*/lib/ant-apache-log4j.jar;/usr/share/java/ant-apache-log4j.jar
+plugins/org.apache.ant_*/lib/ant-apache-oro.jar;/usr/share/java/ant-apache-oro.jar
+plugins/org.apache.ant_*/lib/ant-apache-regexp.jar;/usr/share/java/ant-apache-regexp.jar
+plugins/org.apache.ant_*/lib/ant-apache-resolver.jar;/usr/share/java/ant-apache-resolver.jar
+plugins/org.apache.ant_*/lib/ant-commons-logging.jar;/usr/share/java/ant-commons-logging.jar
+plugins/org.apache.ant_*/lib/ant-commons-net.jar;/usr/share/java/ant-commons-net.jar
+plugins/org.apache.ant_*/lib/ant-jai.jar;/usr/share/java/ant-jai.jar
+plugins/org.apache.ant_*/lib/ant-javamail.jar;/usr/share/java/ant-javamail.jar
+plugins/org.apache.ant_*/lib/ant-jdepend.jar;/usr/share/java/ant-jdepend.jar
+plugins/org.apache.ant_*/lib/ant-jmf.jar;/usr/share/java/ant-jmf.jar
+plugins/org.apache.ant_*/lib/ant-jsch.jar;/usr/share/java/ant-jsch.jar
+plugins/org.apache.ant_*/lib/ant-junit.jar;/usr/share/java/ant-junit.jar
+plugins/org.apache.ant_*/lib/ant-launcher.jar;/usr/share/java/ant-launcher.jar
+plugins/org.apache.ant_*/lib/ant-netrexx.jar;/usr/share/java/ant-netrexx.jar
+plugins/org.apache.ant_*/lib/ant-nodeps.jar;/usr/share/java/ant-nodeps.jar
+plugins/org.apache.ant_*/lib/ant-starteam.jar;/usr/share/java/ant-starteam.jar
+plugins/org.apache.ant_*/lib/ant-stylebook.jar;/usr/share/java/ant-stylebook.jar
+plugins/org.apache.ant_*/lib/ant-swing.jar;/usr/share/java/ant-swing.jar
+plugins/org.apache.ant_*/lib/ant-trax.jar;/usr/share/java/ant-trax.jar
+plugins/org.apache.ant_*/lib/ant-weblogic.jar;/usr/share/java/ant-weblogic.jar
+plugins/org.apache.ant_*/lib/ant.jar;/usr/share/java/ant.jar
+#plugins/org.junit_3.*/junit.jar;/usr/share/java/junit-3.*.jar
+#plugins/com.jcraft.jsch_*.jar;/usr/share/java/jsch.jar
+#plugins/javax.servlet.jsp_*.jar;/usr/share/java/jsp-api-2.1.jar
+#plugins/javax.servlet_2.4*.jar;/usr/share/java/servlet-api-2.4.jar
+#plugins/javax.servlet_2.5*.jar;/usr/share/java/servlet-api-2.5.jar
+#plugins/org.apache.commons.codec_*.jar;/usr/share/java/commons-codec.jar
+#plugins/org.apache.commons.el_*.jar;/usr/share/java/commons-el.jar
+#plugins/org.apache.commons.httpclient_*.jar;/usr/share/java/commons-httpclient.jar
+#plugins/org.apache.commons.logging_*.jar;/usr/share/java/commons-logging.jar
+#plugins/org.apache.lucene.analysis_*.jar;/usr/share/java/lucene-analyzers.jar
+#plugins/org.apache.lucene_*.jar;/usr/share/java/lucene-core.jar
+#plugins/org.hamcrest.core_*.jar;/usr/share/java/hamcrest-core.jar
+#plugins/org.junit4/junit.jar;/usr/share/java/junit4.jar
+#plugins/org.mortbay.jetty.server_*.jar;/usr/share/java/jetty6.jar
+#plugins/org.mortbay.jetty.util_*.jar;/usr/share/java/jetty6-util.jar
+#plugins/org.sat4j.core_*.jar;/usr/share/sat4j/org.sat4j.core.jar
+#plugins/org.sat4j.pb_*.jar;/usr/share/sat4j/org.sat4j.pb.jar
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list