2013-02-24 13:37 UTC+0100 Viktor Szakats (harbour syenar.net)

* utils/hbmk2/hbmk2.prg
    + documented the way to exclude libraries from linking
      (see '-l' option and 'libs=' directive)
    + documented '-hbcontainer' target type (no longer
      experimental)
    * '-hbimplib' option marked as Windows-only in help
    * '-hbimplib' option moved to long help
    * '-mt/-st' option moved to top of long help (to keep main
      help screen short)

  * doc/tracing.txt
    - deleted obsolete options from examples

harbour/ChangeLog.txt

@@ -10,6 +10,20 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-24 13:37 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + documented the way to exclude libraries from linking
+      (see '-l' option and 'libs=' directive)
+    + documented '-hbcontainer' target type (no longer
+      experimental)
+    * '-hbimplib' option marked as Windows-only in help
+    * '-hbimplib' option moved to long help
+    * '-mt/-st' option moved to top of long help (to keep main
+      help screen short)
+
+  * doc/tracing.txt
+    - deleted obsolete options from examples
+
 2013-02-23 18:05 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     + added HBSHELL_CLIPPER() shell/script API call, which

harbour/doc/tracing.txt

@@ -90,14 +90,14 @@ HB_TR_LEVEL_WARNING             they have no performance effect; only
                                 effect, since the code was compiled with
                                 a lower tracing level.
 
-For example, I compile Harbour on WinNT with gcc (MINGW32), so I
+For example, I compile Harbour on WinNT with gcc (mingw), so I
 usually set the HB_USER_CFLAGS environment variable like this:
 
-  export HB_USER_CFLAGS='-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO'
+  export HB_USER_CFLAGS='-DHB_TR_LEVEL=HB_TR_INFO'
 
 or for other OS (eg: MS-DOS, Windows)
 
-  SET HB_USER_CFLAGS=-DHARBOUR_USR_WIN_GTAPI -DHB_TR_LEVEL_INFO
+  SET HB_USER_CFLAGS=-DHB_TR_LEVEL_INFO
 
 and make sure I have all the tracing for the INFO, WARNING, ERROR,
 FATAL and ALWAYS levels. If I get too much information, at run-time I

harbour/utils/hbmk2/hbmk2.prg

@@ -1888,7 +1888,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
          { {|| iif( ( tmp1 := FindInPath( "icl.exe" ) ) != NIL .AND. "itanium" $ Lower( tmp1 ), tmp1, NIL ) }, "iccia64" }, ;
          { {|| FindInPath( "icl.exe"  ) }, "icc"    }, ;
          { {|| FindInPath( "xCC.exe"  ) }, "xcc"    }, ;
-         { {|| FindInPath( "dmc.exe"  ) }, "dmc"    }}
+         { {|| FindInPath( "dmc.exe"  ) }, "dmc"    } }
 #endif
       aCOMPSUP := { ;
          "mingw", "msvc", "clang", "bcc", "watcom", "icc", "pocc", "xcc", ;
@@ -7739,7 +7739,7 @@ STATIC PROCEDURE vxworks_env_init( hbmk )
       "x86"  => { "pentium", "X86LH"  , "_VX_SIMPENTIUM", "simpentium/SIMPENTIUM" }, ;
       "arm"  => { "arm"    , "ARMV7LS", "_VX_ARMARCH7"  , "arm/ARMARCH7"          }, ;
       "mips" => { "mips"   , ""       , ""              , ""                      }, ;
-      "ppc"  => { "ppc"    , ""       , ""              , ""                      }}
+      "ppc"  => { "ppc"    , ""       , ""              , ""                      } }
 
    IF hbmk[ _HBMK_cCPU ] $ aTable
       IF Empty( hbmk[ _HBMK_cCCSUFFIX ] )
