Removed support for legacy macOS Java runtimes.

Author: LeviticusMB

binding.gyp

@@ -15,12 +15,9 @@
       ['OS=="win"', {
         'javahome%': '<!(node findJavaHome.js)'
       }],
-      ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"'  , {
+      ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
         'javahome%': '<!(node findJavaHome.js)'
       }],
-      ['OS=="mac"', {
-        'javaver%' : "<!(awk -F/ -v h=`node findJavaHome.js` 'BEGIN {n=split(h, a); print a[2]; exit}')"
-      }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" or OS=="zos"', {
         'javalibdir%': "<!(./find_java_libdir.sh <(target_arch) <(OS))"
       }],
@@ -128,40 +125,14 @@
             'xcode_settings': {
               'OTHER_CFLAGS': ['-O3'],
             },
-            'conditions': [
-              ['javaver=="Library"',
-                {
-                  'include_dirs': [
-                    '<(javahome)/include',
-                    '<(javahome)/include/darwin'
-                  ],
-                  'libraries': [
-                    '-L<(javalibdir)',
-                    '-Wl,-rpath,<(javalibdir)',
-                    '-ljli'
-                  ],
-                },
-              ],
-              ['javaver=="System"',
-                {
-                  'include_dirs': [
-                    '/System/Library/Frameworks/JavaVM.framework/Headers'
-                  ],
-                  'libraries': [
-                    '-framework JavaVM'
-                  ],
-                },
-              ],
-              ['javaver==""',
-                {
-                  'include_dirs': [
-                    '/System/Library/Frameworks/JavaVM.framework/Headers'
-                  ],
-                  'libraries': [
-                    '-framework JavaVM'
-                  ],
-                },
-              ],
+            'include_dirs': [
+              '<(javahome)/include',
+              '<(javahome)/include/darwin'
+            ],
+            'libraries': [
+              '-L<(javalibdir)',
+              '-Wl,-rpath,<(javalibdir)',
+              '-ljli'
             ],
           },
         ],

compile-java-code.sh

@@ -2,20 +2,7 @@
 
 JAVA_VERSION=1.7
 
-if [ -x /usr/libexec/java_home ]; then
-  # On MacOS we can do this to choose the Java 1.7 JDK
-  # and then let the JDK default -source and -target to 1.7
-  JAVA_HOME=$(/usr/libexec/java_home -v ${JAVA_VERSION})
-
-  cd test
-  ${JAVA_HOME}/bin/javac *.java
-
-  cd ../src-java/node
-  ${JAVA_HOME}/bin/javac *.java
-
-  cd ../../
-  ${JAVA_HOME}/bin/javah -classpath src-java -d ./src node.NodeDynamicProxyClass
-elif [ -n "$1" ]; then
+if [ -n "$1" ]; then
   JAVA_HOME=$1
   JAVAC_OPTS="-source ${JAVA_VERSION} -target ${JAVA_VERSION} -bootclasspath ${JAVA_HOME}/jre/lib/rt.jar"