Changeset 697 for AE/installer2
- Timestamp:
- Mar 12, 2013, 7:08:36 PM (12 years ago)
- Location:
- AE/installer2/setup_win
- Files:
-
- 1 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
AE/installer2/setup_win/AEI.iss
r651 r697 1 1 #define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}" 2 #define AppVersion "0.99 "2 #define AppVersion "0.99p" 3 3 #define AppLongName "Anniversary Edition of Oni" 4 4 #define AppShortName "AEInstaller" 5 5 6 6 #define MinJavaVersion "1.6" 7 #define JavaDownloadPage "http://www.java.com/en/download/manual.jsp#win" 7 8 8 9 [Setup] … … 17 18 AppendDefaultDirName=no 18 19 20 ArchitecturesInstallIn64BitMode=x64 19 21 ShowComponentSizes=no 20 22 AppPublisher= … … 35 37 [CustomMessages] 36 38 en.wrongDir=This doesn't seem to be your Oni installation; I don't see a file here named "Oni.exe". 39 en.JavaNotFound=This program needs a Java Runtime (JRE) with version being at least %1.%nPlease download and install a suitable JRE.%nDo you want do download a JRE now? 37 40 38 41 [Tasks] … … 115 118 procedure CheckJavaRuntime(); 116 119 var 120 W6432: Boolean; 117 121 Res: Boolean; 118 122 JavaVer: String; 119 123 begin 124 W6432 := False; 120 125 Res := RegQueryStringValue(HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', JavaVer); 126 if (Res = False) and IsWin64() then 127 begin 128 Res := RegQueryStringValue(HKLM32, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', JavaVer); 129 W6432 := Res; 130 end; 121 131 if Res = True then 122 132 begin … … 125 135 if CompareVersion(JavaVer, '{#MinJavaVersion}') >= 0 then 126 136 begin 127 Res := RegQueryStringValue(HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment\'+JavaVer, 'JavaHome', javaPath); 137 if W6432 then 138 Res := RegQueryStringValue(HKLM32, 'SOFTWARE\JavaSoft\Java Runtime Environment\'+JavaVer, 'JavaHome', javaPath) 139 else 140 Res := RegQueryStringValue(HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment\'+JavaVer, 'JavaHome', javaPath); 128 141 end; 129 142 end; -
AE/installer2/setup_win/AEI_no_jre.iss
r657 r697 1 1 #define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}" 2 #define AppVersion "0.99 h"2 #define AppVersion "0.99p" 3 3 #define AppLongName "Anniversary Edition of Oni" 4 4 #define AppShortName "AEInstaller" … … 18 18 AppendDefaultDirName=no 19 19 20 ArchitecturesInstallIn64BitMode=x64 20 21 ShowComponentSizes=no 21 22 AppPublisher=
Note:
See TracChangeset
for help on using the changeset viewer.