summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-07-13 13:43:09 +0200
committerSven Gothel <[email protected]>2015-07-13 13:43:09 +0200
commitad79a9b81e6539b44a957a8e9921682915748552 (patch)
treed1fd417f89e7ae18e4a05ecab850c852dd44b34e
parente06d21b3268b1fe7d673ff904c5f7eed3507b605 (diff)
OSX 10.10 Java6: Borrow JNI headers from jdk1.7.0_80, since Java6* doesn't provide them
* java_for_os_x_2013005_dp__11m4609.dmg
-rw-r--r--jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt4
1 files changed, 3 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 0946362..2f3acc1 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
@@ -8,7 +8,9 @@ the Java6 default location was broken.
I had to fix this manually:
cd /System/Library/Frameworks/JavaVM.framework/
-rm CurrentJDK ; ln -s /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents CurrentJDK
+rm -f CurrentJDK ; ln -s /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents CurrentJDK
+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
Now fix broken links: cacerts .. etc
172 cd /Library/Java/JavaVirtualMachines/1.6.0_65-b14-462.jdk/Contents/Home/lib/security/