summaryrefslogtreecommitdiffstats
path: root/jenkins-server-slave-setup
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-07-13 16:45:30 +0200
committerSven Gothel <[email protected]>2015-07-13 16:45:30 +0200
commit2202cac5456689aafdd607632de4a4e831c4eb7f (patch)
tree04a11cce3e14606855d8812dfc4eaa1719d2664d /jenkins-server-slave-setup
parent5b29d1aad3a976b89d27e7fb779ac0343f25735c (diff)
Use current Apple Java 6 JDK for 32bit and 64bit builds: JavaForOSX2014-001.dmg
Diffstat (limited to 'jenkins-server-slave-setup')
-rw-r--r--jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt12
1 files changed, 11 insertions, 1 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt
index 2f3acc1..1bb74fe 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt
@@ -1,3 +1,11 @@
+Current Java 6 for OSX (10.10):
+
+Java 6 for 32bit and 64bit builds on OSX 10.10: JavaForOSX2014-001.dmg
+ <https://support.apple.com/kb/DL1572?locale=en_US>
+
+Obsolete:
+===========
+
java6 for 32bit builds: java_for_os_x_2013005_dp__11m4609.dmg
See <https://jogamp.org/bugzilla/show_bug.cgi?id=1050#c8>:
@@ -7,8 +15,10 @@ the Java6 default location was broken.
I had to fix this manually:
-cd /System/Library/Frameworks/JavaVM.framework/
+cd /System/Library/Frameworks/JavaVM.framework/Versions
rm -f CurrentJDK ; ln -s /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents CurrentJDK
+
+cd /System/Library/Frameworks/JavaVM.framework
rm -f Home ; ln -s /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Home .
rm -f Headers ; ln -s /Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home/include Headers