From 7cc5205fb919af395dcf1e9b15e997715b73b1bd Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Fri, 17 Oct 2008 19:49:13 +0000
Subject: [PATCH] - Fix quoting bug in pdebuild.sh again.

---
 eclipse-pdebuild.sh | 70 +++++++++++++++++++++------------------------
 eclipse.spec        |  5 +++-
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/eclipse-pdebuild.sh b/eclipse-pdebuild.sh
index 1a9be9f..d818d49 100755
--- a/eclipse-pdebuild.sh
+++ b/eclipse-pdebuild.sh
@@ -17,7 +17,7 @@ Optional arguments:
    -j      VM arguments (ex. -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar)
    -v      Be verbose
    -D      Debug platform itself (passes -consolelog -debug to Eclipse)
-   -o      Orbit dependencies
+   -o      Directory containing Orbit-style dependencies
 _EOF_
 }
 
@@ -204,42 +204,14 @@ if [ $debugPlatform -eq 1 ]; then
     debugPlatformArgs="-debug -consolelog"
 fi
 
-if [ $testing != true ]; then
-  p2Generate="-Dp2.root.name=\"$featureName\" \
- -Dp2.root.version=\"$featureVersion\" \
- -Dgenerate.p2.metadata=true \
- -Dp2.metadata.repo=file:$buildDir/repo \
- -Dp2.artifact.repo=file:$buildDir/repo \
- -Dp2.flavor=tooling \
- -Dp2.publish.artifacts=true"
+if [ "x$orbitDepsDir" != "x" ]; then
+    orbitDeps="-DorbitDepsDir=\"$orbitDepsDir\""
 fi
 
-echo
 echo "Starting build:"
 
-echo "
-java -cp $SDK/startup.jar \
-org.eclipse.core.launcher.Main \
--application org.eclipse.ant.core.antRunner \
-$debugPlatformArgs \
--Dtype=feature \
--Did=$featureId \
--DbaseLocation=$SDK \
--DsourceDirectory=$sourceDir \
--DbuildDirectory=$buildDir \
--Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
--DorbitDepsDir="$orbitDepsDir" \
--Dtesting="$testing" \
-$p2Generate \
-$additionalArgs \
--f $pdeBuildDir/scripts/build.xml \
--vmargs \
--Duser.home=$homeDir \
-$vmArgs
-"
-
-if [ $dryRun -ne 1 ]; then
-    java -cp $SDK/startup.jar \
+if [ $testing != true ]; then
+  java -cp $SDK/startup.jar \
     org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     $debugPlatformArgs \
@@ -249,17 +221,21 @@ if [ $dryRun -ne 1 ]; then
     -DsourceDirectory=$sourceDir \
     -DbuildDirectory=$buildDir \
     -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
-    -DorbitDepsDir=$orbitDepsDir \
+    $orbitDeps \
     -Dtesting="$testing" \
-    $p2Generate \
+    -Dp2.root.name="$featureName" \
+    -Dp2.root.version="$featureVersion" \
+    -Dgenerate.p2.metadata=true \
+    -Dp2.metadata.repo=file:$buildDir/repo \
+    -Dp2.artifact.repo=file:$buildDir/repo \
+    -Dp2.flavor=tooling \
+    -Dp2.publish.artifacts=true \
     $additionalArgs \
     -f $pdeBuildDir/scripts/build.xml \
     -vmargs \
     -Duser.home=$homeDir \
     $vmArgs
-fi
 
-if [ $testing != true ]; then
   # Add content.xml into zip
   pushd $buildDir/rpmBuild
   unzip $featureId.zip
@@ -268,4 +244,22 @@ if [ $testing != true ]; then
   zip -r $featureId.zip eclipse
   rm -rf eclipse
   popd
-fi
\ No newline at end of file
+else
+  java -cp $SDK/startup.jar \
+    org.eclipse.core.launcher.Main \
+    -application org.eclipse.ant.core.antRunner \
+    $debugPlatformArgs \
+    -Dtype=feature \
+    -Did=$featureId \
+    -DbaseLocation=$SDK \
+    -DsourceDirectory=$sourceDir \
+    -DbuildDirectory=$buildDir \
+    -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
+    $orbitDeps \
+    -Dtesting="$testing" \
+    $additionalArgs \
+    -f $pdeBuildDir/scripts/build.xml \
+    -vmargs \
+    -Duser.home=$homeDir \
+    $vmArgs
+fi
diff --git a/eclipse.spec b/eclipse.spec
index f1746d8..021559a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        3%{?dist} 
+Release:        4%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1531,6 +1531,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Oct 17 2008 Andrew Overholt <overholt@redhat.com> 3.4.1-4
+- Fix quoting bug in pdebuild.sh again.
+
 * Fri Oct 16 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-3
 - Fix swt symlinks in %%libdir/eclipse.