From 840606d86cdf7f3eb79222bf620d4f78285cb54a Mon Sep 17 00:00:00 2001 From: meep-eep Date: Tue, 17 May 2005 01:11:26 +0000 Subject: [PATCH] New version scheme. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1793 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/content/version | 2 +- sc2/src/res/UrQuanMasters.rc | 4 ++-- sc2/src/sc2code/libs/cdp/cdp.c | 4 ++-- sc2/src/sc2code/libs/cdp/cdpapi.c | 3 ++- sc2/src/sc2code/libs/cdp/cdpmod.h | 2 ++ .../sc2code/libs/graphics/sdl/sdl_common.c | 5 +++-- sc2/src/sc2code/restart.c | 4 ++-- sc2/src/starcon2.c | 9 +++++---- sc2/src/uqmversion.h | 19 +++++++++++-------- 9 files changed, 30 insertions(+), 22 deletions(-) diff --git a/sc2/content/version b/sc2/content/version index 5688fdfdb..d955e2f0f 100644 --- a/sc2/content/version +++ b/sc2/content/version @@ -1,3 +1,3 @@ -0.3 +0.4.0 $Date$ diff --git a/sc2/src/res/UrQuanMasters.rc b/sc2/src/res/UrQuanMasters.rc index fab618c76..2c805292a 100644 --- a/sc2/src/res/UrQuanMasters.rc +++ b/sc2/src/res/UrQuanMasters.rc @@ -21,8 +21,8 @@ LANGUAGE 0x09, 0x01 // LANG_ENGLISH, SUBLANG_ENGLISH_US // 1 VERSIONINFO - FILEVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_SUB_VERSION,0 - PRODUCTVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_SUB_VERSION,0 + FILEVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_PATCH_VERSION,0 + PRODUCTVERSION UQM_MAJOR_VERSION,UQM_MINOR_VERSION,UQM_PATCH_VERSION,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/sc2/src/sc2code/libs/cdp/cdp.c b/sc2/src/sc2code/libs/cdp/cdp.c index acbec9f90..ca9536e22 100644 --- a/sc2/src/sc2code/libs/cdp/cdp.c +++ b/sc2/src/sc2code/libs/cdp/cdp.c @@ -54,8 +54,8 @@ cdp_ModuleInfo cdp_kernel_info = { sizeof (cdp_ModuleInfo), CDPAPI_VERSION, // API version we are using - UQM_MAJOR_VERSION, UQM_MINOR_VERSION, - UQM_MAJOR_VERSION, UQM_MINOR_VERSION, + UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_PATCH_VERSION, + UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_PATCH_VERSION, CDP_MODINFO_RESERVED1, "UQM", // CDP context cannonical name "UQM Kernel", // CDP mod name diff --git a/sc2/src/sc2code/libs/cdp/cdpapi.c b/sc2/src/sc2code/libs/cdp/cdpapi.c index 31a743cc3..5f069cfea 100644 --- a/sc2/src/sc2code/libs/cdp/cdpapi.c +++ b/sc2/src/sc2code/libs/cdp/cdpapi.c @@ -242,7 +242,8 @@ cdp_Host_GetApiVersion (void) static uint32 cdp_Host_GetVersion (void) { - return (UQM_MAJOR_VERSION << 16) | UQM_MINOR_VERSION; + return (UQM_MAJOR_VERSION << 20) | (UQM_MINOR_VERSION << 15) | + UQM_PATCH_VERSION; } static cdp_Error diff --git a/sc2/src/sc2code/libs/cdp/cdpmod.h b/sc2/src/sc2code/libs/cdp/cdpmod.h index 78a62c5e5..756666f53 100644 --- a/sc2/src/sc2code/libs/cdp/cdpmod.h +++ b/sc2/src/sc2code/libs/cdp/cdpmod.h @@ -38,8 +38,10 @@ typedef struct cdp_ApiVersion api_ver; // version of cdp API used, set to CDPAPI_VERSION uint16 ver_major; // module version, somewhat informational uint16 ver_minor; + uint16 ver_patch; uint16 host_ver_major; // minimum host version required, purely informational uint16 host_ver_minor; + uint16 host_ver_patch; // reserved members: set all to 0 or use CDP_MODINFO_RESERVED1 uint32 _32_reserved1; diff --git a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c index fd3a267a8..235f15226 100644 --- a/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c +++ b/sc2/src/sc2code/libs/graphics/sdl/sdl_common.c @@ -97,8 +97,9 @@ TFB_ReInitGraphics (int driver, int flags, int width, int height, int bpp) result = TFB_Pure_ConfigureVideo (driver, flags, width, height, bpp); } - sprintf (caption, "The Ur-Quan Masters v%d.%d%s", - UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION); + sprintf (caption, "The Ur-Quan Masters v%d.%d.%d%s", + UQM_MAJOR_VERSION, UQM_MINOR_VERSION, + UQM_PATCH_VERSION, UQM_EXTRA_VERSION); SDL_WM_SetCaption (caption, NULL); if (flags & TFB_GFXFLAGS_FULLSCREEN) diff --git a/sc2/src/sc2code/restart.c b/sc2/src/sc2code/restart.c index 48a8f7cd1..f66f04931 100644 --- a/sc2/src/sc2code/restart.c +++ b/sc2/src/sc2code/restart.c @@ -106,8 +106,8 @@ DrawRestartMenu (BYTE OldState, BYTE NewState, FRAME f) t.align = ALIGN_RIGHT; t.valign = VALIGN_BOTTOM; t.CharCount = (COUNT)~0; - wsprintf (buf, "v%d.%d%s", UQM_MAJOR_VERSION, - UQM_MINOR_VERSION, UQM_EXTRA_VERSION); + wsprintf (buf, "v%d.%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, + UQM_PATCH_VERSION, UQM_EXTRA_VERSION); SetContextForeGroundColor (WHITE_COLOR); font_DrawText (&t); diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c index b90f80ab4..ecb6a4620 100644 --- a/sc2/src/starcon2.c +++ b/sc2/src/starcon2.c @@ -150,15 +150,16 @@ main (int argc, char *argv[]) if (options.runMode == runMode_version) { - printf ("%d.%d%s\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, - UQM_EXTRA_VERSION); + printf ("%d.%d.%d%s\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, + UQM_PATCH_VERSION, UQM_EXTRA_VERSION); return EXIT_SUCCESS; } - fprintf (stderr, "The Ur-Quan Masters v%d.%d%s (compiled %s %s)\n" + fprintf (stderr, "The Ur-Quan Masters v%d.%d.%d%s (compiled %s %s)\n" "This software comes with ABSOLUTELY NO WARRANTY;\n" "for details see the included 'COPYING' file.\n\n", - UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION, + UQM_MAJOR_VERSION, UQM_MINOR_VERSION, + UQM_PATCH_VERSION, UQM_EXTRA_VERSION, __DATE__, __TIME__); if (options.runMode == runMode_usage) diff --git a/sc2/src/uqmversion.h b/sc2/src/uqmversion.h index c4b4da0cf..a8d6982be 100644 --- a/sc2/src/uqmversion.h +++ b/sc2/src/uqmversion.h @@ -15,20 +15,23 @@ */ #ifndef UQMVERSION_H -#define UQMVERSION_H +#define UQMVERSION_H #define UQM_MAJOR_VERSION 0 #define UQM_MAJOR_VERSION_S "0" -#define UQM_MINOR_VERSION 3 -#define UQM_MINOR_VERSION_S "3" -#define UQM_SUB_VERSION 4 -#define UQM_EXTRA_VERSION "4" +#define UQM_MINOR_VERSION 4 +#define UQM_MINOR_VERSION_S "4" +#define UQM_PATCH_VERSION 0 +#define UQM_PATCH_VERSION_S "0" +#define UQM_EXTRA_VERSION "" /* The final version is interpreted as: - printf ("%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, UQM_EXTRA_VERSION); -*/ + * printf ("%d.%d.%d%s", UQM_MAJOR_VERSION, UQM_MINOR_VERSION, + * UQM_PATCH_VERSION, UQM_EXTRA_VERSION); + */ #define UQM_STRING_VERSION \ - UQM_MAJOR_VERSION_S "." UQM_MINOR_VERSION_S UQM_EXTRA_VERSION + UQM_MAJOR_VERSION_S "." UQM_MINOR_VERSION_S "." UQM_PATCH_VERSION_S \ + UQM_EXTRA_VERSION #define UQM_CVS_DATE "$Date$"