Merge branch 'release/2.1'

ddabapps · Sep 30, 2021 · 30d6e4c · 30d6e4c
2 parents e4ceda2 + 2aba242
commit 30d6e4c
Show file tree

Hide file tree

Showing 21 changed files with 181 additions and 84 deletions.
diff --git a/Build.txt b/Build.txt
@@ -23,7 +23,10 @@ The following tools are required to build the program:
      suffice). The following instructions assume that `MAKE` is on the system
      path. If not you must specify the correct path when running `MAKE`
 + `VIEd.exe` (Version Information Editor by DelphiDabbler). See
-  http://delphidabbler.com/software/vied.
+  https://delphidabbler.com/software/vied.
++ `Zip.exe` This program is used to create CompFileDates's release file. You can
+  get a Windows command line version at
+  http://stahlforce.com/dev/index.php?tool=zipunzip.
 
 
 Environment Variables
@@ -37,6 +40,8 @@ before calling Make, or defined on the Make command line:
   directory as `MAKE.exe`.
 + `VIEDROOT` - set to the install directory of `VIEd.exe`. If not set then
   `VIEd.exe` is assumed to be on the path.
++ `ZIPROOT` - set to the install directory of `Zip.exe`. If not set then
+  `Zip.exe` is assumed to be on the path.
 
 
 Download the Source
@@ -101,4 +106,4 @@ When ready create a pull request on the main GitHub repo.
 Licensing
 ---------
 
-See `LICENSE.txt` for information about source code licenses.
+See `LICENSE.md` for information about source code licenses.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,39 @@
+# Changelog
+
+This is the change log for _DelphiDabbler CompFileDate_.
+
+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.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)]
+* 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)]
+* 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.
+* Now compiled with Delphi 2010.
+* Re-licensed source code and executable program under Mozilla Public License v2.0.
+* Updated documentation.
+
+## Release v1.0.0 of 15 July 2009
+
+* Original version (compiled with Delphi 2006).
diff --git a/Docs/ChangeLog.txt b/Docs/ChangeLog.txt
diff --git a/Docs/MPL-2.0.txt b/Docs/MPL-2.0.txt
@@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE

diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt
@@ -13,7 +13,7 @@ The usage is:
   CompFileDate <filename1> <filename2> [options]
   CompFileDate -h | -? | --help
   CompFileDate -V | --version
-  
+
 
 where
 
@@ -65,6 +65,9 @@ options are:
     Displays the program's version number 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:
@@ -102,18 +105,18 @@ at https://github.com/delphidabbler/compfiledate
 Copyright and License
 ---------------------
 
-See the file `LICENSE.txt` provided with this download for copyright and
+See the file `LICENSE.md` provided with this download for copyright and
 licensing information.
 
 
 Change Log
 ----------
 
-The change log is provided in the file `ChangeLog.txt` provided with this
+The change log is provided in the file `ChangeLog.md` provided with this
 download.
 
 
 Web page
 --------
 
-The program has a web page at http://www.delphidabbler.com/software/compfiledate
+The program has a web page at https://delphidabbler.com/software/compfiledate
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,11 @@
+# License
+
+_CompFileDate_ is copyright © 2009-2021 by [Peter D Johnson][1].
+
+The executable program and original source code are made available under the terms of the [Mozilla Public License v2.0][2].
+
+The full license text can also be found in [`MPL-2.0.txt`][3]
+
+[1]: https://gravatar.com/delphidabbler
+[2]: https://mozilla.org/MPL/2.0/
+[3]: https://github.com/delphidabbler/compfiledate/blob/master/Docs/MPL-2.0.txt
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 File Date Comparison Utility
 ============================
 
-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.
+_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
 -----
@@ -15,9 +15,9 @@ You can also view a help screen from within CompFileDate by using the command:
 Contributions
 -------------
 
-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.
+It's only a little utility, but any improvements are welcome. Just fork the repo and create a feature branch off the `develop` 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](https://mozilla.org/MPL/2.0/).
diff --git a/Src/Assets/CompFileDate.manifest b/Src/Assets/CompFileDate.manifest
@@ -3,27 +3,58 @@
 <!--
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2014-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
- * Manifest file for File Date Comparison Utility. Specifies execution level
- * required for Windows Vista and later.
+ * Application manifest file.
 -->
 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly
+  manifestVersion="1.0"
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
+>
   <assemblyIdentity
     type="win32"
     name="CompFileDate"
