fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-08-03 20:54 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/make.hbs
    ! Fixed missing output from hbmk2 runs.
    * Will not echo the --hbinfo hbmk2 invokation anymore.

  * INSTALL
    * Minor.
This commit is contained in:
Viktor Szakats
2010-08-03 18:54:25 +00:00
parent ec980b2999
commit 49be9ffd54
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -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)

6
harbour/INSTALL
View File

@@ -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.).

21
harbour/contrib/make.hbs
View File

@@ -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() )