Adding the fix that was applied to generate the Mac OS installer for …

…Apache NetBeans 12.1
apache · Sep 10, 2020 · e9143f9 · e9143f9
1 parent 6f66a12
commit e9143f9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/nbbuild/installer/mac/newbuild/commonfiles/get_current_jdk.sh b/nbbuild/installer/mac/newbuild/commonfiles/get_current_jdk.sh
@@ -23,7 +23,7 @@ if [ -z "$jdkhome" ] ; then
 
     # read Java Preferences
     if [ -x "/usr/libexec/java_home" ]; then
-        jdkhome=`/usr/libexec/java_home --version 1.8+`
+        jdkhome=`/usr/libexec/java_home`
     fi
 
     # JRE

diff --git a/nbbuild/installer/mac/newbuild/commonfiles/postinstall/postinstall b/nbbuild/installer/mac/newbuild/commonfiles/postinstall/postinstall
@@ -32,7 +32,7 @@ jdk_home=`"$dirname"/get_current_jdk.sh`
 
 #"$dirname"/add_tc.sh "$NETBEANS_INSTALL_DIR" "$TOMCAT_INSTALL_DIR"
 
-DEFAULT_JDK_HOME=`/usr/libexec/java_home --version 1.8+`
+DEFAULT_JDK_HOME=`/usr/libexec/java_home`
 
 if [ -f "$dirname"/set_jdk_home.sh ]; then
     "$dirname"/set_jdk_home.sh "$NETBEANS_INSTALL_DIR" "$DEFAULT_JDK_HOME"

diff --git a/nbbuild/installer/mac/newbuild/dmg/distribution-nbide.dist b/nbbuild/installer/mac/newbuild/dmg/distribution-nbide.dist
@@ -62,32 +62,23 @@ function checkMemsize() {
 function checkJavaVersion() {
     var JDK_ENABLED = false;
     var result = false;
-    var java8_or_newer = false;
     var jdkFound = false;
     var jreFound = false;
     try {
         if(system.files.fileExistsAtPath('/usr/libexec/java_home')) {
-           var res = system.run("/usr/libexec/java_home", "--version", "1.8+", "--failfast");                       
-           java8_or_newer = (0 == res);
-           if(!java8_or_newer) {
-               var res = system.run("/usr/libexec/java_home", "--version", "1.5", "--failfast");                       
-               jdkFound = (0 == res);
-           }
+           var res = system.run("/usr/libexec/java_home", "--failfast");                       
+           jdkFound = (0 == res);
         }
     } catch (e) {}
 
     if(system.files.fileExistsAtPath('/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home')) {
         jreFound = true;
     }
 
-    if (java8_or_newer || JDK_ENABLED &amp;&amp; jreFound) {
+    if (jdkFound || JDK_ENABLED &amp;&amp; jreFound) {
         result = true;
     } else {
-        if (jdkFound) {
-            my.result.type = 'Fatal';
-            my.result.title = system.localizedStringWithFormat('ERR_OLDER_JAVA8_TITLE');
-            my.result.message = system.localizedStringWithFormat('ERR_OLDER_JAVA8_TITLE');
-        } else if (jreFound) {
+        if (jreFound) {
             my.result.type = 'Fatal';
             my.result.title = system.localizedStringWithFormat('ERR_NO_JDK_TITLE');
             my.result.message = system.localizedStringWithFormat('ERR_NO_JDK_MSG');            

diff --git a/nbbuild/installer/mac/newbuild/dmg/distribution.dist b/nbbuild/installer/mac/newbuild/dmg/distribution.dist
@@ -62,32 +62,23 @@ function checkMemsize() {
 function checkJavaVersion() {
     var JDK_ENABLED = false;
     var result = false;
-    var java8_or_newer = false;
     var jdkFound = false;
     var jreFound = false;
     try {
         if(system.files.fileExistsAtPath('/usr/libexec/java_home')) {
-           var res = system.run("/usr/libexec/java_home", "--version", "1.8+", "--failfast");                       
-           java8_or_newer = (0 == res);
-           if(!java8_or_newer) {
-               var res = system.run("/usr/libexec/java_home", "--version", "1.5", "--failfast");                       
-               jdkFound = (0 == res);
-           }
+           var res = system.run("/usr/libexec/java_home", "--failfast");                       
+           jdkFound = (0 == res);
         }
     } catch (e) {}
 
     if(system.files.fileExistsAtPath('/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home')) {
         jreFound = true;
     }
 
-    if (java8_or_newer || JDK_ENABLED &amp;&amp; jreFound) {
+    if (jdkFound || JDK_ENABLED &amp;&amp; jreFound) {
         result = true;
     } else {
-        if (jdkFound) {
-            my.result.type = 'Fatal';
-            my.result.title = system.localizedStringWithFormat('ERR_OLDER_JAVA8_TITLE');
-            my.result.message = system.localizedStringWithFormat('ERR_OLDER_JAVA8_TITLE');
-        } else if (jreFound) {
+        if (jreFound) {
             my.result.type = 'Fatal';
             my.result.title = system.localizedStringWithFormat('ERR_NO_JDK_TITLE');
             my.result.message = system.localizedStringWithFormat('ERR_NO_JDK_MSG');            

diff --git a/nbi/engine/native/launcher/unix/src/launcher.sh b/nbi/engine/native/launcher/unix/src/launcher.sh
@@ -955,7 +955,7 @@ installBundledJVMs() {
 
 searchJavaOnMacOs() {
         if [ -x "/usr/libexec/java_home" ]; then
-            javaOnMacHome=`/usr/libexec/java_home --version 1.8+ --failfast`
+            javaOnMacHome=`/usr/libexec/java_home --failfast`
         fi
 
         if [ ! -x "$javaOnMacHome/bin/java" -a -f "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" ] ; then