Skip to content

Commit e1ce753

Browse files
committed
Extract common version information into include file
Version information from VCodeSnip.vi and VCodeSnipPortable.vi that is common to both files was extracted into the VersionInfo.vi-inc file as macro definitions. The macros were then imported into to .vi files. Changed file description. Renamed program from historic "Viewer" (that dates back to v1!) to "Repository". Also added "Standard Version" for standard version to match "Portable Version" that was already appended to file description in portable version. As a side effect, this commit fixes problem of rendering copyright symbol, because VIEd handles UTF-8 correctly in macro import files but not in .vi files! Closes #75
1 parent e46349b commit e1ce753

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

Diff for: Src/VCodeSnip.vi

+12-7
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
; Version information description file for CodeSnip.
88

99

10+
[Macros]
11+
Import:ver=.\VersionInfo.vi-inc
12+
1013
[Fixed File Info]
11-
File Version #=4, 20, 2, 266
12-
Product Version #=4, 20, 2, 0
14+
File Version #=<%ver.version>.<%ver.build>
15+
Product Version #=<%ver.version>
1316
File OS=4
1417
File Type=1
1518
File Sub-Type=0
@@ -21,19 +24,21 @@ Language=2057
2124
Character Set=1252
2225

2326
[String File Info]
24-
Comments=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)
25-
Company Name=DelphiDabbler
26-
File Description=CodeSnip Database Viewer
27+
Comments=<%var.license>
28+
Company Name=<%ver.company>
29+
File Description=<%ver.description> (Standard Edition)
2730
File Version=<#F1>.<#F2>.<#F3> build <#F4>
2831
Internal Name=<SHORTFNAME>
29-
Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
32+
Legal Copyright=<%ver.copyright>
3033
Legal Trademark=
3134
Original File Name=CodeSnip.exe
3235
Private Build=
33-
Product Name=DelphiDabbler CodeSnip
36+
Product Name=<%ver.company> <%ver.name>
3437
Product Version=Release <#P1>.<#P2>.<#P3>
3538
Special Build=
3639

3740
[Configuration Details]
3841
Identifier=
3942
NumRCComments=0
43+
ResOutputDir=
44+
FileVersion=1

Diff for: Src/VCodeSnipPortable.vi

+12-7
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
; Version information description file for the portable edition of CodeSnip
88

99

10+
[Macros]
11+
Import:ver=.\VersionInfo.vi-inc
12+
1013
[Fixed File Info]
11-
File Version #=4, 20, 2, 266
12-
Product Version #=4, 20, 2, 0
14+
File Version #=<%ver.version>.<%ver.build>
15+
Product Version #=<%ver.version>
1316
File OS=4
1417
File Type=1
1518
File Sub-Type=0
@@ -21,19 +24,21 @@ Language=2057
2124
Character Set=1252
2225

2326
[String File Info]
24-
Comments=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)
25-
Company Name=DelphiDabbler
26-
File Description=CodeSnip Database Viewer (Portable Edition)
27+
Comments=<%var.license>
28+
Company Name=<%ver.company>
29+
File Description=<%ver.description> (Portable Edition)
2730
File Version=<#F1>.<#F2>.<#F3> build <#F4>
2831
Internal Name=<SHORTFNAME>
29-
Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
32+
Legal Copyright=<%ver.copyright>
3033
Legal Trademark=
3134
Original File Name=CodeSnip-p.exe
3235
Private Build=
33-
Product Name=DelphiDabbler CodeSnip
36+
Product Name=<%ver.company> <%ver.name>
3437
Product Version=Release <#P1>.<#P2>.<#P3>
3538
Special Build=Portable
3639

3740
[Configuration Details]
3841
Identifier=
3942
NumRCComments=0
43+
ResOutputDir=
44+
FileVersion=1

Diff for: Src/VersionInfo.vi-inc

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# CodeSnip Version Information Macros for Including in .vi files
2+
3+
# Version & build numbers
4+
version=4.22.2
5+
build=266
6+
7+
# String file information
8+
copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
9+
description=Code Snippets Repository
10+
company=DelphiDabbler
11+
name=CodeSnip
12+
license=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)

0 commit comments

Comments
 (0)