Skip to content

Commit 087fb0a

Browse files
committed
Commit for 1.0.2
1 parent c2f1b1a commit 087fb0a

File tree

2 files changed

+58
-54
lines changed

2 files changed

+58
-54
lines changed

src/HackWindowsInstaller.iss

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//#define DEBUG
1919

2020
//Update this when releasing a new version
21-
#define public Version '1.0.1'
21+
#define public Version '1.0.2'
2222

2323
//This defines in which sub folder of this project the current files are located
2424
#define public HackMonospaced_Sourcefolder 'Hack_v2_019'
@@ -115,6 +115,7 @@
115115

116116

117117

118+
118119
;General procedure
119120
; e) Ready to install
120121
; d) INSTALL
@@ -141,9 +142,11 @@ AppSupportURL={#Installer_Homepage}
141142
AppComments=Hack font installer
142143
AppCopyright={#Copyright}
143144

144-
;No icon?
145-
;UninstallDisplayIcon
146-
;SetupIconFile
145+
;This icon is used for the icon of HackWindowsInstaller.exe itself
146+
SetupIconFile=img\Hack-installer-icon.ico
147+
;This icon will be displayed in Add/Remove programs and needs to be installed locally
148+
UninstallDisplayIcon={app}\Hack-installer-icon.ico
149+
147150

148151
;Target folder settings
149152
DefaultDirName={pf}\Hack Windows Installer\
@@ -172,23 +175,29 @@ SolidCompression=yes
172175

173176
PrivilegesRequired=admin
174177

175-
;Only include LicenseFile and InfoBeforeFile when using a release build
176-
;#ifndef DEBUG
177-
;Might be disabled later on
178+
;Ignore some screens
178179
DisableWelcomePage=yes
180+
DisableDirPage=yes
181+
DisableProgramGroupPage=yes
182+
AllowCancelDuringInstall=False
179183

180-
;License information
181-
;LicenseFile=LICENSE.txt
182184

183-
;readme
184-
;InfoBeforeFile=readme.md
185+
[Messages]
186+
;Default Windows/App text
187+
;SetupAppTitle is displayed in the taskbar
188+
SetupAppTitle={#AppName}
189+
;SetupWindowsTitle is displayed in the setup window itself so better include the version
190+
SetupWindowTitle={#AppName} {#Version}
191+
192+
;Message for the "Read to install" wizard page
193+
;NOT USED - "Ready To Install" - below title bar
194+
;WizardReady=
195+
;"Setup is now ready to begin installing ...."
196+
ReadyLabel1=
197+
;"Click Install to continue with the installation"
198+
ReadyLabel2b=Setup is now ready to install the Hack fonts v{#HackMonospaced_Version} on your system.
185199

186-
;#endif
187200

188-
;Ignore some screens
189-
DisableDirPage=yes
190-
DisableProgramGroupPage=yes
191-
AllowCancelDuringInstall=False
192201

193202

194203
[Icons]
@@ -202,6 +211,9 @@ Name: "{app}\Hack Homepage"; Filename: "{#HackMonospaced_Homepage}";
202211
;Copy license files - always copied
203212
Source: "license*.*"; DestDir: "{app}"; Flags: ignoreversion;
204213

214+
;Copy the icon to the installation folder in order to show it in Add/Remove programs
215+
Source: "img\Hack-installer-icon.ico"; DestDir: "{app}"; Flags: ignoreversion;
216+
205217
;Install fonts
206218
#define public i 0
207219
#sub Sub_FontInstall
@@ -243,16 +255,6 @@ Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "{#AppN
243255
Type: files; Name: "{app}\InstallInfo.ini"
244256

245257

246-
[Messages]
247-
;Message for the "Read to install" wizard page
248-
;"Ready To Install"
249-
;WizardReady=
250-
251-
;"Setup is now ready to begin installing ...."
252-
ReadyLabel1=
253-
;"Click Install to continue with the installation"
254-
ReadyLabel2b=Setup is now ready to install the Hack fonts v{#HackMonospaced_Version} on your system.
255-
;%n%nClick Install to continue.
256258

257259

258260
[Code]

src/HackWindowsInstaller_TEMP_Preprocessed.iss

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161

6262

63+
6364
;General procedure
6465
; e) Ready to install
6566
; d) INSTALL
@@ -77,18 +78,20 @@ AppId=HackWindowsInstaller
7778
SetupMutex=HackWindowsInstaller_SetupMutex
7879

7980
AppName=Hack Windows Installer
80-
AppVersion=1.0.1
81-
VersionInfoVersion=1.0.1
81+
AppVersion=1.0.2
82+
VersionInfoVersion=1.0.2
8283

8384
AppPublisher=Michael Hex / Source Foundry
8485
AppContact=Michael Hex / Source Foundry
8586
AppSupportURL=https://github.com/source-foundry/Hack-windows-installer
8687
AppComments=Hack font installer
8788
AppCopyright=Copyright © 2016 Michael Hex / Source Foundry
8889

89-
;No icon?
90-
;UninstallDisplayIcon
91-
;SetupIconFile
90+
;This icon is used for the icon of HackWindowsInstaller.exe itself
91+
SetupIconFile=img\Hack-installer-icon.ico
92+
;This icon will be displayed in Add/Remove programs and needs to be installed locally
93+
UninstallDisplayIcon={app}\Hack-installer-icon.ico
94+
9295

9396
;Target folder settings
9497
DefaultDirName={pf}\Hack Windows Installer\
@@ -117,23 +120,29 @@ SolidCompression=yes
117120

118121
PrivilegesRequired=admin
119122

120-
;Only include LicenseFile and InfoBeforeFile when using a release build
121-
;#ifndef DEBUG
122-
;Might be disabled later on
123+
;Ignore some screens
123124
DisableWelcomePage=yes
125+
DisableDirPage=yes
126+
DisableProgramGroupPage=yes
127+
AllowCancelDuringInstall=False
124128

125-
;License information
126-
;LicenseFile=LICENSE.txt
127129

128-
;readme
129-
;InfoBeforeFile=readme.md
130+
[Messages]
131+
;Default Windows/App text
132+
;SetupAppTitle is displayed in the taskbar
133+
SetupAppTitle=Hack Windows Installer
134+
;SetupWindowsTitle is displayed in the setup window itself so better include the version
135+
SetupWindowTitle=Hack Windows Installer 1.0.2
136+
137+
;Message for the "Read to install" wizard page
138+
;NOT USED - "Ready To Install" - below title bar
139+
;WizardReady=
140+
;"Setup is now ready to begin installing ...."
141+
ReadyLabel1=
142+
;"Click Install to continue with the installation"
143+
ReadyLabel2b=Setup is now ready to install the Hack fonts v2.019 on your system.
130144

131-
;#endif
132145

133-
;Ignore some screens
134-
DisableDirPage=yes
135-
DisableProgramGroupPage=yes
136-
AllowCancelDuringInstall=False
137146

138147

139148
[Icons]
@@ -147,6 +156,9 @@ Name: "{app}\Hack Homepage"; Filename: "http://sourcefoundry.org/hack/";
147156
;Copy license files - always copied
148157
Source: "license*.*"; DestDir: "{app}"; Flags: ignoreversion;
149158

159+
;Copy the icon to the installation folder in order to show it in Add/Remove programs
160+
Source: "img\Hack-installer-icon.ico"; DestDir: "{app}"; Flags: ignoreversion;
161+
150162
;Install fonts
151163
Source: "fonts\Hack_v2_019\Hack-Bold.ttf"; FontInstall: "Hack Bold"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
152164
Source: "fonts\Hack_v2_019\Hack-BoldItalic.ttf"; FontInstall: "Hack Bold Italic"; DestDir: "{fonts}"; Check: FontFileInstallationRequired; Flags: ignoreversion restartreplace;
@@ -174,24 +186,14 @@ Type: files; Name: "{fonts}\Hack-RegularOblique.ttf";
174186

175187
[INI]
176188
;Create an ini to make detection for enterprise deployment tools easy
177-
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.0.1"
189+
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Version"; String: "1.0.2"
178190
Filename: "{app}\InstallInfo.ini"; Section: "Main"; Key: "Name"; String: "Hack Windows Installer"
179191

180192
[UninstallDelete]
181193
;Delete Install Info
182194
Type: files; Name: "{app}\InstallInfo.ini"
183195

184196

185-
[Messages]
186-
;Message for the "Read to install" wizard page
187-
;"Ready To Install"
188-
;WizardReady=
189-
190-
;"Setup is now ready to begin installing ...."
191-
ReadyLabel1=
192-
;"Click Install to continue with the installation"
193-
ReadyLabel2b=Setup is now ready to install the Hack fonts v2.019 on your system.
194-
;%n%nClick Install to continue.
195197

196198

197199
[Code]

0 commit comments

Comments
 (0)