[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 534e0e67d383a80a8d57d28da30152ebbe26d56d
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Feb 24 15:38:56 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 534e0e67d383a80a8d57d28da30152ebbe26d56d (commit)
via c45c8e16a0c9dd49ffaf033a109410af763ff028 (commit)
via 1a65f4d0a3b5a5af2db0862c718fa313e0893f77 (commit)
from 64a72af62e6106c0418bda94f5bf6bb3296b472b (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 534e0e67d383a80a8d57d28da30152ebbe26d56d
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Feb 24 16:38:46 2010 +0100
Refresh patches.
commit c45c8e16a0c9dd49ffaf033a109410af763ff028
Merge: 64a72af62e6106c0418bda94f5bf6bb3296b472b 1a65f4d0a3b5a5af2db0862c718fa313e0893f77
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Feb 24 16:33:12 2010 +0100
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 27 +++++++-
build.sh | 4 +-
build.xml | 9 +--
debian/patches/codec.patch | 4 +-
debian/patches/eclipse-manpage.patch | 12 ++--
debian/patches/fix-shell-script-perm.patch | 8 +-
debian/patches/install-icu4j-bundles.patch | 6 +-
debian/patches/lucene.patch | 4 +-
debian/patches/pdebuild-path-copy-platform.patch | 10 ++--
debian/patches/pdebuild-script.patch | 6 +-
debian/patches/system-jars.patch | 12 ++--
ecf-filetransfer-build.properties | 1 -
ecf-filetransfer-feature.xml | 85 ----------------------
eclipse-build-generatedScripts.tar.bz2 | Bin 14599 -> 14409 bytes
patches/eclipse-no-jetty5.patch | 42 +++++++++++
pdebuild.xml | 9 ---
pdebuild/eclipse-pdebuild.sh | 4 +
17 files changed, 110 insertions(+), 133 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9a5e97f..1b0c1a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,29 @@
-2010-02-18 akurtakov <akurtakov at localhost.localdomain>
+2010-02-22 Andrew Overholt <overholt at redhat.com>
+
+ Bug #294557
+
+ * pdebuild/eclipse-pdebuild.sh: Maintain Eclipse's exit code (Niels
+ Thykier).
+
+2010-02-22 Alexander Kurtakov <akurtako at redhat.com>
+
+ * build.sh: Propagate the error code from ant and fix in a call to a
+ dpkg-architecture (Niels Thykier).
+
+2010-02-22 Alexander Kurtakov <akurtako at redhat.com>
+ Remove jetty5 dependency. (Niels Thykier)
+ * patches/eclipse-no-jetty5.patch: New file.
+ * build.xml: Apply no-jetty5.patch and remove jetty5 bundles.
+ * eclipse-build-generatedScripts.tar.bz2: Regenerated.
+ * pdebuild.xml: Don't build o.e.equinox.http.jetty_1.1.100.
+
+2010-02-19 Alexander Kurtakov <akurtako at redhat.com>
+
+ * ecf-filetransfer-build.properties: Removed.
+ * ecf-filetransfer-feature.xml: Removed.
+ * build.xml: Reduce the ecf section.
+
+2010-02-18 Alexander Kurtakov <akurtako at redhat.com>
* regenerateBootstrapFiles.sh: New file.(Fedora specific but let's at least keep it in the repo)
* build.xml: Don't build ecf. It's done in pdebuild now.
diff --git a/build.sh b/build.sh
index 954e21f..53808ac 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ case ${arch} in
arch=ia64 ;;
mips*)
if which dpkg-architecture >/dev/null 2>&1; then
- arch=`dpkg-architecture -q-qDEB_HOST_ARCH`
+ arch=`dpkg-architecture -qDEB_HOST_ARCH`
fi ;;
parisc*)
arch=PA_RISC ;;
@@ -39,4 +39,6 @@ esac
DATE=`date +%Y%m%d%H%M%S`
ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log
+EXIT_CODE=$?
echo "Build log is available in build_${DATE}.log"
+exit $?
diff --git a/build.xml b/build.xml
index bebe2e7..113c1d3 100644
--- a/build.xml
+++ b/build.xml
@@ -162,18 +162,16 @@
<!-- add additional archs -->
<untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src/plugins" src="${basedir}/eclipse-build-additionalArchs.tar.bz2" />
<!-- prepare ecf build tree -->
- <mkdir dir="${buildDirectory}/ecf-src/plugins" />
- <delete >
+ <delete>
<fileset dir="${buildDirectory}/plugins" includes="org.eclipse.ecf*" />
+ <fileset dir="${buildDirectory}/plugins" includes="org.mortbay.jetty_5*" />
</delete>
+ <delete dir="${buildDirectory}/plugins/org.eclipse.equinox.http.jetty_1.1.100" />
<move todir="${buildDirectory}/plugins">
<fileset dir="${buildDirectory}/ecf-src">
<filename name="org.eclipse*/**" />
</fileset>
</move>
- <mkdir dir="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature" />
- <copy tofile="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature/feature.xml" file="ecf-filetransfer-feature.xml" />
- <copy tofile="${buildDirectory}/ecf-src/features/org.eclipse.ecf.filetransfer-feature/build.properties" file="ecf-filetransfer-build.properties" />
<!-- Create a stamp file -->
<echo file="unpack-stamp" />
@@ -254,6 +252,7 @@
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
diff --git a/debian/patches/codec.patch b/debian/patches/codec.patch
index 89fdfd4..7e7d4a6 100644
--- a/debian/patches/codec.patch
+++ b/debian/patches/codec.patch
@@ -5,8 +5,8 @@ Applied-Upstream: no
Index: debian.git/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml
===================================================================
---- debian.git.orig/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-02-18 22:32:06.418418000 +0100
-+++ debian.git/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-02-18 22:35:46.028418085 +0100
+--- debian.git.orig/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-02-24 16:33:29.035338554 +0100
++++ debian.git/eclipse/features/org.eclipse.equinox.p2.user.ui/feature.xml 2010-02-24 16:33:45.885338990 +0100
@@ -305,7 +305,7 @@
id="org.apache.commons.codec"
download-size="0"
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 4ae6a4a..8990c66 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -3,10 +3,10 @@ Author: Pablo Duboue <pablo.duboue at gmail.com>
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=30107
Bug-Ubuntu: https://launchpad.net/bugs/494065
-Index: eclipse/eclipse.1.xml
+Index: debian.git/eclipse.1.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ eclipse/eclipse.1.xml 2010-02-22 20:42:56.465663355 +0100
++++ debian.git/eclipse.1.xml 2010-02-24 16:33:57.404088906 +0100
@@ -0,0 +1,616 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
@@ -624,11 +624,11 @@ Index: eclipse/eclipse.1.xml
+
+</refsect1>
+</refentry>
-Index: eclipse/build.xml
+Index: debian.git/build.xml
===================================================================
---- eclipse.orig/build.xml 2010-02-22 20:42:55.262649957 +0100
-+++ eclipse/build.xml 2010-02-22 20:42:56.493666601 +0100
-@@ -764,6 +764,12 @@
+--- debian.git.orig/build.xml 2010-02-24 16:33:52.994089026 +0100
++++ debian.git/build.xml 2010-02-24 16:33:57.404088906 +0100
+@@ -763,6 +763,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
diff --git a/debian/patches/fix-shell-script-perm.patch b/debian/patches/fix-shell-script-perm.patch
index 7b2e238..dd09f93 100644
--- a/debian/patches/fix-shell-script-perm.patch
+++ b/debian/patches/fix-shell-script-perm.patch
@@ -5,13 +5,13 @@ Applied-Upstream: no
Index: debian.git/build.xml
===================================================================
---- debian.git.orig/build.xml 2010-02-18 22:32:06.418418000 +0100
-+++ debian.git/build.xml 2010-02-18 22:34:05.749668178 +0100
-@@ -251,6 +251,7 @@
+--- debian.git.orig/build.xml 2010-02-24 16:33:29.035338554 +0100
++++ debian.git/build.xml 2010-02-24 16:33:38.605339066 +0100
+@@ -249,6 +249,7 @@
<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
+ <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
- <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
diff --git a/debian/patches/install-icu4j-bundles.patch b/debian/patches/install-icu4j-bundles.patch
index a8f340f..17ec5af 100644
--- a/debian/patches/install-icu4j-bundles.patch
+++ b/debian/patches/install-icu4j-bundles.patch
@@ -4,9 +4,9 @@ Forwarded: no
Index: debian.git/build.xml
===================================================================
---- debian.git.orig/build.xml 2010-02-18 22:34:05.749668178 +0100
-+++ debian.git/build.xml 2010-02-18 22:38:12.598418040 +0100
-@@ -551,6 +551,12 @@
+--- debian.git.orig/build.xml 2010-02-24 16:33:38.605339066 +0100
++++ debian.git/build.xml 2010-02-24 16:33:50.824089013 +0100
+@@ -550,6 +550,12 @@
<include name="org.eclipse.equinox.initializer*.jar" />
</fileset>
</copy>
diff --git a/debian/patches/lucene.patch b/debian/patches/lucene.patch
index d5fa549..1367234 100644
--- a/debian/patches/lucene.patch
+++ b/debian/patches/lucene.patch
@@ -3,8 +3,8 @@ Author: Niels Thykier <niels at thykier.net>
Index: debian.git/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
===================================================================
---- debian.git.orig/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2010-02-18 22:32:06.418418000 +0100
-+++ debian.git/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2010-02-18 22:35:52.028417876 +0100
+--- debian.git.orig/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2010-02-24 16:33:29.035338554 +0100
++++ debian.git/eclipse/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF 2010-02-24 16:33:48.454089016 +0100
@@ -36,8 +36,8 @@
org.eclipse.help.search,
org.eclipse.help.server,
diff --git a/debian/patches/pdebuild-path-copy-platform.patch b/debian/patches/pdebuild-path-copy-platform.patch
index 2adf3fc..f3c98b3 100644
--- a/debian/patches/pdebuild-path-copy-platform.patch
+++ b/debian/patches/pdebuild-path-copy-platform.patch
@@ -4,11 +4,11 @@ Description: Substitute the path to copy-platform with a variable.
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 {
+Index: debian.git/pdebuild/eclipse-pdebuild.sh
+===================================================================
+--- debian.git.orig/pdebuild/eclipse-pdebuild.sh 2010-02-24 16:34:00.854089200 +0100
++++ debian.git/pdebuild/eclipse-pdebuild.sh 2010-02-24 16:34:03.234089450 +0100
+@@ -27,19 +27,19 @@
# counting as arguments to copy-platform -- overholt, 2008-03
if [ -z "$dependencies" ]; then
if [ $verbose -eq 1 ]; then
diff --git a/debian/patches/pdebuild-script.patch b/debian/patches/pdebuild-script.patch
index 0ebf158..9e68521 100644
--- a/debian/patches/pdebuild-script.patch
+++ b/debian/patches/pdebuild-script.patch
@@ -1,7 +1,7 @@
Index: debian.git/pdebuild/eclipse-pdebuild.sh
===================================================================
---- debian.git.orig/pdebuild/eclipse-pdebuild.sh 2010-02-18 22:32:06.418418000 +0100
-+++ debian.git/pdebuild/eclipse-pdebuild.sh 2010-02-18 22:41:28.208417431 +0100
+--- debian.git.orig/pdebuild/eclipse-pdebuild.sh 2010-02-24 16:33:29.015338686 +0100
++++ debian.git/pdebuild/eclipse-pdebuild.sh 2010-02-24 16:34:00.854089200 +0100
@@ -123,8 +123,8 @@
buildDir=$PWD/build
SDK=$buildDir/SDK
@@ -22,7 +22,7 @@ Index: debian.git/pdebuild/eclipse-pdebuild.sh
$orbitDeps \
-Dtesting="$testing" \
$additionalArgs \
-@@ -292,7 +292,7 @@
+@@ -293,7 +293,7 @@
-DbaseLocation=$SDK \
-DsourceDirectory=$sourceDir \
-DbuildDirectory=$buildDir \
diff --git a/debian/patches/system-jars.patch b/debian/patches/system-jars.patch
index e9d82d7..781c700 100644
--- a/debian/patches/system-jars.patch
+++ b/debian/patches/system-jars.patch
@@ -6,8 +6,8 @@ Applied-Upstream: no
Index: debian.git/build.xml
===================================================================
---- debian.git.orig/build.xml 2010-02-18 22:38:12.598418040 +0100
-+++ debian.git/build.xml 2010-02-18 22:40:23.059667028 +0100
+--- debian.git.orig/build.xml 2010-02-24 16:33:50.824089013 +0100
++++ debian.git/build.xml 2010-02-24 16:33:52.994089026 +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" />
@@ -16,7 +16,7 @@ Index: debian.git/build.xml
<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" />
-@@ -271,7 +272,24 @@
+@@ -270,7 +271,24 @@
<echo file="testspatch-stamp" />
</target>
@@ -42,7 +42,7 @@ Index: debian.git/build.xml
<echo message="build.xml: eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
<classpath>
-@@ -557,6 +575,11 @@
+@@ -556,6 +574,11 @@
<include name="com.ibm.icu.base*.jar" />
</fileset>
</copy>
@@ -57,7 +57,7 @@ Index: debian.git/build.xml
Index: debian.git/symlink-system-jars
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/symlink-system-jars 2010-02-18 22:38:47.488417247 +0100
++++ debian.git/symlink-system-jars 2010-02-24 16:33:52.994089026 +0100
@@ -0,0 +1,108 @@
+#!/bin/sh
+set -e
@@ -170,7 +170,7 @@ Index: debian.git/symlink-system-jars
Index: debian.git/system-jars.csv
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ debian.git/system-jars.csv 2010-02-18 22:38:47.488417247 +0100
++++ debian.git/system-jars.csv 2010-02-24 16:33:52.994089026 +0100
@@ -0,0 +1,48 @@
+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/ecf-filetransfer-build.properties b/ecf-filetransfer-build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/ecf-filetransfer-build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/ecf-filetransfer-feature.xml b/ecf-filetransfer-feature.xml
deleted file mode 100644
index 6cb633a..0000000
--- a/ecf-filetransfer-feature.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.ecf.filetransfer_feature"
- label="ECF filetransfer"
- version="2.0.0">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
-
- <plugin
- id="org.eclipse.equinox.concurrent"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.filetransfer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.identity"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.provider.filetransfer.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ecf.ssl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
-</feature>
diff --git a/eclipse-build-generatedScripts.tar.bz2 b/eclipse-build-generatedScripts.tar.bz2
index 63aaa28..5534238 100644
Binary files a/eclipse-build-generatedScripts.tar.bz2 and b/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/patches/eclipse-no-jetty5.patch b/patches/eclipse-no-jetty5.patch
new file mode 100644
index 0000000..3957512
--- /dev/null
+++ b/patches/eclipse-no-jetty5.patch
@@ -0,0 +1,42 @@
+diff --git a/eclipse/features/master-equinox/feature.xml b/eclipse/features/master-equinox/feature.xml
+index ff7ccf1..d89663d 100644
+--- a/features/master-equinox/feature.xml
++++ b/features/master-equinox/feature.xml
+@@ -39,14 +39,14 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-
++ <!--
+ <plugin
+ id="org.eclipse.equinox.http.jetty"
+ download-size="0"
+ install-size="0"
+ version="1.1.100.qualifier"
+ unpack="false"/>
+-
++ -->
+ <plugin
+ id="org.eclipse.equinox.http.jetty"
+ download-size="0"
+diff --git a/eclipse/features/master-jetty/feature.xml b/eclipse/features/master-jetty/feature.xml
+index a23c475..d33099e 100644
+--- a/features/master-jetty/feature.xml
++++ b/features/master-jetty/feature.xml
+@@ -17,14 +17,14 @@
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-
++<!--
+ <plugin
+ id="org.eclipse.equinox.http.jetty"
+ download-size="0"
+ install-size="0"
+ version="1.1.100.qualifier"
+ unpack="false"/>
+-
++-->
+ <plugin
+ id="org.eclipse.equinox.http.jetty"
+ download-size="0"
diff --git a/pdebuild.xml b/pdebuild.xml
index a7e759f..166f3b8 100644
--- a/pdebuild.xml
+++ b/pdebuild.xml
@@ -81,7 +81,6 @@
-->
</filelist>
<filelist id="helpDirs" dir="${sdkSource}/plugins">
- <file name="org.eclipse.equinox.http.jetty_1.1.100" />
<file name="org.eclipse.equinox.http.jetty_2.0.0" />
<file name="org.eclipse.help" />
<file name="org.eclipse.help.base" />
@@ -129,17 +128,9 @@
<fileset id="depsZips" dir="${sdkSource}/plugins" includes="**/*_*.zip" />
<target name="generateScripts">
<generateBuildScripts builddirs="depsDirs" rootdir="${sdkSource}" />
- <!-- FIXME: don't blindly use /tmp -->
- <move file="${sdkSource}/plugins/org.eclipse.equinox.http.jetty_1.1.100"
- todir="/tmp" />
<eclipse.buildScript elements="plugin at org.eclipse.equinox.http.jetty"
significantVersionDigits="2.0.0"
builddirectory="${sdkSource}" />
- <move file="/tmp/org.eclipse.equinox.http.jetty_1.1.100"
- todir="${sdkSource}/plugins" />
- <eclipse.buildScript elements="plugin at org.eclipse.equinox.http.jetty"
- significantVersionDigits="1.1.100"
- builddirectory="${sdkSource}" />
<eclipse.buildScript elements="plugin at org.eclipse.help.base"
builddirectory="${sdkSource}" />
<eclipse.buildScript elements="plugin at org.eclipse.help"
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index cb69849..56d23f9 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -283,6 +283,7 @@ if [ $testing != true ]; then
$vmArgs
else
+ echo "\
java -cp $SDK/startup.jar \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
@@ -300,4 +301,7 @@ else
-vmargs \
-Duser.home=$homeDir \
$vmArgs
+ "
fi
+
+exit $?
diff --git a/symlink-system-jars b/symlink-system-jars
old mode 100755
new mode 100644
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list