-    version="1.0.0.0"
+    version="2.0.0.0"
     processorArchitecture="*"
   />
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+        processorArchitecture="*"
+      />
+    </dependentAssembly>
+  </dependency>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>
-      <requestedExecutionLevel level="asInvoker" />
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"
+        />
       </requestedPrivileges>
     </security>
   </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+    </application>
+  </compatibility>
 </assembly>
-
diff --git a/Src/CompFileDate.dpr b/Src/CompFileDate.dpr
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2009-2021, Peter Johnson (https://delphidabbler.com).
  *
  * Main project file.
 }

diff --git a/Src/Makefile b/Src/Makefile
@@ -2,7 +2,7 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at http://mozilla.org/MPL/2.0/
 #
-# Copyright (C) 2009-2014, Peter Johnson (www.delphidabbler.com).
+# Copyright (C) 2009-2021, Peter Johnson (www.delphidabbler.com).
 #
 # Makefile for the project.
 
@@ -55,6 +55,13 @@ VIED = "$(VIEDROOT)\VIEd.exe" -makerc
 !else
 VIED = "VIEd.exe" -makerc
 !endif
+# ZIP.exe is expected to be on the path or its install directory must be
+# specified in the ZIPROOT macro
+!ifdef ZIPROOT
+ZIP = "$(ZIPROOT)\Zip.exe"
+!else
+ZIP = "Zip.exe"
+!endif
 
 # Define macros for paths
 RESOUTDIR = ..\Build\Bin
@@ -105,10 +112,10 @@ releaseexe:
   @echo ------------------
   -@cd ..
   -@if exist $(EXEFILE) del $(EXEFILE)
-  @zip -j -9 $(EXEFILE) Build\Exe\CompFileDate.exe
-  @zip -j -9 $(EXEFILE) Docs\ReadMe.txt
-  @zip -j -9 $(EXEFILE) LICENSE.txt
-  @zip -j -9 $(EXEFILE) Docs\changelog.txt
+  @$(ZIP) -j -9 $(EXEFILE) Build\Exe\CompFileDate.exe
+  @$(ZIP) -j -9 $(EXEFILE) Docs\ReadMe.txt
+  @$(ZIP) -j -9 $(EXEFILE) LICENSE.md
+  @$(ZIP) -j -9 $(EXEFILE) CHANGELOG.md
   -@cd Src
 
 # Create release zip file for source
@@ -119,11 +126,12 @@ releasesrc:
   @echo -------------------
   -@cd ..
   -@if exist $(SRCFILE) del $(SRCFILE)
-  @zip -r -9 $(SRCFILE) Src
-  @zip -r -9 $(SRCFILE) Docs
-  @zip -j -9 $(SRCFILE) .gitignore
-  @zip -j -9 $(SRCFILE) Build.txt
-  @zip -j -9 $(SRCFILE) LICENSE.txt
+  @$(ZIP) -r -9 $(SRCFILE) Src
+  @$(ZIP) -r -9 $(SRCFILE) Docs
+  @$(ZIP) -j -9 $(SRCFILE) .gitignore
+  @$(ZIP) -j -9 $(SRCFILE) Build.txt
+  @$(ZIP) -j -9 $(SRCFILE) LICENSE.md
+  @$(ZIP) -j -9 $(SRCFILE) CHANGELOG.md
   -@cd Src
 
 # Configure source tree for building

diff --git a/Src/Resources.rc b/Src/Resources.rc
@@ -1,9 +1,9 @@
 /*
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Includes program's assets in resources.
  */

diff --git a/Src/UAppException.pas b/Src/UAppException.pas
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Exception class for application errors. Stores error message and associated
  * error exit code.

diff --git a/Src/UConsole.pas b/Src/UConsole.pas
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that writes text to console using standard output unless output is
  * inhibited.

diff --git a/Src/UDateComparer.pas b/Src/UDateComparer.pas
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2014-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Static class for comparing dates using various equality operators.
 }

diff --git a/Src/UDateExtractor.pas b/Src/UDateExtractor.pas
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2014-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Static class that extracts a supported file date from a file.
 }

diff --git a/Src/UFileInfo.pas b/Src/UFileInfo.pas
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2014, Peter Johnson (www.delphidabbler.com).
+ * Copyright (C) 2014-2021, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements advanced record that stores information about a file and resolves
  * file shortcuts if required.