Move the version numbers from the interface of the version module into a new

implementation. Allow for release candidates to be specified and disinguished.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4260 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ar65/main.c b/src/ar65/main.c
index 13c54c642ef5fc88fcf40f805189395a2dfbf514..5877520de4be5d0d1db9402d8f8b48971acb3a37 100644 (file)
--- a/src/ar65/main.c
+++ b/src/ar65/main.c
@@ -6,10 +6,10 @@
 /*                                                                          */
 /*                                                                          */
 /*                                                                          */
-/* (C) 1998-2003 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                          */
 /*                                                                          */
 /* This software is provided 'as-is', without any expressed or implied      */
@@ -121,8 +121,8 @@ int main (int argc, char* argv [])
 
            case 'V':
                fprintf (stderr,
-                                "ar65 V%u.%u.%u - (C) Copyright 1998-2003 Ullrich von Bassewitz\n",
-                        VER_MAJOR, VER_MINOR, VER_PATCH);
+                                "ar65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
+                        GetVersionAsString ());
                break;
 
            default:

diff --git a/src/ca65/expr.c b/src/ca65/expr.c
index bb2aac50a09ef995ee9607c96fb8df31e1234dab..cbca98ee3bd7cc6f20b7d7a4dc181c51be4c51bb 100644 (file)
--- a/src/ca65/expr.c
+++ b/src/ca65/expr.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2008 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -945,7 +945,7 @@ static ExprNode* Factor (void)
            break;
 
         case TOK_VERSION:
-            N = GenLiteralExpr (VERSION);
+            N = GenLiteralExpr (GetVersionAsNumber ());
             NextTok ();
             break;
 

diff --git a/src/ca65/listing.c b/src/ca65/listing.c
index 37dbcd2c98f1a6e0164db65cadea1e31c590fc4e..425bf91d7a8a13c3fcf66d6d9d5100b9cb5a7997 100644 (file)
--- a/src/ca65/listing.c
+++ b/src/ca65/listing.c
@@ -224,12 +224,11 @@ static void PrintPageHeader (FILE* F, const ListLine* L)
 
     /* Print the header on the new page */
     fprintf (F,
-            "ca65 V%u.%u.%u - %s\n"
+                    "ca65 V%s - %s\n"
             "Main file   : %s\n"
             "Current file: %.*s\n"
             "\n",
-            VER_MAJOR, VER_MINOR, VER_PATCH,
-             Copyright,
+            GetVersionAsString (), Copyright,
             InFile,
             (int) SB_GetLen (CurFile), SB_GetConstBuf (CurFile));
 

diff --git a/src/ca65/main.c b/src/ca65/main.c
index 3ec6c16a31755ceb94bb91540fcdb5748a205673..911be731552ead4f8df35cb58602f97688e469b9 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -132,7 +132,7 @@ static void SetOptions (void)
     StrBuf Buf = STATIC_STRBUF_INITIALIZER;
 
     /* Set the translator */
-    SB_Printf (&Buf, "ca65 V%u.%u.%u", VER_MAJOR, VER_MINOR, VER_PATCH);
+    SB_Printf (&Buf, "ca65 V%s", GetVersionAsString ());
     OptTranslator (&Buf);
 
     /* Set date and time */
@@ -521,9 +521,7 @@ static void OptVersion (const char* Opt attribute ((unused)),
                        const char* Arg attribute ((unused)))
 /* Print the assembler version */
 {
-    fprintf (stderr,
-                    "ca65 V%u.%u.%u - %s\n",
-                    VER_MAJOR, VER_MINOR, VER_PATCH, Copyright);
+    fprintf (stderr, "ca65 V%s - %s\n", GetVersionAsString (), Copyright);
 }
 
 

diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c
index abb8a6ec43a67989dc4e07d634d978a06da9eafa..2feb273f4f338c26d663809947cf686dadb022aa 100644 (file)
--- a/src/cc65/codegen.c
+++ b/src/cc65/codegen.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2009 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -151,13 +151,12 @@ void g_preamble (void)
 
     /* Identify the compiler version */
     AddTextLine (";");
-    AddTextLine ("; File generated by cc65 v %u.%u.%u",
-                VER_MAJOR, VER_MINOR, VER_PATCH);
+    AddTextLine ("; File generated by cc65 v %s", GetVersionAsString ());
     AddTextLine (";");
 
     /* Insert some object file options */
