Changeset 697

Timestamp:

Mar 12, 2013, 7:08:36 PM (12 years ago)

Author:

alloc

Message:

AEI2: SVN Cleanups

Location:

AE/installer2/setup_win

Files:

• AEI.iss (modified) (5 diffs)
• AEI_no_jre.iss (modified) (2 diffs)
• AEInstaller2.jar (deleted)

AE/installer2/setup_win/AEI.iss

@@ -1 +1 @@
 #define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}"
-#define AppVersion "0.99"
+#define AppVersion "0.99p"
 #define AppLongName "Anniversary Edition of Oni"
 #define AppShortName "AEInstaller"
 
 #define MinJavaVersion "1.6"
+#define JavaDownloadPage "http://www.java.com/en/download/manual.jsp#win"
 
 [Setup]
@@ -17 +18 @@
 AppendDefaultDirName=no
 
+ArchitecturesInstallIn64BitMode=x64
 ShowComponentSizes=no
 AppPublisher=
@@ -35 +37 @@
 [CustomMessages]
 en.wrongDir=This doesn't seem to be your Oni installation; I don't see a file here named "Oni.exe".
+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?
 
 [Tasks]
@@ -115 +118 @@
 procedure CheckJavaRuntime();
 var
+  W6432: Boolean;
   Res: Boolean;
   JavaVer: String;
 begin
+  W6432 := False;
   Res := RegQueryStringValue(HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', JavaVer);
+  if (Res = False) and IsWin64() then
+  begin
+    Res := RegQueryStringValue(HKLM32, 'SOFTWARE\JavaSoft\Java Runtime Environment', 'CurrentVersion', JavaVer);
+    W6432 := Res;
+  end;
   if Res = True then
   begin
@@ -125 +135 @@
         if CompareVersion(JavaVer, '{#MinJavaVersion}') >= 0 then
         begin
-        Res := RegQueryStringValue(HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment\'+JavaVer, 'JavaHome', javaPath);
+        if W6432 then
+          Res := RegQueryStringValue(HKLM32, 'SOFTWARE\JavaSoft\Java Runtime Environment\'+JavaVer, 'JavaHome', javaPath)
+        else
+          Res := RegQueryStringValue(HKLM, 'SOFTWARE\JavaSoft\Java Runtime Environment\'+JavaVer, 'JavaHome', javaPath);
         end;
     end;

AE/installer2/setup_win/AEI_no_jre.iss

@@ -1 +1 @@
 #define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}"
-#define AppVersion "0.99h"
+#define AppVersion "0.99p"
 #define AppLongName "Anniversary Edition of Oni"
 #define AppShortName "AEInstaller"
@@ -18 +18 @@
 AppendDefaultDirName=no
 
+ArchitecturesInstallIn64BitMode=x64
 ShowComponentSizes=no
 AppPublisher=