Changeset 697 for AE


Ignore:
Timestamp:
Mar 12, 2013, 7:08:36 PM (6 years ago)
Author:
alloc
Message:

AEI2: SVN Cleanups

Location:
AE/installer2/setup_win
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • AE/installer2/setup_win/AEI.iss

    r651 r697  
    11#define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}"
    2 #define AppVersion "0.99"
     2#define AppVersion "0.99p"
    33#define AppLongName "Anniversary Edition of Oni"
    44#define AppShortName "AEInstaller"
    55
    66#define MinJavaVersion "1.6"
     7#define JavaDownloadPage "http://www.java.com/en/download/manual.jsp#win"
    78
    89[Setup]
     
    1718AppendDefaultDirName=no
    1819
     20ArchitecturesInstallIn64BitMode=x64
    1921ShowComponentSizes=no
    2022AppPublisher=
     
    3537[CustomMessages]
    3638en.wrongDir=This doesn't seem to be your Oni installation; I don't see a file here named "Oni.exe".
     39en.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?
    3740
    3841[Tasks]
     
    115118procedure CheckJavaRuntime();
    116119var
     120  W6432: Boolean;
    117121  Res: Boolean;
    118122  JavaVer: String;
    119123begin
     124  W6432 := False;
    120125  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;
    121131  if Res = True then
    122132  begin
     
    125135        if CompareVersion(JavaVer, '{#MinJavaVersion}') >= 0 then
    126136        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);
    128141        end;
    129142    end;
  • AE/installer2/setup_win/AEI_no_jre.iss

    r657 r697  
    11#define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}"
    2 #define AppVersion "0.99h"
     2#define AppVersion "0.99p"
    33#define AppLongName "Anniversary Edition of Oni"
    44#define AppShortName "AEInstaller"
     
    1818AppendDefaultDirName=no
    1919
     20ArchitecturesInstallIn64BitMode=x64
    2021ShowComponentSizes=no
    2122AppPublisher=
Note: See TracChangeset for help on using the changeset viewer.