date:20210624

[netbeans-native-launchers] 03/03: Short Readme

2021-06-24 Thread skygo

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

commit dc53297f473cdab9357f66ab28665c3de7ae6aa4
Author: Eric Barboni 
AuthorDate: Fri Jun 25 01:11:12 2021 +0200

Short Readme
---
 README.md | 48 
 1 file changed, 48 insertions(+)

diff --git a/README.md b/README.md
new file mode 100755
index 000..dd585a7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,48 @@
+
+
+# Apache NetBeans Native Launchers
+
+## 
+
+To build binaries, only Linux OS is known to work, using the MinGW project. On 
Ubuntu,
+this may work to install suitable MinGW:
+
+```
+$ apt install mingw-w64 mingw-w64-tools
+```
+
+The command to build the launchers:
+
+```
+$ mvn clean install
+```
+
+## Get In Touch
+
+[Subscribe](mailto:users-subscr...@netbeans.apache.org) or 
[mail](mailto:us...@netbeans.apache.org) the 
[us...@netbeans.apache.org](mailto:us...@netbeans.apache.org) list - Ask 
questions, find answers, and also help other users.
+
+[Subscribe](mailto:dev-subscr...@netbeans.apache.org) or 
[mail](mailto:d...@netbeans.apache.org) the 
[d...@netbeans.apache.org](mailto:d...@netbeans.apache.org) list - Join 
developement discussions, propose new ideas and connect with contributors.
+
+## Reporting Bugs
+
+Bugs should be reported to 
https://issues.apache.org/jira/projects/NETBEANS/issues/ 
+

-
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

[netbeans-native-launchers] 01/03: add missing header

2021-06-24 Thread skygo

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

commit 339ae03bafdd54e749f94f17d6172898e88b063e
Author: Eric Barboni 
AuthorDate: Fri Jun 25 01:10:08 2021 +0200

add missing header
---
 src/assembly/assembly.xml | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/assembly/assembly.xml b/src/assembly/assembly.xml
index 7f0aeba..5e353fe 100644
--- a/src/assembly/assembly.xml
+++ b/src/assembly/assembly.xml
@@ -1,6 +1,24 @@
-http://maven.apache.org/ASSEMBLY/2.1.0;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 
http://maven.apache.org/xsd/assembly-2.1.0.xsd;>
+
+
+
+http://maven.apache.org/ASSEMBLY/2.1.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 
http://maven.apache.org/xsd/assembly-2.1.0.xsd;>
 distribution
 
 zip

-
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

[netbeans-native-launchers] 02/03: Add notice to be the same as netbeans repo

2021-06-24 Thread skygo

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

commit 404f2960d5bf177033855314c130e01d2ac2b9fd
Author: Eric Barboni 
AuthorDate: Fri Jun 25 01:10:37 2021 +0200

Add notice to be the same as netbeans repo
---
 NOTICE | 13 +
 1 file changed, 13 insertions(+)

diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000..66ea2ba
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,13 @@
+Apache NetBeans Native Launchers
+Copyright 2017-2021 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The code is based on NetBeans, that has been kindly donated to the Apache
+Software Foundation by Oracle.
+
+The code was Copyright 1997-2016 Oracle and/or its affiliates.  The Initial
+Developer of the Original Software was Sun Microsystems, Inc. Portions
+Copyright 1997-2006 Sun Microsystems, Inc.
+

-
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

[netbeans-native-launchers] branch master updated (0894a99 -> dc53297)

2021-06-24 Thread skygo

This is an automated email from the ASF dual-hosted git repository.

skygo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-native-launchers.git.


from 0894a99  scripts and folder adjustement
 new 339ae03  add missing header
 new 404f296  Add notice to be the same as netbeans repo
 new dc53297  Short Readme

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 NOTICE| 13 +
 README.md | 48 +++
 src/assembly/assembly.xml | 24 +---
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 NOTICE
 create mode 100755 README.md

-
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

[netbeans-native-launchers] branch master updated: scripts and folder adjustement

2021-06-24 Thread skygo

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 
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

[jira] [Created] (NETBEANS-5813) IDE crash completely without internet

2021-06-24 Thread jose luis romero (Jira)

jose luis romero created NETBEANS-5813:
--

 Summary: IDE crash completely without internet
 Key: NETBEANS-5813
 URL: https://issues.apache.org/jira/browse/NETBEANS-5813
 Project: NetBeans
  Issue Type: Bug
Affects Versions: 12.4
 Environment: W10, JDK 1.8 Oracle
Reporter: jose luis romero


The IDE start up, but at the first "Opening projects" or "Scanning 
background..." it froze, no action works, like double click on a project, it 
stuck with  "Initializing..", no option in the menu response.
It is simple to reproduce, just disable the Ethernet network

{code:java}
java.lang.NoClassDefFoundError: Could not initialize class 
org.netbeans.modules.payara.jakartaee.Hk2JpaSupportImpl
at 
org.netbeans.modules.payara.jakartaee.Hk2JavaEEPlatformImpl.initLocalLookup(Hk2JavaEEPlatformImpl.java:127)
at 
org.netbeans.modules.payara.jakartaee.Hk2JavaEEPlatformImpl.(Hk2JavaEEPlatformImpl.java:314)
at 
org.netbeans.modules.payara.jakartaee.Hk2JavaEEPlatformFactory.getJ2eePlatformImpl(Hk2JavaEEPlatformFactory.java:186)
at 
org.netbeans.modules.j2ee.deployment.impl.ServerInstance.getJ2eePlatformImpl(ServerInstance.java:322)
at 
org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform.create(J2eePlatform.java:257)
at 
org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance.getJ2eePlatform(ServerInstance.java:124)
at 
org.netbeans.modules.j2ee.common.ProjectUtil.getPlatform(ProjectUtil.java:59)
at 
org.netbeans.modules.j2ee.common.ProjectUtil.getSupportedProfiles(ProjectUtil.java:39)
at 
org.netbeans.modules.maven.j2ee.web.WebRecoPrivTemplates.isServerSupportingEJB31(WebRecoPrivTemplates.java:194)
at 
org.netbeans.modules.maven.j2ee.web.WebRecoPrivTemplates.getPrivilegedTemplates(WebRecoPrivTemplates.java:177)
at 
org.netbeans.spi.project.ui.support.UILookupMergerSupport$PrivilegedTemplatesImpl.getPrivilegedTemplates(UILookupMergerSupport.java:171)
at 
org.netbeans.modules.project.ui.OpenProjectList.getTemplateNamesLRU(OpenProjectList.java:1479)
at 
org.netbeans.modules.project.ui.OpenProjectList.getTemplatesLRU(OpenProjectList.java:1176)
at 
org.netbeans.modules.project.ui.OpenProjectList.prepareTemplates(OpenProjectList.java:1371)
at 
org.netbeans.modules.project.ui.OpenProjectList.notifyOpened(OpenProjectList.java:1339)
at 
org.netbeans.modules.project.ui.OpenProjectList.access$1600(OpenProjectList.java:116)
at 
org.netbeans.modules.project.ui.OpenProjectList$LoadOpenProjects.loadOnBackground(OpenProjectList.java:513)
at 
org.netbeans.modules.project.ui.OpenProjectList$LoadOpenProjects.run(OpenProjectList.java:384)
at 
org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1418)
at 
org.netbeans.modules.openide.util.GlobalLookup.execute(GlobalLookup.java:45)
at org.openide.util.lookup.Lookups.executeWith(Lookups.java:278)
[catch] at 
org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:2033)

{code}




--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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

[netbeans-native-launchers] 19/20: ide code migration

2021-06-24 Thread skygo

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

commit 655f52a955e433c7a9184ebe7053985c43a83671
Merge: 5e84f26 8277081
Author: Eric Barboni 
AuthorDate: Fri Jun 25 00:00:40 2021 +0200

ide code migration

 src/main/cpp/ide/.dep.inc |  22 ++
 src/main/cpp/ide/Makefile | 106 +
 src/main/cpp/ide/Makefile.mingw   |  33 ++
 src/main/cpp/ide/cmdargs.h| 119 ++
 src/main/cpp/ide/nblauncher.cpp   | 532 ++
 src/main/cpp/ide/nblauncher.h | 107 ++
 src/main/cpp/ide/nbproject/configurations.xml | 164 
 src/main/cpp/ide/nbproject/project.properties |  17 +
 src/main/cpp/ide/nbproject/project.xml|  49 +++
 src/main/cpp/ide/netbeans.cpp |  29 ++
 src/main/cpp/ide/netbeans.exe.manifest|  71 
 src/main/cpp/ide/netbeans.ico | Bin 0 -> 99678 bytes
 src/main/cpp/ide/netbeans.rc  |  31 ++
 src/main/cpp/ide/netbeans64.exe.manifest  |  71 
 src/main/cpp/ide/version.h|  28 ++
 src/main/cpp/ide/version.rc   |  62 +++
 16 files changed, 1441 insertions(+)

