[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. eclipse-ppa/maverick-55-ge1df0a8

[Niels Thykier]

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  e1df0a89e48fbb0d07de9310d90c2a19714ec537 (commit)
      from  5a8fe5da292712b4b1a1a55171c04d78bc71b271 (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 e1df0a89e48fbb0d07de9310d90c2a19714ec537
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Aug 20 12:49:48 2010 +0200

    Added patch for pde-build to make it stop writing to ~/workspace,
    which is not acceptable during autobuilds.
    
    Closes: 592526

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

Summary of changes:
 debian/changelog                        |    8 +++-
 debian/patches/pdebuild-workspace.patch |   70 +++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 pdebuild/eclipse-pdebuild.sh            |   18 +++++---
 4 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 100ca46..ce3670a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 eclipse (3.5.2-6) UNRELEASED; urgency=low
 
-  * fixed libjetty-java and sat4j build/regular dependency versioning #591140
+  [ Adnan Hodzic ]
+  * Fixed libjetty-java and sat4j build/regular dependency versioning
+    (see #591140)
+
+  [ Niels Thykier ]
+  * Added patch for pde-build to make it stop writing to ~/workspace,
+    which is not acceptable during autobuilds. (Closes: #592526)
 
  -- Adnan Hodzic <adnan at foolcontrol.org>  Wed, 18 Aug 2010 21:46:36 +0200
 
diff --git a/debian/patches/pdebuild-workspace.patch b/debian/patches/pdebuild-workspace.patch
new file mode 100644
index 0000000..ecdc446
--- /dev/null
+++ b/debian/patches/pdebuild-workspace.patch
@@ -0,0 +1,70 @@
+Description: Make pde-build use the -data argument so it does not write
+ to ~/workspace during auto-builds.
+Fowarded: yes
+Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=322271
+Bug-Debian: http://bugs.debian.org/592526
+Author: Niels Thykier <niels at thykier.net>
+
+diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
+index bf9f039..0d528c3 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=/usr/lib
+ pdeBuildDir=$datadir/eclipse/plugins/org.eclipse.pde.build_ at 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
+@@ -265,7 +271,10 @@ echo "Starting build:"
+ 
+ if [ $testing != true ]; then
+   java -cp $SDK/startup.jar \
++    -Duser.home=$homeDir \
++    $vmArgs \
+     org.eclipse.core.launcher.Main \
++    -data $workspaceDir \
+     -application org.eclipse.ant.core.antRunner \
+     $debugPlatformArgs \
+     -Dtype=feature \
+@@ -278,14 +287,14 @@ if [ $testing != true ]; then
+     -Dtesting="$testing" \
+     $additionalArgs \
+     -f $pdeBuildDir/scripts/build.xml \
+-    -vmargs \
+-    -Duser.home=$homeDir \
+-    $vmArgs
+ 
+ else
+   echo "\
+   java -cp $SDK/startup.jar \
++    -Duser.home=$homeDir \
++    $vmArgs \
+     org.eclipse.core.launcher.Main \
++    -data $workspaceDir \
+     -application org.eclipse.ant.core.antRunner \
+     $debugPlatformArgs \
+     -Dtype=feature \
+@@ -298,9 +307,6 @@ else
+     -Dtesting="$testing" \
+     $additionalArgs \
+     -f $pdeBuildDir/scripts/build.xml \
+-    -vmargs \
+-    -Duser.home=$homeDir \
+-    $vmArgs
+   "
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6611889..7a10dc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ fix-bashism.patch
 build-arch.patch
 sat4j-version.patch
 add-o.e.equinox.concurrent.patch
+pdebuild-workspace.patch
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index bf9f039..0d528c3 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=/usr/lib
 pdeBuildDir=$datadir/eclipse/plugins/org.eclipse.pde.build_ at 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
@@ -265,7 +271,10 @@ echo "Starting build:"
 
 if [ $testing != true ]; then
   java -cp $SDK/startup.jar \
+    -Duser.home=$homeDir \
+    $vmArgs \
     org.eclipse.core.launcher.Main \
+    -data $workspaceDir \
     -application org.eclipse.ant.core.antRunner \
     $debugPlatformArgs \
     -Dtype=feature \
@@ -278,14 +287,14 @@ if [ $testing != true ]; then
     -Dtesting="$testing" \
     $additionalArgs \
     -f $pdeBuildDir/scripts/build.xml \
-    -vmargs \
-    -Duser.home=$homeDir \
-    $vmArgs
 
 else
   echo "\
   java -cp $SDK/startup.jar \
+    -Duser.home=$homeDir \
+    $vmArgs \
     org.eclipse.core.launcher.Main \
+    -data $workspaceDir \
     -application org.eclipse.ant.core.antRunner \
     $debugPlatformArgs \
     -Dtype=feature \
@@ -298,9 +307,6 @@ else
     -Dtesting="$testing" \
     $additionalArgs \
     -f $pdeBuildDir/scripts/build.xml \
-    -vmargs \
-    -Duser.home=$homeDir \
-    $vmArgs
   "
 fi
 


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