2010-02-20 03:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* utils/hbmk2/hbmk2.pt_BR.po
  * utils/hbmk2/hbmk2.hu_HU.po
  * utils/hbmk2/hbmk2.prg
    + Added support for -harbourhelp option which will result
      in the same output as 'harbour --help' command.
    + Added reference to -harbourhelp option which display
      Harbour compiler help.
    + Added support for -build option support in hbmk2.
      It will be passed to Harbour compiler.

  * contrib/hbwin/hbwin.ch
    * Formatting.

harbour/ChangeLog

@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-20 03:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.pt_BR.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * utils/hbmk2/hbmk2.prg
+    + Added support for -harbourhelp option which will result
+      in the same output as 'harbour --help' command.
+    + Added reference to -harbourhelp option which display
+      Harbour compiler help.
+    + Added support for -build option support in hbmk2.
+      It will be passed to Harbour compiler.
+
+  * contrib/hbwin/hbwin.ch
+    * Formatting.
+
 2010-02-19 17:40 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/resources/dbl2sglquote.png
   * contrib/hbide/resources/sgl2dblquote.png

harbour/contrib/hbwin/hbwin.ch

@@ -151,8 +151,8 @@
 #define HB_WIN_RGB_BLACK            WIN_RGB( 0x00, 0x00, 0x00 )
 #define HB_WIN_RGB_BLUE             WIN_RGB( 0x00, 0x00, 0xFF )
 #define HB_WIN_RGB_GREEN            WIN_RGB( 0x00, 0xFF, 0x00 )
-#define HB_WIN_RGB_CYAN             WIN_RGB( 0x00, 0xFF, 0xFF )
 #define HB_WIN_RGB_RED              WIN_RGB( 0xFF, 0x00, 0x00 )
+#define HB_WIN_RGB_CYAN             WIN_RGB( 0x00, 0xFF, 0xFF )
 #define HB_WIN_RGB_MAGENTA          WIN_RGB( 0xFF, 0x00, 0xFF )
 #define HB_WIN_RGB_BROWN            WIN_RGB( 0xFF, 0xFF, 0x00 )
 #define HB_WIN_RGB_WHITE            WIN_RGB( 0xFF, 0xFF, 0xFF )

harbour/utils/hbmk2/hbmk2.hu_HU.po

@@ -499,7 +499,7 @@ msgstr "fel
 
 #: hbmk2.prg:7959
 #, c-format
-msgid "Regular Harbour compiler options are also accepted."
+msgid "Regular Harbour compiler options are also accepted.\\n(see them with -harbourhelp option)"
 msgstr "Normál Harbour fordító kapcsolók is megadhatók."
 
 #: hbmk2.prg:7941

harbour/utils/hbmk2/hbmk2.prg

@@ -689,6 +689,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
    LOCAL lAcceptCFlag := .F.
    LOCAL lAcceptLDFlag := .F.
    LOCAL lAcceptLDClipper := .F.
+   LOCAL lHarbourInfo := .F.
 
    LOCAL cWorkDir := NIL
 
@@ -1643,6 +1644,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
       CASE cParamL == "-strip-" .OR. ;
            cParamL == "-nostrip"         ; hbmk[ _HBMK_lSTRIP ]       := .F.
 
+      CASE cParamL == "--harbourhelp"    ; AAdd( hbmk[ _HBMK_aOPTPRG ], "--help" ) ; lHarbourInfo := .T.
+      CASE cParamL == "-harbourhelp"     ; AAdd( hbmk[ _HBMK_aOPTPRG ], "--help" ) ; lHarbourInfo := .T.
+      CASE cParamL == "-build"           ; AAdd( hbmk[ _HBMK_aOPTPRG ], "-build" ) ; lHarbourInfo := .T.
+
       CASE cParamL == "-warn" .OR. ;
            Left( cParamL, 6 ) == "-warn="
 
@@ -2120,6 +2125,19 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
       l_aLIBSYSMISC := {}
    ENDIF
 
+   IF lHarbourInfo
+      IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_NATIVE
+         /* Use integrated compiler */
+         hb_compile( "harbour", hbmk[ _HBMK_aOPTPRG ] )
+      ELSE
+         /* Use external compiler */
+         cCommand := FN_Escape( DirAddPathSep( PathSepToSelf( l_cHB_BIN_INSTALL ) ) + cBin_CompPRG + cBinExt, nCmd_Esc ) +;
+                     iif( ! Empty( hbmk[ _HBMK_aOPTPRG ] ), " " + ArrayToList( hbmk[ _HBMK_aOPTPRG ] ), "" )
+         hb_processRun( AllTrim( cCommand ) )
+      ENDIF
+      RETURN 0
+   ENDIF
+
    /* Strip leading @ char of .clp files */
    IF ! Empty( hbmk[ _HBMK_cFIRST ] ) .AND. Left( hbmk[ _HBMK_cFIRST ], 1 ) == "@" .AND. Lower( FN_ExtGet( hbmk[ _HBMK_cFIRST ] ) ) == ".clp"
       hbmk[ _HBMK_cFIRST ] := SubStr( hbmk[ _HBMK_cFIRST ], 2 )
@@ -8415,9 +8433,9 @@ STATIC PROCEDURE ShowHelp( lLong )
       I_( "Notes:" ) }
 
    LOCAL aNotes := {;
-      I_( "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file." ),;
+      I_( "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file" ),;
       I_( "Multiple -l, -L and <script> parameters are accepted." ),;
-      I_( "Regular Harbour compiler options are also accepted." ),;
+      I_( "Regular Harbour compiler options are also accepted.\n(see them with -harbourhelp option)" ),;
       hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory. The file format is the same as .hbc." ), _HBMK_CFG_NAME ),;
       hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),;
       I_( ".hbc config files in current dir are automatically processed." ),;

harbour/utils/hbmk2/hbmk2.pt_BR.po

@@ -507,7 +507,7 @@ msgstr "Multiplos par
 
 #: hbmk2.prg:7960
 #, c-format
-msgid "Regular Harbour compiler options are also accepted."
+msgid "Regular Harbour compiler options are also accepted.\\n(see them with -harbourhelp option)"
 msgstr "Opções usadas com o compilador Harbour também são aceitas."
 
 #: hbmk2.prg:7960