Merge branch 'feature/75-centralise-version-numbers-in-one-file' into develop

Author: delphidabbler

Build.html

@@ -6,7 +6,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Instructions for building CodeSnip from source.
 -->
@@ -191,10 +191,10 @@ <h3>
 </h3>
 
 <p>
-  This tool is used to compile version information (<code>.vi</code>) files
-  into intermediate resource source (<code>.rc</code>) files. Version 2.11.2
-  or later is required.
-  Version Information Editor can be obtained from
+  This tool is used to compile version information (<code>.vi</code>) files and
+  any associated macro file(s) into intermediate resource source
+  (<code>.rc</code>) files. Version 2.14.0 or later is required. Version
+  Information Editor can be obtained from
   <a
     href="https://github.com/delphidabbler/vied/releases"
   >https://github.com/delphidabbler/vied/releases</a>.

Src/VCodeSnip.vi

@@ -7,9 +7,12 @@
 ; Version information description file for CodeSnip.
 
 
+[Macros]
+Import:ver=.\VersionInfo.vi-inc
+
 [Fixed File Info]
-File Version #=4, 20, 2, 266
-Product Version #=4, 20, 2, 0
+File Version #=<%ver.version>.<%ver.build>
+Product Version #=<%ver.version>
 File OS=4
 File Type=1
 File Sub-Type=0
@@ -21,19 +24,21 @@ Language=2057
 Character Set=1252
 
 [String File Info]
-Comments=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)
-Company Name=DelphiDabbler
-File Description=CodeSnip Database Viewer
+Comments=<%var.license>
+Company Name=<%ver.company>
+File Description=<%ver.description> (Standard Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
 Internal Name=<SHORTFNAME>
-Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
+Legal Copyright=<%ver.copyright>
 Legal Trademark=
 Original File Name=CodeSnip.exe
 Private Build=
-Product Name=DelphiDabbler CodeSnip
+Product Name=<%ver.company> <%ver.name>
 Product Version=Release <#P1>.<#P2>.<#P3>
 Special Build=
 
 [Configuration Details]
 Identifier=
 NumRCComments=0
+ResOutputDir=
+FileVersion=1

Src/VCodeSnipPortable.vi

@@ -7,9 +7,12 @@
 ; Version information description file for the portable edition of CodeSnip
 
 
+[Macros]
+Import:ver=.\VersionInfo.vi-inc
+
 [Fixed File Info]
-File Version #=4, 20, 2, 266
-Product Version #=4, 20, 2, 0
+File Version #=<%ver.version>.<%ver.build>
+Product Version #=<%ver.version>
 File OS=4
 File Type=1
 File Sub-Type=0
@@ -21,19 +24,21 @@ Language=2057
 Character Set=1252
 
 [String File Info]
-Comments=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)
-Company Name=DelphiDabbler
-File Description=CodeSnip Database Viewer (Portable Edition)
+Comments=<%var.license>
+Company Name=<%ver.company>
+File Description=<%ver.description> (Portable Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
 Internal Name=<SHORTFNAME>
-Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
+Legal Copyright=<%ver.copyright>
 Legal Trademark=
 Original File Name=CodeSnip-p.exe
 Private Build=
-Product Name=DelphiDabbler CodeSnip
+Product Name=<%ver.company> <%ver.name>
 Product Version=Release <#P1>.<#P2>.<#P3>
 Special Build=Portable
 
 [Configuration Details]
 Identifier=
 NumRCComments=0
+ResOutputDir=
+FileVersion=1

Src/VersionInfo.vi-inc

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