Merge branch 'release/2.3.0'

Release v2.3.0

Author: delphidabbler

.gitignore

@@ -8,6 +8,7 @@
 *.dsk
 *.~*
 __history/
+__recovery/
 
 # Project specific directories
 _build

Build.txt

@@ -1,7 +1,7 @@
 CompFileDate Build Instructions
 ===============================
 
-These instructions assume you are building the program using Delphi 12. Later
+These instructions assume you are building the program using Delphi 13. Later
 versions of Delphi may be suitable.
 
 
@@ -28,7 +28,7 @@ Step 2: Configure the Build Environment
 
 The following tools must be installed to build CompFileDate:
 
-+ Delphi 12.1 or later
++ Delphi 13 or later
 
 + `VIEd.exe` (Version Information Editor by DelphiDabbler). See
   https://delphidabbler.com/software/vied.

CHANGELOG.md

@@ -6,14 +6,33 @@ All notable changes to this project are documented in this file.
 
 This change log begins with the first public release version of _CompFileDate_. Releases are listed in reverse version number order.
 
-## Release v2.2.0 of 27 August 2024
+## Release v2.3.0 of 31 January 2026
+
+* Error messages are now written to standard error instead of standard output [[issue #13](https://github.com/ddabapps/compfiledate/issues/13)].
+* Modified the `--version` / `-V` command line option to so that, in addition to the program version number, information about whether the program was built as either a 32 bit or 64 bit Windows application is displayed [[issue #23](https://github.com/ddabapps/compfiledate/issues/23)].
+* Updated the program to compile with Delphi 13 [[issue #22](https://github.com/ddabapps/compfiledate/issues/22)]. 
+* Corrected errors in some error messages [[issue #26](https://github.com/ddabapps/compfiledate/issues/26)].
+* Refactorings:
+    * The source code was refactored and re-arranged, in large part to take advantage of modern compiler features [[issue #17](https://github.com/ddabapps/compfiledate/issues/17)] & [[issue #25](https://github.com/ddabapps/compfiledate/issues/25)].
+    * The program release version is no longer hard coded in `VerInfo.vi` but is instead obtained from a new `VERSION` file.
+    * Redundant code was removed [[issue #27](https://github.com/ddabapps/compfiledate/issues/27)].
+* Updated the `Deploy.bat` release creation script:
+    * Fixed a typo that was causing a potential bug [[issue #18](https://github.com/ddabapps/compfiledate/issues/18)].
+    * The user no longer has to pass the program version as a parameter when calling `Deploy.bat`. The script now gets the information by reading the `VERSION` file [[issue #21](https://github.com/ddabapps/compfiledate/issues/21)].
+* Updated documentation re the changes:
+    * Fixed errors in the description of error codes in `Docs/ReadMe.txt` [[issue #24](https://github.com/ddabapps/compfiledate/issues/24)].
+    * Source code commenting was changed to use the XMLDoc format [[issue #17](https://github.com/ddabapps/compfiledate/issues/17)].
+    * The program's help screen and the help section of `Docs/ReadMe.txt` were updated re the change to writing error messages to standard error.
+    * `Build.txt` was updated re the change to using Delphi 13.
+    * Updated the URLs of issues in `CHANGELOG.md` to reference the `ddabapps/compfiledate` GitHub repo instead of the old `delphidabbler/compfiledate` repo.
 
+## Release v2.2.0 of 27 August 2024
 
-* Added 64 bit version of the program. [[issue #12](https://github.com/delphidabbler/compfiledate/issues/12)]
-* Fixed bug where no error code was returned by the program when a file name passed on the command line does not exist. [[issue #14](https://github.com/delphidabbler/compfiledate/issues/14)]
-* Refactoring: Delphi units are now referenced in source code by fully qualified unit scope names. [[issue #15](https://github.com/delphidabbler/compfiledate/issues/15)]
+* Added 64 bit version of the program. [[issue #12](https://github.com/ddabapps/compfiledate/issues/12)]
+* Fixed bug where no error code was returned by the program when a file name passed on the command line does not exist. [[issue #14](https://github.com/ddabapps/compfiledate/issues/14)]
+* Refactoring: Delphi units are now referenced in source code by fully qualified unit scope names. [[issue #15](https://github.com/ddabapps/compfiledate/issues/15)]
 * Changed build process:
-    * Updated program to compile with Delphi 12.1. [[issue #11](https://github.com/delphidabbler/compfiledate/issues/11)]
+    * Updated program to compile with Delphi 12.1. [[issue #11](https://github.com/ddabapps/compfiledate/issues/11)]
     * MSBuild replaces use of Embarcadero Make. `Makefile` and `CompFileDate.cfg` were removed.
     * A new `Deploy.bat` script is now used to create releases.
     * Binaries are now created in the `_build` directory instead of `Build`.
@@ -23,20 +42,20 @@ This change log begins with the first public release version of _CompFileDate_.
 
 ## Release v2.1.0 of 30 September 2021
 
-* Replaced error message displayed when no files are provided on command line with a brief help message that prompts the use of the `--help` command. [[issue #6](https://github.com/delphidabbler/compfiledate/issues/6)]
-* Updated application manifest. [[issue #7](https://github.com/delphidabbler/compfiledate/issues/7)]
-* Converted change log and license files to markdown format. [[issue #8](https://github.com/delphidabbler/compfiledate/issues/8)] and [[issue #9](https://github.com/delphidabbler/compfiledate/issues/9)]
-* Fixed problem in `Makefile` where it was failing to find `Zip.exe` when not on the system path. [[issue #10](https://github.com/delphidabbler/compfiledate/issues/10)]
+* Replaced error message displayed when no files are provided on command line with a brief help message that prompts the use of the `--help` command. [[issue #6](https://github.com/ddabapps/compfiledate/issues/6)]
+* Updated application manifest. [[issue #7](https://github.com/ddabapps/compfiledate/issues/7)]
+* Converted change log and license files to markdown format. [[issue #8](https://github.com/ddabapps/compfiledate/issues/8)] and [[issue #9](https://github.com/ddabapps/compfiledate/issues/9)]
+* Fixed problem in `Makefile` where it was failing to find `Zip.exe` when not on the system path. [[issue #10](https://github.com/ddabapps/compfiledate/issues/10)]
 * Updated many URLs in program and documentation.
 * Documentation updated re changes.
 
 ## Release v2.0.0 of 20 July 2014
 
-* Operator used in date comparison can now be specified using new --compare or -c commands. This enables user to choose whether date of 1st file is tested to be <, <=, >, >=, <> or = to date of second file. [[issue #1](https://github.com/delphidabbler/compfiledate/issues/1)]
-* Comparison can now operate on either creation or last modification date of files. This is specified with new --datetype or -d commands. [[issue #2](https://github.com/delphidabbler/compfiledate/issues/2)]
-* When comparing the dates of shortcut files the date of the shortcut's target file can now be compared by using the new --followshortcuts or -s commands. [[issue #3](https://github.com/delphidabbler/compfiledate/issues/3)]
-* Program version number can now be displayed using the new --version or -V commands. Version is no longer displayed in normal program output. [[issue #5](https://github.com/delphidabbler/compfiledate/issues/5)]
-* Long forms of -v and -h commands added: --verbose and --help respectively. [[issue #4](https://github.com/delphidabbler/compfiledate/issues/4)]
+* Operator used in date comparison can now be specified using new --compare or -c commands. This enables user to choose whether date of 1st file is tested to be <, <=, >, >=, <> or = to date of second file. [[issue #1](https://github.com/ddabapps/compfiledate/issues/1)]
+* Comparison can now operate on either creation or last modification date of files. This is specified with new --datetype or -d commands. [[issue #2](https://github.com/ddabapps/compfiledate/issues/2)]
+* When comparing the dates of shortcut files the date of the shortcut's target file can now be compared by using the new --followshortcuts or -s commands. [[issue #3](https://github.com/ddabapps/compfiledate/issues/3)]
+* Program version number can now be displayed using the new --version or -V commands. Version is no longer displayed in normal program output. [[issue #5](https://github.com/ddabapps/compfiledate/issues/5)]
+* Long forms of -v and -h commands added: --verbose and --help respectively. [[issue #4](https://github.com/ddabapps/compfiledate/issues/4)]
 * Help screen revised re changes.
 * Now compiled with Delphi XE.
 * Updated and rationalised documentation re changes.

Deploy.bat

@@ -8,37 +8,61 @@
 ::
 :: Get zip.exe from https://delphidabbler.com/extras/info-zip
 :: Get Version Information Editor from https://delphidabbler.com/software/vied
-
-:: To use the script:
-::   1) Start the Embarcadero RAD Studio Command Prompt to set the required
-::      environment variables for MSBuild.
-::   2) Set the ZIPROOT environment variable to the directory where zip.exe is
-::      installed.
-::   3) Set the VIEDROOT environment variable to the directory where VIEd.exe is
-::      installed.
-::   3) Change directory to that where this script is located.
-::   4) Run the script.
 ::
-:: Usage:
-::   Deploy <version>
-:: where
-::   <version> is the version number of the release, e.g. 2.2.0 or 3.1.0-beta.
+:: To use the script:
+::  To use the script:
+::    1) Start the Embarcadero RAD Studio Command Prompt to set the required
+::       environment variables for MSBuild.
+::    2) Set the BDSBIN variable to %BDS%\bin (required by MSBuild/Delphi).
+::    3) Set the ZIPROOT environment variable to the directory where zip.exe is
+::       installed.
+::    4) Set the VIEDROOT environment variable to the directory where VIEd.exe 
+::       is installed.
+::    5) Change directory to that where this script is located.
+::    6) Run the script, without parameters
 
 @echo off
 
 echo ------------------------------
 echo Deploying CompFileDate Release
 echo ------------------------------
 
-:: Check for required parameter
-if "%1"=="" goto paramerror
-
 :: Check for required environment variables
 if "%ZipRoot%"=="" goto envvarerror
-if "%VIEdRoot"=="" goto envvarerror
+if "%VIEdRoot%"=="" goto envvarerror
+
+:: Get version info from Src\VERSION
+
+:: Set path to file containing version information
+set VerFile=.\Src\VERSION
+
+:: Undefine the variables used to collect version information
+set vernum=
+set suffix=
+
+:: Get the version number from the version info file - this MUST exist
+for /f "tokens=2 delims==" %%A in (
+  'findstr /rc:"^version" %VerFile%'
+) do (
+    set vernum=%%A
+  )
+)
+if not defined vernum (
+    goto badversionerror
+)
+
+:: Get the optional version number suffix from the version info file
+for /f "tokens=2 delims==" %%A in (
+  'findstr /rc:"^suffix" %VerFile%'
+) do (
+    set suffix=%%A
+)
+
+:: Record & report the build version
+set Version=%vernum%%suffix%
+echo Building release v%Version%
 
 :: Set variables
-set Version=%1
 set BuildRoot=.\_build
 set Win32Dir=%BuildRoot%\Win32\Release\exe
 set Win64Dir=%BuildRoot%\Win64\Release\exe
@@ -101,15 +125,15 @@ goto end
 
 :: Error messages
 
-:paramerror
+:envvarerror
 echo.
-echo ***ERROR: Please specify a version number as a parameter
+echo ***ERROR: ZipRoot or VIEdRoot environment variable not set
 echo.
 goto end
 
-:envvarerror
+:badversionerror
 echo.
-echo ***ERROR: ZipRoot environment variable not set
+echo ***ERROR: "version" field not set in %VerFile%
 echo.
 goto end
 

Docs/ReadMe.txt

@@ -90,23 +90,24 @@ options are:
     shortcut file itself is used in the comparison.
 
   -v or --verbose
-    Verbose: writes output to standard output. No output is generated if this
-    option is not provided. Output is always written when an error occurs or
-    when help or the program's version number are requested.
+      Verbose: writes output to standard output. No output is written if the 
+      option is not provided. Output is always written to standard error when an
+      error occurs or to standard output when help or the program's version
+      number are requested.
 
   -h or -? or --help
     Displays a help screen. Any file names and other options are ignored.
 
   -V or --version.
-    Displays the program's version number on standard output and halts. Any file
-    names and other options are ignored.
+    Displays the program's version number and platform on standard output and
+    halts. Any file names and other options are ignored.
 
 If no file names are provided on the command line and none of the help or
 version commands are used then a brief help message is displayed.
 
 The program's exit code is 1 if the comparison is true and 0 if it is false.
 If an error occurs then an error code >= 100 is returned and an error message
-is written to standard output. The error codes are:
+is written to standard error. The error codes are:
 
   100 - unknown error
   101 - invalid command or option
@@ -115,8 +116,8 @@ is written to standard output. The error codes are:
   104 - one or both files cannot be found
   105 - no comparison type was specified for the -c or --compare option
   106 - an invalid comparison type was specified for the -c or --compare option
-  107 - no date type was specified for the -t or --datetype option
-  108 - an invalid date type was specified for the -t or --datetype option
+  107 - no date type was specified for the -d or --datetype option
+  108 - an invalid date type was specified for the -d or --datetype option
 
 
 4. Source Code

Src/CompFileDate.dpr

@@ -3,7 +3,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-2024, Peter Johnson (https://delphidabbler.com).
+ * Copyright (C) 2009-2026, Peter Johnson (https://delphidabbler.com).
  *
  * Main project file.
 }
@@ -17,22 +17,20 @@ program CompFileDate;
 {$RESOURCE VerInfo.res}     // version information
 
 uses
-  System.SysUtils,
   UAppException in 'UAppException.pas',
   UConsole in 'UConsole.pas',
   UMain in 'UMain.pas',
   UParams in 'UParams.pas',
-  UStdOutput in 'UStdOutput.pas',
   UDateComparer in 'UDateComparer.pas',
   UDateExtractor in 'UDateExtractor.pas',
   UFileInfo in 'UFileInfo.pas';
 
 begin
-  with TMain.Create do
-    try
-      Execute;
-    finally
-      Free;
-    end;
+  var App := TMain.Create;
+  try
+    App.Execute;
+  finally
+    App.Free;
+  end;
 end.
 

Src/CompFileDate.dproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{7AD279F8-D795-4200-882E-D2EFA27C797F}</ProjectGuid>
-        <ProjectVersion>20.1</ProjectVersion>
+        <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>FMX</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
@@ -120,7 +120,6 @@ $(PostBuildEvent)]]></PostBuildEvent>
         <DCCReference Include="UConsole.pas"/>
         <DCCReference Include="UMain.pas"/>
         <DCCReference Include="UParams.pas"/>
-        <DCCReference Include="UStdOutput.pas"/>
         <DCCReference Include="UDateComparer.pas"/>
         <DCCReference Include="UDateExtractor.pas"/>
         <DCCReference Include="UFileInfo.pas"/>
@@ -151,7 +150,7 @@ $(PostBuildEvent)]]></PostBuildEvent>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
-            <Deployment Version="4">
+            <Deployment Version="5">
                 <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
@@ -167,12 +166,13 @@ $(PostBuildEvent)]]></PostBuildEvent>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Win32\Debug\CompFileDate.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="..\_build\Win32\Debug\exe\CompFileDate.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>CompFileDate.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="Win32\Debug\CompFileDate.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
@@ -185,16 +185,6 @@ $(PostBuildEvent)]]></PostBuildEvent>
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="AndroidClasses">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                    <Platform Name="Android64">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>64</Operation>
-                    </Platform>
-                </DeployClass>
                 <DeployClass Name="AndroidFileProvider">
                     <Platform Name="Android">
                         <RemoteDir>res\xml</RemoteDir>
@@ -297,6 +287,16 @@ $(PostBuildEvent)]]></PostBuildEvent>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV35">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v35</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="Android_AdaptiveIcon">
                     <Platform Name="Android">
                         <RemoteDir>res\drawable-anydpi-v26</RemoteDir>