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-mavenutils-nbm-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 317252e added detection for JDK/JRE64 on windows
new 6ddefec Merge pull request #12 from nigjo/win64detection
317252e is described below
commit 317252e85012770a456f97a3e54045d5db0179f0
Author: Jens Hofschröer <git...@nigjo.de>
AuthorDate: Thu Aug 27 11:56:21 2020 +0200
added detection for JDK/JRE64 on windows
since Java 9 there is no "jre" folder inside a jdk installation, hence the
64-bit detection fails always.
in recent (Open)JDK x64 builds on windows there is always a
"windowsaccessbridge-64.dll" file.
---
src/main/java/org/apache/netbeans/nbm/RunNetBeansMojo.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/netbeans/nbm/RunNetBeansMojo.java
b/src/main/java/org/apache/netbeans/nbm/RunNetBeansMojo.java
index 38d02ce..efa0ed5 100644
--- a/src/main/java/org/apache/netbeans/nbm/RunNetBeansMojo.java
+++ b/src/main/java/org/apache/netbeans/nbm/RunNetBeansMojo.java
@@ -206,7 +206,8 @@ public class RunNetBeansMojo
String jdkHome = System.getenv( "JAVA_HOME" );
if ( jdkHome != null )
{
- if ( new File( jdkHome, "jre\\lib\\amd64\\jvm.cfg"
).exists() )
+ if ( new File( jdkHome, "jre\\lib\\amd64\\jvm.cfg"
).exists() ||
+ new File( jdkHome,
"bin\\windowsaccessbridge-64.dll" ).exists()
{
File exec64 = new File( netbeansInstallation, "bin\\"
+ appName + "64.exe" );
if ( exec64.isFile() )
---------------------------------------------------------------------
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
