From 8b0d5311af9c70171e826aa45046f4ba57ecc911 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 2 Mar 2009 16:53:53 +0000
Subject: [PATCH] 2009-03-02 17:53 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * utils/hbmk2/hbmk2.prg     + Automatically switching to -hbcmp mode if
 /gh switch is used.     + In -hbcmp mode it will pass /o option directly to
 Harbour.

  - contrib/examples/uhttpd/modules/bldhrb.bat
  + contrib/examples/uhttpd/modules/allmod.hbm
    + Replaced batch file with hbmk2 make file. It will build
      all .hrb files and place them to cgi-bin dir.
---
 harbour/ChangeLog                             | 10 +++++
 .../examples/uhttpd/modules/allmod.hbm        | 11 ++++++
 .../examples/uhttpd/modules/bldhrb.bat        | 38 -------------------
 harbour/utils/hbmk2/hbmk2.prg                 |  9 ++++-
 4 files changed, 28 insertions(+), 40 deletions(-)
 create mode 100644 harbour/contrib/examples/uhttpd/modules/allmod.hbm
 delete mode 100644 harbour/contrib/examples/uhttpd/modules/bldhrb.bat

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e6d1442c76..e3a6fd25e8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-02 17:53 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Automatically switching to -hbcmp mode if /gh switch is used.
+    + In -hbcmp mode it will pass /o option directly to Harbour.
+
+  - contrib/examples/uhttpd/modules/bldhrb.bat
+  + contrib/examples/uhttpd/modules/allmod.hbm
+    + Replaced batch file with hbmk2 make file. It will build
+      all .hrb files and place them to cgi-bin dir.
+
 2009-03-02 16:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   - obj
   - make_b32.bat
diff --git a/harbour/contrib/examples/uhttpd/modules/allmod.hbm b/harbour/contrib/examples/uhttpd/modules/allmod.hbm
new file mode 100644
index 0000000000..ec5753369f
--- /dev/null
+++ b/harbour/contrib/examples/uhttpd/modules/allmod.hbm
@@ -0,0 +1,11 @@
+#
+# $Id$
+#
+
+-n -gh -w3
+-o..\home\cgi-bin\
+cookie.prg
+info.prg
+showcounter.prg
+tableservletdb.prg
+testajax.prg
diff --git a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat b/harbour/contrib/examples/uhttpd/modules/bldhrb.bat
deleted file mode 100644
index 71638ba168..0000000000
--- a/harbour/contrib/examples/uhttpd/modules/bldhrb.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-@echo off
-rem
-rem $Id$
-rem
-
-set HB_INSTALL=..\..\..\..
-set HB_BIN_INSTALL=%HB_INSTALL%\bin
-set HB_INC_INSTALL=include;%HB_INSTALL%\include
-set HB_LIB_INSTALL=%HB_INSTALL%\lib
-
-%HB_BIN_INSTALL%\harbour %1.prg -n -q0 -w3 -es2 -gh -i%HB_INC_INSTALL% %2 %3 %HARBOURFLAGS% > bldtest.log
-
-IF ERRORLEVEL 1 GOTO SHOWERROR
-
-GOTO COMPILEOK
-
-:SHOWERROR
-echo.
-echo.Error on compiling ...
-echo.
-echo.Running Notepad, please close to end this batch file ...
-echo.
-notepad bldtest.log
-echo.
-echo.Notepad closed, exiting ...
-echo.
-GOTO ENDSET
-
-:COMPILEOK
-echo.
-echo.Compiled successfully
-echo.
-if exist bldtest.log del bldtest.log
-if exist %1.hrb copy %1.hrb ..\home\cgi-bin /y
-if exist %1.hrb del %1.hrb
-GOTO ENDSET
-
-:ENDSET
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 0866c231f9..f5c59f68b8 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -687,9 +687,14 @@ FUNCTION Main( ... )
            cParamL            == "-hblnk" .OR. ;
            cParamL            == "-info"
 
+      CASE Left( cParamL, 2 ) == "-gh" .OR. ;
+           ( ! lNIX .AND. Left( cParamL, 2 ) == "/gh" )
+
+           lStopAfterHarbour := .T.
+
          /* Simply ignore. They were already processed in the first pass. */
 
-      CASE ! lNIX .AND. Left( cParamL, 2 ) == "/o"
+      CASE ! lNIX .AND. Left( cParamL, 2 ) == "/o" .AND. ! lStopAfterHarbour
 
          /* Swallow this switch. We don't pass it to Harbour, as it may badly
             interact with hbmk. */
@@ -755,7 +760,7 @@ FUNCTION Main( ... )
             ENDIF
          ENDIF
 
-      CASE Left( cParam, 2 ) == "-o"
+      CASE Left( cParam, 2 ) == "-o" .AND. ! lStopAfterHarbour
 
          tmp := PathSepToSelf( SubStr( cParam, 3 ) )
          hb_FNameSplit( tmp, @cDir, @cName, @cExt )