This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-native-launchers.git
The following commit(s) were added to refs/heads/master by this push: new 0894a99 scripts and folder adjustement 0894a99 is described below commit 0894a990c83923eb08e278eb400db5f731d6f3b5 Author: Eric Barboni <sk...@apache.org> AuthorDate: Fri Jun 25 00:57:08 2021 +0200 scripts and folder adjustement --- src/main/cpp/bootstrap/.dep.inc | 17 +++++++++++++++++ src/main/cpp/bootstrap/Makefile.mingw | 25 ++++++++++++++++--------- src/main/cpp/harness/Makefile.mingw | 21 ++++++++++++++------- src/main/cpp/harness/applauncher.cpp | 4 ++-- src/main/cpp/harness/applauncher.h | 2 +- src/main/cpp/ide/Makefile.mingw | 21 ++++++++++++++------- src/main/cpp/ide/nblauncher.cpp | 6 +++--- 7 files changed, 67 insertions(+), 29 deletions(-) diff --git a/src/main/cpp/bootstrap/.dep.inc b/src/main/cpp/bootstrap/.dep.inc index 4560e55..08c0aeb 100755 --- a/src/main/cpp/bootstrap/.dep.inc +++ b/src/main/cpp/bootstrap/.dep.inc @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# # This code depends on make tool being used DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES})) ifneq (${DEPFILES},) diff --git a/src/main/cpp/bootstrap/Makefile.mingw b/src/main/cpp/bootstrap/Makefile.mingw index 302d778..0fd8e39 100644 --- a/src/main/cpp/bootstrap/Makefile.mingw +++ b/src/main/cpp/bootstrap/Makefile.mingw @@ -15,31 +15,38 @@ # specific language governing permissions and limitations # under the License. -all: nbexec64.dll nbexec64.exe nbexec.dll nbexec.exe +TMPFLD = ../../../../target/tmp/ +OFLD = ../../../../target/bootstrap/ + +all: prepfolder nbexec64.dll nbexec64.exe nbexec.dll nbexec.exe + +prepfolder: + mkdir -p $(TMPFLD) + mkdir -p $(OFLD) clean: rm -f *.res *.exe *.dll nbexec64.res: nbexec.rc - x86_64-w64-mingw32-windres -onbexec64.res -Ocoff nbexec.rc + x86_64-w64-mingw32-windres -o$(TMPFLD)nbexec64.res -Ocoff nbexec.rc nbexec64.dll: include/jni.h include/jni_types.h jvmlauncher.cpp nbexec.cpp platformlauncher.cpp utilsfuncs.cpp nbexec64.res - x86_64-w64-mingw32-gcc -s -shared -m64 -o nbexec64.dll -I include jvmlauncher.cpp nbexec.cpp platformlauncher.cpp utilsfuncs.cpp nbexec64.res -Wl,--no-insert-timestamp -static -lstdc++ -static-libstdc++ -static-libgcc + x86_64-w64-mingw32-gcc -s -shared -m64 -o $(OFLD)nbexec64.dll -I include jvmlauncher.cpp nbexec.cpp platformlauncher.cpp utilsfuncs.cpp $(TMPFLD)nbexec64.res -Wl,--no-insert-timestamp -static -lstdc++ -static-libstdc++ -static-libgcc 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 + x86_64-w64-mingw32-windres -o$(TMPFLD)nbexec_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 -mwindows 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 $(TMPFLD)nbexec_exe64.res -o$(OFLD)nbexec64.exe -static -lstdc++ -static-libstdc++ -static-libgcc nbexec.res: nbexec.rc - i686-w64-mingw32-windres -onbexec.res -Ocoff nbexec.rc + i686-w64-mingw32-windres -o$(TMPFLD)nbexec.res -Ocoff nbexec.rc nbexec.dll: include/jni.h include/jni_types.h jvmlauncher.cpp nbexec.cpp platformlauncher.cpp utilsfuncs.cpp nbexec.res - i686-w64-mingw32-gcc -s -shared -o nbexec.dll -I include jvmlauncher.cpp nbexec.cpp platformlauncher.cpp utilsfuncs.cpp nbexec.res -static -Wl,--no-insert-timestamp -lstdc++ -static-libstdc++ -static-libgcc + i686-w64-mingw32-gcc -s -shared -o $(OFLD)nbexec.dll -I include jvmlauncher.cpp nbexec.cpp platformlauncher.cpp utilsfuncs.cpp $(TMPFLD)nbexec.res -static -Wl,--no-insert-timestamp -lstdc++ -static-libstdc++ -static-libgcc 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 + i686-w64-mingw32-windres -o$(TMPFLD)nbexec_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 -mwindows 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 $(TMPFLD)nbexec_exe.res -o$(OFLD)nbexec.exe -static -lstdc++ -static-libstdc++ -static-libgcc diff --git a/src/main/cpp/harness/Makefile.mingw b/src/main/cpp/harness/Makefile.mingw index 5ef6f79..866b30d 100644 --- a/src/main/cpp/harness/Makefile.mingw +++ b/src/main/cpp/harness/Makefile.mingw @@ -15,20 +15,27 @@ # specific language governing permissions and limitations # under the License. -all: app64.exe app.exe +TMPFLD = ../../../../target/tmp/ +OFLD = ../../../../target/harness/ + +all: prepfolder app64.exe app.exe + +prepfolder: + mkdir -p $(TMPFLD) + mkdir -p $(OFLD) clean: rm -f *.res *.exe app64.res: app.rc app.exe.manifest - x86_64-w64-mingw32-windres -oapp64.res -Ocoff -DMANIFEST_FILE=app.exe.manifest app.rc + x86_64-w64-mingw32-windres -o$(TMPFLD)app64.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 -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 +app64.exe: app.cpp applauncher.cpp app64.res ../bootstrap/utilsfuncs.cpp + 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 $(TMPFLD)app64.res ../bootstrap/utilsfuncs.cpp ../ide/nblauncher.cpp -I ../bootstrap/ -o$(OFLD)app64.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 + i686-w64-mingw32-windres -o$(TMPFLD)app.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 -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 +app.exe: app.cpp applauncher.cpp app.res ../bootstrap/utilsfuncs.cpp + i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mwindows app.cpp applauncher.cpp $(TMPFLD)app.res ../bootstrap/utilsfuncs.cpp ../ide/nblauncher.cpp -I ../bootstrap/ -o$(OFLD)app.exe -static -lstdc++ -static-libstdc++ -static-libgcc diff --git a/src/main/cpp/harness/applauncher.cpp b/src/main/cpp/harness/applauncher.cpp index f816316..1fa9d4e 100644 --- a/src/main/cpp/harness/applauncher.cpp +++ b/src/main/cpp/harness/applauncher.cpp @@ -21,8 +21,8 @@ */ #include "applauncher.h" -#include "../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.h" -#include "../../../platform/o.n.bootstrap/launcher/windows/argnames.h" +#include "../bootstrap/utilsfuncs.h" +#include "../bootstrap/argnames.h" using namespace std; diff --git a/src/main/cpp/harness/applauncher.h b/src/main/cpp/harness/applauncher.h index 0801c8a..b6002fd 100644 --- a/src/main/cpp/harness/applauncher.h +++ b/src/main/cpp/harness/applauncher.h @@ -27,7 +27,7 @@ #include <windows.h> #include "shlobj.h" -#include "../../../nb/ide.launcher/windows/nblauncher.h" +#include "../ide/nblauncher.h" class AppLauncher : public NbLauncher { diff --git a/src/main/cpp/ide/Makefile.mingw b/src/main/cpp/ide/Makefile.mingw index 791d71b..6db2f87 100644 --- a/src/main/cpp/ide/Makefile.mingw +++ b/src/main/cpp/ide/Makefile.mingw @@ -15,19 +15,26 @@ # specific language governing permissions and limitations # under the License. -all: netbeans64.exe netbeans.exe +TMPFLD = ../../../../target/tmp/ +OFLD = ../../../../target/ide/ + +all: prepfolder netbeans64.exe netbeans.exe + +prepfolder: + mkdir -p $(TMPFLD) + mkdir -p $(OFLD) clean: rm -f *.res *.exe netbeans64.res: netbeans.rc netbeans64.exe.manifest - x86_64-w64-mingw32-windres -onetbeans64.res -Ocoff -DMANIFEST_FILE=netbeans64.exe.manifest netbeans.rc + x86_64-w64-mingw32-windres -o$(TMPFLD)netbeans64.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 -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 +netbeans64.exe: netbeans.cpp nblauncher.cpp netbeans64.res ../bootstrap/utilsfuncs.cpp + 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 $(TMPFLD)netbeans64.res ../bootstrap/utilsfuncs.cpp -I ../bootstrap/ -o$(OFLD)netbeans64.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 + i686-w64-mingw32-windres -o$(TMPFLD)netbeans.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 -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 +netbeans.exe: netbeans.cpp nblauncher.cpp netbeans.res ../bootstrap/utilsfuncs.cpp + i686-w64-mingw32-gcc -s -DNBEXEC_DLL='"/lib/nbexec.dll"' -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mwindows netbeans.cpp nblauncher.cpp $(TMPFLD)netbeans.res ../bootstrap/utilsfuncs.cpp -I ../bootstrap/ -o$(OFLD)netbeans.exe -static -lstdc++ -static-libstdc++ -static-libgcc diff --git a/src/main/cpp/ide/nblauncher.cpp b/src/main/cpp/ide/nblauncher.cpp index dda65af..338e7a7 100644 --- a/src/main/cpp/ide/nblauncher.cpp +++ b/src/main/cpp/ide/nblauncher.cpp @@ -26,9 +26,9 @@ #include <shlobj.h> #include "nblauncher.h" -#include "../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.h" -#include "../../../platform/o.n.bootstrap/launcher/windows/argnames.h" -#include "../../../platform/o.n.bootstrap/launcher/windows/nbexecloader.h" +#include "../bootstrap/utilsfuncs.h" +#include "../bootstrap/argnames.h" +#include "../bootstrap/nbexecloader.h" using namespace std; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists