summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ruzicka2010-09-29 06:14:45 (EDT)
committerMichal Ruzicka2010-09-29 06:14:45 (EDT)
commit37098481bf73277ba64f1520f71a644a0ce354e5 (patch)
treeea84d57b058dcef04ac23a384f6f26d41fec023e
parentf43729f2ad48ad73c08a0f0fea89af1996903b15 (diff)
downloadcdo-37098481bf73277ba64f1520f71a644a0ce354e5.zip
cdo-37098481bf73277ba64f1520f71a644a0ce354e5.tar.gz
cdo-37098481bf73277ba64f1520f71a644a0ce354e5.tar.bz2
merge proxy settings changes from HEAD
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.xml25
1 files changed, 14 insertions, 11 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index defce4c..16fbf4d 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.xml
+++ b/releng/org.eclipse.emf.cdo.releng/build.xml
@@ -52,6 +52,10 @@
<isset property="build.nightly" />
</condition>
+ <condition property="no.proxy" value="${env.no_proxy}, dev.eclipse.org" else="dev.eclipse.org">
+ <isset property="env.no_proxy" />
+ </condition>
+
<!-- Default properties intended to be overridden by entries in the above property file -->
<property name="tools" location="${build.root}/tools" />
<property name="result" location="${build.root}/result" />
@@ -65,6 +69,7 @@
that resides in the folder ${buildtools}/@app -->
<macrodef name="eclipse.launch">
<attribute name="app" />
+ <element name="properties" optional="true" />
<element name="args" optional="true" />
<sequential>
<!-- We assume that the eclipse installation is beneath ${buildtools} -->
@@ -84,6 +89,8 @@
<!-- Launch the eclipse application -->
<java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}" failonerror="true">
+ <env key="no_proxy" value="${no.proxy}" />
+ <properties />
<!-- Uncomment to debug <jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/> -->
<args />
</java>
@@ -93,12 +100,16 @@
<macrodef name="buckminster">
<attribute name="command" />
<attribute name="workspace" default="${workspace}" />
+ <element name="sysproperties" optional="true" />
<element name="globargs" optional="true" />
<element name="cmdargs" optional="true" />
<sequential>
<eclipse.launch app="buckminster">
+ <properties>
+ <sysproperty key="bugfix.288796" value="true" />
+ <sysproperties />
+ </properties>
<args>
- <jvmarg value="-Dbugfix.288796=true" />
<jvmarg value="-Xmx4096m" />
<arg value="-data" />
<arg value="@{workspace}" />
@@ -139,11 +150,7 @@
<target name="get.director" unless="director.exists">
<echo message="Fetching headless director application" />
- <tempfile destdir="${java.io.tmpdir}"
- prefix="director-"
- suffix=".zip"
- property="director.zip"
- deleteonexit="true" />
+ <tempfile destdir="${java.io.tmpdir}" prefix="director-" suffix=".zip" property="director.zip" deleteonexit="true" />
<get src="${eclipse.downloads}/${director.path}" dest="${director.zip}" />
<mkdir dir="${tools}" />
<unzip src="${director.zip}" dest="${tools}" />
@@ -185,11 +192,7 @@
<target name="init.build.properties">
<!-- Echo relevant properties to a temporary file so that Buckminster can read them -->
- <tempfile destdir="${java.io.tmpdir}"
- prefix="build-"
- suffix=".properties"
- deleteonexit="true"
- property="properties.tmp" />
+ <tempfile destdir="${java.io.tmpdir}" prefix="build-" suffix=".properties" deleteonexit="true" property="properties.tmp" />
<echo message="Properties file is: ${properties.tmp}" />
<echoproperties destfile="${properties.tmp}">
<!-- We don't want these. basedir in particular will cause problems if passed explicitly -->