lkishalmi closed pull request #962: [NETBEANS-1415] Fix Windows Launcher build
scripts.
URL: https://github.com/apache/incubator-netbeans/pull/962
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/windows-launcher-src/Makefile.mingw
b/harness/apisupport.harness/windows-launcher-src/Makefile.mingw
index 4f7d188090..fb8fa7e362 100644
--- a/harness/apisupport.harness/windows-launcher-src/Makefile.mingw
+++ b/harness/apisupport.harness/windows-launcher-src/Makefile.mingw
@@ -23,12 +23,12 @@ clean:
app64.res: app.rc
x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc
-app64.exe: app.cpp applauncher.cpp app64.res
../../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 ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
../../ide/launcher/windows/nblauncher.cpp -I
../../o.n.bootstrap/launcher/windows/ -oapp64.exe -static -lstdc++
-static-libstdc++ -static-libgcc
+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
app.res: app.rc
i686-w64-mingw32-windres -oapp.res -Ocoff app.rc
-app.exe: app.cpp applauncher.cpp app.res
../../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 ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
../../ide/launcher/windows/nblauncher.cpp -I
../../o.n.bootstrap/launcher/windows/ -oapp.exe -static -lstdc++
-static-libstdc++ -static-libgcc
+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
diff --git a/harness/apisupport.harness/windows-launcher-src/applauncher.cpp
b/harness/apisupport.harness/windows-launcher-src/applauncher.cpp
index 3a8937934a..f8163168ce 100644
--- a/harness/apisupport.harness/windows-launcher-src/applauncher.cpp
+++ b/harness/apisupport.harness/windows-launcher-src/applauncher.cpp
@@ -21,8 +21,8 @@
*/
#include "applauncher.h"
-#include "../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
-#include "../../o.n.bootstrap/launcher/windows/argnames.h"
+#include "../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.h"
+#include "../../../platform/o.n.bootstrap/launcher/windows/argnames.h"
using namespace std;
diff --git a/harness/apisupport.harness/windows-launcher-src/applauncher.h
b/harness/apisupport.harness/windows-launcher-src/applauncher.h
index 35569bfa3f..0801c8a316 100644
--- a/harness/apisupport.harness/windows-launcher-src/applauncher.h
+++ b/harness/apisupport.harness/windows-launcher-src/applauncher.h
@@ -27,7 +27,7 @@
#include <windows.h>
#include "shlobj.h"
-#include "../../ide/launcher/windows/nblauncher.h"
+#include "../../../nb/ide.launcher/windows/nblauncher.h"
class AppLauncher : public NbLauncher {
diff --git a/nb/ide.launcher/windows/Makefile.migw
b/nb/ide.launcher/windows/Makefile.mingw
similarity index 72%
rename from nb/ide.launcher/windows/Makefile.migw
rename to nb/ide.launcher/windows/Makefile.mingw
index be43affd99..ea8b60e700 100644
--- a/nb/ide.launcher/windows/Makefile.migw
+++ b/nb/ide.launcher/windows/Makefile.mingw
@@ -23,11 +23,11 @@ clean:
netbeans64.res: netbeans.rc
x86_64-w64-mingw32-windres -onetbeans64.res -Ocoff
-DMANIFEST_FILE=netbeans64.exe.manifest netbeans.rc
-netbeans64.exe: netbeans.cpp nblauncher.cpp netbeans64.res
../../../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
../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp -I
../../../o.n.bootstrap/launcher/windows/ -onetbeans64.exe -static -lstdc++
-static-libstdc++ -static-libgcc
+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
netbeans.res: netbeans.rc
i686-w64-mingw32-windres -onetbeans.res -Ocoff
-DMANIFEST_FILE=netbeans.exe.manifest netbeans.rc
-netbeans.exe: netbeans.cpp nblauncher.cpp netbeans.res
../../../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
../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp -I
../../../o.n.bootstrap/launcher/windows/ -onetbeans.exe -static -lstdc++
-static-libstdc++ -static-libgcc
+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
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
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