ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/installer2/setup_win/AEI.iss

Comparing AE/installer2/setup_win/AEI.iss (file contents):
Revision 651 by alloc, Fri Jan 25 14:03:29 2013 UTC vs.
Revision 697 by alloc, Tue Mar 12 18:08:36 2013 UTC

#	Line 1 | Line 1
1		#define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}"
2	<	#define AppVersion "0.99"
2	>	#define AppVersion "0.99p"
3		#define AppLongName "Anniversary Edition of Oni"
4		#define AppShortName "AEInstaller"
5
6		#define MinJavaVersion "1.6"
7	+	#define JavaDownloadPage "http://www.java.com/en/download/manual.jsp#win"
8
9		[Setup]
10		AppId={#AppId}
#	Line 16 | Line 17 | DefaultGroupName=Oni AE
17		DirExistsWarning=no
18		AppendDefaultDirName=no
19
20	+	ArchitecturesInstallIn64BitMode=x64
21		ShowComponentSizes=no
22		AppPublisher=
23		AppPublisherURL=
#	Line 34 | Line 36 | en.SelectDirBrowseLabel=Please select th
36
37		[CustomMessages]
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?
40
41		[Tasks]
42		Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
#	Line 114 | Line 117 | end;
117
118		procedure CheckJavaRuntime();
119		var
120	+	W6432: Boolean;
121		Res: Boolean;
122		JavaVer: String;
123		begin
124	+	W6432 := False;
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;
131		if Res = True then
132		begin
133		if Length( JavaVer ) > 0 then
134		begin
135		if CompareVersion(JavaVer, '{#MinJavaVersion}') >= 0 then
136		begin
137	<	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);
141		end;
142		end;
143		end;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)