diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 961f1196ea..c8e4db94f1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-01 18:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/mpkg_win_nightly.bat + * Requirements. + + * utils/hbmk2/hbmk2.prg + * Changed -rebuild option to not rebuild sub-projects. + + Added -rebuildall option which will also rebuild sub-proects. + + * contrib/make.hbs + * -rebuild -> -rebuildall + 2010-08-31 14:06 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpparthandler.prg * contrib/hbxbp/xbpwindow.prg diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs index c9ec4c6a7b..0483dd95a4 100755 --- a/harbour/contrib/make.hbs +++ b/harbour/contrib/make.hbs @@ -111,9 +111,9 @@ PROCEDURE Main( ... ) -- -------------- -------------- ---------------------- ------------------------- #1 clean clean _ACT_INC_CLEAN -inc -clean #2 _ACT_INC -inc - #3 clean all clean all _ACT_INC_REBUILD -inc -rebuild + #3 clean all clean all _ACT_INC_REBUILD -inc -rebuildall #4 install install _ACT_INC_INST -inc -instpath= - #5 clean install clean install _ACT_INC_REBUILD_INST -inc -rebuild -instpath= + #5 clean install clean install _ACT_INC_REBUILD_INST -inc -rebuildall -instpath= */ PROCEDURE Standalone( aParams, hProjectList ) LOCAL hProjectReqList @@ -211,9 +211,9 @@ PROCEDURE Standalone( aParams, hProjectList ) #2 all _ACT_INC -inc #3 install install install _ACT_INC_INST -inc -instpath= #4 clean all clean clean all _ACT_INC_CLEAN -inc -clean - first clean all _ACT_INC_REBUILD -inc -rebuild + first clean all _ACT_INC_REBUILD -inc -rebuildall #5 clean install clean clean install _ACT_INC_CLEAN -inc -clean - install clean install _ACT_INC_REBUILD_INST -inc -rebuild -instpath= + install clean install _ACT_INC_REBUILD_INST -inc -rebuildall -instpath= #6 install clean install install clean _ACT_INC_INST -inc -instpath= clean install clean _ACT_INC_CLEAN -inc -clean */ @@ -257,7 +257,7 @@ PROCEDURE GNUMake( aParams, hProjectList ) AScanL( aGNUMakeParams, "install" ) > AScanL( aGNUMakeParams, "clean" ) /* Use rebuild mode. This is needed because the clean phase might not have been called previously by GNU Make, f.e. - because hbrun or hbmk2 wasn't available. -rebuild is + because hbrun or hbmk2 wasn't available. -rebuildall is costless, so we do it to make sure to build cleanly. [vszakats] */ nAction := _ACT_INC_REBUILD_INST @@ -413,7 +413,7 @@ STATIC PROCEDURE build_projects( nAction, hProjectList, hProjectReqList, cOption cOptions += " -clean" ELSEIF nAction == _ACT_INC_REBUILD .OR. ; nAction == _ACT_INC_REBUILD_INST - cOptions += " -rebuild" + cOptions += " -rebuildall" ENDIF lInstall := nAction == _ACT_INC_INST .OR. ; diff --git a/harbour/package/mpkg_win_nightly.bat b/harbour/package/mpkg_win_nightly.bat index 36063eb8a9..373cb56f3e 100644 --- a/harbour/package/mpkg_win_nightly.bat +++ b/harbour/package/mpkg_win_nightly.bat @@ -11,8 +11,8 @@ rem --------------------------------------------------------------- rem --------------------------------------------------------------- rem REQUIREMENTS FOR BUILD MACHINE: -rem - Online 24/7 -rem - Windows XP or higher +rem - Online 24/7 (reliable) +rem - Windows XP or higher (server preferred) rem - 8GB disk space rem - downstream internet traffic 100MB per day rem - upstream internet traffic 100MB per day diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index afe6aa5645..0e02722efa 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1881,7 +1881,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF ! hbmk[ _HBMK_lQuiet ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing local make script: %1$s" ), _HBMK_AUTOHBM_NAME ) ) ENDIF - HBM_Load( hbmk, aParams, _HBMK_AUTOHBM_NAME, 1, .F. ) /* Do not allow subprojects in automatic make file */ + HBM_Load( hbmk, aParams, _HBMK_AUTOHBM_NAME, 1, .F. ) /* Do not allow sub-projects in automatic make file */ ENDIF /* Collect all command line parameters */ @@ -2017,7 +2017,18 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE cParamL == "-beep" ; hbmk[ _HBMK_lBEEP ] := .T. CASE cParamL == "-beep-" .OR. ; cParamL == "-nobeep" ; hbmk[ _HBMK_lBEEP ] := .F. - CASE cParamL == "-rebuild" ; hbmk[ _HBMK_lINC ] := .T. ; hbmk[ _HBMK_lREBUILD ] := .T. + CASE cParamL == "-rebuild" + + hbmk[ _HBMK_lINC ] := .T. + IF nLevel == 1 + hbmk[ _HBMK_lREBUILD ] := .T. + ENDIF + + CASE cParamL == "-rebuildall" + + hbmk[ _HBMK_lINC ] := .T. + hbmk[ _HBMK_lREBUILD ] := .T. + CASE cParamL == "-rebuildpo" ; hbmk[ _HBMK_lREBUILDPO ] := .T. CASE cParamL == "-minipo" ; hbmk[ _HBMK_lMINIPO ] := .T. CASE cParamL == "-minipo-" .OR. ; @@ -11361,7 +11372,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-jobs=" , I_( "start n compilation threads (multiprocess platforms only)" ) },; { "-inc" , I_( "enable incremental build mode" ) },; { "-[no]head[=]" , I_( "control source header parsing (in incremental build mode)\n can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off" ) },; - { "-rebuild" , I_( "rebuild all (in incremental build mode)" ) },; + { "-rebuild" , I_( "rebuild (in incremental build mode)" ) },; + { "-rebuildall" , I_( "rebuild with sub-projects (in incremental build mode)" ) },; { "-clean" , I_( "clean (in incremental build mode)" ) },; { "-workdir=" , hb_StrFormat( I_( "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)" ), _WORKDIR_BASE_ ) },; NIL,;