From af16a73b89912120ed9c246df6b4e51ec61fa821 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sun, 6 Jan 2019 02:16:34 -0500 Subject: [PATCH] More detailed version numbering, partly after Simon Sobisch; replace hardwired version numbers elsewhere with these. --- common/pdcurses.rc | 9 +++++---- curses.h | 9 +++++++-- demos/ozdemo.c | 9 +++++++-- pdcurses/initscr.c | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/common/pdcurses.rc b/common/pdcurses.rc index 8c233ab7..53d4754d 100644 --- a/common/pdcurses.rc +++ b/common/pdcurses.rc @@ -1,8 +1,9 @@ #include +#include "../curses.h" VS_VERSION_INFO VERSIONINFO -FILEVERSION 3,7,0,0 -PRODUCTVERSION 3,7,0,0 +FILEVERSION PDC_VER_MAJOR,PDC_VER_MINOR,0,0 +PRODUCTVERSION PDC_VER_MAJOR,PDC_VER_MINOR,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG | VS_FF_PRERELEASE @@ -19,12 +20,12 @@ BEGIN BEGIN VALUE "CompanyName", "PDCurses.org" VALUE "FileDescription", "PDCurses Library" - VALUE "FileVersion", "3.7.0.0" + VALUE "FileVersion", PDC_VERDOT ".0.0" VALUE "InternalName", "PDCurses" VALUE "LegalCopyright", "Public Domain" VALUE "OriginalFilename", "pdcurses.dll" VALUE "ProductName", "PDCurses" - VALUE "ProductVersion", "3.7.0.0" + VALUE "ProductVersion", PDC_VERDOT ".0.0" END END BLOCK "VarFileInfo" diff --git a/curses.h b/curses.h index 4e239b37..8f0cada9 100644 --- a/curses.h +++ b/curses.h @@ -21,13 +21,18 @@ Define before inclusion (only those needed): Defined by this header: - PDC_BUILD Defines API build version. PDCURSES Enables access to PDCurses-only routines. + PDC_BUILD Defines API build version. + PDC_VER_MAJOR Major version number + PDC_VER_MINOR Minor version number **man-end****************************************************************/ -#define PDC_BUILD 3701 #define PDCURSES 1 /* PDCurses-only routines */ +#define PDC_BUILD 3702 +#define PDC_VER_MAJOR 3 +#define PDC_VER_MINOR 7 +#define PDC_VERDOT "3.7" #define CHTYPE_LONG 1 /* size of chtype; long */ #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L diff --git a/demos/ozdemo.c b/demos/ozdemo.c index 271670ca..05e9d93e 100644 --- a/demos/ozdemo.c +++ b/demos/ozdemo.c @@ -326,8 +326,13 @@ int main(int argc, char **argv) init_pair(5, COLOR_BLUE, COLOR_WHITE); wattrset(win, COLOR_PAIR(5) | A_BLINK); - mvwaddstr(win, height - 2, 2, - " PDCurses 3.7 - DOS, OS/2, Windows, X11, SDL"); + mvwaddstr(win, height - 2, +#ifdef PDC_VERDOT + 2, " PDCurses " PDC_VERDOT +#else + 3, " PDCurses" +#endif + " - DOS, OS/2, Windows, X11, SDL"); wrefresh(win); /* Draw running messages */ diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index d45f2ff5..69c7ddf9 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -95,7 +95,7 @@ initscr char ttytype[128]; -const char *_curses_notice = "PDCurses 3.7 - Public Domain 2018"; +const char *_curses_notice = "PDCurses " PDC_VERDOT " - Public Domain 2019"; SCREEN *SP = (SCREEN*)NULL; /* curses variables */ WINDOW *curscr = (WINDOW *)NULL; /* the current screen image */