This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e9143f9 Adding the fix that was applied to generate the Mac OS
installer for Apache NetBeans 12.1
e9143f9 is described below
commit e9143f9d2057fe66e0bffd5db955cf228d364346
Author: John McDonnell <mcdonnell.j...@gmail.com>
AuthorDate: Mon Sep 7 21:16:15 2020 +0100
Adding the fix that was applied to generate the Mac OS installer for Apache
NetBeans 12.1
---
.../mac/newbuild/commonfiles/get_current_jdk.sh | 2 +-
.../mac/newbuild/commonfiles/postinstall/postinstall | 2 +-
.../installer/mac/newbuild/dmg/distribution-nbide.dist | 17 ++++-------------
nbbuild/installer/mac/newbuild/dmg/distribution.dist | 17 ++++-------------
nbi/engine/native/launcher/unix/src/launcher.sh | 2 +-
5 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/nbbuild/installer/mac/newbuild/commonfiles/get_current_jdk.sh
b/nbbuild/installer/mac/newbuild/commonfiles/get_current_jdk.sh
index b6311d3..083abc3 100644
--- 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
index 567b111..29d7ee6 100644
--- 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
index 29a4633..8bcc03a 100644
--- a/nbbuild/installer/mac/newbuild/dmg/distribution-nbide.dist
+++ b/nbbuild/installer/mac/newbuild/dmg/distribution-nbide.dist
@@ -62,17 +62,12 @@ 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) {}
@@ -80,14 +75,10 @@ function checkJavaVersion() {
jreFound = true;
}
- if (java8_or_newer || JDK_ENABLED && jreFound) {
+ if (jdkFound || JDK_ENABLED && 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
index d3d4fcd..34d9f96 100644
--- a/nbbuild/installer/mac/newbuild/dmg/distribution.dist
+++ b/nbbuild/installer/mac/newbuild/dmg/distribution.dist
@@ -62,17 +62,12 @@ 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) {}
@@ -80,14 +75,10 @@ function checkJavaVersion() {
jreFound = true;
}
- if (java8_or_newer || JDK_ENABLED && jreFound) {
+ if (jdkFound || JDK_ENABLED && 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
index 31cca1d..5a6fc13 100644
--- 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
