Slightly change generation of revision numbers

diff --git a/ArchiveSupport/Merge7z/Merge7zCommon.cpp b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
index 4df2701..6116fc9 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7zCommon.cpp
+++ b/ArchiveSupport/Merge7z/Merge7zCommon.cpp
@@ -289,17 +289,21 @@ EXTERN_C
 EXTERN_C HRESULT CALLBACK DllGetVersion(DLLVERSIONINFO *pdvi)
 {
        // Compute dwBuild from revision.txt
-       static const DWORD dwBuild = sizeof""
-#      define MAJOR_REVISION(N) "*"
-#      include "revision.txt"
-#      undef MAJOR_REVISION
-       ;
+       static const DWORD dwBuild =
+       (
+               sizeof""
+#              define VERSION(MAJOR,MINOR)
+#              include "revision.txt"
+#              undef VERSION
+       );
        // Compute dwVersion from revision.txt
-       static const DWORD dwVersion = sizeof""
-#      define MAJOR_REVISION(N) * 0 + (1UL << 16) + sizeof""
-#      include "revision.txt"
-#      undef MAJOR_REVISION
-       - 1;
+       static const DWORD dwVersion =
+       (
+               0*sizeof""
+#              define VERSION(MAJOR,MINOR) , MAKELONG(MINOR,MAJOR) + 0*sizeof""
+#              include "revision.txt"
+#              undef VERSION
+       );
        static const DLLVERSIONINFO dvi =
        {
                sizeof dvi,

diff --git a/ArchiveSupport/Merge7z/revision.txt b/ArchiveSupport/Merge7z/revision.txt
index b38d1fe..1a3e65a 100755 (executable)
--- a/ArchiveSupport/Merge7z/revision.txt
+++ b/ArchiveSupport/Merge7z/revision.txt
@@ -1,13 +1,19 @@
-//      DATE:          BY:                             DESCRIPTION:
-//      ==========     =============== ================================================
+//Merge7z/revision.txt
 
-MAJOR_REVISION(1)
 "*"//2003/12/16        Jochen Tucht    GuessFormat() now checks for directory
 "*"//2004/03/15        Jochen Tucht    Fix Visual Studio 2003 build issue
 "*"//2004/04/13        Jochen Tucht    Experimental DllGetVersion() based on rcsid.
 
-MAJOR_REVISION(2)
-//2004/10/10   Jochen Tucht
-//-    DllGetVersion() no longer based on rcsid.
-//     Revision numbers will be generated from new file REVISION.TXT.
-"*"//2004/10/10        Jochen Tucht    Support 7z409 beta
+VERSION(2,1)
+
+//2004/10/10   Jochen Tucht    DllGetVersion() no longer based on rcsid.
+//Revision numbers will be generated from new file REVISION.TXT.
+"*"//2004/10/10        Jochen Tucht: Support 7z409 beta
+"*"
+"*"
+"*"//2004/10/18 Jochen Tucht   Change generation of revision numbers to allow
+//for arbitrary version numbers at any stage without affecting build number.
+//Merge7z may now follow a WinMerge-like versioning policy, or just use same
+//version numbers as WinMerge, yet provide a build number simply reflecting
+//the number of changes recorded in this revision.txt.
+//(Two extra "*" needed to yield a higher build number than with first approach)