- Fix quoting bug in pdebuild.sh again.
This commit is contained in:
parent
056ce73cfc
commit
7cc5205fb9
@ -17,7 +17,7 @@ Optional arguments:
|
|||||||
-j VM arguments (ex. -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar)
|
-j VM arguments (ex. -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar)
|
||||||
-v Be verbose
|
-v Be verbose
|
||||||
-D Debug platform itself (passes -consolelog -debug to Eclipse)
|
-D Debug platform itself (passes -consolelog -debug to Eclipse)
|
||||||
-o Orbit dependencies
|
-o Directory containing Orbit-style dependencies
|
||||||
_EOF_
|
_EOF_
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,42 +204,14 @@ if [ $debugPlatform -eq 1 ]; then
|
|||||||
debugPlatformArgs="-debug -consolelog"
|
debugPlatformArgs="-debug -consolelog"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $testing != true ]; then
|
if [ "x$orbitDepsDir" != "x" ]; then
|
||||||
p2Generate="-Dp2.root.name=\"$featureName\" \
|
orbitDeps="-DorbitDepsDir=\"$orbitDepsDir\""
|
||||||
-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"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo
|
|
||||||
echo "Starting build:"
|
echo "Starting build:"
|
||||||
|
|
||||||
echo "
|
if [ $testing != true ]; then
|
||||||
java -cp $SDK/startup.jar \
|
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 \
|
|
||||||
org.eclipse.core.launcher.Main \
|
org.eclipse.core.launcher.Main \
|
||||||
-application org.eclipse.ant.core.antRunner \
|
-application org.eclipse.ant.core.antRunner \
|
||||||
$debugPlatformArgs \
|
$debugPlatformArgs \
|
||||||
@ -249,17 +221,21 @@ if [ $dryRun -ne 1 ]; then
|
|||||||
-DsourceDirectory=$sourceDir \
|
-DsourceDirectory=$sourceDir \
|
||||||
-DbuildDirectory=$buildDir \
|
-DbuildDirectory=$buildDir \
|
||||||
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
|
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
|
||||||
-DorbitDepsDir=$orbitDepsDir \
|
$orbitDeps \
|
||||||
-Dtesting="$testing" \
|
-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 \
|
$additionalArgs \
|
||||||
-f $pdeBuildDir/scripts/build.xml \
|
-f $pdeBuildDir/scripts/build.xml \
|
||||||
-vmargs \
|
-vmargs \
|
||||||
-Duser.home=$homeDir \
|
-Duser.home=$homeDir \
|
||||||
$vmArgs
|
$vmArgs
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $testing != true ]; then
|
|
||||||
# Add content.xml into zip
|
# Add content.xml into zip
|
||||||
pushd $buildDir/rpmBuild
|
pushd $buildDir/rpmBuild
|
||||||
unzip $featureId.zip
|
unzip $featureId.zip
|
||||||
@ -268,4 +244,22 @@ if [ $testing != true ]; then
|
|||||||
zip -r $featureId.zip eclipse
|
zip -r $featureId.zip eclipse
|
||||||
rm -rf eclipse
|
rm -rf eclipse
|
||||||
popd
|
popd
|
||||||
fi
|
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
|
||||||
|
@ -30,7 +30,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -1531,6 +1531,9 @@ fi
|
|||||||
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Oct 16 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-3
|
||||||
- Fix swt symlinks in %%libdir/eclipse.
|
- Fix swt symlinks in %%libdir/eclipse.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user