diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4a4b852bc7..7e5a0ced0f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
past entries belonging to author(s): Viktor Szakats.
*/
+2009-08-22 14:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+ * config/global.mk
+ % Minor opt.
+
+ * utils/hbmk2/hbmk2.pt_BR.po
+ * utils/hbmk2/hbmk2.hu_HU.po
+ * utils/hbmk2/hbmk2.prg
+ + Some 'hbmk' texts changed to 'hbmk2'.
+
+ * contrib/rddads/adsfunc.c
+ ! Fixed ADSGETLASTERROR() to return empty string instead of garbage
+ when there was no error.
+ Borrowed from xhb by Augusto Infante.
+ Fixes applied: Using manifest constant instead of 0, using NULL
+ instead of empty string literal.
+
2009-08-22 13:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/dynlib/mt/Makefile
* source/dynlib/Makefile
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index dfca56301f..2ca8c6dc18 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -26,15 +26,15 @@
# TOFIX: $(realpath/abspath) need GNU Make 3.81 or upper
# TOFIX: $(eval) needs GNU Make 3.80 or upper
+ifeq ($(GLOBAL_CF_),)
+GLOBAL_CF_ := yes
+
HB_VER_MAJOR := 2
HB_VER_MINOR := 0
HB_VER_RELEASE := 0
HB_VER_STATUS := beta2
HB_VER_STATUS_SH := b2
-ifeq ($(GLOBAL_CF_),)
-GLOBAL_CF_ := yes
-
-include $(TOP)$(ROOT)config/conf.mk
# This isn't strictly necessary, but it does signficantly reduce
diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c
index e7e92be53f..88f0117070 100644
--- a/harbour/contrib/rddads/adsfunc.c
+++ b/harbour/contrib/rddads/adsfunc.c
@@ -1449,11 +1449,12 @@ HB_FUNC( ADSGETLASTERROR )
UNSIGNED8 aucError[ ADS_MAX_ERROR_LEN + 1 ];
UNSIGNED16 usLength = ADS_MAX_ERROR_LEN + 1;
- AdsGetLastError( &ulLastErr,
- aucError,
- &usLength );
+ AdsGetLastError( &ulLastErr, aucError, &usLength );
- hb_storclen( ( char * ) aucError, usLength, 1 );
+ if( ulLastErr == AE_SUCCESS )
+ hb_storc( NULL, 1 );
+ else
+ hb_storclen( ( char * ) aucError, usLength, 1 );
hb_retnl( ulLastErr );
}
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index f5396aa0c0..17c0800f2b 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -39,8 +39,8 @@ msgstr "Figyelem: C ford
#: hbmk2.prg:5758 hbmk2.prg:6471
#, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect"
-msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\\nA hbmk program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk2 to rtlink/blinker/exospace for the same effect"
+msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\\nA hbmk2 program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
#: hbmk2.prg:308 hbmk2.prg:389
#, c-format
@@ -49,8 +49,8 @@ msgstr "Folytat
#: hbmk2.prg:5758 hbmk2.prg:6471
#, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk to hbcc for the same effect"
-msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\\nA hbmk program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk2 to hbcc for the same effect"
+msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\\nA hbmk2 program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
#: hbmk2.prg:5644 hbmk2.prg:6349
#, c-format
@@ -484,8 +484,8 @@ msgstr "aktu
#: hbmk2.prg:5758 hbmk2.prg:6471
#, c-format
-msgid "stop after creating the object files\\ncreate link/copy hbmk to hbcmp/clipper for the same effect"
-msgstr "álljon meg az object állományok létrehozása után\\nA hbmk program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "stop after creating the object files\\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect"
+msgstr "álljon meg az object állományok létrehozása után\\nA hbmk2 program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
#: hbmk2.prg:5661 hbmk2.prg:6366
#, c-format
@@ -544,8 +544,8 @@ msgstr "dinamikus f
#: hbmk2.prg:5769 hbmk2.prg:6487
#, c-format
-msgid "%1$s option file in hbmk directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, /etc/harbour, /etc are checked (in that order) before the hbmk directory. The file format is the same as .hbc."
-msgstr "%1$s opció fájl a hbmk könyvtárában mindig feldolgozásra kerül amennyiben létezik. *nix platformokon a fájl a ~/.harbour, /etc/harbour, /etc/harbour, /etc könyvtárak (ebben a sorrendben) szintén ellenőrzésre kerül. Az fájl formátuma megegyezik a .hbc-vel."
+msgid "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, /etc/harbour, /etc are checked (in that order) before the hbmk2 directory. The file format is the same as .hbc."
+msgstr "%1$s opció fájl a hbmk2 könyvtárában mindig feldolgozásra kerül amennyiben létezik. *nix platformokon a fájl a ~/.harbour, /etc/harbour, /etc/harbour, /etc könyvtárak (ebben a sorrendben) szintén ellenőrzésre kerülnek. Az fájl formátuma megegyezik a .hbc-vel."
#: hbmk2.prg:5758 hbmk2.prg:6471
#, c-format
@@ -719,8 +719,8 @@ msgstr "Hiba: C ford
#: hbmk2.prg:5661 hbmk2.prg:6366
#, c-format
-msgid " hbmk [options] [] "
-msgstr " hbmk [kapcsolók] [] "
+msgid " hbmk2 [options] [] "
+msgstr " hbmk2 [kapcsolók] [] "
#: hbmk2.prg:2937 hbmk2.prg:3341
#, c-format
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 1b47439208..339e08f236 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -67,7 +67,7 @@
#include "hbver.ch"
/* NOTE: Keep this code clean from any kind of contribs and Harbour level
- 3rd party library/tool information. This (the hbmk) component
+ 3rd party library/tool information. This (the hbmk2) component
shall only contain hard-wired knowledge on Harbour _core_
(official interfaces preferred), C compilers and OS details on
the smallest possible level.
@@ -88,7 +88,7 @@
Problems to solve: -hbcc compatibility (the feature has to be
disabled when this switch is uses). Collision with -o harbour
option isn't a problem, since we're overriding it already for
- hbmk, but we will need to deal with "/" prefixed variant. Since
+ hbmk2, but we will need to deal with "/" prefixed variant. Since
we need to use -o Harbour switch, it will be a problem also when
user tries to use -p option, .ppo files will be generated in temp
dir. */
@@ -3135,7 +3135,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
/* Build C stub */
/* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
- cFile := '/* This temp source file was generated by hbmk tool. */' + Chr( 10 ) +;
+ cFile := '/* This temp source file was generated by hbmk2 tool. */' + Chr( 10 ) +;
'/* You can safely delete it. */' + Chr( 10 ) +;
'' + Chr( 10 ) +;
'#include "hbapi.h"' + Chr( 10 )
@@ -3336,7 +3336,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
IF ! l_lCLEAN
/* Build .rc stub */
/* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
- cFile := '/* This temp source file was generated by hbmk tool. */' + Chr( 10 ) +;
+ cFile := '/* This temp source file was generated by hbmk2 tool. */' + Chr( 10 ) +;
'/* You can safely delete it. */' + Chr( 10 ) +;
'' + Chr( 10 )
AEval( hbmk[ _HBMK_aICON ], {|tmp, tmp1| cFile += 'ICON' + hb_ntos( tmp1 ) + ' ICON DISCARDABLE "' + FN_Escape( PathSepToTarget( hbmk, tmp ), _ESC_BACKSLASH ) + '"' + Chr( 10 ) } )
@@ -6582,7 +6582,7 @@ STATIC PROCEDURE SetUILang( hbmk )
STATIC PROCEDURE ShowHeader( hbmk )
- OutStd( "Harbour Make " + HBRawVersion() + hb_osNewLine() +;
+ OutStd( "Harbour Make (hbmk2) " + HBRawVersion() + hb_osNewLine() +;
"Copyright (c) 1999-2009, Viktor Szakats" + hb_osNewLine() +;
"http://www.harbour-project.org/" + hb_osNewLine() )
@@ -6602,7 +6602,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
LOCAL aText_Basic := {;
I_( "Syntax:" ),;
"",;
- I_( " hbmk [options] [] " ),;
+ I_( " hbmk2 [options] [] " ),;
"",;
I_( "Options:" ) }
@@ -6690,15 +6690,15 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
NIL,;
{ "-hbrun" , I_( "run target" ) },;
{ "-hbraw" , I_( "stop after running Harbour compiler" ) },;
- { "-hbcmp|-clipper" , I_( "stop after creating the object files\ncreate link/copy hbmk to hbcmp/clipper for the same effect" ) },;
- { "-hbcc" , I_( "stop after creating the object files and accept raw C flags\ncreate link/copy hbmk to hbcc for the same effect" ) },;
+ { "-hbcmp|-clipper" , I_( "stop after creating the object files\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect" ) },;
+ { "-hbcc" , I_( "stop after creating the object files and accept raw C flags\ncreate link/copy hbmk2 to hbcc for the same effect" ) },;
{ "-hblnk" , I_( "accept raw linker flags" ) },;
{ "-hb10" , I_( "enable Harbour 1.0.x compatibility mode (experimental)" ) },;
{ "-xhb" , I_( "enable xhb mode (experimental)" ) },;
{ "-hbc" , I_( "enable pure C mode (experimental)" ) },;
{ "-rtlink" , "" },;
{ "-blinker" , "" },;
- { "-exospace" , I_( "emulate Clipper compatible linker behavior\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect" ) },;
+ { "-exospace" , I_( "emulate Clipper compatible linker behavior\ncreate link/copy hbmk2 to rtlink/blinker/exospace for the same effect" ) },;
NIL,;
{ "--hbdirbin" , I_( "output Harbour binary directory" ) },;
{ "--hbdirdyn" , I_( "output Harbour dynamic library directory" ) },;
@@ -6722,7 +6722,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
I_( "