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 60d8d3157816b79916d9bb3167ac621ce641707b (commit)
from 570e68ee7f070b71c41e55cc9ac1aeeead4d65e1 (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 60d8d3157816b79916d9bb3167ac621ce641707b
Author: Niels Thykier <[email protected]>
Date: Tue Aug 9 13:40:46 2011 +0200
Fixed the regressions to the pde-build script
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +
...ass-data-to-eclipse-and-VM-args-to-the-VM.patch | 104 ++++++++++++++++++++
debian/patches/pdebuild-script.patch | 26 +-----
debian/patches/series | 1 +
debian/rules | 9 ++-
5 files changed, 122 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f6b6978..134c5ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse (3.7~exp-2) UNRELEASED; urgency=low
+
+ * Fixed the regression to pde-build script in eclipse-pde.
+
+ -- Niels Thykier <[email protected]> Tue, 09 Aug 2011 13:40:05 +0200
+
eclipse (3.7~exp-1) experimental; urgency=low
[ Andres Mejia ]
diff --git
a/debian/patches/0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
b/debian/patches/0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
new file mode 100644
index 0000000..c7e6b2e
--- /dev/null
+++
b/debian/patches/0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
@@ -0,0 +1,104 @@
+From 06176095e850e1c86b2617d7325a028875a817f8 Mon Sep 17 00:00:00 2001
+From: Niels Thykier <[email protected]>
+Date: Tue, 9 Aug 2011 12:51:24 +0200
+Subject: [PATCH] pdebuild: Pass -data to eclipse and VM args to the VM
+
+2011-08-09 Niels Thykier <[email protected]>
+
+ Bug #322271
+
+ * pdebuild/eclipse-pdebuild.sh: Pass JVM arguments directly to the VM
and
+ pass -data to avoid using the user's real workspace.
+---
+ eclipse-build/ChangeLog | 7 +++++++
+ eclipse-build/pdebuild/eclipse-pdebuild.sh | 25 +++++++++++++++----------
+ 2 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/eclipse-build/ChangeLog b/eclipse-build/ChangeLog
+index 99301c1..f0427a8 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2011-08-09 Niels Thykier <[email protected]>
++
++ Bug #322271
++
++ * pdebuild/eclipse-pdebuild.sh: Pass JVM arguments directly to the VM
and
++ pass -data to avoid using the user's real workspace.
++
+ 2011-08-05 Niels Thykier <[email protected]>
+
+ * build.xml: Re-enabled four patches for adding extra architectures to
eclipse.
+diff --git a/eclipse-build/pdebuild/eclipse-pdebuild.sh
b/eclipse-build/pdebuild/eclipse-pdebuild.sh
+index 209f03e..ea14c58 100755
+--- a/pdebuild/eclipse-pdebuild.sh
++++ b/pdebuild/eclipse-pdebuild.sh
+@@ -123,6 +123,7 @@ sourceDir=$PWD
+ buildDir=$PWD/build
+ SDK=$buildDir/SDK
+ homeDir=$buildDir/home
++workspaceDir=$homeDir/workspace
+ datadir=`rpm --eval "%{_libdir}"`
+
pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@
+
+@@ -195,6 +196,11 @@ if [ $dryRun -ne 1 ]; then
+ mkdir -p $homeDir
+ fi
+
++echo "mkdir -p $workspaceDir"
++if [ $dryRun -ne 1 ]; then
++ mkdir -p $workspaceDir
++fi
++
+ if [ -z $featureId ]; then
+ findFeatureId
+ fi
+@@ -267,7 +273,10 @@ launcherJar=$(ls $SDK/plugins | grep
"org.eclipse.equinox.launcher_")
+
+ if [ $testing != true ]; then
+ java -cp $SDK/plugins/${launcherJar} \
++ -Duser.home=$homeDir \
++ $vmArgs \
+ org.eclipse.core.launcher.Main \
++ -data $workspaceDir \
+ -application org.eclipse.ant.core.antRunner \
+ $debugPlatformArgs \
+ -Dtype=feature \
+@@ -279,15 +288,14 @@ if [ $testing != true ]; then
+ $orbitDeps \
+ -Dtesting="$testing" \
+ $additionalArgs \
+- -f $pdeBuildDir/scripts/build.xml \
+- -vmargs \
+- -Duser.home=$homeDir \
+- $vmArgs
+-
++ -f $pdeBuildDir/scripts/build.xml
+ else
+ echo "\
+ java -cp $SDK/plugins/${launcherJar} \
++ -Duser.home=$homeDir \
++ $vmArgs \
+ org.eclipse.core.launcher.Main \
++ -data $workspaceDir \
+ -application org.eclipse.ant.core.antRunner \
+ $debugPlatformArgs \
+ -Dtype=feature \
+@@ -297,12 +305,9 @@ else
+ -DbuildDirectory=$buildDir \
+
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build
\
+ $orbitDeps \
+- -Dtesting="$testing" \
++ -Dtesting=\"$testing\" \
+ $additionalArgs \
+- -f $pdeBuildDir/scripts/build.xml \
+- -vmargs \
+- -Duser.home=$homeDir \
+- $vmArgs
++ -f $pdeBuildDir/scripts/build.xml
+ "
+ fi
+
+--
+1.7.5.4
+
diff --git a/debian/patches/pdebuild-script.patch
b/debian/patches/pdebuild-script.patch
index 55c4a36..93aa59c 100644
--- a/debian/patches/pdebuild-script.patch
+++ b/debian/patches/pdebuild-script.patch
@@ -3,32 +3,12 @@ From: Niels Thykier <[email protected]>
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
-@@ -123,8 +123,8 @@
- buildDir=$PWD/build
+@@ -124,7 +124,7 @@
SDK=$buildDir/SDK
homeDir=$buildDir/home
+ workspaceDir=$homeDir/workspace
-datadir=`rpm --eval "%{_libdir}"`
--pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@
+datadir=/usr/lib
-+pdeBuildDir=$datadir/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@
+
pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@
featureId=
- dependencies=
-@@ -275,7 +275,7 @@
- -DbaseLocation=$SDK \
- -DsourceDirectory=$sourceDir \
- -DbuildDirectory=$buildDir \
--
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build
\
-+
-Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build
\
- $orbitDeps \
- -Dtesting="$testing" \
- $additionalArgs \
-@@ -295,7 +295,7 @@
- -DbaseLocation=$SDK \
- -DsourceDirectory=$sourceDir \
- -DbuildDirectory=$buildDir \
--
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build
\
-+
-Dbuilder=$datadir/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build
\
- $orbitDeps \
- -Dtesting="$testing" \
- $additionalArgs \
diff --git a/debian/patches/series b/debian/patches/series
index 098e590..9b01d49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ add-o.e.equinox.concurrent.patch
ecj-gccmain-java.patch
fix-help-contents.patch
pdebuild-path-copy-platform.patch
+0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
pdebuild-script.patch
symlink-system-files.patch
remove-unnecessary-files.patch
diff --git a/debian/rules b/debian/rules
index 5b83efd..0d9f24d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ override_dh_shlibdeps:
COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
COPY_PLATFORM_INSTALL:=debian/tmp$(COPY_PLATFORM)
PDEBUILD_INSTALL:=debian/tmp/usr/lib/eclipse/buildscripts/pde-build
-PDEBUILDVERSION = $(shell ls debian/tmp/usr/lib/eclipse/plugins | grep
org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
+PDEBUILDVERSION = $(shell ls debian/tmp/usr/lib/eclipse/dropins/sdk/plugins |
grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
override_dh_install:
# move images from /usr/lib to /usr/share
@@ -76,6 +76,13 @@ override_dh_install:
ls -d * | egrep -v
'^(plugins|features|about_files|dropins|buildscripts)$$' ; \
ls -d * plugins/* features/* ; \
) | sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $$eclipse/\1 \1,' >>
$(COPY_PLATFORM_INSTALL)
+ ( \
+ cd debian/tmp/usr/lib/eclipse; \
+ for p in $$(ls -d dropins/jdt/plugins/* dropins/sdk/plugins/*) ; do \
+ plugin=$$(basename $$p); \
+ echo $$p | sed -e"s,^\(.*\),[ ! -e plugins/$$plugin ] \&\& ln
-s \$$eclipse/\1 plugins/$$plugin,"; \
+ done \
+ ) >> $(COPY_PLATFORM_INSTALL)
sed -e "s/@PDEBUILDVERSION@/$(PDEBUILDVERSION)/g" -e
"s:@COPY_PLATFORM@:$(COPY_PLATFORM):g" < pdebuild/eclipse-pdebuild.sh >
$(PDEBUILD_INSTALL)
chmod a+x $(PDEBUILD_INSTALL)
dh_install --list-missing
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