diff --cc src/main/cpp/ide/.dep.inc
index 000,08c0aeb..08c0aeb
mode 00,100644..100644
--- a/src/main/cpp/ide/.dep.inc
+++ b/src/main/cpp/ide/.dep.inc
diff --cc src/main/cpp/ide/Makefile
index 000,ff8bc92..ff8bc92
mode 00,100644..100644
--- a/src/main/cpp/ide/Makefile
+++ b/src/main/cpp/ide/Makefile
diff --cc src/main/cpp/ide/Makefile.mingw
index 000,791d71b..791d71b
mode 00,100644..100644
--- a/src/main/cpp/ide/Makefile.mingw
+++ b/src/main/cpp/ide/Makefile.mingw
diff --cc src/main/cpp/ide/cmdargs.h
index 000,acf56a4..acf56a4
mode 00,100644..100644
--- a/src/main/cpp/ide/cmdargs.h
+++ b/src/main/cpp/ide/cmdargs.h
diff --cc src/main/cpp/ide/nblauncher.cpp
index 000,dda65af..dda65af
mode 00,100644..100644
--- a/src/main/cpp/ide/nblauncher.cpp
+++ b/src/main/cpp/ide/nblauncher.cpp
diff --cc src/main/cpp/ide/nblauncher.h
index 000,469a21f..469a21f
mode 00,100644..100644
--- a/src/main/cpp/ide/nblauncher.h
+++ b/src/main/cpp/ide/nblauncher.h
diff --cc src/main/cpp/ide/nbproject/configurations.xml
index 000,9e0bf6a..9e0bf6a
mode 00,100644..100644
--- a/src/main/cpp/ide/nbproject/configurations.xml
+++ b/src/main/cpp/ide/nbproject/configurations.xml
diff --cc src/main/cpp/ide/nbproject/project.properties
index 000,2456923..2456923
mode 00,100644..100644
--- a/src/main/cpp/ide/nbproject/project.properties
+++ b/src/main/cpp/ide/nbproject/project.properties
diff --cc src/main/cpp/ide/nbproject/project.xml
index 000,2a78a99..2a78a99
mode 00,100644..100644
--- a/src/main/cpp/ide/nbproject/project.xml
+++ b/src/main/cpp/ide/nbproject/project.xml
diff --cc src/main/cpp/ide/netbeans.cpp
index 000,c14972f..c14972f
mode 00,100644..100644
--- a/src/main/cpp/ide/netbeans.cpp
+++ b/src/main/cpp/ide/netbeans.cpp
diff --cc src/main/cpp/ide/netbeans.exe.manifest
index 000,71b1164..71b1164
mode 00,100644..100644
--- a/src/main/cpp/ide/netbeans.exe.manifest
+++ b/src/main/cpp/ide/netbeans.exe.manifest
diff --cc src/main/cpp/ide/netbeans.ico
index 000,ec123c0..ec123c0
mode 00,100644..100644
Binary files differ
diff --cc src/main/cpp/ide/netbeans.rc
index 000,348a320..348a320
mode 00,100644..100644
--- a/src/main/cpp/ide/netbeans.rc
+++ b/src/main/cpp/ide/netbeans.rc
diff --cc src/main/cpp/ide/netbeans64.exe.manifest
index 000,3f7dc6e..3f7dc6e
mode 00,100644..100644
--- a/src/main/cpp/ide/netbeans64.exe.manifest
+++ b/src/main/cpp/ide/netbeans64.exe.manifest
diff --cc src/main/cpp/ide/version.h
index 000,3d8adef..3d8adef
mode 00,100644..100644
--- a/src/main/cpp/ide/version.h
+++ b/src/main/cpp/ide/version.h
diff --cc src/main/cpp/ide/version.rc
index 000,0bb79bf..0bb79bf
mode 00,100644..100644
--- a/src/main/cpp/ide/version.rc
+++ b/src/main/cpp/ide/version.rc

-
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

[netbeans-native-launchers] 14/20: [NETBEANS-1605] Removed NetBeans max HeapSize heuristics. (#1007)

2021-06-24 Thread skygo

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

commit 82770818e47de325b39b5eabfd138f156d3e8e29
Author: Laszlo Kishalmi 
AuthorDate: Mon Dec 3 11:31:18 2018 -0800

[NETBEANS-1605] Removed NetBeans max HeapSize heuristics. (#1007)

* [NETBEANS-1605] Removed NetBeans max HeapSize heuristics.

* Removed areWeOn32bits(), min heap size and the reference of deprecated 
CMS GC.
---
 nblauncher.cpp | 44 
 nblauncher.h   |  2 --
 2 files changed, 46 deletions(-)

diff --git a/nblauncher.cpp b/nblauncher.cpp
index 37adb70..dda65af 100644
--- a/nblauncher.cpp
+++ b/nblauncher.cpp
@@ -89,7 +89,6 @@ int NbLauncher::start(int argc, char *argv[]) {
 parseConfigFile((userDir + "\\etc\\" + getAppName() + ".conf").c_str());
 userDir = oldUserDir;
 
-adjustHeapAndPermGenSize();
 addExtraClusters();
 string nbexecPath;
 SetDllDirectory(baseDir.c_str());
@@ -489,49 +488,6 @@ bool NbLauncher::parseConfigFile(const char* path) {
 
 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
 
-bool NbLauncher::areWeOn32bits() {
-// find out if we are on 32-bit Windows
-SYSTEM_INFO siSysInfo;
-PGNSI pGNSI;
-pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
-"GetNativeSystemInfo");
-if (NULL != pGNSI)
-pGNSI();
-else
-GetSystemInfo();
-logMsg("NbLauncher::areWeOn32bits returns (0=false, 1=true)? %i", 
((siSysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) ||
-(strstr(NBEXEC_FILE_PATH, "64") == NULL)));
-return ((siSysInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) 
||
-(strstr(NBEXEC_FILE_PATH, "64") == NULL));
-}
-
-// Search if -Xmx and -XX:MaxPermSize are specified in existing arguments
-// If it isn't compute default values based on 32/64-bits and available RAM
-void NbLauncher::adjustHeapAndPermGenSize() {
-if (nbOptions.find("-J-Xmx") == string::npos) {
-int maxheap;
-if (areWeOn32bits())
-maxheap = 512;
-else
-maxheap = 1024;
-// find how much memory we have and add -Xmx as 1/5 of the memory
-MEMORYSTATUSEX ms;
-ms.dwLength = sizeof (ms);
-GlobalMemoryStatusEx();
-int memory = (int)((ms.ullTotalPhys / 1024 / 1024) / 5);
-if (memory < 96) {
-memory = 96;
-}
-else if (memory > maxheap) {
-memory = maxheap;
-}
-char tmp[32];
-snprintf(tmp, 32, " -J-Xmx%dm", memory);
-logMsg("Memory settings: -J-Xmx%dm", memory);
-nbOptions += tmp;
-}
-}
-
 const char * NbLauncher::getAppName() {
 return "netbeans";
 }
diff --git a/nblauncher.h b/nblauncher.h
index 591e65f..469a21f 100644
--- a/nblauncher.h
+++ b/nblauncher.h
@@ -63,8 +63,6 @@ public:
 protected:
 virtual bool initBaseNames();
 virtual void addSpecificOptions(CmdArgs );
-virtual bool areWeOn32bits();
-virtual void adjustHeapAndPermGenSize();
 virtual bool findUserDir(const char *str);
 virtual bool findCacheDir(const char *str);
 virtual const char * getAppName();

-
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

[netbeans-native-launchers] 10/20: [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

2021-06-24 Thread skygo

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

commit d9fb186899d185314f52d6b899d7e4a0a8f71253
Author: Eirik Bakke 
AuthorDate: Sun Oct 14 13:43:45 2018 -0400

[NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

* Fix paths that broke in windows launcher sources when directories were 
moved around.

* Fix a small documentation bug in the platform app launcher configuration 
template.

* Rename Makefile.migw (typo) to Makefile.mingw in one of the windows 
launcher sources.

* Ignore files generated when NetBeans 8.2 is used to open the windows 
launcher projects.

* [NETBEANS-1227] Mark Windows launchers as DPI-aware
---
 Makefile.mingw   | 16 +-
 app.exe.manifest | 69 
 app.rc   |  4 +++
 applauncher.cpp  |  4 +--
 applauncher.h|  2 +-
 nbproject/configurations.xml |  8 ++---
 6 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/Makefile.mingw b/Makefile.mingw
index 4f7d188..1e54da8 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -20,15 +20,15 @@ all: app64.exe app.exe
 clean:
rm -f *.res *.exe
 
-app64.res: app.rc
-   x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc
+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 
../../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.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 
../../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/app.exe.manifest b/app.exe.manifest
new file mode 100644
index 000..26921b3
--- /dev/null
+++ b/app.exe.manifest
@@ -0,0 +1,69 @@
+
+
+
+
+
+NBP application process
+
+  
+
+  
+
+
+
+  
+
+  
+  
+ 
+
+
+
+  http://schemas.microsoft.com/SMI/2005/WindowsSettings; 
xmlns:dpi2="http://schemas.microsoft.com/SMI/2016/WindowsSettings;>
+true/PM
+PerMonitorV2, PerMonitor, system
+  
+
+
+
+  
+
+
+
+
+
+  
+
+
diff --git a/app.rc b/app.rc
index 345b1a5..d52211e 100644
--- a/app.rc
+++ b/app.rc
@@ -18,5 +18,9 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 
+#include 
+
 100 ICON "app.ico"
 
+// Value MANIFEST_FILE id taken from windres parameter -DMANIFEST_FILE
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MANIFEST_FILE
diff --git a/applauncher.cpp b/applauncher.cpp
index 3a89379..f816316 100644
--- a/applauncher.cpp
+++ b/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

[netbeans-native-launchers] 18/20: harness code migration

2021-06-24 Thread skygo

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

commit 5e84f26cdcdebb29493f63bc29f1b6538cfe7f48
Merge: c5b4786 5294726
Author: Eric Barboni 
AuthorDate: Thu Jun 24 23:58:28 2021 +0200

harness code migration

 src/main/cpp/harness/Makefile | 103 
 src/main/cpp/harness/Makefile.mingw   |  34 ++
 src/main/cpp/harness/app.cpp  |  29 +
 src/main/cpp/harness/app.exe.manifest |  69 +++
 src/main/cpp/harness/app.ico  | Bin 0 -> 21174 bytes
 src/main/cpp/harness/app.rc   |  26 
 src/main/cpp/harness/applauncher.cpp  | 141 ++
 src/main/cpp/harness/applauncher.h|  67 ++
 src/main/cpp/harness/nbproject/configurations.xml | 112 +
 src/main/cpp/harness/nbproject/project.properties |  17 +++
 src/main/cpp/harness/nbproject/project.xml|  46 +++
 11 files changed, 644 insertions(+)

diff --cc src/main/cpp/harness/Makefile
index 000,bef2334..bef2334
mode 00,100644..100644
--- a/src/main/cpp/harness/Makefile
+++ b/src/main/cpp/harness/Makefile
diff --cc src/main/cpp/harness/Makefile.mingw
index 000,5ef6f79..5ef6f79
mode 00,100644..100644
--- a/src/main/cpp/harness/Makefile.mingw
+++ b/src/main/cpp/harness/Makefile.mingw
diff --cc src/main/cpp/harness/app.cpp
index 000,840c828..840c828
mode 00,100644..100644
--- a/src/main/cpp/harness/app.cpp
+++ b/src/main/cpp/harness/app.cpp
diff --cc src/main/cpp/harness/app.exe.manifest
index 000,26921b3..26921b3
mode 00,100644..100644
--- a/src/main/cpp/harness/app.exe.manifest
+++ b/src/main/cpp/harness/app.exe.manifest
diff --cc src/main/cpp/harness/app.ico
index 000,294cd70..294cd70
mode 00,100644..100644
Binary files differ
diff --cc src/main/cpp/harness/app.rc
index 000,d52211e..d52211e
mode 00,100644..100644
--- a/src/main/cpp/harness/app.rc
+++ b/src/main/cpp/harness/app.rc
diff --cc src/main/cpp/harness/applauncher.cpp
index 000,f816316..f816316
mode 00,100644..100644
--- a/src/main/cpp/harness/applauncher.cpp
+++ b/src/main/cpp/harness/applauncher.cpp
diff --cc src/main/cpp/harness/applauncher.h
index 000,0801c8a..0801c8a
mode 00,100644..100644
--- a/src/main/cpp/harness/applauncher.h
+++ b/src/main/cpp/harness/applauncher.h
diff --cc src/main/cpp/harness/nbproject/configurations.xml
index 000,55d0647..55d0647
mode 00,100644..100644
--- a/src/main/cpp/harness/nbproject/configurations.xml
+++ b/src/main/cpp/harness/nbproject/configurations.xml
diff --cc src/main/cpp/harness/nbproject/project.properties
index 000,2456923..2456923
mode 00,100644..100644
--- a/src/main/cpp/harness/nbproject/project.properties
+++ b/src/main/cpp/harness/nbproject/project.properties
diff --cc src/main/cpp/harness/nbproject/project.xml
index 000,34dd422..34dd422
mode 00,100644..100644
--- a/src/main/cpp/harness/nbproject/project.xml
+++ b/src/main/cpp/harness/nbproject/project.xml

-
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

[netbeans-native-launchers] 01/20: Moving the platform modules into their own subdirectory to lower the clutter in the root

2021-06-24 Thread skygo

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

commit 1d019a29da279c15b4c3adf98ee2e56b6380c0de
Author: Jaroslav Tulach 
AuthorDate: Sun May 6 07:27:25 2018 +0200

Moving the platform modules into their own subdirectory to lower the 
clutter in the root
---
 .dep.inc |   5 +
 Makefile | 107 +++
 argnames.h   |  41 +++
 jvmlauncher.cpp  | 455 +++
 jvmlauncher.h| 123 
 nbexec.cpp   |  63 
 nbexec.exe.manifest  |  51 +++
 nbexec.rc|  26 ++
 nbexec_exe.rc|  29 ++
 nbexecexe.cpp|  32 ++
 nbexecloader.h   |  66 
 nbproject/configurations.xml | 210 +
 nbproject/project.properties |  17 +
 nbproject/project.xml|  49 +++
 platformlauncher.cpp | 724 +++
 platformlauncher.h   | 111 +++
 utilsfuncs.cpp   | 449 +++
 utilsfuncs.h |  52 
 version.h|  28 ++
 version.rc   |  63 
 20 files changed, 2701 insertions(+)

diff --git a/.dep.inc b/.dep.inc
new file mode 100755
index 000..4560e55
--- /dev/null
+++ b/.dep.inc
@@ -0,0 +1,5 @@
+# This code depends on make tool being used
+DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES}))
+ifneq (${DEPFILES},)
+include ${DEPFILES}
+endif
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..ee8f7c1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,107 @@
+# 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.
+
+#  Main targets can be executed directly, and they are:
+#  
+# buildbuild a specific configuration
+# cleanremove built files from a configuration
+# clobber  remove all built files
+# all  build all configurations
+# help print help mesage
+#  
+#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
+#  .help-impl are implemented in nbproject/makefile-impl.mk.
+#
+# NOCDDL
+
+# Environment 
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+
+
+
+# build
+build: .build-post-$(CONF)
+
+.build-pre:
+# Add your pre 'build' code here...
+
+.build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp 
nbexec_exe.rc
+   windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
+   g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh 
-DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o 
nbexec.exe
+   cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
+   cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
+   
+.build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp 
nbexec_exe.rc
+   x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res 
+   x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat 
-Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc 
-static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe 
+   cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
+   cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
+
+
+
+# clean
+clean: .clean-post-$(CONF)
+
+.clean-pre:
+# Add your pre 'clean' code here...
+
+.clean-post-nbexec: .clean-impl
+   rm -f nbexec_exe32.res nbexec32.exe
+   
+.clean-post-nbexec64: .clean-impl
+   rm -f nbexec_exe64.res nbexec64.exe
+
+
+
+# clobber
+clobber: .clobber-post
+
+.clobber-pre:
+# Add your pre 'clobber' code here...
+
+.clobber-post: .clobber-impl
+# Add your post 'clobber' code here...
+
+
+
+# all
+all: .all-post
+
+.all-pre:
+# Add your pre 'all' code here...
+
+.all-post: .all-impl
+# Add your post 'all' code here...
+
+
+
+# help
+help: .help-post
+
+.help-pre:
+# Add your pre 'help' code here...
+
+.help-post: .help-impl
+# Add your post 'help' code here...
+
+
+
+# include project implementation makefile
+include nbproject/Makefile-impl.mk
diff --git

[netbeans-native-launchers] 07/20: Move the launcher from ide.etc to nb/ide.launcher. Removed the unused projectopener

2021-06-24 Thread skygo

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

commit 250a0455d2be664b1bafe2866177eb8b948180c8
Author: Ralph Benjamin Ruijs 
AuthorDate: Wed Sep 12 20:00:23 2018 +0200

Move the launcher from ide.etc to nb/ide.launcher. Removed the unused 
projectopener
---
 .dep.inc |  22 ++
 Makefile | 106 
 Makefile.migw|  33 +++
 cmdargs.h| 119 +
 nblauncher.cpp   | 576 +++
 nblauncher.h | 109 
 nbproject/configurations.xml | 164 
 nbproject/project.properties |  17 ++
 nbproject/project.xml|  49 
 netbeans.cpp |  29 +++
 netbeans.exe.manifest|  51 
 netbeans.ico | Bin 0 -> 99678 bytes
 netbeans.rc  |  31 +++
 netbeans64.exe.manifest  |  51 
 version.h|  28 +++
 version.rc   |  62 +
 16 files changed, 1447 insertions(+)

diff --git a/.dep.inc b/.dep.inc
new file mode 100644
index 000..08c0aeb
--- /dev/null
+++ b/.dep.inc
@@ -0,0 +1,22 @@
+# 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},)
+include ${DEPFILES}
+endif
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..ff8bc92
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,106 @@
+# 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.
+
+#  Main targets can be executed directly, and they are:
+#  
+# buildbuild a specific configuration
+# cleanremove built files from a configuration
+# clobber  remove all built files
+# all  build all configurations
+# help print help mesage
+#  
+#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
+#  .help-impl are implemented in nbproject/makefile-impl.mk.
+#
+# NOCDDL
+
+
+
+# Environment 
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+
+
+
+# build
+build: .build-post-$(CONF)
+
+.build-pre: .build-pre-$(CONF)
+# Add your pre 'build' code here...
+
+.build-pre-netbeans.exe: netbeans.rc
+   windres -DMANIFEST_FILE="netbeans.exe.manifest" -onetbeans.res -Ocoff 
netbeans.rc
+
+.build-pre-netbeans64.exe: netbeans.rc
+   x86_64-w64-mingw32-windres.exe 
-DMANIFEST_FILE="netbeans64.exe.manifest" -onetbeans64.res -Ocoff netbeans.rc
+
+.build-post-netbeans.exe: .build-impl
+   cp netbeans.exe ../../../nbbuild/netbeans/bin/netbeans.exe
+   
+.build-post-netbeans64.exe: .build-impl
+   cp netbeans64.exe ../../../nbbuild/netbeans/bin/netbeans64.exe
+
+   

+
+# clean
+clean: .clean-post
+
+.clean-pre:
+# Add your pre 'clean' code here...
+
+.clean-post: .clean-impl
+# Add your post 'clean' code here...
+
+
+
+# clobber
+clobber: .clobber-post
+
+.clobber-pre:
+# Add your pre 'clobber' code here...
+
+.clobber-post: .clobber-impl
+# Add your post 'clobber' code here...
+
+
+
+# all
+all: .all-post
+
+.all-pre:
+# Add your pre 'all' code here...
+
+.all-post: .all-impl
+# Add your post 'all' code here...
+
+
+
+# help
+help: .help-post
+
+.help-pre:
+# Add your pre 'help'

[netbeans-native-launchers] 15/20: Prevent race conditions during CLI install (#2523)

2021-06-24 Thread skygo

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

commit 7ed198dbaa6a7d7bf2ffcf2347d4aad9eedb03e1
Author: Svatopluk Dedic 
AuthorDate: Sun Nov 8 17:10:32 2020 +0100

Prevent race conditions during CLI install  (#2523)

* Use a special exitcode when connecting to CLI as client. Do not run 
upgrade step thereafter.

* Piggyback with NBJLS server relaunch after installation completes.

* Delay and/or disable the restart LSP client after connection termination
with the hope to finish install tasks meanwhile and then restart explicitly

* Wait after last child closes on Win.

* Fixed launchers release number -> release.

Co-authored-by: Jaroslav Tulach 
---
 nbexec.cpp   | 9 -
 platformlauncher.cpp | 9 -
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/nbexec.cpp b/nbexec.cpp
index 2e63d02..47e490e 100644
--- a/nbexec.cpp
+++ b/nbexec.cpp
@@ -43,9 +43,16 @@ extern "C" BOOL APIENTRY DllMain(HANDLE hModule,
 return TRUE;
 }
 
+volatile int exitStatus = 0;
+
 void exitHook(int status) {
+exitStatus = status;
 logMsg("Exit hook called with status %d", status);
-launcher.onExit();
+// do not handle possible restarts, if we are just CLI-connecting to a 
running process.
+if (status != -252) {
+launcher.onExit();
+}
+logMsg("Exit hook terminated.");
 }
 
 #define NBEXEC_EXPORT extern "C" __declspec(dllexport)
diff --git a/platformlauncher.cpp b/platformlauncher.cpp
index b29b309..8df954c 100644
--- a/platformlauncher.cpp
+++ b/platformlauncher.cpp
@@ -24,6 +24,8 @@
 #include "platformlauncher.h"
 #include "argnames.h"
 
+volatile extern int exitStatus;
+
 using namespace std;
 
 const char *PlatformLauncher::HELP_MSG =
@@ -662,6 +664,10 @@ bool PlatformLauncher::restartRequested() {
 
 void PlatformLauncher::onExit() {
 logMsg("onExit()");
+if (exitStatus == -252) {
+logMsg("Exiting from CLI client, will not restart.");
+return;
+}
 
 if (exiting) {
 logMsg("Already exiting, no need to schedule restart");
@@ -714,7 +720,8 @@ void PlatformLauncher::onExit() {
 STARTUPINFO si = {0};
 PROCESS_INFORMATION pi = {0};
 si.cb = sizeof(STARTUPINFO);
-if (!CreateProcess(NULL, cmdLineStr, NULL, NULL, FALSE, 0, NULL, NULL, 
, )) {
+
+if (!CreateProcess(NULL, cmdLineStr, NULL, NULL, TRUE, 0, NULL, NULL, 
, )) {
 logErr(true, true, "Failed to create process.");
 return;
 }

-
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

[netbeans-native-launchers] 02/20: Moving the platform modules into their own subdirectory to lower the clutter in the root

2021-06-24 Thread skygo

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

commit ab04dd8f5d85e9a39b3514ac23ac31b26f8c331c
Author: Jaroslav Tulach 
AuthorDate: Sun May 6 07:27:25 2018 +0200

Moving the platform modules into their own subdirectory to lower the 
clutter in the root
---
 Makefile | 103 
 app.cpp  |  29 
 app.ico  | Bin 0 -> 21174 bytes
 app.rc   |  22 ++
 applauncher.cpp  | 158 +++
 applauncher.h|  65 ++
 nbproject/configurations.xml | 112 ++
 nbproject/project.properties |  17 +
 nbproject/project.xml|  46 +
 9 files changed, 552 insertions(+)

diff --git a/Makefile b/Makefile
new file mode 100644
index 000..bef2334
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,103 @@
+# 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.
+
+#  Main targets can be executed directly, and they are:
+#  
+# buildbuild a specific configuration
+# cleanremove built files from a configuration
+# clobber  remove all built files
+# all  build all configurations
+# help print help mesage
+#  
+#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
+#  .help-impl are implemented in nbproject/makefile-impl.mk.
+#
+# NOCDDL
+
+
+
+# Environment 
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+
+
+
+# build
+build: .build-post
+
+.build-pre: .build-pre-$(CONF)
+# Add your pre 'build' code here...
+
+.build-pre-app.exe: app.rc
+   windres -oapp.res -Ocoff app.rc
+
+.build-pre-app64.exe: app.rc
+   x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc
+
+.build-post: .build-impl
+# Add your post 'build' code here...   
+
+
+
+# clean
+clean: .clean-post
+
+.clean-pre:
+# Add your pre 'clean' code here...
+
+.clean-post: .clean-impl
+# Add your post 'clean' code here...
+
+
+
+# clobber
+clobber: .clobber-post
+
+.clobber-pre:
+# Add your pre 'clobber' code here...
+
+.clobber-post: .clobber-impl
+# Add your post 'clobber' code here...
+
+
+
+# all
+all: .all-post
+
+.all-pre:
+# Add your pre 'all' code here...
+
+.all-post: .all-impl
+# Add your post 'all' code here...
+
+
+
+# help
+help: .help-post
+
+.help-pre:
+# Add your pre 'help' code here...
+
+.help-post: .help-impl
+# Add your post 'help' code here...
+
+
+
+# include project implementation makefile
+include nbproject/Makefile-impl.mk
diff --git a/app.cpp b/app.cpp
new file mode 100644
index 000..840c828
--- /dev/null
+++ b/app.cpp
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+ /*
+ * Author: Tomas Holy
+ */
+
+
+#include "applauncher.h"
+
+int main(int argc, char *argv[]) {
+AppLauncher launcher;
+return launcher.start(argc - 1, argv + 1);
+}
diff --git a/app.ico b/app.ico
new file mode 100644
index 000..294cd70
Binary files /dev/null and b/app.ico differ
diff --git a/app.rc b/app.rc
new file mode 100644
index 000..345b1a5
--- /dev/null
+++ b/app.rc
@@ -0,0 +1,22 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work

[netbeans-native-launchers] 11/20: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … (#969)

2021-06-24 Thread skygo

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

commit 1f5e822f73370343f140c2f744f4e81656f73fad
Author: Jan Lahoda 
AuthorDate: Sun Nov 4 03:44:42 2018 +0100

[NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … 
(#969)

* [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling 
console when the launchers are used.

* Fixing name/version of ide launchers.
---
 Makefile.mingw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.mingw b/Makefile.mingw
index 512c77a..791d71b 100644
--- a/Makefile.mingw
+++ b/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

-
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

[netbeans-native-launchers] 20/20: add assembly.xml for distribution

2021-06-24 Thread skygo

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

commit 65042c67818a771926cbf9f70e8a348b873348ba
Author: Eric Barboni 
AuthorDate: Fri Jun 25 00:02:10 2021 +0200

add assembly.xml for distribution
---
 src/assembly/assembly.xml | 41 +
 1 file changed, 41 insertions(+)

diff --git a/src/assembly/assembly.xml b/src/assembly/assembly.xml
new file mode 100644
index 000..7f0aeba
--- /dev/null
+++ b/src/assembly/assembly.xml
@@ -0,0 +1,41 @@
+http://maven.apache.org/ASSEMBLY/2.1.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 
http://maven.apache.org/xsd/assembly-2.1.0.xsd;>
+distribution
+
+zip
+
+false
+
+
+
${project.build.directory}/maven-shared-archive-resources/META-INF
+
+
+README*
+LICENSE*
+NOTICE*
+
+
+
+${project.build.directory}/bootstrap
+
+
+*
+
+
+
+${project.build.directory}/harness
+
+
+*
+
+
+
+${project.build.directory}/ide
+
+
+*
+
+
+
+
\ No newline at end of file

-
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

[netbeans-native-launchers] 09/20: [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

2021-06-24 Thread skygo

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

commit fa6b1a4a76ef7f43ca17a789d2c69c93f47d2be7
Author: Eirik Bakke 
AuthorDate: Sun Oct 14 13:43:45 2018 -0400

[NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

* Fix paths that broke in windows launcher sources when directories were 
moved around.

* Fix a small documentation bug in the platform app launcher configuration 
template.

* Rename Makefile.migw (typo) to Makefile.mingw in one of the windows 
launcher sources.

* Ignore files generated when NetBeans 8.2 is used to open the windows 
launcher projects.

* [NETBEANS-1227] Mark Windows launchers as DPI-aware
---
 Makefile.mingw  |  8 
 nbexec.exe.manifest | 20 +++-
 nbexec_exe.rc   |  4 ++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Makefile.mingw b/Makefile.mingw
index 2f67aa3..d76ddcd 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -26,8 +26,8 @@ nbexec64.res: 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
 
-nbexec_exe64.res: nbexec_exe.rc
-   x86_64-w64-mingw32-windres -onbexec_exe64.res -Ocoff nbexec_exe.rc
+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
@@ -38,8 +38,8 @@ nbexec.res: 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
 
-nbexec_exe.res: nbexec_exe.rc
-   i686-w64-mingw32-windres -onbexec_exe.res -Ocoff nbexec_exe.rc
+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
diff --git a/nbexec.exe.manifest b/nbexec.exe.manifest
index da15223..cfc9190 100644
--- a/nbexec.exe.manifest
+++ b/nbexec.exe.manifest
@@ -25,7 +25,7 @@
name="nbexec.exe"
type="win32"/>
 
-nbexec Process.
+nbexec process
 
   
 
  
 
+
+
+  http://schemas.microsoft.com/SMI/2005/WindowsSettings; 
xmlns:dpi2="http://schemas.microsoft.com/SMI/2016/WindowsSettings;>
+true/PM
+PerMonitorV2, PerMonitor, system
+  
+
+
+
+  
+
+
+
+
+
+  
+
 
diff --git a/nbexec_exe.rc b/nbexec_exe.rc
index 598b6c0..df75c0b 100644
--- a/nbexec_exe.rc
+++ b/nbexec_exe.rc
@@ -24,6 +24,6 @@
 
 #include "version.rc"
 
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nbexec.exe.manifest"
+// Value MANIFEST_FILE id taken from windres parameter -DMANIFEST_FILE
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST MANIFEST_FILE
 

-
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

[netbeans-native-launchers] 16/20: add pom and initial files

2021-06-24 Thread skygo

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

commit c043840ae244e5f5e120b237f39a93f4f69e2d3d
Author: Eric Barboni 
AuthorDate: Thu Jun 24 23:51:29 2021 +0200

add pom and initial files
---
 .gitignore |   2 +
 LICENSE| 208 +
 pom.xml| 136 
 3 files changed, 346 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..41d77da
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/nb-configuration.xml
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..aeb123f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,208 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide,

[netbeans-native-launchers] 17/20: bootstrap code migration

2021-06-24 Thread skygo

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

commit c5b47860f449a47075fb9062801a708924994350
Merge: c043840 7ed198d
Author: Eric Barboni 
AuthorDate: Thu Jun 24 23:56:11 2021 +0200

bootstrap code migration

 src/main/cpp/bootstrap/.dep.inc|5 +
 src/main/cpp/bootstrap/Makefile|  107 ++
 src/main/cpp/bootstrap/Makefile.mingw  |   45 +
 src/main/cpp/bootstrap/argnames.h  |   41 +
 src/main/cpp/bootstrap/include/README  |   18 +
 src/main/cpp/bootstrap/include/jni.h   | 1838 
 src/main/cpp/bootstrap/include/jni_types.h |  451 +
 src/main/cpp/bootstrap/jvmlauncher.cpp |  454 +
 src/main/cpp/bootstrap/jvmlauncher.h   |  123 ++
 src/main/cpp/bootstrap/nbexec.cpp  |   70 +
 src/main/cpp/bootstrap/nbexec.exe.manifest |   69 +
 src/main/cpp/bootstrap/nbexec.rc   |   26 +
 src/main/cpp/bootstrap/nbexec_exe.rc   |   29 +
 src/main/cpp/bootstrap/nbexecexe.cpp   |   32 +
 src/main/cpp/bootstrap/nbexecloader.h  |   66 +
 .../cpp/bootstrap/nbproject/configurations.xml |  210 +++
 .../cpp/bootstrap/nbproject/project.properties |   17 +
 src/main/cpp/bootstrap/nbproject/project.xml   |   49 +
 src/main/cpp/bootstrap/platformlauncher.cpp|  731 
 src/main/cpp/bootstrap/platformlauncher.h  |  111 ++
 src/main/cpp/bootstrap/utilsfuncs.cpp  |  449 +
 src/main/cpp/bootstrap/utilsfuncs.h|   52 +
 src/main/cpp/bootstrap/version.h   |   28 +
 src/main/cpp/bootstrap/version.rc  |   63 +
 24 files changed, 5084 insertions(+)

diff --cc src/main/cpp/bootstrap/.dep.inc
index 000,4560e55..4560e55
mode 00,100755..100755
--- a/src/main/cpp/bootstrap/.dep.inc
+++ b/src/main/cpp/bootstrap/.dep.inc
diff --cc src/main/cpp/bootstrap/Makefile
index 000,ee8f7c1..ee8f7c1
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/Makefile
+++ b/src/main/cpp/bootstrap/Makefile
diff --cc src/main/cpp/bootstrap/Makefile.mingw
index 000,302d778..302d778
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/Makefile.mingw
+++ b/src/main/cpp/bootstrap/Makefile.mingw
diff --cc src/main/cpp/bootstrap/argnames.h
index 000,c4bdaba..c4bdaba
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/argnames.h
+++ b/src/main/cpp/bootstrap/argnames.h
diff --cc src/main/cpp/bootstrap/include/README
index 000,7641ada..7641ada
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/include/README
+++ b/src/main/cpp/bootstrap/include/README
diff --cc src/main/cpp/bootstrap/include/jni.h
index 000,16cf67b..16cf67b
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/include/jni.h
+++ b/src/main/cpp/bootstrap/include/jni.h
diff --cc src/main/cpp/bootstrap/include/jni_types.h
index 000,a809ebb..a809ebb
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/include/jni_types.h
+++ b/src/main/cpp/bootstrap/include/jni_types.h
diff --cc src/main/cpp/bootstrap/jvmlauncher.cpp
index 000,74bf1cc..74bf1cc
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/jvmlauncher.cpp
+++ b/src/main/cpp/bootstrap/jvmlauncher.cpp
diff --cc src/main/cpp/bootstrap/jvmlauncher.h
index 000,01f4e34..01f4e34
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/jvmlauncher.h
+++ b/src/main/cpp/bootstrap/jvmlauncher.h
diff --cc src/main/cpp/bootstrap/nbexec.cpp
index 000,47e490e..47e490e
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbexec.cpp
+++ b/src/main/cpp/bootstrap/nbexec.cpp
diff --cc src/main/cpp/bootstrap/nbexec.exe.manifest
index 000,cfc9190..cfc9190
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbexec.exe.manifest
+++ b/src/main/cpp/bootstrap/nbexec.exe.manifest
diff --cc src/main/cpp/bootstrap/nbexec.rc
index 000,b0843af..b0843af
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbexec.rc
+++ b/src/main/cpp/bootstrap/nbexec.rc
diff --cc src/main/cpp/bootstrap/nbexec_exe.rc
index 000,df75c0b..df75c0b
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbexec_exe.rc
+++ b/src/main/cpp/bootstrap/nbexec_exe.rc
diff --cc src/main/cpp/bootstrap/nbexecexe.cpp
index 000,181a365..181a365
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbexecexe.cpp
+++ b/src/main/cpp/bootstrap/nbexecexe.cpp
diff --cc src/main/cpp/bootstrap/nbexecloader.h
index 000,221a557..221a557
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbexecloader.h
+++ b/src/main/cpp/bootstrap/nbexecloader.h
diff --cc src/main/cpp/bootstrap/nbproject/configurations.xml
index 000,0121be8..0121be8
mode 00,100644..100644
--- a/src/main/cpp/bootstrap/nbproject/configurations.xml
+++ b/src/main/cpp/bootstrap/nbproject/configurations.xml
diff

[netbeans-native-launchers] 12/20: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … (#969)

2021-06-24 Thread skygo

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

commit ab70cb219b5efa30cbaecf18693d9e50952bd50f
Author: Jan Lahoda 
AuthorDate: Sun Nov 4 03:44:42 2018 +0100

[NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … 
(#969)

* [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling 
console when the launchers are used.

* Fixing name/version of ide launchers.
---
 Makefile.mingw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.mingw b/Makefile.mingw
index d76ddcd..302d778 100644
--- a/Makefile.mingw
+++ b/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

-
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

[netbeans-native-launchers] 13/20: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … (#969)

2021-06-24 Thread skygo

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

commit 529472675609d3a6ce6a2f5392671988de8d894e
Author: Jan Lahoda 
AuthorDate: Sun Nov 4 03:44:42 2018 +0100

[NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … 
(#969)

* [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling 
console when the launchers are used.

* Fixing name/version of ide launchers.
---
 Makefile.mingw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.mingw b/Makefile.mingw
index 1e54da8..5ef6f79 100644
--- a/Makefile.mingw
+++ b/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
 

-
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

[netbeans-native-launchers] branch master created (now 65042c6)

2021-06-24 Thread skygo

This is an automated email from the ASF dual-hosted git repository.

skygo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-native-launchers.git.


  at 65042c6  add assembly.xml for distribution

This branch includes the following new commits:

 new 1d019a2  Moving the platform modules into their own subdirectory to 
lower the clutter in the root
 new ab04dd8  Moving the platform modules into their own subdirectory to 
lower the clutter in the root
 new 9ae59c7  Merging with most recent changes in master
 new afdd739  Merging with most recent changes in master
 new b18f30a  Moving new apisupport.harness and o.n.bootstrap files into 
cluster location
 new 06b52bc  Moving new apisupport.harness and o.n.bootstrap files into 
cluster location
 new 250a045  Move the launcher from ide.etc to nb/ide.launcher. Removed 
the unused projectopener
 new 76d6acf  [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)
 new fa6b1a4  [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)
 new d9fb186  [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)
 new 1f5e822  [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, 
disabling … (#969)
 new ab70cb2  [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, 
disabling … (#969)
 new 5294726  [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, 
disabling … (#969)
 new 8277081  [NETBEANS-1605] Removed NetBeans max HeapSize heuristics. 
(#1007)
 new 7ed198d  Prevent race conditions during CLI install  (#2523)
 new c043840  add pom and initial files
 new c5b4786  bootstrap code migration
 new 5e84f26  harness code migration
 new 655f52a  ide code migration
 new 65042c6  add assembly.xml for distribution

The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-
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

[netbeans-native-launchers] 06/20: Moving new apisupport.harness and o.n.bootstrap files into cluster location

2021-06-24 Thread skygo

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

commit 06b52bcd9114b7d9426c814e27702440150a8b69
Author: Jaroslav Tulach 
AuthorDate: Fri Aug 17 18:39:33 2018 +0200

Moving new apisupport.harness and o.n.bootstrap files into cluster location
---
 Makefile.mingw | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/Makefile.mingw b/Makefile.mingw
new file mode 100644
index 000..4f7d188
--- /dev/null
+++ b/Makefile.mingw
@@ -0,0 +1,34 @@
+# 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.
+
+all: app64.exe app.exe
+
+clean:
+   rm -f *.res *.exe
+
+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
+
+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
+

-
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

[netbeans-native-launchers] 04/20: Merging with most recent changes in master

2021-06-24 Thread skygo

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

commit afdd739fd3aea10df0d1ef707d16ed7bc507970c
Author: Jaroslav Tulach 
AuthorDate: Fri Aug 17 17:46:34 2018 +0200

Merging with most recent changes in master
---
 applauncher.cpp | 55 +++
 applauncher.h   |  2 ++
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/applauncher.cpp b/applauncher.cpp
index 02ed481..3a89379 100644
--- a/applauncher.cpp
+++ b/applauncher.cpp
@@ -32,6 +32,7 @@ const char *AppLauncher::OPT_DEFAULT_OPTIONS = 
"default_options=";
 const char *AppLauncher::OPT_EXTRA_CLUSTERS = "extra_clusters=";
 const char *AppLauncher::OPT_JDK_HOME = "jdkhome=";
 const char *AppLauncher::APPNAME_TOKEN = "${APPNAME}";
+const char *AppLauncher::CACHE_SUFFIX = "\\Cache\\";
 
 AppLauncher::AppLauncher() {
 }
@@ -75,51 +76,25 @@ bool AppLauncher::initBaseNames() {
 
 bool AppLauncher::findUserDir(const char *str) {
 logMsg("AppLauncher::findUserDir()");
-if (strncmp(str, HOME_TOKEN, strlen(HOME_TOKEN)) == 0) {
-if (userHome.empty()) {
-TCHAR userHomeChar[MAX_PATH];
-if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, 
userHomeChar))) {
-return false;
-}
-userHome = userHomeChar;   
-logMsg("User home: %s", userHome.c_str());
-}
-str += strlen(HOME_TOKEN);
-userDir = userHome;
+if (!NbLauncher::findUserDir(str)) {// will set userDir and possibly 
userHome.
+return false;
 }
-const char *appToken = strstr(str, APPNAME_TOKEN);
-if (appToken) {
-userDir += string(str, appToken - str);
-str += appToken - str;
-userDir += appName;
-str += strlen(APPNAME_TOKEN);
+int pos = userDir.find(APPNAME_TOKEN);
+if (pos != string::npos) {
+userDir.replace(pos, strlen(APPNAME_TOKEN), appName);
 }
-userDir += str;
 return true;
 }
 
 bool AppLauncher::findCacheDir(const char *str) {
 logMsg("AppLauncher::findCacheDir");
-if (strncmp(str, HOME_TOKEN, strlen(HOME_TOKEN)) == 0) {
-if (userHome.empty()) {
-TCHAR userHomeChar[MAX_PATH];
-if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, 
userHomeChar))) {
-return false;
-}
-userHome = userHomeChar;
-logMsg("User home: %s", userHome.c_str());
-}
-str += strlen(HOME_TOKEN);
-cacheDir = userHome;
+if (!NbLauncher::findCacheDir(str)) {// will set userDir and possibly 
userHome.
+return false;
 }
-const char *appToken = strstr(str, APPNAME_TOKEN);
-if (appToken) {
-cacheDir += string(str, appToken - str);
-str += appToken - str;
-cacheDir += appName;
-str += strlen(APPNAME_TOKEN);
+int pos = cacheDir.find(APPNAME_TOKEN);
+if (pos != string::npos) {
+cacheDir.replace(pos, strlen(APPNAME_TOKEN), appName);
 }
-cacheDir += str;
 return true;
 }
 
@@ -156,3 +131,11 @@ const char * AppLauncher::getJdkHomeOptName() {
 const char * AppLauncher::getCurrentDir() {
 return baseDir.c_str();
 }
+
+std::string AppLauncher::constructApplicationDir(const std::string& dir, bool 
cache) {
+if (cache) {
+return dir + "\\" + getAppName() + CACHE_SUFFIX;
+} else {
+return dir + "\\" + getAppName() + "\\";
+}
+}
diff --git a/applauncher.h b/applauncher.h
index eb554c4..35569bf 100644
--- a/applauncher.h
+++ b/applauncher.h
@@ -38,6 +38,7 @@ class AppLauncher : public NbLauncher {
 static const char *OPT_JDK_HOME;
 static const char *APPNAME_TOKEN;
 static const char *REG_APPDATA_NAME;
+static const char *CACHE_SUFFIX;
 
 public:
 AppLauncher();
@@ -56,6 +57,7 @@ protected:
 virtual const char * getExtraClustersOptName();
 virtual const char * getJdkHomeOptName();
 virtual const char * getCurrentDir();
+virtual std::string constructApplicationDir(const std::string& dir, bool 
cache);
 
 private:
 AppLauncher(const AppLauncher& orig);

-
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

[netbeans-native-launchers] 08/20: [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

2021-06-24 Thread skygo

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

commit 76d6acf2acba6ec3bd1d68b0ddd83ef58f3d422a
Author: Eirik Bakke 
AuthorDate: Sun Oct 14 13:43:45 2018 -0400

[NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

* Fix paths that broke in windows launcher sources when directories were 
moved around.

* Fix a small documentation bug in the platform app launcher configuration 
template.

* Rename Makefile.migw (typo) to Makefile.mingw in one of the windows 
launcher sources.

* Ignore files generated when NetBeans 8.2 is used to open the windows 
launcher projects.

* [NETBEANS-1227] Mark Windows launchers as DPI-aware
---
 Makefile.migw => Makefile.mingw | 12 ++--
 nblauncher.cpp  |  6 +++---
 nbproject/configurations.xml| 12 ++--
 netbeans.exe.manifest   | 22 +-
 netbeans64.exe.manifest | 24 ++--
 5 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/Makefile.migw b/Makefile.mingw
similarity index 68%
rename from Makefile.migw
rename to Makefile.mingw
index be43aff..512c77a 100644
--- a/Makefile.migw
+++ b/Makefile.mingw
@@ -20,14 +20,14 @@ all: netbeans64.exe netbeans.exe
 clean:
rm -f *.res *.exe
 
-netbeans64.res: netbeans.rc
+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 
../../../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
+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 
../../../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
diff --git a/nblauncher.cpp b/nblauncher.cpp
index 7dd7f08..37adb70 100644
--- a/nblauncher.cpp
+++ b/nblauncher.cpp
@@ -26,9 +26,9 @@
 
 #include 
 #include "nblauncher.h"
-#include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
-#include "../../../o.n.bootstrap/launcher/windows/argnames.h"
-#include "../../../o.n.bootstrap/launcher/windows/nbexecloader.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"
 
 using namespace std;
 
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 9fdda65..9e0bf6a 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -26,7 +26,7 @@
projectFiles="true">
   cmdargs.h
   nblauncher.h
-  ../../../o.n.bootstrap/launcher/windows/utilsfuncs.h
+  
../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.h
   version.h
 
 
   nblauncher.cpp
   netbeans.cpp
-  
../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+  
../../../platform/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
 
 -mwindows -Wl,--nxcompat -Wl,--dynamicbase 
-Wl,--no-seh

[netbeans-native-launchers] 03/20: Merging with most recent changes in master

2021-06-24 Thread skygo

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

commit 9ae59c743e7d9afb055f8a26f031a2b46cfb9ac1
Author: Jaroslav Tulach 
AuthorDate: Fri Aug 17 17:46:34 2018 +0200

Merging with most recent changes in master
---
 jvmlauncher.cpp | 3 +--
 version.h   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jvmlauncher.cpp b/jvmlauncher.cpp
index 7e297f1..74bf1cc 100644
--- a/jvmlauncher.cpp
+++ b/jvmlauncher.cpp
@@ -21,8 +21,7 @@
  */
 
 #include "jvmlauncher.h"
-#include 
-#include 
+#include 
 
 using namespace std;
 
diff --git a/version.h b/version.h
index b423ffc..63f0860 100644
--- a/version.h
+++ b/version.h
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-#define COMPANY "Oracle Corporation"
+#define COMPANY ""
 #define COMPONENT "NetBeans Platform Launcher"
 #define VER "9.0.0.0"
 #define FVER 9,0,0,0
-#define BUILD_ID "04012017"
+#define BUILD_ID "03062018"
 #define INTERNAL_NAME "nbexec"
-#define COPYRIGHT "\xA9 2007, 2017 Oracle and/or its affiliates. All rights 
reserved."
+#define COPYRIGHT "Based on Apache NetBeans from the Apache Software 
Foundation and is licensed under Apache License Version 2.0"
 #define NAME "NetBeans Platform Launcher"
 

-
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

[netbeans-native-launchers] 05/20: Moving new apisupport.harness and o.n.bootstrap files into cluster location

2021-06-24 Thread skygo

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

commit b18f30a00cf39413e05fdfd245a2985f5afbddc0
Author: Jaroslav Tulach 
AuthorDate: Fri Aug 17 18:39:33 2018 +0200

Moving new apisupport.harness and o.n.bootstrap files into cluster location
---
 Makefile.mingw  |   45 ++
 include/README  |   18 +
 include/jni.h   | 1838 +++
 include/jni_types.h |  451 +
 4 files changed, 2352 insertions(+)

diff --git a/Makefile.mingw b/Makefile.mingw
new file mode 100644
index 000..2f67aa3
--- /dev/null
+++ b/Makefile.mingw
@@ -0,0 +1,45 @@
+# 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.
+
+all: nbexec64.dll nbexec64.exe nbexec.dll nbexec.exe
+
+clean:
+   rm -f *.res *.exe *.dll
+
+nbexec64.res: nbexec.rc
+   x86_64-w64-mingw32-windres -onbexec64.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
+
+nbexec_exe64.res: nbexec_exe.rc
+   x86_64-w64-mingw32-windres -onbexec_exe64.res -Ocoff 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
+
+nbexec.res: nbexec.rc
+   i686-w64-mingw32-windres -onbexec.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
+
+nbexec_exe.res: nbexec_exe.rc
+   i686-w64-mingw32-windres -onbexec_exe.res -Ocoff 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
diff --git a/include/README b/include/README
new file mode 100644
index 000..7641ada
--- /dev/null
+++ b/include/README
@@ -0,0 +1,18 @@
+# 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.
+
+These header files originate in the Apache Harmony project, tag 5.0m12a.
diff --git a/include/jni.h b/include/jni.h
new file mode 100644
index 000..16cf67b
--- /dev/null
+++ b/include/jni.h
@@ -0,0 +1,1838 @@
+/* 
+ *  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
+ *
+ *

[jira] [Commented] (NETBEANS-5810) MakeUpdateDesc tries to download DTD from www.netbeans.org!

2021-06-24 Thread Eric D. (Jira)



[ 
https://issues.apache.org/jira/browse/NETBEANS-5810?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17368947#comment-17368947
 ] 

Eric D. commented on NETBEANS-5810:
---

Patch against nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java added.

> MakeUpdateDesc tries to download DTD from www.netbeans.org!
> ---
>
> Key: NETBEANS-5810
> URL: https://issues.apache.org/jira/browse/NETBEANS-5810
> Project: NetBeans
>  Issue Type: Bug
>  Components: apisupport - Harness
>Affects Versions: 12.4
>Reporter: Eric D.
>Priority: Major
> Attachments: nbbuild.patch
>
>
> In order to validate generated updates.xml, MakeUpdateDesc calls 
> MakeNBM.validateAgainstAUDTDs().
> This method contains an EntityResolver which resolve to local files when the 
> URL starts with "[http://www.netbeans.org/]; which is not valid anymore. All 
> DTDs are hosted at "[https://netbeans.apache.org/];!
> The validation occurs normally (thanks to redirection) unless you are offline 
> or behind a restrictive firewall.
> Please update remote URL in MakeNBM.validateAgainstAUDTDs method.
>  



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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

[jira] [Updated] (NETBEANS-5810) MakeUpdateDesc tries to download DTD from www.netbeans.org!

2021-06-24 Thread Eric D. (Jira)



 [ 
https://issues.apache.org/jira/browse/NETBEANS-5810?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Eric D. updated NETBEANS-5810:
--
Attachment: nbbuild.patch

> MakeUpdateDesc tries to download DTD from www.netbeans.org!
> ---
>
> Key: NETBEANS-5810
> URL: https://issues.apache.org/jira/browse/NETBEANS-5810
> Project: NetBeans
>  Issue Type: Bug
>  Components: apisupport - Harness
>Affects Versions: 12.4
>Reporter: Eric D.
>Priority: Major
> Attachments: nbbuild.patch
>
>
> In order to validate generated updates.xml, MakeUpdateDesc calls 
> MakeNBM.validateAgainstAUDTDs().
> This method contains an EntityResolver which resolve to local files when the 
> URL starts with "[http://www.netbeans.org/]; which is not valid anymore. All 
> DTDs are hosted at "[https://netbeans.apache.org/];!
> The validation occurs normally (thanks to redirection) unless you are offline 
> or behind a restrictive firewall.
> Please update remote URL in MakeNBM.validateAgainstAUDTDs method.
>  



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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

[jira] [Created] (NETBEANS-5811) Annoying Auto Popup Completion Window with plain text

2021-06-24 Thread Arnaud BERNARD (Jira)

Arnaud BERNARD created NETBEANS-5811:


 Summary: Annoying Auto Popup Completion Window with plain text
 Key: NETBEANS-5811
 URL: https://issues.apache.org/jira/browse/NETBEANS-5811
 Project: NetBeans
  Issue Type: Bug
  Components: editor - Completion  Templates
Affects Versions: 12.3, 12.4
 Environment: Authentic Windows 10 Pro 64bits version 21H1 up to date.
Reporter: Arnaud BERNARD
 Attachments: netbeans-auto-popup_1.png, netbeans-auto-popup_2.png

Hi,

If you uncheck "Auto Popup Completion Window" only for HTML, the Popup still 
showing up each time you press the space bar to write a plain text in HTML tags 
inside a PHP file.

As I had already read, It's really annoying when you use NetBeans as simple 
text editor, even if I spend most of my time to code in PHP.

The only way to turn of this feature with the HTML is to uncheck "Auto Popup 
Completion Window" for all languages.

This problem is not new. I tried several parameters, in PHP tab with no success.

Thanks,



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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

[jira] [Created] (NETBEANS-5810) MakeUpdateDesc tries to download DTD from www.netbeans.org!

2021-06-24 Thread Eric D. (Jira)

Eric D. created NETBEANS-5810:
-

 Summary: MakeUpdateDesc tries to download DTD from 
www.netbeans.org!
 Key: NETBEANS-5810
 URL: https://issues.apache.org/jira/browse/NETBEANS-5810
 Project: NetBeans
  Issue Type: Bug
  Components: apisupport - Harness
Affects Versions: 12.4
Reporter: Eric D.


In order to validate generated updates.xml, MakeUpdateDesc calls 
MakeNBM.validateAgainstAUDTDs().

This method contains an EntityResolver which resolve to local files when the 
URL starts with "[http://www.netbeans.org/]; which is not valid anymore. All 
DTDs are hosted at "[https://netbeans.apache.org/];!

The validation occurs normally (thanks to redirection) unless you are offline 
or behind a restrictive firewall.

Please update remote URL in MakeNBM.validateAgainstAUDTDs method.

 



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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

[netbeans] branch master updated (5fb463f -> 6a3825c)

2021-06-24 Thread sdedic

This is an automated email from the ASF dual-hosted git repository.

sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 5fb463f  Do not proceed with launch with disabled action.
 new c282a25  MavenActionProvider can disable an action.
 new fd774af  Micronaut disables Debug* in development mode
 new 4bcb96a  Temporarily reset to default config, to get toplevel profile 
definitions.
 new a401cec  UI support for disabled actions.
 new 6a3825c  Merge pull request #3016 from 
sdedic/maven/disable-project-action

The 5568 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 enterprise/micronaut/nbproject/project.xml |  2 +-
 .../micronaut/resources/micronaut-actions.xml  | 39 
 java/api.maven/manifest.mf |  2 +-
 .../test/unit/src/META-INF/generated-layer.xml |  5 ++
 .../org/netbeans/api/maven/MavenActionsTest.java   | 55 ++--
 .../org/netbeans/api/maven/test-maven-actions.xml  |  5 ++
 .../netbeans/api/maven/test-maven-actions2.xml}| 14 +++--
 java/maven/apichanges.xml  | 14 +
 java/maven/manifest.mf |  2 +-
 .../maven/configurations/M2ConfigProvider.java |  8 ++-
 .../modules/maven/customizer/ActionMappings.form   | 15 -
 .../modules/maven/customizer/ActionMappings.java   | 73 +++---
 .../modules/maven/customizer/Bundle.properties |  3 +-
 .../modules/maven/execute/ActionToGoalUtils.java   | 41 
 .../maven/spi/actions/MavenActionsProvider.java|  6 ++
 15 files changed, 247 insertions(+), 37 deletions(-)
 copy java/{maven/src/org/netbeans/modules/maven/nbactions.xml => 
api.maven/test/unit/src/org/netbeans/api/maven/test-maven-actions2.xml} (75%)

-
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

[netbeans] branch master updated (5f0acca -> 5fb463f)

2021-06-24 Thread entl

This is an automated email from the ASF dual-hosted git repository.

entl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 5f0acca  Add Run with configuration into code lenses.
 new 36ec200  Removing unused findEnabledTarget() method.
 new 5fb463f  Do not proceed with launch with disabled action.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

-
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

[netbeans] 02/02: Do not proceed with launch with disabled action.

2021-06-24 Thread entl

This is an automated email from the ASF dual-hosted git repository.

entl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 5fb463fe8f713cfde5f264b961526e93c1f0b807
Author: Svata Dedic 
AuthorDate: Wed Jun 23 17:59:24 2021 +0200

Do not proceed with launch with disabled action.
---
 .../modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
index 3113b6e..767ad13 100644
--- 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
@@ -260,6 +260,7 @@ public abstract class NbLaunchDelegate {
 } else {
 launchFuture.completeExceptionally(new 
CancellationException());
 }
+return;
 }
 }
 

-
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

[netbeans] 01/02: Removing unused findEnabledTarget() method.

2021-06-24 Thread entl

This is an automated email from the ASF dual-hosted git repository.

entl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 36ec2009bc4b04a812485ebfcb76c16f79ffe127
Author: Martin Entlicher 
AuthorDate: Wed Jun 23 16:30:40 2021 +0200

Removing unused findEnabledTarget() method.
---
 .../modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java  | 6 --
 1 file changed, 6 deletions(-)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
index e9e9de4..3113b6e 100644
--- 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
@@ -404,12 +404,6 @@ public abstract class NbLaunchDelegate {
 }
 }
 
-private static CompletableFuture> 
findEnabledTarget(FileObject toRun, SingleMethod singleMethod, boolean debug, 
boolean testRun, NbProcessConsole ioContext) throws IllegalArgumentException {
-return findTargetWithPossibleRebuild(toRun, singleMethod, debug, 
testRun, ioContext).thenApply((Pair actionAndCommand) 
-> {
-return null;
-});
-}
-
 private static CompletableFuture> 
findTargetWithPossibleRebuild(FileObject toRun, SingleMethod singleMethod, 
boolean debug, boolean testRun, NbProcessConsole ioContext) throws 
IllegalArgumentException {
 Pair providerAndCommand = findTarget(toRun, 
singleMethod, debug, testRun);
 if (providerAndCommand != null) {

-
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

[netbeans-native-launchers] 03/03: Short Readme

[netbeans-native-launchers] 01/03: add missing header

[netbeans-native-launchers] 02/03: Add notice to be the same as netbeans repo

[netbeans-native-launchers] branch master updated (0894a99 -> dc53297)

[netbeans-native-launchers] branch master updated: scripts and folder adjustement

[jira] [Created] (NETBEANS-5813) IDE crash completely without internet

[netbeans-native-launchers] 19/20: ide code migration

[netbeans-native-launchers] 14/20: [NETBEANS-1605] Removed NetBeans max HeapSize heuristics. (#1007)

[netbeans-native-launchers] 10/20: [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

[netbeans-native-launchers] 18/20: harness code migration

[netbeans-native-launchers] 01/20: Moving the platform modules into their own subdirectory to lower the clutter in the root

[netbeans-native-launchers] 07/20: Move the launcher from ide.etc to nb/ide.launcher. Removed the unused projectopener

[netbeans-native-launchers] 15/20: Prevent race conditions during CLI install (#2523)

[netbeans-native-launchers] 02/20: Moving the platform modules into their own subdirectory to lower the clutter in the root

[netbeans-native-launchers] 11/20: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … (#969)

[netbeans-native-launchers] 20/20: add assembly.xml for distribution

[netbeans-native-launchers] 09/20: [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

[netbeans-native-launchers] 16/20: add pom and initial files

[netbeans-native-launchers] 17/20: bootstrap code migration

[netbeans-native-launchers] 12/20: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … (#969)

[netbeans-native-launchers] 13/20: [NETBEANS-1420][NETBEANS-1308] Updating Windows Launchers, disabling … (#969)

[netbeans-native-launchers] branch master created (now 65042c6)

[netbeans-native-launchers] 06/20: Moving new apisupport.harness and o.n.bootstrap files into cluster location

[netbeans-native-launchers] 04/20: Merging with most recent changes in master

[netbeans-native-launchers] 08/20: [NETBEANS-1227] Mark Windows launchers as DPI-aware (#883)

[netbeans-native-launchers] 03/20: Merging with most recent changes in master

[netbeans-native-launchers] 05/20: Moving new apisupport.harness and o.n.bootstrap files into cluster location

[jira] [Commented] (NETBEANS-5810) MakeUpdateDesc tries to download DTD from www.netbeans.org!

[jira] [Updated] (NETBEANS-5810) MakeUpdateDesc tries to download DTD from www.netbeans.org!

[jira] [Created] (NETBEANS-5811) Annoying Auto Popup Completion Window with plain text

[jira] [Created] (NETBEANS-5810) MakeUpdateDesc tries to download DTD from www.netbeans.org!

[netbeans] branch master updated (5fb463f -> 6a3825c)

[netbeans] branch master updated (5f0acca -> 5fb463f)

[netbeans] 02/02: Do not proceed with launch with disabled action.

[netbeans] 01/02: Removing unused findEnabledTarget() method.

35 matches

Site Navigation

Mail list logo

Footer information