summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ruzicka2010-12-14 06:00:28 (EST)
committerMichal Ruzicka2010-12-14 06:00:28 (EST)
commitf2e558d0132a35b732d912d3c4b2d0ce326b7873 (patch)
treeb4342c99cff4ded88f21df728bbb548e5a832dcc
parent4fca404adf6140ea58087623c98a875206045112 (diff)
downloadcdo-f2e558d0132a35b732d912d3c4b2d0ce326b7873.zip
cdo-f2e558d0132a35b732d912d3c4b2d0ce326b7873.tar.gz
cdo-f2e558d0132a35b732d912d3c4b2d0ce326b7873.tar.bz2
pass down (to Buckminster) pack200 setting if defined
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.xml18
1 files changed, 14 insertions, 4 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index ac4b155..7e41684 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.xml
+++ b/releng/org.eclipse.emf.cdo.releng/build.xml
@@ -148,12 +148,16 @@
<target name="install.buckminster" unless="buckminster.exists" depends="get.director">
<echo message="Configuring headless buckminster with needed features" />
<eclipse.launch app="director">
- <args>
- <jvmarg value="-Declipse.p2.mirrors=false" />
+ <properties>
+ <sysproperty key="eclipse.p2.mirrors" value="false" />
<!--
- Hudson Ant property: org.eclipse.update.jarprocessor.pack200=/shared/common/ibm-java2-ppc-50/jre/bin
- <jvmarg value="-Dorg.eclipse.update.jarprocessor.pack200=${org.eclipse.update.jarprocessor.pack200}" />
+ propagate the pack200 setting if defined
+ <syspropertyset>
+ <propertyref name="org.eclipse.update.jarprocessor.pack200" />
+ </syspropertyset>
-->
+ </properties>
+ <args>
<arg value="-r" />
<arg value="${eclipse.downloads}/${bm.headless.path}" />
<arg value="-d" />
@@ -298,6 +302,12 @@
<echo message="Performing org.eclipse.emf.cdo.site#site.p2" />
<buckminster command="perform">
+ <sysproperties>
+ <!-- propagate the pack200 setting if defined -->
+ <syspropertyset>
+ <propertyref name="org.eclipse.update.jarprocessor.pack200" />
+ </syspropertyset>
+ </sysproperties>
<cmdargs>
<arg value="org.eclipse.emf.cdo.site#site.p2" />
</cmdargs>