[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 1a65f4d0a3b5a5af2db0862c718fa313e0893f77
Benjamin Drung
bdrung-guest at alioth.debian.org
Wed Feb 24 15:31:26 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, upstream has been updated
via 1a65f4d0a3b5a5af2db0862c718fa313e0893f77 (commit)
from 97be7b079f8a6bedefe379c07b5a81038d9d68b5 (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 1a65f4d0a3b5a5af2db0862c718fa313e0893f77
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Feb 24 16:30:34 2010 +0100
Import eclipse-build R3.5.2 branch (revision 24254).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 27 ++++++++++-
build.sh | 4 +-
build.xml | 9 ++--
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 ++
9 files changed, 79 insertions(+), 102 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 d5a384b..416d89a 100644
--- a/build.xml
+++ b/build.xml
@@ -161,18 +161,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" />
@@ -252,6 +250,7 @@
<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" />
<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/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 1011199..85cbd51 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 $?
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list