Skip to content

Commit afff956

Browse files
committed
Setup version update to 1.6.0, Hack to 3.003
1 parent b056b5a commit afff956

File tree

9 files changed

+54
-49
lines changed

9 files changed

+54
-49
lines changed

LICENSE-Hack.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
The work in the Hack project is Copyright 2017 Source Foundry Authors and licensed under the MIT License
1+
The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License
22

33
The work in the DejaVu project was committed to the public domain.
44

55
Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera"
66

77
### MIT License
88

9-
Copyright (c) 2017 Source Foundry Authors
9+
Copyright (c) 2018 Source Foundry Authors
1010

1111
Permission is hereby granted, free of charge, to any person obtaining a copy
1212
of this software and associated documentation files (the "Software"), to deal

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (C) 2016 Michael Hex / Source Foundry
3+
Copyright (C) 2018 Michael Hex / Source Foundry
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ In order to fix a bug you have encountered, we require the log file. To view thi
5555

5656

5757
## License
58-
Copyright © 2016-2017 [Michael Hex](http://www.texhex.info/) / Source Foundry. Licensed under the **MIT License**. For details, please see [LICENSE.txt](https://github.com/source-foundry/Hack-windows-installer/blob/master/LICENSE.txt).
58+
Copyright © 2016-2018 [Michael Hex](http://www.texhex.info/) / Source Foundry. Licensed under the **MIT License**. For details, please see [LICENSE.txt](https://github.com/source-foundry/Hack-windows-installer/blob/master/LICENSE.txt).

fonts/Hack_v3_003/Hack-Bold.ttf

310 KB
Binary file not shown.
315 KB
Binary file not shown.

fonts/Hack_v3_003/Hack-Italic.ttf

309 KB
Binary file not shown.

fonts/Hack_v3_003/Hack-Regular.ttf

302 KB
Binary file not shown.

src/Data.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ UniqueID=HackWindowsInstaller
1010

1111
[Version]
1212
;Version of the Setup (*NOT* for the Font release).
13-
Version=1.5.3
13+
Version=1.6.0
1414
;This value can be overwritten by an CI tool during build like this (param EXTERNAL_VERSION):
1515
;iscc.exe /DEXTERNAL_VERSION=%APPVEYOR_BUILD_VERSION% src/YourScriptFile.iss
1616

1717
;Version of FONT release
18-
FontVersion=3.002
18+
FontVersion=3.003
1919
;This value can be overwritten by an CI tool during build like this (param EXTERNAL_FONT_VERSION):
2020
;iscc.exe /DEXTERNAL_FONT_VERSION=%MY_FONT_BUILD_VERSION% src/YourScriptFile.iss
2121

@@ -29,7 +29,7 @@ FontName=Hack Fonts
2929
Publisher=Michael Hex / Source Foundry
3030

3131
;Copyright for the font/setup.
32-
Copyright=Copyright (c) 2016-2017 Michael Hex / Source Foundry
32+
Copyright=Copyright (c) 2016-2018 Michael Hex / Source Foundry
3333

3434
;This URL will be created as web shortcut [Website.lnk] in the destination folder and
3535
;also displayed in the Add/Remove Programs applet.
@@ -69,7 +69,7 @@ LicenseFile=license*.*
6969
;This section defines which fonts should be installed.
7070
[InstallFonts]
7171
;In which sub folder are the font files located (as seen from the base path).
72-
SourceFolder=fonts\Hack_v3_002
72+
SourceFolder=fonts\Hack_v3_003
7373

7474
;How many fonts are in this section we should install.
7575
;This must be number of the last File.X and Name.X entry
@@ -116,3 +116,4 @@ Name.5=Hack Italic linegap
116116

117117
File.6=Hack-BoldItalic-linegap*.*
118118
Name.6=Hack Bold Italic linegap
119+

src/zz_Preprocessor_Result.iss

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
;--------------------------------------------------------
12-
; FSCW Script Version: 2.10
12+
; FSCW Script Version: 2.11
1313
; Inno Setup Version.: 5.5.9
1414
; Inno Setup Type....: ANSI
1515
;--------------------------------------------------------
@@ -66,26 +66,26 @@
6666
; INI position #1
6767
; Hack Bold
6868
; Hack-Bold.ttf
69-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Bold.ttf
70-
; 9496473dd1dce0a09767d8ade36b90fbd99a56dd
69+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Bold.ttf
70+
; 28b45407cfdb0e9c5ea5797b5963e01c18a2c269
7171

7272
; INI position #2
7373
; Hack
7474
; Hack-Regular.ttf
75-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Regular.ttf
76-
; 5e5e6f6653fa87782e303a7a9fd491e0b8374e95
75+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Regular.ttf
76+
; b1cd50ba36380d6d6ada37facfc954a8f20c15ba
7777

7878
; INI position #3
7979
; Hack Bold Italic
8080
; Hack-BoldItalic.ttf
81-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-BoldItalic.ttf
82-
; 6f938a70da3081e8682c19458dbfa64b18185636
81+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-BoldItalic.ttf
82+
; 12edfb7fc8c0a7e5b2bdb50007dd2024b02d530d
8383

8484
; INI position #4
8585
; Hack Italic
8686
; Hack-Italic.ttf
87-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Italic.ttf
88-
; 34df26c80fe9ed938f2f792f91db54e617a113c6
87+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Italic.ttf
88+
; a49b01c9fe79f45aa6e951db193c8f39c6c5e2df
8989

9090

9191

@@ -136,10 +136,10 @@
136136
;Because the sub expects a string for each item, an error from ISPP about "Actual datatype not declared type"
137137
;when compiling the setup indicates that total_fonts is set to a wrong value
138138

139-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Bold.ttf\Hack-Bold.ttf - "Hack Bold" - 9496473dd1dce0a09767d8ade36b90fbd99a56dd
140-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Regular.ttf\Hack-Regular.ttf - "Hack" - 5e5e6f6653fa87782e303a7a9fd491e0b8374e95
141-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-BoldItalic.ttf\Hack-BoldItalic.ttf - "Hack Bold Italic" - 6f938a70da3081e8682c19458dbfa64b18185636
142-
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Italic.ttf\Hack-Italic.ttf - "Hack Italic" - 34df26c80fe9ed938f2f792f91db54e617a113c6
139+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Bold.ttf\Hack-Bold.ttf - "Hack Bold" - 28b45407cfdb0e9c5ea5797b5963e01c18a2c269
140+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Regular.ttf\Hack-Regular.ttf - "Hack" - b1cd50ba36380d6d6ada37facfc954a8f20c15ba
141+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-BoldItalic.ttf\Hack-BoldItalic.ttf - "Hack Bold Italic" - 12edfb7fc8c0a7e5b2bdb50007dd2024b02d530d
142+
; C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Italic.ttf\Hack-Italic.ttf - "Hack Italic" - a49b01c9fe79f45aa6e951db193c8f39c6c5e2df
143143

144144
;---END---
145145

@@ -159,13 +159,13 @@
159159
AppId=HackWindowsInstaller
160160
SetupMutex=HackWindowsInstaller_Mutex
161161

162-
AppName=Hack Windows Installer
162+
AppName=Hack Fonts
163163

164-
AppVersion=1.5.2
165-
VersionInfoVersion=1.5.2
164+
AppVersion=1.6.0
165+
VersionInfoVersion=1.6.0
166166

167167
AppPublisher=Michael Hex / Source Foundry
168-
AppCopyright=Copyright © 2016-2017 Michael Hex / Source Foundry
168+
AppCopyright=Copyright (c) 2016-2018 Michael Hex / Source Foundry
169169

170170
;Information displayed in Control Panel -> Add/Remove Programs applet
171171
;---------------------------------------------------
@@ -174,7 +174,7 @@ AppSupportURL=http://sourcefoundry.org/hack/
174174
;Should also be displayed there, but I was unable to verify this
175175
AppContact=Michael Hex / Source Foundry
176176
;Displayed as "Comments"
177-
AppComments=Hack fonts v3.002
177+
AppComments=Hack Fonts v3.003
178178
;NOT USED: Displayed as "Update information:"
179179
;AppUpdatesURL=http://appupdates.com
180180
;---------------------------------------------------
@@ -183,18 +183,18 @@ AppComments=Hack fonts v3.002
183183
OutputDir=out\
184184

185185
;How to call the resulting EXE file
186-
OutputBaseFilename=HackWindowsInstaller
186+
OutputBaseFilename=HackFontsWindowsInstaller
187187

188188
;Target folder settings
189-
DefaultDirName={pf}\Hack Windows Installer\
189+
DefaultDirName={pf}\Hack Fonts\
190190
;Don't warn when the taget folder exists
191191
DirExistsWarning=no
192192

193193
;This icon is used for the icon of the resulting exe
194-
SetupIconFile=img\Hack-installer-icon.ico
194+
SetupIconFile=img\Hack-win-installer-crunch.ico
195195

196196
;This icon will be displayed in Add/Remove Programs and needs to be installed locally
197-
UninstallDisplayIcon={app}\Hack-installer-icon.ico
197+
UninstallDisplayIcon={app}\Hack-win-installer-crunch.ico
198198

199199
;Source folder is the base path
200200
SourceDir=C:\dev\git\Hack-windows-installer\
@@ -230,10 +230,10 @@ AllowCancelDuringInstall=False
230230
;Patching default Windows/App text
231231
[Messages]
232232
;SetupAppTitle is displayed in the taskbar
233-
SetupAppTitle=Hack Windows Installer
233+
SetupAppTitle=Hack Fonts
234234

235235
;SetupWindowsTitle is displayed in the setup window itself so we better include the version
236-
SetupWindowTitle=Hack Windows Installer 1.5.2
236+
SetupWindowTitle=Hack Fonts 1.6.0
237237

238238
;Messages for the "Read to install" wizard page
239239
;NOT USED - "Ready To Install" - below title bar
@@ -243,7 +243,7 @@ SetupWindowTitle=Hack Windows Installer 1.5.2
243243
ReadyLabel1=
244244

245245
;ReadyLabel2b: "Click Install to continue with the installation"
246-
ReadyLabel2b=Setup is now ready to install the Hack fonts v3.002 on your system.
246+
ReadyLabel2b=Setup is now ready to install the Hack Fonts v3.003 on your system.
247247

248248

249249
[Icons]
@@ -259,14 +259,14 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
259259
Source: "license*.*"; DestDir: "{app}"; Flags: ignoreversion;
260260

261261
;Copy the icon to the installation folder in order to show it in Add/Remove Programs
262-
Source: "img\Hack-installer-icon.ico"; DestDir: "{app}"; Flags: ignoreversion;
262+
Source: "img\Hack-win-installer-crunch.ico"; DestDir: "{app}"; Flags: ignoreversion;
263263

264264
;------------------------
265265
;Install font files and register them
266-
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Bold.ttf"; FontInstall: "Hack Bold"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
267-
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Regular.ttf"; FontInstall: "Hack"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
268-
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-BoldItalic.ttf"; FontInstall: "Hack Bold Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
269-
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_002\Hack-Italic.ttf"; FontInstall: "Hack Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
266+
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Bold.ttf"; FontInstall: "Hack Bold"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
267+
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Regular.ttf"; FontInstall: "Hack"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
268+
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-BoldItalic.ttf"; FontInstall: "Hack Bold Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
269+
Source: "C:\dev\git\Hack-windows-installer\fonts\Hack_v3_003\Hack-Italic.ttf"; FontInstall: "Hack Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
270270
;------------------------
271271

272272

@@ -306,8 +306,8 @@ Name: "{app}\Website"; Filename: "http://sourcefoundry.org/hack/";
306306

307307
[INI]
308308
;Create an ini to make detection for enterprise deployment tools easy
309-
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.5.2"
310-
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "Hack Windows Installer"
309+
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.6.0"
310+
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "Hack Fonts"
311311

312312

313313
[UninstallDelete]
@@ -553,10 +553,10 @@ end;
553553
procedure FillFontDataArray();
554554
begin
555555
556-
AddFontData('Hack-Bold.ttf', 'Hack Bold', '9496473dd1dce0a09767d8ade36b90fbd99a56dd');
557-
AddFontData('Hack-Regular.ttf', 'Hack', '5e5e6f6653fa87782e303a7a9fd491e0b8374e95');
558-
AddFontData('Hack-BoldItalic.ttf', 'Hack Bold Italic', '6f938a70da3081e8682c19458dbfa64b18185636');
559-
AddFontData('Hack-Italic.ttf', 'Hack Italic', '34df26c80fe9ed938f2f792f91db54e617a113c6');
556+
AddFontData('Hack-Bold.ttf', 'Hack Bold', '28b45407cfdb0e9c5ea5797b5963e01c18a2c269');
557+
AddFontData('Hack-Regular.ttf', 'Hack', 'b1cd50ba36380d6d6ada37facfc954a8f20c15ba');
558+
AddFontData('Hack-BoldItalic.ttf', 'Hack Bold Italic', '12edfb7fc8c0a7e5b2bdb50007dd2024b02d530d');
559+
AddFontData('Hack-Italic.ttf', 'Hack Italic', 'a49b01c9fe79f45aa6e951db193c8f39c6c5e2df');
560560
561561
end;
562562
@@ -630,7 +630,7 @@ begin
630630
631631
subTitle:=SetupMessage(msgInstallingLabel);
632632
633-
StringChangeEx(subTitle, '[name]', 'Hack Windows Installer', True);
633+
StringChangeEx(subTitle, '[name]', 'Hack Fonts', True);
634634
635635
customProgressPage:=CreateOutputProgressPage(title, subTitle);
636636
@@ -642,10 +642,10 @@ function PrepareToInstall(var NeedsRestart: Boolean): String;
642642
begin
643643
LogAsImportant('---PrepareToInstall---');
644644
645-
LogAsImportant('Font name.....: Hack fonts');
646-
LogAsImportant('Font version..: 3.002');
647-
LogAsImportant('Setup version.: 1.5.2');
648-
LogAsImportant('Script version: 2.10');
645+
LogAsImportant('Font name.....: Hack Fonts');
646+
LogAsImportant('Font version..: 3.003');
647+
LogAsImportant('Setup version.: 1.6.0');
648+
LogAsImportant('Script version: 2.11');
649649
LogAsImportant('Local time....: ' + GetDateTimeString('yyyy-dd-mm hh:nn', '-', ':'));
650650
LogAsImportant('Fonts folder..: ' + ExpandConstant('{fonts}'));
651651
LogAsImportant('Dest folder...: ' + ExpandConstant('{app}'));
@@ -1046,6 +1046,10 @@ begin
10461046
AfterInstallAction();
10471047
end;
10481048
1049+
if CurStep=ssDone then begin
1050+
LogAsImportant('Setup finished');
1051+
end;
1052+
10491053
end;
10501054
10511055

0 commit comments

Comments
 (0)