diff options
| author | Silenio Quarti | 2012-04-26 14:54:32 +0000 |
|---|---|---|
| committer | Silenio Quarti | 2012-04-26 14:54:32 +0000 |
| commit | 29c6960ec8553d56f9796a3e6cc54a1b04324ae0 (patch) | |
| tree | ed55579c82b0196dfc31a9496716431dfc7b4d97 /bundles | |
| parent | a6568f5db9fc6011c02f6ee6a4b28bb359e3d9ea (diff) | |
| download | rt.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 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/gtk/build.sh | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/motif/build.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh index 9608803de..894ce4a1f 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 87241b886..0aa148406 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" |