diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b63c298f9a..79d732c74a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-28 18:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + + Added -instforce option which will force the target to be + copied to -instpath even if it was up to date. This is to + make it in sync with GNU Make behaviour, where single + 'make install' will copy everything regardless of being + up to date or not. + + * contrib/hbpost.hbm + + Added -instforce to make it in sync with old GNU Make + behavior. Such case is exploited by .rpm generation, and + this is the reason why the contrib libs weren't + appearing in target lib dir. + + * config/postinst.hbs + + Added two .so related TOFIXes. + + * mpkg_src.sh + + Changed to always delete temp file bin/hb_flst.tmp containing + a list of all source files. (anyone knows why was it left there?) + 2010-07-28 17:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * package/harbour.spec * Minor in comment. diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index 323bf3fd2d..63082556fd 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -104,6 +104,7 @@ PROCEDURE Main() tmp := GetEnv( "HB_ETC_INSTALL" ) + hb_ps() + ".." + hb_ps() + "ld.so.conf.d" IF DirBuild( tmp ) + /* TOFIX: Put HB_LIB_INSTALL without build sandbox prefix */ hb_MemoWrit( tmp + hb_ps() + "harbour.conf", GetEnv( "HB_LIB_INSTALL" ) + hb_eol() ) ELSE OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", tmp ) + hb_eol() ) @@ -127,6 +128,7 @@ PROCEDURE Main() ENDIF ENDIF + /* TOFIX: Rewrite this in .prg */ #if 0 for l in ${full_lib_name} ${full_lib_name_mt} do diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm index f46d3d205b..302aa84c8f 100644 --- a/harbour/contrib/hbpost.hbm +++ b/harbour/contrib/hbpost.hbm @@ -49,3 +49,4 @@ {_HB_BUILD_INSTALL}-instpath=etc:${_HB_ETC_INSTALL}/ {_HB_BUILD_INSTALL}-instpath=man:${_HB_MAN_INSTALL}/ {_HB_BUILD_INSTALL&HB_INSTALL_IMPLIB='yes'}-instpath=implib:${_HB_LIB_INSTALL}/ +{_HB_BUILD_INSTALL}-instforce diff --git a/harbour/mpkg_src.sh b/harbour/mpkg_src.sh index 34a1bb7f8d..04dde94d38 100755 --- a/harbour/mpkg_src.sh +++ b/harbour/mpkg_src.sh @@ -79,7 +79,7 @@ hb_collect_all_tree() done } -hb_rmflst="no" +hb_rmflst="yes" hb_flst="bin/hb_flst.tmp" #if [ -d "$hb_rootdir/.svn" ] || [ ! -r "$hb_rootdir/$hb_flst" ]; then if [ -d "$hb_rootdir/.svn" ] ; then diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index cd188d8d87..fd8f7a0b57 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -409,13 +409,14 @@ REQUEST hbmk_KEYW #define _HBMK_nCOMPVer 118 #define _HBMK_lDEPIMPLIB 119 /* Generate import libs configured in dependecy specification */ +#define _HBMK_lInstForce 120 /* Force to install target even if was up to date */ -#define _HBMK_aArgs 120 -#define _HBMK_nArgTarget 121 -#define _HBMK_lPause 122 -#define _HBMK_nLevel 123 +#define _HBMK_aArgs 121 +#define _HBMK_nArgTarget 122 +#define _HBMK_lPause 123 +#define _HBMK_nLevel 124 -#define _HBMK_MAX_ 123 +#define _HBMK_MAX_ 124 #define _HBMK_DEP_CTRL_MARKER ".control." /* must be an invalid path */ @@ -907,10 +908,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) hbmk[ _HBMK_hDEPTSDIR ] := { => } - hbmk[ _HBMK_aArgs ] := aArgs + hbmk[ _HBMK_lInstForce ] := .F. + + hbmk[ _HBMK_aArgs ] := aArgs hbmk[ _HBMK_nArgTarget ] := nArgTarget - hbmk[ _HBMK_lPause ] := lPause - hbmk[ _HBMK_nLevel ] := nLevel + hbmk[ _HBMK_lPause ] := lPause + hbmk[ _HBMK_nLevel ] := nLevel GetUILangCDP( @hbmk[ _HBMK_cUILNG ], @hbmk[ _HBMK_cUICDP ] ) SetUILang( hbmk ) @@ -1940,6 +1943,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE cParamL == "-strip" ; hbmk[ _HBMK_lSTRIP ] := .T. CASE cParamL == "-strip-" .OR. ; cParamL == "-nostrip" ; hbmk[ _HBMK_lSTRIP ] := .F. + CASE cParamL == "-instforce" ; hbmk[ _HBMK_lInstForce ] := .T. + CASE cParamL == "-instforce-" ; hbmk[ _HBMK_lInstForce ] := .F. CASE cParamL == "--harbourhelp" ; AAdd( hbmk[ _HBMK_aOPTPRG ], "--help" ) ; lHarbourInfo := .T. CASE cParamL == "-harbourhelp" ; AAdd( hbmk[ _HBMK_aOPTPRG ], "--help" ) ; lHarbourInfo := .T. @@ -5722,7 +5727,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ENDIF ENDCASE + ENDIF + IF ! lTargetUpToDate .OR. hbmk[ _HBMK_lInstForce ] hb_AIns( hbmk[ _HBMK_aINSTFILE ], 1, { "", hbmk[ _HBMK_cPROGNAME ] }, .T. ) ENDIF ENDIF @@ -10919,6 +10926,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-icon=" , I_( "set as application icon. should be a supported format on the target platform" ) },; { "-instfile=" , I_( "add in to the list of files to be copied to path specified by -instpath option. is an optional copy group, it must be at least two characters long." ) },; { "-instpath=" , I_( "copy target to . if is a directory, it should end with path separatorm, in this case files specified by -instfile option will also be copied. can be specified multiple times. is an optional copy group, it must be at least two characters long. Build target will be automatically copied to default (empty) copy group." ) },; + { "-instforce[-]" , I_( "copy target to install path even if it is up to date" ) },; { "-stop[=]" , I_( "stop without doing anything and display if specified" ) },; { "-echo=" , I_( "echo text on screen" ) },; { "-pause" , I_( "force waiting for a key on exit in case of failure (with alternate GTs only)" ) },;