-    AddTextLine ("\t.fopt\t\tcompiler,\"cc65 v %u.%u.%u\"",
-                   VER_MAJOR, VER_MINOR, VER_PATCH);
+    AddTextLine ("\t.fopt\t\tcompiler,\"cc65 v %s\"",
+                GetVersionAsString ());
 
     /* If we're producing code for some other CPU, switch the command set */
     switch (CPU) {

diff --git a/src/cc65/compile.c b/src/cc65/compile.c
index 9e2f23fce21d7fc13413d4a0841d982b56f73ae4..6429e09f7eeab8da46e28c01acd4f965ed6c86af 100644 (file)
--- a/src/cc65/compile.c
+++ b/src/cc65/compile.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2009 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -300,7 +300,7 @@ void Compile (const char* FileName)
     };
 
     /* Add macros that are always defined */
-    DefineNumericMacro ("__CC65__", VERSION);
+    DefineNumericMacro ("__CC65__", GetVersionAsNumber ());
 
     /* Language standard that is supported */
     DefineNumericMacro ("__CC65_STD_C89__", STD_C89);

diff --git a/src/cc65/main.c b/src/cc65/main.c
index dc51736e57a03fc0457e9c1cf3ebf4b9817d3546..343e2a4c61860ac6468c9a65a5017c47d0b45062 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -667,9 +667,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the compiler version */
 {
     fprintf (stderr,
-                    "cc65 V%u.%u.%u\n"
-            "SVN version: %s\n",
-                    VER_MAJOR, VER_MINOR, VER_PATCH, SVNVersion);
+                    "cc65 V%s\nSVN version: %s\n",
+                    GetVersionAsString (), SVNVersion);
     exit (EXIT_SUCCESS);
 }
 

diff --git a/src/cl65/main.c b/src/cl65/main.c
index 78dcea63fcef9f8817f957a6ead73b1f5192ce7e..bd3a3064bb7275d184ce544f0a1c996fd8605d38 100644 (file)
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -1128,8 +1128,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print version number */
 {
     fprintf (stderr,
-            "cl65 V%u.%u.%u - (C) Copyright 1998-2005 Ullrich von Bassewitz\n",
-            VER_MAJOR, VER_MINOR, VER_PATCH);
+            "cl65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
+            GetVersionAsString ());
 }
 
 

diff --git a/src/co65/convert.c b/src/co65/convert.c
index ef05b6ba0043eae3ea17e39a98a5c11368065cba..6b60f86de9ca4e5c9c2f81913ff98e951730025c 100644 (file)
--- a/src/co65/convert.c
+++ b/src/co65/convert.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -454,8 +454,8 @@ void Convert (const O65Data* D)
     }
 
     /* Create a header */
-    fprintf (F, ";\n; File generated by co65 v %u.%u.%u using model `%s'\n;\n",
-             VER_MAJOR, VER_MINOR, VER_PATCH, GetModelName (Model));
+    fprintf (F, ";\n; File generated by co65 v %s using model `%s'\n;\n",
+             GetVersionAsString (), GetModelName (Model));
 
     /* Select the CPU */
     if ((D->Header.mode & O65_CPU_MASK) == O65_CPU_65816) {
@@ -463,8 +463,7 @@ void Convert (const O65Data* D)
     }
 
     /* Object file options */
-    fprintf (F, ".fopt\t\tcompiler,\"co65 v %u.%u.%u\"\n",
-             VER_MAJOR, VER_MINOR, VER_PATCH);
+    fprintf (F, ".fopt\t\tcompiler,\"co65 v %s\"\n", GetVersionAsString ());
     if (Author) {
         fprintf (F, ".fopt\t\tauthor, \"%s\"\n", Author);
         xfree (Author);

diff --git a/src/co65/main.c b/src/co65/main.c
index b565c526e7e9d9173f99ab5056ba38ea7f376074..fe7ba8c7acb1aff14dc07ed82b194b052482cb24 100644 (file)
--- a/src/co65/main.c
+++ b/src/co65/main.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -264,8 +264,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the assembler version */
 {
     fprintf (stderr,
-                    "co65 V%u.%u.%u - (C) Copyright 1998-2003 Ullrich von Bassewitz\n",
-                    VER_MAJOR, VER_MINOR, VER_PATCH);
+                    "co65 V%s - (C) Copyright 1998-2009 Ullrich von Bassewitz\n",
+                    GetVersionAsString ());
 }
 
 

