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

2010-07-31 20:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2010-07-31 18:13:53 +00:00
parent 7b3f7cc949
commit 4b656a7a22
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

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

7
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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 */