Update to Windows launcher (2-6c17cc6) and move SM flag to config

mbien · mbien · commit e390f3305204 · 2025-01-13T19:10:58.000+01:00
new native win launcher

 - doesn't set hardcoded '-Djava.security.manager=allow' anymore
 - minor update release

unix launcher script

 - move flag from launcher script to shared config file
 - flag can now be easily removed later
diff --git a/harness/apisupport.harness/external/binaries-list b/harness/apisupport.harness/external/binaries-list
@@ -20,4 +20,4 @@
 # D4EF66C1CC8A5B3C97E0CC7C210227AAEC1F1086 jsearch-2.0_05.jar
 A806D99716C5E9441BFD8B401176FDDEFC673022 bindex-2.2.jar
 6FF4C411EE231AB8042C9047373F87FC64D0299D harness-launchers-8.2.zip
-B7F800780CC94C214B0FE9DA455ADCD20D976C15 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/1-94a19f0/launcher-external-binaries-1-94a19f0.zip launcher-external-binaries-1-94a19f0.zip
+DB781CBFDA3565BC55742D90E0C111204764D85C https://archive.apache.org/dist/netbeans/native/netbeans-launchers/2-6c17cc6/launcher-external-binaries-2-6c17cc6.zip launcher-external-binaries-2-6c17cc6.zip
diff --git a/harness/apisupport.harness/external/launcher-external-binaries-2-6c17cc6-license.txt b/harness/apisupport.harness/external/launcher-external-binaries-2-6c17cc6-license.txt
@@ -1,6 +1,6 @@
 Name: NetBeans Application Launchers
 Description: Windows Launchers for NetBeans Applications
-Version: 1-94a19f0
+Version: 2-6c17cc6
 License: Apache-2.0
 Source: https://netbeans.org/
 Origin: NetBeans
diff --git a/harness/apisupport.harness/nbproject/project.properties b/harness/apisupport.harness/nbproject/project.properties
@@ -30,8 +30,8 @@ release.../../nbbuild/jdk.xml=jdk.xml
 # release.external/jsearch-2.0_05.jar=antlib/jsearch-2.0_05.jar
 release.external/bindex-2.2.jar=antlib/bindex-2.2.jar
 #release.external/jnlp-servlet.jar=jnlp/jnlp-servlet.jar
-release.external/launcher-external-binaries-1-94a19f0.zip!/app.exe=launchers/app.exe
-release.external/launcher-external-binaries-1-94a19f0.zip!/app64.exe=launchers/app64.exe
+release.external/launcher-external-binaries-2-6c17cc6.zip!/app.exe=launchers/app.exe
+release.external/launcher-external-binaries-2-6c17cc6.zip!/app64.exe=launchers/app64.exe
 release.external/harness-launchers-8.2.zip!/pre7_app.exe=launchers/pre7_app.exe
 release.external/harness-launchers-8.2.zip!/pre7_app_w.exe=launchers/pre7_app_w.exe
 nbm.executable.files=launchers/app.sh
diff --git a/nb/ide.launcher/external/binaries-list b/nb/ide.launcher/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-B7F800780CC94C214B0FE9DA455ADCD20D976C15 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/1-94a19f0/launcher-external-binaries-1-94a19f0.zip launcher-external-binaries-1-94a19f0.zip
+DB781CBFDA3565BC55742D90E0C111204764D85C https://archive.apache.org/dist/netbeans/native/netbeans-launchers/2-6c17cc6/launcher-external-binaries-2-6c17cc6.zip launcher-external-binaries-2-6c17cc6.zip
diff --git a/nb/ide.launcher/external/launcher-external-binaries-1-94a19f0-license.txt b/nb/ide.launcher/external/launcher-external-binaries-1-94a19f0-license.txt
@@ -1,6 +1,6 @@
 Name: NetBeans Application Launchers
 Description: Windows Launchers for NetBeans Applications
-Version: 1-94a19f0
+Version: 2-6c17cc6
 License: Apache-2.0
 Source: https://netbeans.org/
 Origin: NetBeans
diff --git a/nb/ide.launcher/netbeans.conf b/nb/ide.launcher/netbeans.conf
@@ -56,7 +56,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/@@metabuild.RawVersion@@"
 # The automatically selected value can be overridden by specifying -J-Xmx
 # here or on the command line.
 #
-netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m @@metabuild.logcli@@ -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.application.appearance=system -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes @@metabuild.jms-flags@@ -J-XX:+IgnoreUnrecognizedVMOptions"
+netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m @@metabuild.logcli@@ -J-Djava.security.manager=allow -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.application.appearance=system -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes @@metabuild.jms-flags@@ -J-XX:+IgnoreUnrecognizedVMOptions"
 
 # Default location of JDK:
 # (set by installer or commented out if launcher should decide)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
@@ -63,7 +63,7 @@ extide/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
 extide/gradle/release/modules/gradle/netbeans-gradle-tooling.jar
 
 # ide.launcher is a special semi-module, does not have nbproject/project.xml, so is not recognized:
-nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip
+nb/ide.launcher/external/launcher-external-binaries-2-6c17cc6.zip
 
 # webcommon/libs.oracle.jsparser builds a test-only binaries into build/webcommon. Not distributed.
 contrib/libs.oracle.jsparser/build/webcommon/**
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -90,10 +90,10 @@ webcommon/javascript2.extdoc/external/testfiles-jsdoc-1.zip webcommon/javascript
 webcommon/javascript2.jsdoc/external/testfiles-jsdoc-1.zip webcommon/javascript2.sdoc/external/testfiles-jsdoc-1.zip
 
 # not part of the product:
-harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0.zip platform/o.n.bootstrap/external/launcher-external-binaries-1-94a19f0.zip
-harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0.zip nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip
-nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip platform/o.n.bootstrap/external/launcher-external-binaries-1-94a19f0.zip
-nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0.zip
+harness/apisupport.harness/external/launcher-external-binaries-2-6c17cc6.zip platform/o.n.bootstrap/external/launcher-external-binaries-2-6c17cc6.zip
+harness/apisupport.harness/external/launcher-external-binaries-2-6c17cc6.zip nb/ide.launcher/external/launcher-external-binaries-2-6c17cc6.zip
+nb/ide.launcher/external/launcher-external-binaries-2-6c17cc6.zip platform/o.n.bootstrap/external/launcher-external-binaries-2-6c17cc6.zip
+nb/ide.launcher/external/launcher-external-binaries-2-6c17cc6.zip harness/apisupport.harness/external/launcher-external-binaries-2-6c17cc6.zip
 
 # only one is part of the product:
 java/libs.javacapi/external/nb-javac-jdk-24+29-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-24+29-api.jar
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
@@ -467,7 +467,7 @@ metabuild.hash=${metabuild.hash}</echo>
     </downloadbinaries>
 
     <mkdir dir="${netbeans.dest.dir}/bin" />
-    <unzip src="../nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip" dest="${netbeans.dest.dir}/bin">
+    <unzip src="../nb/ide.launcher/external/launcher-external-binaries-2-6c17cc6.zip" dest="${netbeans.dest.dir}/bin">
         <patternset>
             <include name="netbeans*.exe"/>
         </patternset>
diff --git a/platform/o.n.bootstrap/external/binaries-list b/platform/o.n.bootstrap/external/binaries-list
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-B7F800780CC94C214B0FE9DA455ADCD20D976C15 https://archive.apache.org/dist/netbeans/native/netbeans-launchers/1-94a19f0/launcher-external-binaries-1-94a19f0.zip launcher-external-binaries-1-94a19f0.zip
+DB781CBFDA3565BC55742D90E0C111204764D85C https://archive.apache.org/dist/netbeans/native/netbeans-launchers/2-6c17cc6/launcher-external-binaries-2-6c17cc6.zip launcher-external-binaries-2-6c17cc6.zip
diff --git a/platform/o.n.bootstrap/external/launcher-external-binaries-2-6c17cc6-license.txt b/platform/o.n.bootstrap/external/launcher-external-binaries-2-6c17cc6-license.txt
@@ -1,6 +1,6 @@
 Name: NetBeans Application Launchers
 Description: Windows Launchers for NetBeans Applications
-Version: 1-94a19f0
+Version: 2-6c17cc6
 License: Apache-2.0
 Source: https://netbeans.org/
 Origin: NetBeans
diff --git a/platform/o.n.bootstrap/launcher/unix/nbexec b/platform/o.n.bootstrap/launcher/unix/nbexec
@@ -192,7 +192,7 @@ fi
 # rename old heap dump to .old
 mv "${userdir}/var/log/heapdump.hprof" "${userdir}/var/log/heapdump.hprof.old" > /dev/null 2>&1
 
-jargs_without_clusters="$jargs -Djava.security.manager=allow"
+jargs_without_clusters="$jargs"
 jargs="-Dnetbeans.dirs=\"${clusters}\" $jargs_without_clusters"
 
 if [ -z "$cachedirspecified" ]; then
diff --git a/platform/o.n.bootstrap/nbproject/project.properties b/platform/o.n.bootstrap/nbproject/project.properties
@@ -20,10 +20,10 @@ javac.source=1.8
 module.jar.dir=lib
 module.jar.basename=boot.jar
 release.launcher/unix/nbexec=lib/nbexec
-release.external/launcher-external-binaries-1-94a19f0.zip!/nbexec.exe=lib/nbexec.exe
-release.external/launcher-external-binaries-1-94a19f0.zip!/nbexec64.exe=lib/nbexec64.exe
-release.external/launcher-external-binaries-1-94a19f0.zip!/nbexec.dll=lib/nbexec.dll
-release.external/launcher-external-binaries-1-94a19f0.zip!/nbexec64.dll=lib/nbexec64.dll
+release.external/launcher-external-binaries-2-6c17cc6.zip!/nbexec.exe=lib/nbexec.exe
+release.external/launcher-external-binaries-2-6c17cc6.zip!/nbexec64.exe=lib/nbexec64.exe
+release.external/launcher-external-binaries-2-6c17cc6.zip!/nbexec.dll=lib/nbexec.dll
+release.external/launcher-external-binaries-2-6c17cc6.zip!/nbexec64.dll=lib/nbexec64.dll
 nbm.executable.files=lib/nbexec
 
 javadoc.arch=${basedir}/arch.xml

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/@@metabuild.RawVersion@@"`
`56`	`56`	`# The automatically selected value can be overridden by specifying -J-Xmx`
`57`	`57`	`# here or on the command line.`
`58`	`58`	`#`
`59`		`-netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m @@metabuild.logcli@@ -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.application.appearance=system -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes @@metabuild.jms-flags@@ -J-XX:+IgnoreUnrecognizedVMOptions"`
	`59`	`+netbeans_default_options="-J-XX:+UseStringDeduplication -J-Xss2m @@metabuild.logcli@@ -J-Djava.security.manager=allow -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.application.appearance=system -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.dpiaware=true -J-Dplugin.manager.check.updates=false -J-Dnetbeans.extbrowser.manual_chrome_plugin_install=yes @@metabuild.jms-flags@@ -J-XX:+IgnoreUnrecognizedVMOptions"`
`60`	`60`
`61`	`61`	`# Default location of JDK:`
`62`	`62`	`# (set by installer or commented out if launcher should decide)`