diff --git a/src/common/make/gcc.mak b/src/common/make/gcc.mak
index f2118253e7c6d0283c80d387f40726a96de877bf..4c406408717b7e59f4ee2d6e67bcf7d6db933326 100644 (file)
--- a/src/common/make/gcc.mak
+++ b/src/common/make/gcc.mak
@@ -39,6 +39,7 @@ OBJS =        abend.o         \
        strutil.o       \
        target.o        \
        tgttrans.o      \
+        version.o       \
        xmalloc.o       \
        xsprintf.o
 

diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak
index f4d5b3b90040065cc4116813380a3afecfd1c74a..f7a195f8007649b1feb8f3717cbb9140b6e09b02 100644 (file)
--- a/src/common/make/watcom.mak
+++ b/src/common/make/watcom.mak
@@ -85,6 +85,7 @@ OBJS =        abend.obj       \
        strutil.obj     \
        target.obj      \
        tgttrans.obj    \
+        version.obj     \
         wildargv.obj    \
        xmalloc.obj     \
        xsprintf.obj

diff --git a/src/common/version.c b/src/common/version.c
new file mode 100644 (file)
index 0000000..da5060e
--- /dev/null
+++ b/src/common/version.c
@@ -0,0 +1,82 @@
+/*****************************************************************************/
+/*                                                                          */
+/*                                version.c                                 */
+/*                                                                          */
+/*            Version information for the cc65 compiler package             */
+/*                                                                          */
+/*                                                                          */
+/*                                                                          */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                          */
+/*                                                                          */
+/* This software is provided 'as-is', without any expressed or implied      */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                   */
+/*                                                                          */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                           */
+/*                                                                          */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                      */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                             */
+/* 3. This notice may not be removed or altered from any source                     */
+/*    distribution.                                                         */
+/*                                                                          */
+/*****************************************************************************/
+
+
+
+#include "version.h"
+#include "xsprintf.h"
+
+
+
+/*****************************************************************************/
+/*                                  Data                                    */
+/*****************************************************************************/
+
+
+
+#define VER_MAJOR      2U
+#define VER_MINOR              13U
+#define VER_PATCH       0U
+#define VER_RC          0U
+
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+const char* GetVersionAsString (void)
+/* Returns the version number as a string in a static buffer */
+{
+    static char Buf[20];
+#if defined(VER_RC) && (VER_RC > 0U)
+    xsnprintf (Buf, sizeof (Buf), "%u.%u.%u-rc%u", VER_MAJOR, VER_MINOR, VER_PATCH, VER_RC);
+#else
+    xsnprintf (Buf, sizeof (Buf), "%u.%u.%u", VER_MAJOR, VER_MINOR, VER_PATCH);
+#endif
+    return Buf;
+}
+
+
+
+unsigned GetVersionAsNumber (void)
+/* Returns the version number as a combined unsigned for use in a #define */
+{
+    return ((VER_MAJOR * 0x100) + (VER_MINOR * 0x10) + VER_PATCH);
+}
+
+
+

diff --git a/src/common/version.h b/src/common/version.h
index 0ab0becd28523c1739dcdd0296d81340d37871b5..0039b2a60ec39bad356bd8696b9afcf82ec2c8a6 100644 (file)
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -6,7 +6,7 @@
 /*                                                                          */
 /*                                                                          */
 /*                                                                          */
-/* (C) 1998-2008, Ullrich von Bassewitz                                      */
+/* (C) 1998-2009, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -39,16 +39,16 @@
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
 
-#define VER_MAJOR      2U
-#define VER_MINOR      12U
-#define VER_PATCH       9U
+const char* GetVersionAsString (void);
+/* Returns the version number as a string in a static buffer */
 
-#define VERSION         ((VER_MAJOR * 0x100) + (VER_MINOR * 0x10) + VER_PATCH)
+unsigned GetVersionAsNumber (void);
+/* Returns the version number as a combined unsigned for use in a #define */
 
 
 

diff --git a/src/da65/main.c b/src/da65/main.c
index 6cc5e459f4cbd6c38454ecc29ac7c404481f44c8..aa48629ba5a8483f9c33e25f8738b1c93040c672 100644 (file)
--- a/src/da65/main.c
+++ b/src/da65/main.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2007 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2009, Ullrich von Bassewitz                                       */
+/*                Roemerstrasse 52                                            */
+/*                D-70794 Filderstadt                                         */
+/* EMail:         uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -340,8 +340,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the disassembler version */
 {
     fprintf (stderr,
-                    "da65 V%u.%u.%u - (C) Copyright 2000-2006, Ullrich von Bassewitz\n",
-                    VER_MAJOR, VER_MINOR, VER_PATCH);
+                    "da65 V%s - (C) Copyright 2000-2009, Ullrich von Bassewitz\n",
+                    GetVersionAsString ());  
 }
 
 