@@ -15346,24 +15346,23 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
    LOCAL aLst_Opt_Basic := { ;
       NIL, ;
       { "-o<outname>"        , I_( "output file name" ) }, ;
-      { "-l<libname>"        , I_( "link with <libname> library. <libname> should be without path, extension and 'lib' prefix (unless part of libname). Do not add core Harbour libraries, they are automatically added as needed." ) }, ;
+      { "-l<libname>"        , I_( "link with <libname> library. <libname> should be without path, extension and 'lib' prefix (unless part of the name). Do not add core Harbour libraries, they are automatically added as needed. If <libname> starts with a '-' character, the library will be removed from the list of libraries at link time." ) }, ;
       { "-L<libpath>"        , I_( "additional path to search for libraries" ) }, ;
       { "-i<p>|-incpath=<p>" , I_( "additional path to search for headers" ) }, ;
       { "-static|-shared"    , I_( "link with static/shared libs" ) }, ;
-      { "-mt|-st"            , I_( "link with multi/single-thread Harbour VM" ) }, ;
       { "-gt<name>"          , I_( "link with GT<name> GT driver, can be repeated to link with more GTs. First one will be the default at runtime" ) }, ;
       { "-inc[-]"            , I_( "enable/disable incremental build mode (default: disabled)" ) }, ;
       { "-hbexe"             , I_( "create executable (default)" ) }, ;
       { "-hblib"             , I_( "create static library" ) }, ;
       { "-hbdyn"             , I_( "create dynamic library (without linked Harbour VM)" ) }, ;
-      { "-hbdynvm"           , I_( "create dynamic library" ) }, ;
-      { "-hbimplib"          , I_( "create import library" ) }}
+      { "-hbdynvm"           , I_( "create dynamic library" ) } }
 
    LOCAL aLst_Opt_Help := { ;
       { "-help|--help"       , I_( "long help" ) } }
 
    LOCAL aLst_Opt_Long := { ;
       NIL, ;
+      { "-mt|-st"            , I_( "link with multi/single-thread Harbour VM" ) }, ;
       { "-gui|-std"          , I_( "create GUI/console executable" ) }, ;
       { "-main=<mainfunc>"   , I_( "override the name of starting function/procedure" ) }, ;
       { "-request=<func>"    , I_( "force function/procedure to be linked" ) }, ;
@@ -15435,6 +15434,9 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       { "-clean"             , I_( "clean (in incremental build mode)" ) }, ;
       { "-workdir=<dir>"     , hb_StrFormat( I_( e"working directory\n(default: %1$s/<platform>/<compiler> [*] in incremental mode, OS temp directory otherwise)" ), _WORKDIR_BASE_ ) }, ;
       NIL, ;
+      { "-hbcontainer"       , I_( "virtual target, it doesn't create anything. Useful for creating an .hbp with the sole purpose of referencing subprojects" ) }, ;
+      { "-hbimplib"          , I_( "create import library (Windows only)" ) }, ;
+      NIL, ;
       { "-hbl[=<output>]"    , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) }, ;
       { "-lng=<languages>"   , hb_StrFormat( I_( e"list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en,hu-HU,de" ), _LNG_MARKER ) }, ;
       { "-po=<output>"       , I_( "create/update .po file from source. Merge it with previous .po file of the same name" ) }, ;
@@ -15675,7 +15677,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       { "stop=[<msg>]"      , I_( "stop the build. Display <msg>, if specified." ) }, ;
       { "sources="          , I_( "add space separated list of files as input files" ) }, ;
       { "headers="          , I_( "add space separated list of .ch format headers as standard header" ) }, ;
-      { "libs="             , I_( "add space separated list of libraries" ) }, ;
+      { "libs="             , I_( "add space separated list of libraries (see more at -l option)" ) }, ;
       { "frameworks="       , I_( "add space separated list of frameworks (Darwin only)" ) }, ;
       { "requests="         , I_( "add space separated list of symbols to force link to the target" ) }, ;
       { "syslibs="          , I_( "add space separated list of libraries as system libraries (before regular libraries)" ) }, ;