Author: johnmcdonnell
Date: Tue Sep 8 05:07:34 2020
New Revision: 41348
Log:
Added installer Apache NetBeans 12.1 Mac OSX Installer - attempt 2.
Also added a diff showing the changes that were made to the installer to help
build this
Added:
dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.asc
dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.sha512
dev/netbeans/netbeans/12.1/diff/
dev/netbeans/netbeans/12.1/diff/netbeans_12.1_macosx_installer.diff
Modified:
dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg
Modified: dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg
==============================================================================
Binary files - no diff available.
Added: dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.asc
==============================================================================
--- dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.asc (added)
+++ dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.asc Tue Sep
8 05:07:34 2020
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE3ouPsrIjyE9FFC3JPtR3dQwJ0Y0FAl9XERsACgkQPtR3dQwJ
+0Y339Q//X1x7/7TLQnj3w4GE0l6f+9thmZIoEgGqs2P/gpLp9Bo8RZxlIpgwPj5W
+v6jBDemvbdUlbvT16lrviMjr4aIvawY+lCpB95nyIdTMuCh+3s53wSHuZOlF+r28
+K27DqDY8Iq9pa9KhqQYgqKEG2OcX68cH/JbML1p2GBCPuR+eqhTBEr+wLAtnEkUm
+wAYe0MiUtpgK9qsZuDbo8BSR77h8TXtMLr4HiMmaeJU2zXCg09R0QBXIuSSQbsg8
+IjO9ROy3Kez6fKl3DcO50EESh0/J/6F79BAuL2GiqMic2mqTVmvwE9zMn2E4gBi3
+PD7aMStiNyqBhSQjq38MCbIJSh2eNNr68AYWElLYXFCEoKiZgDkiSOCRqAtVhmDT
+wVcTG/L0BZXvxid1VK+5GsfRKBqutn2YWfm8iOrSTrt4pudguB3sQqz6lY52qdCG
+eaOVV7/sJ7VyjW8FGTvHp0wsOMNcDh02v5Qn1LixHPMjSspnIOciHyTvddVpWcg/
+6JT2ZU69TIs6RcaUqhrddxvpAZwUvbXBoX3Ipnh0NFkf9LTc6KzSIgIYYNVWqaJ7
+vQin0guVmysihU9GjLqpXo1cgowf3EngTWm/c02kFwpoTu2WEqMlZC2afyqeDZ6n
+LA+w+6Z4UwdJJhWnkmnrgKVOfoE3fXr8nfMdkqtoFh2KDfYnWNo=
+=Lq3u
+-----END PGP SIGNATURE-----
Added: dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.sha512
==============================================================================
--- dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.sha512
(added)
+++ dev/netbeans/netbeans/12.1/Apache-NetBeans-12.1-bin-macosx.dmg.sha512 Tue
Sep 8 05:07:34 2020
@@ -0,0 +1,4 @@
+Apache-NetBeans-12.1-bin-macosx.dmg: 55DF3924 46784D2D 3520154B 2E0D0C1B
+ C09D51B2 DB48C9E4 67453FA7 17CA41A0
+ ADDF5109 1DEC07CA 09F41C51 59590755
+ CB3B0669 61B72BC9 B91699ED 6557FBB0
Added: dev/netbeans/netbeans/12.1/diff/netbeans_12.1_macosx_installer.diff
==============================================================================
--- dev/netbeans/netbeans/12.1/diff/netbeans_12.1_macosx_installer.diff (added)
+++ dev/netbeans/netbeans/12.1/diff/netbeans_12.1_macosx_installer.diff Tue Sep
8 05:07:34 2020
@@ -0,0 +1,121 @@
+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 @@
+
+ # 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 @@
+
+ #"$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 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 @@
+ 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 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 @@
+ 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 @@
+
+ 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