diff --git a/src/da65/output.c b/src/da65/output.c
index 85115740584d2ebc49f4b1d3cb81cb10a4c3a660..9a20b55f84df3c87e242f6cffea219c78ae0901f 100644 (file)
--- a/src/da65/output.c
+++ b/src/da65/output.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2007 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -75,11 +75,11 @@ static void PageHeader (void)
 /* Print a page header */
 {
     fprintf (F,
-                    "; da65 V%u.%u.%u - (C) Copyright 2000-2005,  Ullrich von Bassewitz\n"
+                    "; da65 V%s - (C) Copyright 2000-2009,  Ullrich von Bassewitz\n"
              "; Created:    %s\n"
             "; Input file: %s\n"
             "; Page:       %u\n\n",
-                    VER_MAJOR, VER_MINOR, VER_PATCH,
+                    GetVersionAsString (),
              Now,
             InFile,
             Page);
@@ -188,7 +188,7 @@ void DefForward (const char* Name, const char* Comment, unsigned Offs)
             LineFeed ();
         }
 
-        /* Output the forward definition */ 
+        /* Output the forward definition */
         Output ("%s", Name);
         Indent (ACol);
         if (UseHexOffs) {

diff --git a/src/ld65/main.c b/src/ld65/main.c
index 0567e4bd9760effc9205a1ead2c96a5a5475c181..4b7a5353f718b6b7eb13077f6fe2890a0a074e9d 100644 (file)
--- a/src/ld65/main.c
+++ b/src/ld65/main.c
@@ -490,8 +490,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the assembler version */
 {
     fprintf (stderr,
-                    "ld65 V%u.%u.%u - (C) Copyright 1998-2005 Ullrich von Bassewitz\n",
-            VER_MAJOR, VER_MINOR, VER_PATCH);
+                    "ld65 V%s - (C) Copyright 1998-2009, Ullrich von Bassewitz\n",
+            GetVersionAsString ());
 }
 
 

diff --git a/src/ld65/o65.c b/src/ld65/o65.c
index 3fd6103574800eebe9697412a397287e33d4cf47..6f31909e4ef0bc2db5e2fc6f51c095f3c0e5d98b 100644 (file)
--- a/src/ld65/o65.c
+++ b/src/ld65/o65.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1999-2007 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1999-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -1385,7 +1385,7 @@ void O65WriteTarget (O65Desc* D, File* F)
     }
     OptBuf[OptLen] = '\0';
     O65SetOption (D, O65OPT_TIMESTAMP, OptBuf, OptLen + 1);
-    sprintf (OptBuf, "ld65 V%u.%u.%u", VER_MAJOR, VER_MINOR, VER_PATCH);
+    sprintf (OptBuf, "ld65 V%s", GetVersionAsString ());
     O65SetOption (D, O65OPT_ASM, OptBuf, strlen (OptBuf) + 1);
 
     /* Write the header */

diff --git a/src/od65/main.c b/src/od65/main.c
index 6e4c413bf98e09f0ccb8afb3ed12481ba096c64e..e8bea3cbadf6002c5b2129aa4c268708a586e2f1 100644 (file)
--- a/src/od65/main.c
+++ b/src/od65/main.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -201,8 +201,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
 /* Print the assembler version */
 {
     fprintf (stderr,
-                    "%s V%u.%u.%u - (C) Copyright 2000-2002 Ullrich von Bassewitz\n",
-                    ProgName, VER_MAJOR, VER_MINOR, VER_PATCH);
+                    "%s V%s - (C) Copyright 2000-2009, Ullrich von Bassewitz\n",
+                    ProgName, GetVersionAsString ());
 }
 
 

diff --git a/src/sim65/main.c b/src/sim65/main.c
index 7f53895d4b3e6d94cdb78898d73d165de2cf1d22..fe8fa2994f628b1bdf01d89380bb782cb0f4b642 100644 (file)
--- a/src/sim65/main.c
+++ b/src/sim65/main.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2002-2005 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2002-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -207,9 +207,7 @@ static void OptVersion (const char* Opt attribute ((unused)),
                        const char* Arg attribute ((unused)))
 /* Print the assembler version */
 {
-    fprintf (stderr,
-                    "sim65 V%u.%u.%u\n",
-                    VER_MAJOR, VER_MINOR, VER_PATCH);
+    fprintf (stderr, "sim65 V%s\n", GetVersionAsString ());
 }