This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 6868fd8d30 Update to Windows native launchers 1-94a19f0.
new cc9cb19ca8 Merge pull request #6933 from
neilcsmith-net/native-launcher-1-94a19f0
6868fd8d30 is described below
commit 6868fd8d30842bdbccfa6fd750514e37a8e400f5
Author: Neil C Smith <[email protected]>
AuthorDate: Mon Jan 8 17:08:10 2024 +0000
Update to Windows native launchers 1-94a19f0.
---
harness/apisupport.harness/external/binaries-list | 2 +-
.../external/launcher-external-binaries-1-94a19f0-license.txt | 4 ++--
harness/apisupport.harness/nbproject/project.properties | 4 ++--
nb/ide.launcher/external/binaries-list | 2 +-
...cense.txt => launcher-external-binaries-1-94a19f0-license.txt} | 5 +++--
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries | 2 +-
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 5 ++++-
nbbuild/build.xml | 2 +-
platform/o.n.bootstrap/external/binaries-list | 2 +-
.../external/launcher-external-binaries-1-94a19f0-license.txt | 6 +++---
platform/o.n.bootstrap/nbproject/project.properties | 8 ++++----
11 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/harness/apisupport.harness/external/binaries-list
b/harness/apisupport.harness/external/binaries-list
index bdd243133a..1f3e2d13f3 100644
--- 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
-13F01FA7621AB429CEE9F0F78AE8092D7125CB53
org.apache.netbeans.native:launcher:12.5:distribution@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
diff --git
a/platform/o.n.bootstrap/external/launcher-12.5-distribution-license.txt
b/harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0-license.txt
similarity index 99%
rename from
platform/o.n.bootstrap/external/launcher-12.5-distribution-license.txt
rename to
harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0-license.txt
index 3af9765681..fd67e15b88 100644
--- a/platform/o.n.bootstrap/external/launcher-12.5-distribution-license.txt
+++
b/harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0-license.txt
@@ -1,6 +1,6 @@
Name: NetBeans Application Launchers
-Description: Windows Launchers for the NetBeans Platform
-Version: 12.5
+Description: Windows Launchers for NetBeans Applications
+Version: 1-94a19f0
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
index be119558d1..8768446441 100644
--- 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-12.5-distribution.zip!/app.exe=launchers/app.exe
-release.external/launcher-12.5-distribution.zip!/app64.exe=launchers/app64.exe
+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/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
index 489ef4a108..aa98d2a6ad 100644
--- 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.
-13F01FA7621AB429CEE9F0F78AE8092D7125CB53
org.apache.netbeans.native:launcher:12.5:distribution@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
diff --git a/nb/ide.launcher/external/launcher-12.5-distribution-license.txt
b/nb/ide.launcher/external/launcher-external-binaries-1-94a19f0-license.txt
similarity index 99%
rename from nb/ide.launcher/external/launcher-12.5-distribution-license.txt
rename to
nb/ide.launcher/external/launcher-external-binaries-1-94a19f0-license.txt
index 17ec824a55..fd67e15b88 100644
--- a/nb/ide.launcher/external/launcher-12.5-distribution-license.txt
+++ b/nb/ide.launcher/external/launcher-external-binaries-1-94a19f0-license.txt
@@ -1,8 +1,9 @@
Name: NetBeans Application Launchers
-Version: 12.5
+Description: Windows Launchers for NetBeans Applications
+Version: 1-94a19f0
License: Apache-2.0
+Source: https://netbeans.org/
Origin: NetBeans
-Description: Windows Launchers for the NetBeans Applications
Apache License
Version 2.0, January 2004
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
index aa15f6ae96..ce99f91c44 100644
--- 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-12.5-distribution.zip
+nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.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
index febeccf491..ec9973e061 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -96,7 +96,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-12.5-distribution.zip
platform/o.n.bootstrap/external/launcher-12.5-distribution.zip
+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
# only one is part of the product:
java/libs.javacapi/external/nb-javac-jdk-21u-api.jar
java/libs.nbjavacapi/external/nb-javac-jdk-21u-api.jar
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index b2db625f89..8acd2d6df2 100644
--- 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-12.5-distribution.zip"
dest="${netbeans.dest.dir}/bin">
+ <unzip
src="../nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.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
index 489ef4a108..aa98d2a6ad 100644
--- 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.
-13F01FA7621AB429CEE9F0F78AE8092D7125CB53
org.apache.netbeans.native:launcher:12.5:distribution@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
diff --git
a/harness/apisupport.harness/external/launcher-12.5-distribution-license.txt
b/platform/o.n.bootstrap/external/launcher-external-binaries-1-94a19f0-license.txt
similarity index 98%
rename from
harness/apisupport.harness/external/launcher-12.5-distribution-license.txt
rename to
platform/o.n.bootstrap/external/launcher-external-binaries-1-94a19f0-license.txt
index 6048a324e9..fd67e15b88 100644
--- a/harness/apisupport.harness/external/launcher-12.5-distribution-license.txt
+++
b/platform/o.n.bootstrap/external/launcher-external-binaries-1-94a19f0-license.txt
@@ -1,6 +1,6 @@
-Name: NetBeans Platform Applications Launchers
-Description: Windows Launchers for the NetBeans Platform Applications
-Version: 12.5
+Name: NetBeans Application Launchers
+Description: Windows Launchers for NetBeans Applications
+Version: 1-94a19f0
License: Apache-2.0
Source: https://netbeans.org/
Origin: NetBeans
diff --git a/platform/o.n.bootstrap/nbproject/project.properties
b/platform/o.n.bootstrap/nbproject/project.properties
index 874b43489f..e8ec0b6ad9 100644
--- 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-12.5-distribution.zip!/nbexec.exe=lib/nbexec.exe
-release.external/launcher-12.5-distribution.zip!/nbexec64.exe=lib/nbexec64.exe
-release.external/launcher-12.5-distribution.zip!/nbexec.dll=lib/nbexec.dll
-release.external/launcher-12.5-distribution.zip!/nbexec64.dll=lib/nbexec64.dll
+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
nbm.executable.files=lib/nbexec
javadoc.arch=${basedir}/arch.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
