Skip to content

Commit adb3369

Browse files
committed
Changed version number
1 parent d8fb53c commit adb3369

File tree

2 files changed

+33
-14
lines changed

2 files changed

+33
-14
lines changed

src/HackWindowsInstaller.iss

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256

257257
//--------------------------------------------------------
258258
//Version of this installer script. Please do not change.
259-
#define public ScriptVersion '1.08'
259+
#define public ScriptVersion '2.01'
260260
//--------------------------------------------------------
261261

262262

@@ -321,10 +321,9 @@ OutputBaseFilename={#ExeFile}
321321

322322
;Target folder settings
323323
DefaultDirName={pf}\{#AddBackslash(DestinationFolder)}
324-
;Dot warn the user when the folder exists
324+
;Don't warn when the taget folder exists
325325
DirExistsWarning=no
326326

327-
328327
#if len(IconFile)>0
329328
;This icon is used for the icon of the resulting exe
330329
SetupIconFile={#IconFile}
@@ -333,12 +332,9 @@ DirExistsWarning=no
333332
UninstallDisplayIcon={app}\{#ExtractFileName(IconFile)}
334333
#endif
335334

336-
337-
;Source dir is the base path
335+
;Source folder is the base path
338336
SourceDir={#base_path}
339337

340-
341-
342338
;Always create a log to aid troubleshooting. The file is created as:
343339
;C:\Users\<YourUsername>\AppData\Local\Temp\Setup Log Year-Month-Day #XXX.txt
344340
SetupLogging=Yes
@@ -1079,6 +1075,20 @@ begin
10791075
end;
10801076
10811077
1078+
{
1079+
//Not used right now - See [Messages]
1080+
function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
1081+
var
1082+
text:string;
1083+
begin
1084+
text:='';
1085+
text:=text + 'Setup is now ready to install Hack v2.XXX on your system' + NewLine;
1086+
text:=text + NewLine;
1087+
text:=text + 'Click Install to continue.' + NewLine;
1088+
1089+
result:=text;
1090+
end;
1091+
}
10821092
10831093
10841094
//Save the result of the preprocessor to a file for review

src/zz_Preprocessor_Result.iss

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,22 +162,18 @@ OutputBaseFilename=HackWindowsInstaller
162162

163163
;Target folder settings
164164
DefaultDirName={pf}\Hack Windows Installer\
165-
;Dot warn the user when the folder exists
165+
;Don't warn when the taget folder exists
166166
DirExistsWarning=no
167167

168-
169168
;This icon is used for the icon of the resulting exe
170169
SetupIconFile=img\Hack-installer-icon.ico
171170

172171
;This icon will be displayed in Add/Remove Programs and needs to be installed locally
173172
UninstallDisplayIcon={app}\Hack-installer-icon.ico
174173

175-
176-
;Source dir is the base path
174+
;Source folder is the base path
177175
SourceDir=C:\dev\git\Hack-windows-installer\
178176

179-
180-
181177
;Always create a log to aid troubleshooting. The file is created as:
182178
;C:\Users\<YourUsername>\AppData\Local\Temp\Setup Log Year-Month-Day #XXX.txt
183179
SetupLogging=Yes
@@ -674,7 +670,7 @@ begin
674670
675671
LogAsImportant('--------------------------------');
676672
LogAsImportant('Font name.....: Hack fonts');
677-
LogAsImportant('Script version: 1.08');
673+
LogAsImportant('Script version: 2.01');
678674
LogAsImportant('Setup version.: 1.3.0');
679675
LogAsImportant('Font version..: 2.020');
680676
LogAsImportant('Local time....: ' + GetDateTimeString('yyyy-dd-mm hh:nn', '-', ':'));
@@ -827,5 +823,18 @@ begin
827823
end;
828824
829825
826+
{
827+
function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
828+
var
829+
text:string;
830+
begin
831+
text:='';
832+
text:=text + 'Setup is now ready to install Hack v2.XXX on your system' + NewLine;
833+
text:=text + NewLine;
834+
text:=text + 'Click Install to continue.' + NewLine;
835+
836+
result:=text;
837+
end;
838+
}
830839
831840

0 commit comments

Comments
 (0)