diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 76537acf21..f98017efe8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-31 20:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + * Changed to not give fatal error if cmdline (or .hbp) + didn't contain any sources. Just warn. Required for hbqt.hbp, + which is a holder project without own output. + + ; NOTE: BTW HBQT fails very badly on any dynamic lib creating + attempt, and the reason is that it's still a monolithic + lib under the surface, just split some files into separate + libs to avoid cmdline length. + 2010-07-31 14:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt.hbc * contrib/hbqt/hbqt.hbp @@ -23,11 +34,11 @@ - contrib/hbqt/hbqts.hbp + contrib/hbqt/hbqtmains.hbp * Renamed hbqt lib to hbqtmain. - * Flattened the internal .hbp sub-projects to control the - build order (until hbmk2 gets automatic internal sub-project + * Flattened the internal .hbp sub-projects to control the + build order (until hbmk2 gets automatic internal sub-project dependency order sorting logic). - This was required for HB_BUILD_CONTRIB_DYN mode, because - hbqt (now hbqtmain) needs to be built first, to be able to + This was required for HB_BUILD_CONTRIB_DYN mode, because + hbqt (now hbqtmain) needs to be built first, to be able to link hbqtcore and the rest. * contrib/hbqt/hbqt_hbqabstractitemmodel.h diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 6a64cf42cf..9d8c3d06af 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2705,11 +2705,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) /* Start doing the make process. */ IF ! hbmk[ _HBMK_lStopAfterInit ] .AND. ! hbmk[ _HBMK_lCreateImpLib ] .AND. ( Len( hbmk[ _HBMK_aPLUGINPars ] ) + Len( hbmk[ _HBMK_aPRG ] ) + Len( hbmk[ _HBMK_aC ] ) + Len( hbmk[ _HBMK_aCPP ] ) + Len( hbmk[ _HBMK_aOBJUSER ] ) + Len( l_aOBJA ) ) == 0 - hbmk_OutErr( hbmk, I_( "Error: No source files were specified." ) ) - IF hbmk[ _HBMK_lBEEP ] - DoBeep( .F. ) - ENDIF - RETURN 4 + hbmk_OutErr( hbmk, I_( "Warning: No source files were specified." ) ) + RETURN 0 ENDIF /* Decide about output name */