Skip to content

Commit

Permalink
win installer java11 fix (#6480)
Browse files Browse the repository at this point in the history
* fix typo in Windows Installer config for Java 11

* update installer version number

* another variable name typo correction
  • Loading branch information
devel-bobm committed Jan 22, 2019
1 parent 82650bd commit 1aa99cc
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions scripts/WinInstallFiles/InstallJMRI.nsi
Expand Up @@ -50,6 +50,9 @@
; -------------------------------------------------------------------------
; - Version History
; -------------------------------------------------------------------------
; - Version 0.1.24.1
; - Correct the support for Java 11 Registry Keys
; -------------------------------------------------------------------------
; - Version 0.1.24.0
; - Add support for Java 11 Registry Keys
; -------------------------------------------------------------------------
Expand Down Expand Up @@ -301,7 +304,7 @@
; -- usually, this will be determined by the build.xml ant script
!define JRE_VER "1.8" ; Required JRE version
!endif
!define INST_VER "0.1.24.0" ; Installer version
!define INST_VER "0.1.24.1" ; Installer version
!define PNAME "${APP}.${JMRI_VER}" ; Name of installer.exe
!define SRCDIR "." ; Path to head of sources
InstallDir "$PROGRAMFILES\JMRI" ; Default install directory
Expand Down Expand Up @@ -1201,8 +1204,8 @@ Function CheckJRE
ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
ReadRegStr $0 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "JavaHome"
IfErrors 0 JRECheck
ReadRegStr $R1 HKLM "SOFTWARE\JavaSoft\JDK" "CurrentVersion"
ReadRegStr $R0 HKLM "SOFTWARE\JavaSoft\JDK\$R1" "JavaHome"
ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\JDK" "CurrentVersion"
ReadRegStr $0 HKLM "SOFTWARE\JavaSoft\JDK\$1" "JavaHome"

; -- Not found
IfErrors 0 JRECheck
Expand Down

0 comments on commit 1aa99cc

Please sign in to comment.