From 7ca3548e34cdebd079bdf9b879a2f863f7c36d02 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 29 Apr 2009 17:38:37 +0000
Subject: [PATCH] 2009-04-29 19:37 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * utils/hbmk2/hbmk2.prg     ! Readded -map support for *nixes.     !
 Changed -strip support for darwin to use separate strip command.     + .hbmk
 dir is now set hidden.     + Target name is displayed on screen.

  * ChangeLog
    - Removed one empty line from license header after last commit.
      (Przemek pls update your script to reflect that)
---
 harbour/ChangeLog             | 12 ++++++++-
 harbour/utils/hbmk2/hbmk2.prg | 46 +++++++++++++++++++++++++++++++----
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7388fe348d..7f47ddab60 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,7 +7,6 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 
    This work is licensed under the Creative Commons Attribution-ShareAlike
-
    License. To view a copy of this license, visit
    http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
    Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305,
@@ -18,6 +17,17 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-04-29 19:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Readded -map support for *nixes.
+    ! Changed -strip support for darwin to use separate strip command.
+    + .hbmk dir is now set hidden.
+    + Target name is displayed on screen.
+
+  * ChangeLog
+    - Removed one empty line from license header after last commit.
+      (Przemek pls update your script to reflect that)
+
 2009-04-29 19:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/compiler/genc.c
     ! respect \ escaping in C strings when #pragma dump C code is scanned
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 267f5b6f09..fb08cefd8d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -348,6 +348,8 @@ FUNCTION hbmk( aArgs )
    LOCAL cOpt_Cprs
    LOCAL cOpt_CprsMin
    LOCAL cOpt_CprsMax
+   LOCAL cBin_Post := NIL
+   LOCAL cOpt_Post
 
    LOCAL cCommand
 #if defined( HBMK_INTEGRATED_COMPILER )
@@ -1505,6 +1507,9 @@ FUNCTION hbmk( aArgs )
                aLIB_BASE2 := ArrayAJoin( { aLIB_BASE2, { "hbcommon", "hbrtl" }, s_aLIBVM } )
             ENDIF
          ENDIF
+         IF s_lMAP
+            AAdd( s_aOPTL, "-Wl,-map,{OM}" )
+         ENDIF
          IF s_lSTATICFULL
             AAdd( s_aOPTL, "-static" )
          ENDIF
@@ -1516,8 +1521,13 @@ FUNCTION hbmk( aArgs )
                AAdd( s_aOPTL, "-multiply_defined suppress" )
             ENDIF
          ENDIF
-         IF s_lSTRIP .AND. !( s_cARCH == "sunos" )
-            AAdd( s_aOPTL, "-s" )
+         IF s_lSTRIP
+            IF s_cARCH == "darwin"
+               cBin_Post := "strip"
+               cOpt_Post := "{OB}"
+            ELSEIF !( s_cARCH == "sunos" )
+               AAdd( s_aOPTL, "-s" )
+            ENDIF
          ENDIF
          IF lStopAfterCComp
             IF ! lCreateLib .AND. ! lCreateDyn .AND. ( Len( s_aPRG ) + Len( s_aC ) ) == 1
@@ -2860,7 +2870,7 @@ FUNCTION hbmk( aArgs )
             CASE ! lStopAfterCComp .AND. ! Empty( cBin_Link )
 
                IF s_lINC .AND. ! s_lQuiet
-                  OutStd( "Linking..." + hb_osNewLine() )
+                  OutStd( "Linking...", PathSepToTarget( s_cPROGNAME ), hb_osNewLine() )
                ENDIF
 
                /* Linking */
@@ -2919,7 +2929,7 @@ FUNCTION hbmk( aArgs )
             CASE lStopAfterCComp .AND. lCreateLib .AND. ! Empty( cBin_Lib )
 
                IF s_lINC .AND. ! s_lQuiet
-                  OutStd( "Creating static library..." + hb_osNewLine() )
+                  OutStd( "Creating static library...", PathSepToTarget( s_cPROGNAME ), hb_osNewLine() )
                ENDIF
 
                /* Lib creation (static) */
@@ -2974,7 +2984,7 @@ FUNCTION hbmk( aArgs )
             CASE lStopAfterCComp .AND. lCreateDyn .AND. ! Empty( cBin_Dyn )
 
                IF s_lINC .AND. ! s_lQuiet
-                  OutStd( "Creating dynamic library..." + hb_osNewLine() )
+                  OutStd( "Creating dynamic library...", PathSepToTarget( s_cPROGNAME ), hb_osNewLine() )
                ENDIF
 
                /* Lib creation (dynamic) */
@@ -3059,6 +3069,29 @@ FUNCTION hbmk( aArgs )
       ENDIF
 
       IF nErrorLevel == 0 .AND. ! lStopAfterCComp .AND. ! s_lCLEAN
+
+         IF ! Empty( cBin_Post )
+
+            cOpt_Post := StrTran( cOpt_Post, "{OB}", PathSepToTarget( s_cPROGNAME ) )
+            cOpt_Post := AllTrim( cOpt_Post )
+
+            cCommand := cBin_Post + " " + cOpt_Post
+
+            IF s_lTRACE
+               IF ! s_lQuiet
+                  OutStd( "hbmk: Post processor command:" + hb_osNewLine() )
+               ENDIF
+               OutStd( cCommand + hb_osNewLine() )
+            ENDIF
+
+            IF ! s_lDONTEXEC .AND. ( tmp := hbmk_run( cCommand ) ) != 0
+               OutErr( "hbmk: Warning: Running post processor command. " + hb_ntos( tmp ) + ":" + hb_osNewLine() )
+               IF ! s_lQuiet
+                  OutErr( cCommand + hb_osNewLine() )
+               ENDIF
+            ENDIF
+         ENDIF
+
          IF s_nCOMPR != _COMPR_OFF .AND. ! lCreateLib .AND. ! Empty( cBin_Cprs )
 
             /* Executable compression */
@@ -3704,6 +3737,9 @@ FUNCTION DirBuild( cDir )
                IF hb_DirCreate( cDirTemp ) != 0
                   RETURN .F.
                ENDIF
+               IF Lower( cDirItem ) == ".hbmk"
+                  hb_FSetAttr( cDirTemp, FC_HIDDEN )
+               ENDIF
             ENDIF
          ENDIF
       NEXT