diff options
-rw-r--r-- | releng/org.eclipse.emf.cdo.releng/build.xml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/build.xml b/releng/org.eclipse.emf.cdo.releng/build.xml index d7663c4577..09ac05e334 100644 --- a/releng/org.eclipse.emf.cdo.releng/build.xml +++ b/releng/org.eclipse.emf.cdo.releng/build.xml @@ -65,6 +65,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 +85,11 @@ <!-- Launch the eclipse application --> <java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}" failonerror="true"> + <syspropertyset> + <propertyref prefix="http." /> + <propertyref prefix="https." /> + </syspropertyset> + <properties /> <!-- Uncomment to debug <jvmarg value="-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=y"/> --> <args /> </java> @@ -93,17 +99,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 name="bugfix.288796" value="true" /> + <sysproperties /> + </properties> <args> - <!-- - <jvmarg value="-Dorg.eclipse.update.core.proxy.host=${http.proxyHost}" /> - <jvmarg value="-Dorg.eclipse.update.core.proxy.port=${http.proxyPort}" /> - <jvmarg value="-Dorg.eclipse.update.core.proxy.enable" /> - --> - <jvmarg value="-Dbugfix.288796=true" /> <jvmarg value="-Xmx4096m" /> <arg value="-data" /> <arg value="@{workspace}" /> |