aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2012-04-26 10:54:32 (EDT)
committerSilenio Quarti2012-04-26 10:54:32 (EDT)
commit29c6960ec8553d56f9796a3e6cc54a1b04324ae0 (patch)
treeed55579c82b0196dfc31a9496716431dfc7b4d97
parenta6568f5db9fc6011c02f6ee6a4b28bb359e3d9ea (diff)
downloadrt.equinox.framework-29c6960ec8553d56f9796a3e6cc54a1b04324ae0.zip
rt.equinox.framework-29c6960ec8553d56f9796a3e6cc54a1b04324ae0.tar.gz
rt.equinox.framework-29c6960ec8553d56f9796a3e6cc54a1b04324ae0.tar.bz2
custom launcher.properties is not needed anymore. Machine names are set in hudson.v20120426-1454
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/build.sh8
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/build.sh2
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml8
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/launcher.properties8
4 files changed, 16 insertions, 10 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
index 9608803..894ce4a 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
@@ -58,21 +58,24 @@ case $OS in
"x86_64")
defaultOSArch="x86_64"
defaultJava=DEFAULT_JAVA_EXEC
- [ -d /usr/java64/1.5 ] && defaultJavaHome="/usr/java64/1.5"
+ [ -d /bluebird/teamswt/swt-builddir/build/JRE/x64/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/x64/jdk1.6.0_14"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
i?86)
defaultOSArch="x86"
+ [ -d /bluebird/teamswt/swt-builddir/build/JRE/x32/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/x32/jdk1.6.0_14"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"ppc")
defaultOSArch="ppc"
defaultJava=DEFAULT_JAVA_EXEC
+ [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"ppc64")
defaultOSArch="ppc64"
defaultJava=DEFAULT_JAVA_EXEC
+ [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
"s390")
@@ -112,7 +115,6 @@ case $OS in
"SunOS")
makefile="make_solaris.mak"
defaultOS="solaris"
- [ -d /usr/jdk/jdk1.5.0_01 ] && defaultJavaHome="/usr/jdk/jdk1.5.0_01"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
#PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
@@ -123,10 +125,12 @@ case $OS in
case ${PROC} in
"i386")
defaultOSArch="x86"
+ [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14"
CC=cc
;;
"sparc")
defaultOSArch="sparc"
+ [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14"
CC=cc
;;
*)
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
index 87241b8..0aa1484 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
@@ -68,7 +68,7 @@ case $OS in
"SunOS")
# PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH
PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH
- javaHome="/usr/jdk/jdk1.5.0_01"
+ [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && javaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14"
outputRoot="../../contributed"
export PATH
makefile="make_solaris.mak"
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 1ad64c6..912e019 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 cf323f6..7e2c812 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