Skip to content

Commit ff58709

Browse files
committed
Added HomepageURL and SupportURL parameters
1 parent 8aaf8d1 commit ff58709

File tree

3 files changed

+39
-28
lines changed

3 files changed

+39
-28
lines changed

src/DATA.ini

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ Publisher=Michael Hex / Source Foundry
3535
; Copyright for the font
3636
Copyright=Copyright © 2016 Michael Hex / Source Foundry
3737

38-
; This URL will be created as web shortcut (Homepage.lnk) in the destination folder and
39-
; is also displayed in the Add/Remove Programs applet.
40-
Homepage=https://github.com/source-foundry/FSCW
38+
; This URL will be created as web shortcut (Homepage.lnk) in the destination folder.
39+
; It should contain the URL of your repository where the FONT lives.
40+
HomepageURL=https://github.com/source-foundry/ten-gallon-font/
41+
42+
; This URL be be displayed in Add/Remove programs as "Support URL".
43+
; It should point to the repository where you create this Setup EXE
44+
SupportURL=https://github.com/source-foundry/FSCW
4145

4246

4347
[General]

src/FSCW.iss

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//https://github.com/source-foundry/FSCW
55
//--------------------------------------------------------
66
//Version of this installer script. Please do not change.
7-
#define public ScriptVersion '2.06'
7+
#define public ScriptVersion '2.07'
88
//--------------------------------------------------------
99

1010

@@ -56,18 +56,6 @@
5656
#pragma error 'UniqueID is empty'
5757
#endif
5858

59-
//Retrieve source folder
60-
#define font_source_folder GetDataIniValue(SectionInstallFonts, 'SourceFolder')
61-
#if len(font_source_folder)==0
62-
#error 'Source folder is empty'
63-
#endif
64-
65-
//Retrieve InstallerName
66-
#define public InstallerName GetDataIniValue(SectionGeneral, 'Name')
67-
#if len(InstallerName)==0
68-
#error 'Name is empty'
69-
#endif
70-
7159
//Version of the SETUP/INSTALLER
7260
#define public Version GetDataIniValue(SectionVersion, 'Version')
7361
#if len(Version)==0
@@ -94,6 +82,7 @@
9482
#endif
9583
#endif
9684

85+
9786
//Name of this font
9887
#define public FontName GetDataIniValue(SectionAbout, 'FontName')
9988
#if len(FontName)==0
@@ -112,11 +101,28 @@
112101
#error 'Copyright is empty'
113102
#endif
114103

104+
//Retrieve HomepageURL
105+
#define public HomepageURL GetDataIniValue(SectionAbout, 'HomepageURL')
106+
#if len(HomepageURL)==0
107+
#error 'HomepageURL is empty'
108+
#endif
109+
110+
//Retrieve SupportURL
111+
#define public SupportURL GetDataIniValue(SectionAbout, 'SupportURL')
112+
#if len(SupportURL)==0
113+
#error 'SupportURL is empty'
114+
#endif
115+
116+
//Retrieve InstallerName
117+
#define public InstallerName GetDataIniValue(SectionGeneral, 'Name')
118+
#if len(InstallerName)==0
119+
#error 'Name is empty'
120+
#endif
121+
115122
//Retrieve icon file
116123
#define public IconFile GetDataIniValue(SectionGeneral, 'Icon')
117124
//Icon file can be empty, so no check here
118125

119-
120126
//Retrieve ExeFile (name of the setup)
121127
#define public ExeFile GetDataIniValue(SectionGeneral, 'ExeFile')
122128
#if len(ExeFile)==0
@@ -129,19 +135,19 @@
129135
#error 'DestinationFolder is empty'
130136
#endif
131137

132-
//Retrieve Homepage
133-
#define public Homepage GetDataIniValue(SectionAbout, 'Homepage')
134-
#if len(Homepage)==0
135-
#error 'Homepage is empty'
136-
#endif
137-
138138
//Retrieve license file(s)
139139
#define public LicenseFiles GetDataIniValue(SectionGeneral, 'LicenseFile')
140140
#if len(LicenseFiles)==0
141141
#error 'LicenseFile is empty'
142142
#endif
143143

144144

145+
//Retrieve source folder
146+
#define font_source_folder GetDataIniValue(SectionInstallFonts, 'SourceFolder')
147+
#if len(font_source_folder)==0
148+
#error 'Source folder is empty'
149+
#endif
150+
145151

146152
//Process *InstallFonts* section
147153
#emit '; Processing section ' + SectionInstallFonts
@@ -303,7 +309,7 @@ AppCopyright={#Copyright}
303309
;Information displayed in Control Panel -> Add/Remove Programs applet
304310
;---------------------------------------------------
305311
;Displayed as "Help link:"
306-
AppSupportURL={#Homepage}
312+
AppSupportURL={#SupportURL}
307313
;Should also be displayed there, but I was unable to verify this
308314
AppContact={#Publisher}
309315
;Displayed as "Comments"
@@ -386,7 +392,7 @@ ReadyLabel2b=Setup is now ready to install the {#FontName} v{#FontVersion} on yo
386392
Name: "{app}\Fonts Applet"; Filename: "control.exe"; Parameters: "/name Microsoft.Fonts"; WorkingDir: "{win}";
387393

388394
;Link to the homepage for this font
389-
Name: "{app}\Homepage"; Filename: "{#Homepage}";
395+
Name: "{app}\Homepage"; Filename: "{#HomepageURL}";
390396

391397

392398
[Files]

src/zz_FSCW_Preprocessed.iss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636

3737

38+
3839

3940

4041
; Processing section InstallFonts
@@ -144,7 +145,7 @@ AppCopyright=Copyright © 2016 Michael Hex / Source Foundry
144145
;Information displayed in Control Panel -> Add/Remove Programs applet
145146
;---------------------------------------------------
146147
;Displayed as "Help link:"
147-
AppSupportURL=http://sourcefoundry.org/hack/
148+
AppSupportURL=https://github.com/source-foundry/FSCW
148149
;Should also be displayed there, but I was unable to verify this
149150
AppContact=Michael Hex / Source Foundry
150151
;Displayed as "Comments"
@@ -225,7 +226,7 @@ ReadyLabel2b=Setup is now ready to install the Ten Gallon Hat fonts v1.02 on you
225226
Name: "{app}\Fonts Applet"; Filename: "control.exe"; Parameters: "/name Microsoft.Fonts"; WorkingDir: "{win}";
226227

227228
;Link to the homepage for this font
228-
Name: "{app}\Homepage"; Filename: "http://sourcefoundry.org/hack/";
229+
Name: "{app}\Homepage"; Filename: "https://github.com/source-foundry/ten-gallon-font/";
229230

230231

231232
[Files]
@@ -672,7 +673,7 @@ begin
672673
673674
LogAsImportant('--------------------------------');
674675
LogAsImportant('Font name.....: Ten Gallon Hat fonts');
675-
LogAsImportant('Script version: 2.06');
676+
LogAsImportant('Script version: 2.07');
676677
LogAsImportant('Setup version.: 1.0.0');
677678
LogAsImportant('Font version..: 1.02');
678679
LogAsImportant('Local time....: ' + GetDateTimeString('yyyy-dd-mm hh:nn', '-', ':'));

0 commit comments

Comments
 (0)