From ccd1a88f7bd0f18085fb2bf9fab1b1efea5d7af8 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 5 Nov 2008 18:19:06 +0000
Subject: [PATCH] 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.

---
 harbour/ChangeLog                | 11 +++++++++++
 harbour/bin/hb-func.sh           |  8 ++++----
 harbour/contrib/examples/pp/pp.c |  4 ++--
 harbour/include/hbstdgen.ch      |  2 +-
 harbour/include/hbver.h          |  4 ++--
 harbour/source/common/hbver.c    |  2 +-
 harbour/source/pp/hbpp.c         |  2 +-
 harbour/source/pp/ppcore.c       |  2 +-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4c80f95e37..f770b5b87e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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.
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index a75250dd3e..981dd178c1 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -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()
diff --git a/harbour/contrib/examples/pp/pp.c b/harbour/contrib/examples/pp/pp.c
index bd04344ce7..3cf7a6c580 100644
--- a/harbour/contrib/examples/pp/pp.c
+++ b/harbour/contrib/examples/pp/pp.c
@@ -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();
diff --git a/harbour/include/hbstdgen.ch b/harbour/include/hbstdgen.ch
index d4b20d584c..3e4a1ff741 100644
--- a/harbour/include/hbstdgen.ch
+++ b/harbour/include/hbstdgen.ch
@@ -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__
diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h
index 2a063f3c70..f01be6a5b9 100644
--- a/harbour/include/hbver.h
+++ b/harbour/include/hbver.h
@@ -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_ */
diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c
index bac6d84c53..6b841ae8f2 100644
--- a/harbour/source/common/hbver.c
+++ b/harbour/source/common/hbver.c
@@ -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;
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index a1b0fc97a0..a56718b24c 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -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();
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 4274ce789c..979b62e128 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -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