summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ruzicka2010-09-28 21:38:49 (EDT)
committerMichal Ruzicka2010-09-28 21:38:49 (EDT)
commitf726a47bef7c3e545137fd6a0d100a333df77b27 (patch)
tree6db76c7a23a14274ee56cbd2f5bd769cdae43eb3
parent407ce0be13aee5f9981e6b5d3d9495d7dd65c902 (diff)
downloadcdo-f726a47bef7c3e545137fd6a0d100a333df77b27.zip
cdo-f726a47bef7c3e545137fd6a0d100a333df77b27.tar.gz
cdo-f726a47bef7c3e545137fd6a0d100a333df77b27.tar.bz2
mask http(s)_proxy environment variables when invoking Buckminster, to prevent CVS code from using them
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.xml7
1 files changed, 2 insertions, 5 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index e91e261..a4df146 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.xml
+++ b/releng/org.eclipse.emf.cdo.releng/build.xml
@@ -85,10 +85,8 @@
<!-- Launch the eclipse application -->
<java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}" failonerror="true">
- <syspropertyset>
- <!--propertyref prefix="http." /-->
- <!--propertyref prefix="https." /-->
- </syspropertyset>
+ <env key="http_proxy" value="" />
+ <env key="https_proxy" value="" />
<properties />
<!-- Uncomment to debug <jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/> -->
<args />
@@ -212,7 +210,6 @@
<target name="provision" depends="init.checks,init.workspace,install.buckminster,init.build.properties">
<echo message="Importing projects into workspace ${workspace} and binaries into target platform ${targetPlatformPath}" />
- <echoproperties />
<buckminster command="setpref">
<cmdargs>
<arg value="targetPlatformPath=${targetPlatformPath}" />