From 49be9ffd545ae4fbc6a53aef5c32911950e96b09 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Aug 2010 18:54:25 +0000 Subject: [PATCH] 2010-08-03 20:54 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/make.hbs ! Fixed missing output from hbmk2 runs. * Will not echo the --hbinfo hbmk2 invokation anymore. * INSTALL * Minor. --- harbour/ChangeLog | 10 +++++++++- harbour/INSTALL | 6 +++--- harbour/contrib/make.hbs | 21 ++++++++++++++------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index eff4d15251..8e9b3d3961 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,11 +16,19 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-03 20:54 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/make.hbs + ! Fixed missing output from hbmk2 runs. + * Will not echo the --hbinfo hbmk2 invokation anymore. + + * INSTALL + * Minor. + 2010-08-03 10:11 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idedocks.prg * contrib/hbide/ideedit.prg % A hacked fix: to context menu actions inside editor, reported at FWH forum. - % Fixed: switching over to non-MDI mode from MDI mode was + % Fixed: switching over to non-MDI mode from MDI mode was raising RTE. 2010-08-03 18:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/INSTALL b/harbour/INSTALL index 53b04919a6..7eef945fbf 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -301,8 +301,8 @@ HARBOUR Certain Harbour parts (typically contrib packages) depend on 3rd party components. To make these Harbour parts built, you need - to tell Harbour where to find the required 3rd party components - (typically headers). + to tell Harbour where to find the headers for these 3rd party + components. On *nix systems most of these 3rd party components will automatically be picked up if installed on well-known standard @@ -310,7 +310,7 @@ HARBOUR You only need to use manual setup if the dependency isn't available on your platform on a system location, or you wish to use - a non-standard location. Typically you need to do that on non-*nix + a non-standard location. Typically you need to do this on non-*nix (Windows, MS-DOS, OS/2) systems for all packages and for a few packages on *nix which aren't available through official package managers (ADS Client f.e.). diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs index 05fad6c6bb..852eeb06ca 100755 --- a/harbour/contrib/make.hbs +++ b/harbour/contrib/make.hbs @@ -507,6 +507,7 @@ STATIC FUNCTION DepListToStr( aDeptHBC ) STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn, cStdErr, cStdOut ) LOCAL nErrorLevel LOCAL cOptionsLibDyn := "" + LOCAL cCommand /* Making sure that user settings do not interfere with the std build process. */ hb_setenv( "HBMK_OPTIONS" ) @@ -527,13 +528,19 @@ STATIC FUNCTION call_hbmk2( cProjectPath, cOptionsPre, lLibDyn, cStdErr, cStdOut hb_setenv( "_HB_BUILD_LIBDYN" ) ENDIF - nErrorLevel := mk_hb_processRun( s_cBinDir + "hbmk2" +; - " -quiet -width=0 -shl" +; - " @" + StrTran( s_cHome + "hbpre", "\", "/" ) +; - cOptionsPre +; - " " + StrTran( cProjectPath, "\", "/" ) +; - " @" + StrTran( s_cHome, "\", "/" ) + "hbpost" +; - cOptionsLibDyn, @cStdErr, @cStdOut ) + cCommand := s_cBinDir + "hbmk2" +; + " -quiet -width=0 -shl" +; + " @" + StrTran( s_cHome + "hbpre", "\", "/" ) +; + cOptionsPre +; + " " + StrTran( cProjectPath, "\", "/" ) +; + " @" + StrTran( s_cHome, "\", "/" ) + "hbpost" +; + cOptionsLibDyn + + IF PCount() >= 4 + nErrorLevel := hb_processRun( cCommand, @cStdErr, @cStdOut ) + ELSE + nErrorLevel := mk_hb_processRun( cCommand ) + ENDIF IF nErrorLevel != 0 OutStd( hb_StrFormat( "! '%1$s' returned status: %2$s", cProjectPath, hb_ntos( nErrorLevel ) ) + hb_eol() )