From efa79fba057b1de7ad191d226bed672d9aa668cc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 5 Nov 2008 12:16:30 +0000 Subject: [PATCH] 2008-11-05 13:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * make_vc.mak * -GA option only used for HB_VISUALC_VER >= 70. Please update this if older versions also support it. * include/hbver.ch * source/common/hbver.c * Some more fiddling with version number terminology and hb_version() values: HB_VERSION_MICRO -> HB_VERSION_RELEASE HB_VERSION_BLD_DATE_STR -> HB_VERSION_BUILD_DATE_STR HB_VERSION_BLD_DATE -> HB_VERSION_BUILD_DATE HB_VERSION_BLD_TIME -> HB_VERSION_BUILD_TIME HB_VERSION_CHANGELOG_REV -> HB_VERSION_CHANGELOG_ID Third part of version number could also be: PATCH, MICRO, BUILD SVN revision could also be: BUILD BUILD is inherently connected with a physical binary, so I dropped it, PATCH is limiting and negativ, MICRO is not very common (otherwise good), so a finally opted for RELEASE. REVISION kept as is. ; If there are no objections I'll HB_VER_REVISION macro to HB_VER_RELEASE. This will be an INCOMPATIBLE change, but I expect not too many ppl being affected. * TODO - Removed MT as a TODO. Thanks Przemek for the nice job. --- harbour/ChangeLog | 27 +++++++++++++++++++++++++++ harbour/TODO | 6 ------ harbour/include/hbver.ch | 12 ++++++------ harbour/make_vc.mak | 9 ++++++--- harbour/source/rtl/version.c | 10 +++++----- 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f54fd3f0b3..4c80f95e37 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,33 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-05 13:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_vc.mak + * -GA option only used for HB_VISUALC_VER >= 70. + Please update this if older versions also support it. + + * include/hbver.ch + * source/common/hbver.c + * Some more fiddling with version number terminology and + hb_version() values: + HB_VERSION_MICRO -> HB_VERSION_RELEASE + HB_VERSION_BLD_DATE_STR -> HB_VERSION_BUILD_DATE_STR + HB_VERSION_BLD_DATE -> HB_VERSION_BUILD_DATE + HB_VERSION_BLD_TIME -> HB_VERSION_BUILD_TIME + HB_VERSION_CHANGELOG_REV -> HB_VERSION_CHANGELOG_ID + Third part of version number could also be: PATCH, MICRO, BUILD + SVN revision could also be: BUILD + BUILD is inherently connected with a physical binary, so + I dropped it, PATCH is limiting and negativ, MICRO is not + very common (otherwise good), so a finally opted for + RELEASE. REVISION kept as is. + ; If there are no objections I'll HB_VER_REVISION macro to + HB_VER_RELEASE. This will be an INCOMPATIBLE change, but + I expect not too many ppl being affected. + + * TODO + - Removed MT as a TODO. Thanks Przemek for the nice job. + 2008-11-05 03:01 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbapi.h * harbour/source/vm/hashes.c diff --git a/harbour/TODO b/harbour/TODO index e3a34f8528..1af5037088 100644 --- a/harbour/TODO +++ b/harbour/TODO @@ -35,12 +35,6 @@ Status...: Open. *** -Assign to: -Detail...: Multithreading support. -Status...: Open. - -*** - Assign to: Detail...: Add support for virtual file handles and registering some meta handles so it will be possible to make: diff --git a/harbour/include/hbver.ch b/harbour/include/hbver.ch index 701b797c0d..8336843ca3 100644 --- a/harbour/include/hbver.ch +++ b/harbour/include/hbver.ch @@ -60,16 +60,16 @@ #define HB_VERSION_COMPILER 1 #define HB_VERSION_MAJOR 2 #define HB_VERSION_MINOR 3 -#define HB_VERSION_MICRO 4 +#define HB_VERSION_RELEASE 4 #define HB_VERSION_STATUS 5 #define HB_VERSION_REVISION 6 -#define HB_VERSION_BLD_DATE_STR 7 -#define HB_VERSION_BLD_DATE 8 -#define HB_VERSION_BLD_TIME 9 +#define HB_VERSION_BUILD_DATE_STR 7 +#define HB_VERSION_BUILD_DATE 8 +#define HB_VERSION_BUILD_TIME 9 #define HB_VERSION_PCODE_VER 10 #define HB_VERSION_PCODE_VER_STR 11 #define HB_VERSION_CHANGELOG_LAST 12 -#define HB_VERSION_CHANGELOG_REV 13 +#define HB_VERSION_CHANGELOG_ID 13 #define HB_VERSION_FLAG_PRG 14 #define HB_VERSION_FLAG_C 15 #define HB_VERSION_FLAG_LINKER 16 @@ -79,7 +79,7 @@ #define HB_VERSION_UNIX_COMPAT 20 #define HB_VERSION_PLATFORM 21 -/* hb_version( HB_V_ENDIANNESS ) return values. */ +/* hb_version( HB_VERSION_ENDIANNESS ) return values. */ #define HB_VERSION_ENDIAN_LITTLE 1 #define HB_VERSION_ENDIAN_BIG 2 #define HB_VERSION_ENDIAN_PDP 3 diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 2aab5dece3..16d713ff6e 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -140,9 +140,12 @@ CFLAGS = -Zi $(CFLAGS) DBGMARKER = d !endif -# NOTE: -GA flag should be disabled when building MT .dlls, -# as it creates bad code as per MS docs [vszakats]. -CFLAGSMT = -MT$(DBGMARKER) -DHB_MT_VM -GA +CFLAGSMT = -MT$(DBGMARKER) -DHB_MT_VM +# NOTE: -GA flag should be disabled when building MT _.dlls_, +# as it creates bad code according to MS docs [vszakats]. +!if $(HB_VISUALC_VER) >= 70 +CFLAGSMT = $(CFLAGSMT) -GA +!endif !endif diff --git a/harbour/source/rtl/version.c b/harbour/source/rtl/version.c index eaec03b6e6..fa88c80778 100644 --- a/harbour/source/rtl/version.c +++ b/harbour/source/rtl/version.c @@ -73,16 +73,16 @@ HB_FUNC( HB_VERSION ) case HB_VERSION_COMPILER: hb_retc_buffer( hb_verCompiler() ); break; case HB_VERSION_MAJOR: hb_retni( HB_VER_MAJOR ); break; case HB_VERSION_MINOR: hb_retni( HB_VER_MINOR ); break; - case HB_VERSION_MICRO: hb_retni( HB_VER_REVISION ); break; + case HB_VERSION_RELEASE: hb_retni( HB_VER_REVISION ); break; case HB_VERSION_STATUS: hb_retc( HB_VER_STATUS ); break; case HB_VERSION_REVISION: hb_retni( hb_verSvnID() ); break; - case HB_VERSION_BLD_DATE_STR: hb_retc_buffer( hb_verBuildDate() ); break; - case HB_VERSION_BLD_DATE: hb_retds( NULL ); break; /* TODO */ - case HB_VERSION_BLD_TIME: hb_retc( NULL ); break; /* TODO */ + case HB_VERSION_BUILD_DATE_STR: hb_retc_buffer( hb_verBuildDate() ); break; + case HB_VERSION_BUILD_DATE: hb_retds( NULL ); break; /* TODO */ + case HB_VERSION_BUILD_TIME: hb_retc( NULL ); break; /* TODO */ case HB_VERSION_PCODE_VER: hb_retni( HB_PCODE_VER ); break; case HB_VERSION_PCODE_VER_STR: hb_retc_buffer( hb_verPCode() ); break; case HB_VERSION_CHANGELOG_LAST: hb_retc_const( hb_verSvnLastEntry() ); break; - case HB_VERSION_CHANGELOG_REV: hb_retc_const( hb_verSvnChangeLogID() ); break; + case HB_VERSION_CHANGELOG_ID: hb_retc_const( hb_verSvnChangeLogID() ); break; case HB_VERSION_FLAG_PRG: hb_retc_const( hb_verFlagsPRG() ); break; case HB_VERSION_FLAG_C: hb_retc_const( hb_verFlagsC() ); break; case HB_VERSION_FLAG_LINKER: hb_retc_const( hb_verFlagsL() ); break;