You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/11/04 02:44:44 UTC
[GitHub] lkishalmi closed pull request #969: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling …
lkishalmi closed pull request #969: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling …
URL: https://github.com/apache/incubator-netbeans/pull/969
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/harness/apisupport.harness/external/binaries-list b/harness/apisupport.harness/external/binaries-list
index 15f68a8ee0..b8acf76844 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
-5E44A808DB371AD42096132FC899EE1B23EC5153 harness-launchers-9.0.zip
\ No newline at end of file
+EF35F672941F60C32B28E3C6ECB031A37950DCBE harness-launchers-10.0.zip
diff --git a/harness/apisupport.harness/external/harness-launchers-9.0-license.txt b/harness/apisupport.harness/external/harness-launchers-10.0-license.txt
similarity index 99%
rename from harness/apisupport.harness/external/harness-launchers-9.0-license.txt
rename to harness/apisupport.harness/external/harness-launchers-10.0-license.txt
index f13c0b911a..95c797e3c3 100644
--- a/harness/apisupport.harness/external/harness-launchers-9.0-license.txt
+++ b/harness/apisupport.harness/external/harness-launchers-10.0-license.txt
@@ -1,6 +1,6 @@
Name: NetBeans Platform Applications Launchers
Description: Windows Launchers for the NetBeans Platform Applications
-Version: 9.0
+Version: 10.0
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 37241eddb8..4f50462f6a 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/harness-launchers-9.0.zip!/app.exe=launchers/app.exe
-release.external/harness-launchers-9.0.zip!/app64.exe=launchers/app64.exe
+release.external/harness-launchers-10.0.zip!/app.exe=launchers/app.exe
+release.external/harness-launchers-10.0.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/harness/apisupport.harness/windows-launcher-src/Makefile.mingw b/harness/apisupport.harness/windows-launcher-src/Makefile.mingw
index 1e54da812d..5ef6f79570 100644
--- a/harness/apisupport.harness/windows-launcher-src/Makefile.mingw
+++ b/harness/apisupport.harness/windows-launcher-src/Makefile.mingw
@@ -24,11 +24,11 @@ app64.res: app.rc app.exe.manifest
x86_64-w64-mingw32-windres -oapp64.res -Ocoff -DMANIFEST_FILE=app.exe.manifest app.rc
app64.exe: app.cpp applauncher.cpp app64.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
- x86_64-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec64.dll"' -DARCHITECTURE=64 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh app.cpp applauncher.cpp app64.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp ../../../nb/ide.launcher/windows/nblauncher.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -oapp64.exe -static -lstdc++ -static-libstdc++ -static-libgcc
+ x86_64-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec64.dll"' -DARCHITECTURE=64 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh app.cpp -mwindows applauncher.cpp app64.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp ../../../nb/ide.launcher/windows/nblauncher.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -oapp64.exe -static -lstdc++ -static-libstdc++ -static-libgcc
app.res: app.rc app.exe.manifest
i686-w64-mingw32-windres -oapp.res -Ocoff -DMANIFEST_FILE=app.exe.manifest app.rc
app.exe: app.cpp applauncher.cpp app.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
- i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh app.cpp applauncher.cpp app.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp ../../../nb/ide.launcher/windows/nblauncher.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -oapp.exe -static -lstdc++ -static-libstdc++ -static-libgcc
+ i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mwindows app.cpp applauncher.cpp app.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp ../../../nb/ide.launcher/windows/nblauncher.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -oapp.exe -static -lstdc++ -static-libstdc++ -static-libgcc
diff --git a/nb/ide.launcher/external/binaries-list b/nb/ide.launcher/external/binaries-list
index f98e5cf795..e11f993c0e 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.
-8ED0BAE9FE0429113DD8F7474ED681CE22F65F1C launchers-9.0.zip
+E230EE1EB16B7A7A9969A9AD3C3F33AE5A3B7E1C launchers-10.0.zip
diff --git a/nb/ide.launcher/external/launchers-9.0-license.txt b/nb/ide.launcher/external/launchers-10.0-license.txt
similarity index 99%
rename from nb/ide.launcher/external/launchers-9.0-license.txt
rename to nb/ide.launcher/external/launchers-10.0-license.txt
index 2f2b20cb1d..afd7d427e0 100644
--- a/nb/ide.launcher/external/launchers-9.0-license.txt
+++ b/nb/ide.launcher/external/launchers-10.0-license.txt
@@ -1,5 +1,5 @@
Name: NetBeans Application Launchers
-Version: 9.0
+Version: 10.0
License: Apache-2.0
Origin: NetBeans
Comment: Windows Launchers for the NetBeans Applications
diff --git a/nb/ide.launcher/windows/Makefile.mingw b/nb/ide.launcher/windows/Makefile.mingw
index 512c77a0a6..791d71b044 100644
--- a/nb/ide.launcher/windows/Makefile.mingw
+++ b/nb/ide.launcher/windows/Makefile.mingw
@@ -24,10 +24,10 @@ netbeans64.res: netbeans.rc netbeans64.exe.manifest
x86_64-w64-mingw32-windres -onetbeans64.res -Ocoff -DMANIFEST_FILE=netbeans64.exe.manifest netbeans.rc
netbeans64.exe: netbeans.cpp nblauncher.cpp netbeans64.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
- x86_64-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec64.dll"' -DARCHITECTURE=64 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh netbeans.cpp nblauncher.cpp netbeans64.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -onetbeans64.exe -static -lstdc++ -static-libstdc++ -static-libgcc
+ x86_64-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec64.dll"' -DARCHITECTURE=64 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mwindows netbeans.cpp nblauncher.cpp netbeans64.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -onetbeans64.exe -static -lstdc++ -static-libstdc++ -static-libgcc
netbeans.res: netbeans.rc netbeans.exe.manifest
i686-w64-mingw32-windres -onetbeans.res -Ocoff -DMANIFEST_FILE=netbeans.exe.manifest netbeans.rc
netbeans.exe: netbeans.cpp nblauncher.cpp netbeans.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
- i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh netbeans.cpp nblauncher.cpp netbeans.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -onetbeans.exe -static -lstdc++ -static-libstdc++ -static-libgcc
+ i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mwindows netbeans.cpp nblauncher.cpp netbeans.res ../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp -I ../../../platform/o.n.bootstrap/launcher/windows/ -onetbeans.exe -static -lstdc++ -static-libstdc++ -static-libgcc
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
index a5ade74a69..c23a40a91e 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
@@ -57,4 +57,4 @@ mobility.databindingme/lib/*
lib.terminalemulator/examples/lib.richexecution/process_start-*.zip
# ide.launcher is a special semi-module, does not have nbproject/project.xml, so is not recognized:
-nb/ide.launcher/external/launchers-9.0.zip
+nb/ide.launcher/external/launchers-10.0.zip
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index badaf5b533..e6ee754f0f 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -341,7 +341,7 @@
<mkdir dir="${netbeans.dest.dir}/bin" />
<copy file="../nb/ide.launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
<chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
- <unzip src="../nb/ide.launcher/external/launchers-9.0.zip" dest="${netbeans.dest.dir}/bin" />
+ <unzip src="../nb/ide.launcher/external/launchers-10.0.zip" dest="${netbeans.dest.dir}/bin" />
<!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org -->
<mkdir dir="${netbeans.dest.dir}/etc" />
diff --git a/platform/o.n.bootstrap/external/binaries-list b/platform/o.n.bootstrap/external/binaries-list
index 79b0571ac4..511ab386ca 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.
-D8A083D00A073359E87B5A077D98541B12E31304 platform-launchers-9.0.zip
+3289B87AB9345958E16F3285ED884F5C4DAB7C2D platform-launchers-10.0.zip
diff --git a/platform/o.n.bootstrap/external/platform-launchers-9.0-license.txt b/platform/o.n.bootstrap/external/platform-launchers-10.0-license.txt
similarity index 99%
rename from platform/o.n.bootstrap/external/platform-launchers-9.0-license.txt
rename to platform/o.n.bootstrap/external/platform-launchers-10.0-license.txt
index 42a28c6791..b57feb7e57 100644
--- a/platform/o.n.bootstrap/external/platform-launchers-9.0-license.txt
+++ b/platform/o.n.bootstrap/external/platform-launchers-10.0-license.txt
@@ -1,6 +1,6 @@
Name: NetBeans Application Launchers
Description: Windows Launchers for the NetBeans Platform
-Version: 9.0
+Version: 10.0
License: Apache-2.0
Source: https://netbeans.org/
Origin: NetBeans
diff --git a/platform/o.n.bootstrap/launcher/windows/Makefile.mingw b/platform/o.n.bootstrap/launcher/windows/Makefile.mingw
index d76ddcd104..302d7788d2 100644
--- a/platform/o.n.bootstrap/launcher/windows/Makefile.mingw
+++ b/platform/o.n.bootstrap/launcher/windows/Makefile.mingw
@@ -30,7 +30,7 @@ nbexec_exe64.res: nbexec_exe.rc nbexec.exe.manifest
x86_64-w64-mingw32-windres -onbexec_exe64.res -Ocoff -DMANIFEST_FILE=nbexec.exe.manifest nbexec_exe.rc
nbexec64.exe: nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res
- x86_64-w64-mingw32-gcc -s -DNBEXEC_DLL='"nbexec64.dll"' -DARCHITECTURE=64 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -Wl,--no-insert-timestamp nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -onbexec64.exe -static -lstdc++ -static-libstdc++ -static-libgcc
+ x86_64-w64-mingw32-gcc -s -DNBEXEC_DLL='"nbexec64.dll"' -DARCHITECTURE=64 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -Wl,--no-insert-timestamp -mwindows nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -onbexec64.exe -static -lstdc++ -static-libstdc++ -static-libgcc
nbexec.res: nbexec.rc
i686-w64-mingw32-windres -onbexec.res -Ocoff nbexec.rc
@@ -42,4 +42,4 @@ nbexec_exe.res: nbexec_exe.rc nbexec.exe.manifest
i686-w64-mingw32-windres -onbexec_exe.res -Ocoff -DMANIFEST_FILE=nbexec.exe.manifest nbexec_exe.rc
nbexec.exe: nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res
- i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -Wl,--no-insert-timestamp nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -onbexec.exe -static -lstdc++ -static-libstdc++ -static-libgcc
+ i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -Wl,--no-insert-timestamp -mwindows nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -onbexec.exe -static -lstdc++ -static-libstdc++ -static-libgcc
diff --git a/platform/o.n.bootstrap/nbproject/project.properties b/platform/o.n.bootstrap/nbproject/project.properties
index 23b67e476a..fc55eba983 100644
--- a/platform/o.n.bootstrap/nbproject/project.properties
+++ b/platform/o.n.bootstrap/nbproject/project.properties
@@ -20,10 +20,10 @@ javac.source=1.7
module.jar.dir=lib
module.jar.basename=boot.jar
release.launcher/unix/nbexec=lib/nbexec
-release.external/platform-launchers-9.0.zip!/nbexec.exe=lib/nbexec.exe
-release.external/platform-launchers-9.0.zip!/nbexec64.exe=lib/nbexec64.exe
-release.external/platform-launchers-9.0.zip!/nbexec.dll=lib/nbexec.dll
-release.external/platform-launchers-9.0.zip!/nbexec64.dll=lib/nbexec64.dll
+release.external/platform-launchers-10.0.zip!/nbexec.exe=lib/nbexec.exe
+release.external/platform-launchers-10.0.zip!/nbexec64.exe=lib/nbexec64.exe
+release.external/platform-launchers-10.0.zip!/nbexec.dll=lib/nbexec.dll
+release.external/platform-launchers-10.0.zip!/nbexec64.dll=lib/nbexec64.dll
nbm.executable.files=lib/nbexec
javadoc.arch=${basedir}/arch.xml
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists