Skip to content

Update to Windows launcher (2-6c17cc6) and move security manager flag from launcher to config #8122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbien merged 1 commit into from
Jan 13, 2025
Merged

Update to Windows launcher (2-6c17cc6) and move security manager flag from launcher to config #8122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion harness/apisupport.harness/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...r-external-binaries-1-94a19f0-license.txt → ...r-external-binaries-2-6c17cc6-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions harness/apisupport.harness/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nb/ide.launcher/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion nb/ide.launcher/external/launcher-external-binaries-1-94a19f0-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion nb/ide.launcher/netbeans.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/**
Expand Down
8 changes: 4 additions & 4 deletions nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nbbuild/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion platform/o.n.bootstrap/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ...r-external-binaries-1-94a19f0-license.txt → ...r-external-binaries-2-6c17cc6-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion platform/o.n.bootstrap/launcher/unix/nbexec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions platform/o.n.bootstrap/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading