Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorSilenio Quarti2012-04-26 10:54:32 -0400
committerSilenio Quarti2012-04-26 10:54:32 -0400
commit29c6960ec8553d56f9796a3e6cc54a1b04324ae0 (patch)
treeed55579c82b0196dfc31a9496716431dfc7b4d97 /releng
parenta6568f5db9fc6011c02f6ee6a4b28bb359e3d9ea (diff)
downloadrt.equinox.framework-29c6960ec8553d56f9796a3e6cc54a1b04324ae0.tar.gz
rt.equinox.framework-29c6960ec8553d56f9796a3e6cc54a1b04324ae0.tar.xz
rt.equinox.framework-29c6960ec8553d56f9796a3e6cc54a1b04324ae0.zip
custom launcher.properties is not needed anymore. Machine names are set in hudson.v20120426-1454
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml8
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/launcher.properties8
2 files changed, 9 insertions, 7 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 1ad64c643..912e01902 100644
--- a/releng/org.eclipse.equinox.launcher.releng/build.xml
+++ b/releng/org.eclipse.equinox.launcher.releng/build.xml
@@ -91,6 +91,7 @@
<resolveProperty name="javaArg" value="j_${os}.${arch}" />
<resolveProperty name="userName" value="u_${os}.${arch}" />
<property name="userName" value="swtbuild" />
+ <property name="localGit" value="../../.." />
<!-- windows is built locally, everything else is remote -->
<condition property="local" >
@@ -156,7 +157,12 @@
<equals arg1="cocoa" arg2="${ws}" />
</condition>
<condition property="javaParam" value="" else="-java ${javaArg}" >
- <equals arg1="macosx" arg2="${os}" />
+ <or>
+ <equals arg1="macosx" arg2="${os}" />
+ <not>
+ <isset property="javaArg"/>
+ </not>
+ </or>
</condition>
<sshexec host="${machine}"
username="${userName}"
diff --git a/releng/org.eclipse.equinox.launcher.releng/launcher.properties b/releng/org.eclipse.equinox.launcher.releng/launcher.properties
index cf323f6fb..7e2c812f9 100644
--- a/releng/org.eclipse.equinox.launcher.releng/launcher.properties
+++ b/releng/org.eclipse.equinox.launcher.releng/launcher.properties
@@ -5,11 +5,7 @@
m_linux.x86_64=build.eclipse.org
#list of paths to a Java SDK on each of the machines: j_${os}.${arch}
-# value is -javaHome /path/to/jdk or -java relative/path/to/jdk
-j_linux.x86_64=-javaHome /shared/common/jdk-1.6.0_10
+j_linux.x86_64=/shared/common/jdk-1.6.0_10
#user names to use on each of the machines if different from the user running hudson, u_${os}.${arch}
-u_linux.x86_64=aniefer
-
-#location to scp the binary results to
-resultsBaseFolder=build.eclipse.org:/shared/eclipse/equinox/results \ No newline at end of file
+u_linux.x86_64=swtbuild

Back to the top