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-installers.git
commit e89fd9fd275887844d6d0027d201f76cf6420785
Author: Reema Taneja <32299405+rtane...@users.noreply.github.com>
AuthorDate: Fri May 10 10:28:45 2019 +0530
[NETBEANS-2381] JDK 12 ver string support in nbi native win launcher (#1196)
* [NETBEANS-2381] JDK 12 version string support
* renamed license file
* renamed license file
---
launcher/windows/resources/icon.ico | Bin 300318 -> 99678 bytes
launcher/windows/src/JavaUtils.c | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/launcher/windows/resources/icon.ico
b/launcher/windows/resources/icon.ico
index e730c4a..ec123c0 100644
Binary files a/launcher/windows/resources/icon.ico and
b/launcher/windows/resources/icon.ico differ
diff --git a/launcher/windows/src/JavaUtils.c b/launcher/windows/src/JavaUtils.c
index 6012afb..9e4245e 100644
--- a/launcher/windows/src/JavaUtils.c
+++ b/launcher/windows/src/JavaUtils.c
@@ -42,6 +42,7 @@ const DWORD JVM_EXTRACTION_TIMEOUT = 180000; //180sec
WCHAR * JAVA_REGISTRY_KEYS [] = {
L"SOFTWARE\\JavaSoft\\Java Runtime Environment",
L"SOFTWARE\\JavaSoft\\Java Development Kit",
+ L"SOFTWARE\\JavaSoft\\JDK",
L"SOFTWARE\\JRockit\\Java Runtime Environment",
L"SOFTWARE\\JRockit\\Java Development Kit",
L"SOFTWARE\\IBM\\Java Runtime Environment",
@@ -138,7 +139,7 @@ JavaVersion * getJavaVersionFromString(char * string, DWORD
* result) {
major = (major) * 10 + c - '0';
if (major > 999) return vers;
continue;
- } else if(c=='.'){
+ } else if(c=='.' || c=='+'){
break;
} else{
return vers;
---------------------------------------------------------------------
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
