From 6157304b83fb8b5aabc269b91c1a2ce5c72c624c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Aug 2010 09:14:46 +0000 Subject: [PATCH] 2010-08-03 11:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed to clean map file when -map option is used. * Little cleanup to prev. --- harbour/ChangeLog | 5 +++++ harbour/utils/hbmk2/hbmk2.prg | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6417b56cf6..c94638514b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-03 11:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed to clean map file when -map option is used. + * Little cleanup to prev. + 2010-08-03 11:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed to clean implibs generated in -hbdyn and -hbexe modes. diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 9b96a6fbf1..fbeef1377e 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5839,6 +5839,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF hbmk[ _HBMK_lCLEAN ] FErase( hbmk[ _HBMK_cPROGNAME ] ) + IF hbmk[ _HBMK_lIMPLIB ] .AND. hbmk[ _HBMK_cPLAT ] $ "win|os2|dos" .AND. l_cIMPLIBNAME != NIL + FErase( l_cIMPLIBNAME ) + ENDIF + IF hbmk[ _HBMK_lMAP ] + FErase( FNameExtSet( hbmk[ _HBMK_cPROGNAME ], ".map" ) ) + ENDIF IF lStopAfterCComp .AND. hbmk[ _HBMK_lCreateLib ] /* bcc is known to create it for static libs */ FErase( FNameExtSet( hbmk[ _HBMK_cPROGNAME ], ".bak" ) ) @@ -5859,10 +5865,6 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF ! hbmk[ _HBMK_lINC ] .OR. hbmk[ _HBMK_lCLEAN ] AEval( ListDirExt( hbmk[ _HBMK_aPRG ], hbmk[ _HBMK_cWorkDir ], ".c", .T. ), {| tmp | FErase( tmp ) } ) ENDIF - IF hbmk[ _HBMK_lCLEAN ] .AND. ; - hbmk[ _HBMK_lIMPLIB ] .AND. hbmk[ _HBMK_cPLAT ] $ "win|os2|dos" .AND. l_cIMPLIBNAME != NIL - FErase( l_cIMPLIBNAME ) - ENDIF IF ! lStopAfterCComp .OR. hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ] IF ! hbmk[ _HBMK_lINC ] .OR. hbmk[ _HBMK_lCLEAN ] IF ! Empty( cResExt )