fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-11-05 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* bin/hb-func.sh
  * include/hbstdgen.ch
  * include/hbver.h
  * contrib/examples/pp/pp.c
  * source/pp/ppcore.c
  * source/pp/hbpp.c
  * source/common/hbver.c
    * HB_VER_REVISION -> HB_VER_RELEASE.
      INCOMPATIBLE.
This commit is contained in:
Viktor Szakats
2008-11-05 18:19:06 +00:00
parent efa79fba05
commit ccd1a88f7b
8 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -8,6 +8,17 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-05 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-func.sh
* include/hbstdgen.ch
* include/hbver.h
* contrib/examples/pp/pp.c
* source/pp/ppcore.c
* source/pp/hbpp.c
* source/common/hbver.c
* HB_VER_REVISION -> HB_VER_RELEASE.
INCOMPATIBLE.
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.

8
harbour/bin/hb-func.sh
View File

@@ -45,10 +45,10 @@ get_hbver()
hb_rootdir="${1-.}"
FVER="${hb_rootdir}/include/hbver.h"
MAJOR=`sed -e '/HB_VER_MAJOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
MINOR=`sed -e '/HB_VER_MINOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
REVIS=`sed -e '/HB_VER_REVISION/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
echo "${MAJOR}.${MINOR}.${REVIS}"
MAJOR=`sed -e '/HB_VER_MAJOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
MINOR=`sed -e '/HB_VER_MINOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
RELEA=`sed -e '/HB_VER_RELEASE/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
echo "${MAJOR}.${MINOR}.${RELEA}"
}
get_hbverstat()

4
harbour/contrib/examples/pp/pp.c
View File

@@ -114,8 +114,8 @@ int main( int argc, char * argv[] )
HB_TRACE(HB_TR_DEBUG, ("main(%d, %p)", argc, argv));
printf( "Harbour Preprocessor (old revision) %d.%d.%d\n",
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_REVISION );
printf( "Harbour Preprocessor (old version) %d.%d.%d\n",
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE );
printf( "Copyright (c) 1999-2008, http://www.harbour-project.org/\n" );
hb_pp_Table();

2
harbour/include/hbstdgen.ch
View File

@@ -61,7 +61,7 @@
#undef HB_VER_MAJOR
#undef HB_VER_MINOR
#undef HB_VER_REVISION
#undef HB_VER_RELEASE
#undef HB_VER_STATUS
#undef __DATE__

4
harbour/include/hbver.h
View File

@@ -61,8 +61,8 @@
#define HB_VER_MAJOR 1 /* Major version number */
#define HB_VER_MINOR 1 /* Minor version number */
#define HB_VER_REVISION 0 /* Revision number */
#define HB_VER_RELEASE 0 /* Release number */
#define HB_VER_STATUS "dev" /* Build status */
#define __HARBOUR__ 0x010100 /* Three bytes: Major + Minor + Revision. This is recommented for 3rd party .c and .prg level code. */
#define __HARBOUR__ 0x010100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */
#endif /* HB_VER_H_ */

2
harbour/source/common/hbver.c
View File

@@ -558,7 +558,7 @@ char * hb_verHarbour( void )
pszVersion = ( char * ) hb_xgrab( 80 );
hb_snprintf( pszVersion, 80, "Harbour %d.%d.%d%s (Rev. %d)",
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_REVISION, HB_VER_STATUS,
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE, HB_VER_STATUS,
hb_verSvnID() );
return pszVersion;

2
harbour/source/pp/hbpp.c
View File

@@ -578,7 +578,7 @@ int main( int argc, char * argv[] )
PHB_PP_STATE pState;
printf( "Harbour Preprocessor %d.%d.%d\n",
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_REVISION );
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE );
printf( "Copyright (c) 1999-2008, http://www.harbour-project.org/\n" );
pState = hb_pp_new();

2
harbour/source/pp/ppcore.c
View File

@@ -5220,7 +5220,7 @@ void hb_pp_initDynDefines( PHB_PP_STATE pState )
#endif
#if defined( __HARBOUR__ )
hb_snprintf( szResult, sizeof( szResult ), "0x%02X%02X%02X", HB_VER_MAJOR & 0xFF, HB_VER_MINOR & 0xFF, HB_VER_REVISION & 0xFF );
hb_snprintf( szResult, sizeof( szResult ), "0x%02X%02X%02X", HB_VER_MAJOR & 0xFF, HB_VER_MINOR & 0xFF, HB_VER_RELEASE & 0xFF );
hb_pp_addDefine( pState, "__HARBOUR__", szResult );
#endif