rpms/eclipse/devel eclipse-pdebuild.sh, 1.9, 1.10 eclipse.spec, 1.602, 1.603
Andrew Overholt
overholt at fedoraproject.org
Fri Oct 17 19:49:43 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32014
Modified Files:
eclipse-pdebuild.sh eclipse.spec
Log Message:
* Fri Oct 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-4
- Fix quoting bug in pdebuild.sh again.
Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-pdebuild.sh 16 Oct 2008 19:45:23 -0000 1.9
+++ eclipse-pdebuild.sh 17 Oct 2008 19:49:13 -0000 1.10
@@ -17,7 +17,7 @@
-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 @@
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_ at 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 @@
-DsourceDirectory=$sourceDir \
-DbuildDirectory=$buildDir \
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at 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 @@
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_ at PDEBUILDVERSION@/templates/package-build \
+ $orbitDeps \
+ -Dtesting="$testing" \
+ $additionalArgs \
+ -f $pdeBuildDir/scripts/build.xml \
+ -vmargs \
+ -Duser.home=$homeDir \
+ $vmArgs
+fi
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -r1.602 -r1.603
--- eclipse.spec 17 Oct 2008 10:18:40 -0000 1.602
+++ eclipse.spec 17 Oct 2008 19:49:13 -0000 1.603
@@ -30,7 +30,7 @@
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 @@
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Fri Oct 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.1-4
+- Fix quoting bug in pdebuild.sh again.
+
* Fri Oct 16 2008 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-3
- Fix swt symlinks in %%libdir/eclipse.
More information about the fedora-extras-commits
mailing list