summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ruzicka2010-09-28 22:22:57 (EDT)
committerMichal Ruzicka2010-09-28 22:22:57 (EDT)
commit364e2c2f7e3466c5472561e58a1a4970524b4375 (patch)
treef2e2d8dcad2f9e6a5e8574ef29354d0f554d1cf4
parentf726a47bef7c3e545137fd6a0d100a333df77b27 (diff)
downloadcdo-364e2c2f7e3466c5472561e58a1a4970524b4375.zip
cdo-364e2c2f7e3466c5472561e58a1a4970524b4375.tar.gz
cdo-364e2c2f7e3466c5472561e58a1a4970524b4375.tar.bz2
add dev.eclipse.org to no_proxy environment variable to prevent accessing it through a proxy
-rw-r--r--releng/org.eclipse.emf.cdo.releng/build.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml
index a4df146..0013cc4 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" />
@@ -85,8 +89,7 @@
<!-- Launch the eclipse application -->
<java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}" failonerror="true">
- <env key="http_proxy" value="" />
- <env key="https_proxy" value="" />
+ <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 />