This is an automated email from the ASF dual-hosted git repository.
rtaneja pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e465842 [NETBEANS-2381] JDK 12 ver string support in nbi native win
launcher (#1196)
e465842 is described below
commit e465842e724d727f0f3b4d3b19f1c9587d9b93fd
Author: Reema Taneja <[email protected]>
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
---
harness/libs.nbi.engine/build.xml | 2 +-
harness/libs.nbi.engine/external/binaries-list | 2 +-
...=> nbi.engine-external-binaries-11-license.txt} | 2 +-
.../native/launcher/windows/resources/icon.ico | Bin 300318 -> 99678 bytes
nbi/engine/native/launcher/windows/src/JavaUtils.c | 3 ++-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/harness/libs.nbi.engine/build.xml
b/harness/libs.nbi.engine/build.xml
index a10b622..b5c4319 100644
--- a/harness/libs.nbi.engine/build.xml
+++ b/harness/libs.nbi.engine/build.xml
@@ -47,7 +47,7 @@
</target>
<target name="build-init" depends="projectized.build-init">
- <unzip src="external/nbi.engine-external-binaries-8.2.zip"
dest="${nbi.engine.dir}"/>
+ <unzip src="external/nbi.engine-external-binaries-11.zip"
dest="${nbi.engine.dir}"/>
</target>
</project>
diff --git a/harness/libs.nbi.engine/external/binaries-list
b/harness/libs.nbi.engine/external/binaries-list
index e214063..a9e21b6 100644
--- a/harness/libs.nbi.engine/external/binaries-list
+++ b/harness/libs.nbi.engine/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-F7AC2814BF39CC1555C30C9835674BAF235EBCE1 nbi.engine-external-binaries-8.2.zip
+2B892D9E648A792EDB0F705378E06F84C322E208 nbi.engine-external-binaries-11.zip
diff --git
a/harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt
b/harness/libs.nbi.engine/external/nbi.engine-external-binaries-11-license.txt
similarity index 99%
rename from
harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt
rename to
harness/libs.nbi.engine/external/nbi.engine-external-binaries-11-license.txt
index 0631731..8112b9f 100644
---
a/harness/libs.nbi.engine/external/nbi.engine-external-binaries-8.2-license.txt
+++
b/harness/libs.nbi.engine/external/nbi.engine-external-binaries-11-license.txt
@@ -1,6 +1,6 @@
Name: NetBeans Installer Binaries
Description: NetBeans Installer Binaries
-Version: 8.2
+Version: 11
License: CDDL-1.0
Source: https://netbeans.org/
Origin: NetBeans
diff --git a/nbi/engine/native/launcher/windows/resources/icon.ico
b/nbi/engine/native/launcher/windows/resources/icon.ico
index e730c4a..ec123c0 100644
Binary files a/nbi/engine/native/launcher/windows/resources/icon.ico and
b/nbi/engine/native/launcher/windows/resources/icon.ico differ
diff --git a/nbi/engine/native/launcher/windows/src/JavaUtils.c
b/nbi/engine/native/launcher/windows/src/JavaUtils.c
index 6012afb..9e4245e 100644
--- a/nbi/engine/native/launcher/windows/src/JavaUtils.c
+++ b/nbi/engine/native/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: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
