ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Setup/Windows/AEI.iss

Comparing AE/Setup/Windows/AEI.iss (file contents):
Revision 854 by alloc, Sat Apr 13 23:31:58 2013 UTC vs.
Revision 855 by alloc, Fri May 3 13:45:16 2013 UTC

#	Line 1 | Line 1
1		#define AppId "{{B67333BB-1CF9-4EFD-A40B-E25B5CB4C8A7}}"
2	<	#define AppVersion "1"
2	>	#define AppVersion "1.1"
3		#define AppLongName "Anniversary Edition of Oni"
4		#define AppShortName "Anniversary-Edition-Setup"
5
#	Line 64 | Line 64 | Name: "{group}\AEInstaller 2"; Filename:
64		Name: "{commondesktop}\AEInstaller 2"; Filename: "{code:GetJavaPath}\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; IconFilename: "{app}\AE\AEInstaller\AElogo.ico"; Parameters: "-Dsun.java2d.d3d=false -jar bin\AEInstaller2.jar"; Tasks: desktopicon; Check: IsJavaInstalled
65
66		[Run]
67	<	Filename: "{app}\AE\AEInstaller\JRE\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: not IsJavaInstalled
68	<	Filename: "{code:GetJavaPath}\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: IsJavaInstalled
67	>	Filename: "{app}\AE\AEInstaller\JRE\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: not IsJavaInstalled; BeforeInstall: WriteProxyData
68	>	Filename: "{code:GetJavaPath}\bin\javaw.exe"; WorkingDir: "{app}\AE\AEInstaller"; Parameters: "-Dsun.java2d.d3d=false -jar AEInstaller2Updater.jar"; Flags: runasoriginaluser; Check: IsJavaInstalled; BeforeInstall: WriteProxyData
69
70
71		[Code]
72		var
73	+	PageUseProxy: TInputOptionWizardPage;
74	+	PageProxyData: TInputQueryWizardPage;
75		javaPath: String;
76
77		procedure DecodeVersion (verstr: String; var verint: array of Integer);
#	Line 184 | Line 186 | begin
186		Components.ItemEnabled[i] := false;
187		Components.Checked[i] := true;
188		end;
189	+
190	+	PageUseProxy := CreateInputOptionPage(wpSelectTasks, 'Internet connection type', '', 'Do you require to use a proxy to connect to the internet?', true, false);
191	+	PageUseProxy.Add('Direct connection');
192	+	PageUseProxy.Add('Use proxy');
193	+	PageUseProxy.Values[0] := true;
194	+
195	+	PageProxyData := CreateInputQueryPage(PageUseProxy.ID, 'Proxy data', '', 'Please enter the data required to connect to your proxy.');
196	+	PageProxyData.Add('Hostname or IP:', False);
197	+	PageProxyData.Add('Port:', False);
198		end;
199
200		function DirOk(Path: String): boolean;
#	Line 206 | Line 217 | begin
217		end;
218
219
220	+	function EnterProxyData(): Boolean;
221	+	begin
222	+	Result := PageUseProxy.SelectedValueIndex = 1;
223	+	end;
224	+
225		function ShouldSkipPage(PageID: Integer): Boolean;
226		begin
227	<	Result := PageID = wpSelectComponents;
227	>	Result := false;
228	>	if (PageID = wpSelectComponents) then
229	>	Result := true;
230	>	if (PageID = PageProxyData.ID) then
231	>	Result := not EnterProxyData();
232		end;
233
234	+
235		function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
236		begin
237		Result := MemoUserInfoInfo + NewLine;
238		Result := Result + MemoDirInfo + NewLine;
239		Result := Result + MemoGroupInfo + NewLine;
240		Result := Result + MemoTasksInfo + NewLine;
241	+
242	+	if (EnterProxyData()) then
243	+	Result := Result + NewLine + 'Set proxy configuration';
244		end;
245
246	+
247	+	procedure WriteProxyData();
248	+	begin
249	+	if (EnterProxyData()) then
250	+	begin
251	+	SaveStringToFile(ExpandConstant('{app}') + '\AE\AEInstaller\AEI-ProxySettings.xml',
252	+	'<?xml version="1.0" ?><Proxy><useProxy>true</useProxy><hostOrIp>'+PageProxyData.Values[0]+'</hostOrIp><port>'+PageProxyData.Values[1]+'</port></Proxy>',
253	+	False);
254	+	end;
255	+	end;

Diff Legend

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