Merge branch 'release/2.0'

Author: DelphiDabbler

Build.txt

@@ -1,7 +1,7 @@
 CompFileDate Build Instructions
 ===============================
 
-These instructions assume you are building the program using Delphi 2010. Later
+These instructions assume you are building the program using Delphi XE. Later
 versions of Delphi may be suitable with some minor changes to the make file.
 
 
@@ -16,7 +16,7 @@ Build Tools
 
 The following tools are required to build the program:
 
-+ A Delphi 2010 or later installation. The following tools are required:
++ A Delphi XE or later installation. The following tools are required:
   - `DCC32.exe` command line compiler.
   - `BRCC32.exe` resource compiler.
   - `MAKE.exe` the Borland / Embarcaero make utility (other make tools will not
@@ -29,27 +29,24 @@ The following tools are required to build the program:
 Environment Variables
 ---------------------
 
-The program's make file requires that the following environment variables must
-be set:
+The make file uses the following environment variables, which should be set
+before calling Make, or defined on the Make command line:
 
 + `DELPHIROOT` - should be set to the install directory of the version of Delphi
   being used. If not set it is assumed that Delphi is installed in the same
   directory as `MAKE.exe`.
 + `VIEDROOT` - set to the install directory of `VIEd.exe`. If not set then
-  `VIEd.exe` is assumed to by on the path.
+  `VIEd.exe` is assumed to be on the path.
 
 
 Download the Source
 -------------------
 
-Source code for the current version of DelphiDabbler CompFileDate is always
-available from http://www.delphidabbler.com/download?id=compfiledate&type=src
-and from the Git repository at
-https://sourceforge.net/p/compfiledate/git/ci/master/tree/
+The program's source code is maintained in the delphidabbler/compfiledate Git
+repository on GitHub. See https://github.com/delphidabbler/compfiledate
 
-To build the program first create a folder and copy the source code from the
-download file or from Git into it, preserving the directory structure so that
-you have the following:
+Either clone or fork the repo into a directory on your computer. The following
+directory structure will be created within your nominated directory:
 
     .
     |
@@ -77,7 +74,7 @@ The program can now be created simply by running `Make` with no parameters.
 Intermediate binary files will be placed in `Build\Bin` and the program
 executable will be written to `Build\Exe`.
 
-To create an release run `Make release` after running `Make`. This creates two
+To create a release run `Make release` after running `Make`. This creates two
 zip files, one containing the executable code and the other the source code. The
 zip files are placed in the `Build\Release` directory.
 
@@ -93,6 +90,14 @@ There are other build options available. See the comments in `Makefile` for
 details.
 
 
+Contributing
+------------
+
+Contributions are welcome. Please fork the GitHub repo and create a new feature
+branch off the `development` branch. Commit your changes to the feature branch.
+When ready create a pull request on the main GitHub repo.
+
+
 Licensing
 ---------
 

Docs/ChangeLog.txt

@@ -1,3 +1,13 @@
+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]
++ Comparison can now operate on either creation or last modification date of files. This is specified with new --datetype or -d commands. [issue #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]
++ 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]
++ Long forms of -v and -h commands added: --verbose and --help respectively. [issue #4]
++ Help screen revised re changes.
++ Now compiled with Delphi XE.
++ Updated and rationalised documentation re changes.
+
 Release v1.0.1 of 24 March 2014
 + Changed to use Unicode strings internally and to convert them to local ANSI encoding before output.
 + Fixed typo in help screen.

Docs/ReadMe.txt

@@ -6,36 +6,78 @@ About The Program
 -----------------
 
 CompFileDate.exe compares the dates of two files whose names are passed on the
-command line and returns an exit code that informs if the first named file has
-an older modification date than the second file.
+command line and returns an exit code that indicates the result.
 
 The usage is:
 
-    CompFileDate <filename1> <filename2> [-v]
-
-or:
-
-    CompFileDate -h | -?
-
-where:
-
-* `<filename1>` is the name of the first file to be compared.
-* `<filename2>` is the name of the second file to be compared.
-* `-v` causes the program to emit output to the console's standard output. If
-  this switch is not specified the program emits no output, unless an error is
-  detected when the switch is ignored.
-* `-h` or `-?` displays a help screen on standard output.
-
-Exit codes are:
-
-* `0` - `<filename1>` is newer than, or has the same date as `<filename2>`.
-* `1` - `<filename1>` is older than `<filename2>`.
-* `100` - Unknown error detected.
-* `101` - An invalid switch was supplied.
-* `102` - Incorrect number of file names supplied.
-* `103` - Both file names were the same.
-* `104` - Date information couldn't be read from one or both files. It is
-  possible that a file doesn't exist.
+  CompFileDate <filename1> <filename2> [options]
+  CompFileDate -h | -? | --help
+  CompFileDate -V | --version
+  
+
+where
+
+  <filename1> is the name of the first file to be compared.
+  <filename2> is the name of the second file to be compared.
+
+options are:
+
+  -c <op> or --compare=<op>
+    Defines the compare operation to use. <op> must be one of the following:
+      eq, equal, same:
+        Check if the dates of the files are the same.
+      gt, newer, later:
+        Check if the 1st file date is later than the 2nd file date.
+      gte, not-older, not-earlier
+        Check if the 1st file date is no earlier than the 2nd file date.
+      lt, older, earlier
+        Check if the 1st file date is earlier than the 2nd file date (default
+        used if this option is not provided).
+      lte, not-newer, not-later
+        Check if the 1st file date is no later than the 2nd file date.
+      neq, not-equal, not-same, different
+        Check if the dates of the files are different.
+
+  -d <type> or --datetype=<type>
+    Determines whether the last modification or creation dates of the files are
+    compared. <type> must be one of the following:
+      m, modified, last-modified, modification:
+        Use the date the files were last modified (default used if the option is
+        not provided).
+      c, created, creation:
+        Use the date the files were created.
+
+  -s or --followshortcuts
+    Indicates that if either filename1 or filename2 is a shortcut file then the
+    date of the shortcut's target file will be used in comparisons. If neither
+    option is specified then shortcuts are not followed and the date of the
+    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.
+
+  -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.
+
+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:
+
+  100 - unknown error
+  101 - invalid command or option
+  102 - incorrect number of files specified (two required)
+  103 - both file names are the same
+  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
 
 
 Installation
@@ -47,14 +89,14 @@ installation is required.
 You may want to modify the Windows PATH environment variable to include the
 location of the program.
 
-To uninstall simply delete the program. They make no changes to the system.
+To uninstall simply delete the program. It makes no changes to the system.
 
 
 Source Code
 -----------
 
-Source code for much of the program is available from
-http://www.delphidabbler.com/compfiledate/download.
+The program's source code is available on GitHub. See delphidabbler/compfiledate
+at https://github.com/delphidabbler/compfiledate
 
 
 Copyright and License
@@ -69,3 +111,9 @@ Change Log
 
 The change log is provided in the file `ChangeLog.txt` provided with this
 download.
+
+
+Web page
+--------
+
+The program has a web page at http://www.delphidabbler.com/software/compfiledate

README.md

@@ -1,29 +1,23 @@
 File Date Comparison Utility
 ============================
 
-CompFileDate is a simple command line utility for Windows that compares the modification dates of two files whose names are passed on the command line and returns an exit code that informs if the first named file has an earlier modification date than the second file.
+CompFileDate is a command line utility for Windows that compares the dates of two files whose names are passed on the command line and returns an exit code that indicates the result.
 
 Usage
 -----
 
-    CompFileDate <filename1> <filename2> [-v]
+For a full explanation of how to use the program see [`ReadMe.txt`](Docs/ReadMe.txt).
 
-where `<filename1>` and `<filename2>` are the names of the files to compare. `0` is returned if `<filename1>` is newer than, or has the same date as `<filename2>` and `1` is returned if `<filename1>` is older than `<filename2>`. An error code >= 100 indicates an error: see Docs\ReadMe.txt for details.
+You can also view a help screen from within CompFileDate by using the command:
 
-Unless there is an error CompFileDate normally produces no output. To get the result of the comparison written to standard output specify the `-v` command.
-
-To get help use:
-
-    CompFileDate -?
+    CompFileDate -h
 
 Contributions
 -------------
 
-It's only a little utility, but any improvements are welcome. Just fork the repo
-(the development branch is best), create a feature branch and submit a pull
-request with your changes.
+It's only a little utility, but any improvements are welcome. Just fork the repo and create a feature branch off the `development` branch. Commit your changes to the feature branch then submit a pull request when ready.
 
 License
 -------
 
-Licensed under the [Mozilla Public License v2.0](http://www.mozilla.org/MPL/2.0/).
+Licensed under the [Mozilla Public License v2.0](http://www.mozilla.org/MPL/2.0/).

Src/CompFileDate.dpr

@@ -22,7 +22,10 @@ uses
   UConsole in 'UConsole.pas',
   UMain in 'UMain.pas',
   UParams in 'UParams.pas',
-  UStdOutput in 'UStdOutput.pas';
+  UStdOutput in 'UStdOutput.pas',
+  UDateComparer in 'UDateComparer.pas',
+  UDateExtractor in 'UDateExtractor.pas',
+  UFileInfo in 'UFileInfo.pas';
 
 begin
   with TMain.Create do

Src/CompFileDate.dproj

@@ -4,12 +4,17 @@
 			<MainSource>CompFileDate.dpr</MainSource>
 			<Config Condition="'$(Config)'==''">Base</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-			<ProjectVersion>12.0</ProjectVersion>
+			<ProjectVersion>12.3</ProjectVersion>
+			<Base>True</Base>
+			<Platform>Win32</Platform>
+			<AppType>Console</AppType>
+			<FrameworkType>None</FrameworkType>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
+			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
 			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
 			<DCC_Description>File Date Comparison Utility</DCC_Description>
@@ -40,11 +45,15 @@
 			<DCCReference Include="UMain.pas"/>
 			<DCCReference Include="UParams.pas"/>
 			<DCCReference Include="UStdOutput.pas"/>
+			<DCCReference Include="UDateComparer.pas"/>
+			<DCCReference Include="UDateExtractor.pas"/>
+			<DCCReference Include="UFileInfo.pas"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
 			</BuildConfiguration>
 		</ItemGroup>
-		<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
+		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
 		<ProjectExtensions>
 			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
 			<Borland.ProjectType/>
@@ -53,11 +62,7 @@
 					<Source>
 						<Source Name="MainSource">CompFileDate.dpr</Source>
 					</Source>
-					<Parameters>
-						<Parameters Name="UseLauncher">False</Parameters>
-						<Parameters Name="LoadAllSymbols">True</Parameters>
-						<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-					</Parameters>
+					<Parameters/>
 					<VersionInfo>
 						<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
 						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
@@ -86,6 +91,9 @@
 						<VersionInfoKeys Name="Comments"/>
 					</VersionInfoKeys>
 				</Delphi.Personality>
+				<Platforms>
+					<Platform value="Win32">True</Platform>
+				</Platforms>
 			</BorlandProject>
 			<ProjectFileVersion>12</ProjectFileVersion>
 		</ProjectExtensions>

Src/Makefile

@@ -37,15 +37,15 @@
 
 
 # DELPHIROOT must point to the install directory for the version of Delphi being
-# used to compile the program. NOTE: The program is targeted at Delphi 2010 but
+# used to compile the program. NOTE: The program is targeted at Delphi XE but
 # later compilers should be suitable with only minor changes.
 !ifndef DELPHIROOT
 # DELPHIROOT not set: make a guess
 DELPHIROOT = $(MAKEDIR)\..
 !endif
 
 # Define macros that access required programs
-# DCC32 and BRCC32 should be in same sub-directory of Delphi 2010
+# DCC32 and BRCC32 should be in same sub-directory of Delphi XE
 DCC32 = "$(DELPHIROOT)\Bin\DCC32.exe"
 BRCC32 = "$(DELPHIROOT)\Bin\BRCC32.exe"
 # VIED is expected to be on the path or its install directory must be specified
@@ -94,7 +94,7 @@ clean:
   -@cd Src
   @echo Done.
 
-# Create executable and source released zip files
+# Create executable and source release zip files
 release: clean releaseexe releasesrc
 
 # Create release zip file for executable
@@ -154,7 +154,7 @@ config:
   @echo +++ Compiling Resource file $< +++
   @$(BRCC32) $< -fo$(RESOUTDIR)\$(@F)
 
-# Version info filea are compiled by VIEd: a temporary .rc file is left behind
+# Version info files are compiled by VIEd: a temporary .rc file is left behind
 .vi.rc:
   @echo +++ Compiling Version Info file $< +++
   @$(VIED) .\$<