From a170ec0c28096902d4caea2d80c0413816cb231d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 7 Jul 2010 09:52:53 +0000 Subject: [PATCH] 2010-07-07 11:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * GNU Make 3.81 recommended (without 'or upper') + Documented GNU Make 3.81.90 bug. * contrib/make.hbs * Minor tweak to avoid line ending spaces in stdout. * Minor visual cleanup. * contrib/hbide/hbide.hbp + Added instfile option to install .dlls on Windows systems. * config/postinst.hbs ! Fixes in comment and feedback output. - Deleted commented .hbl generation stuff based on hbmk2. --- harbour/ChangeLog | 16 ++++++++++++++++ harbour/INSTALL | 5 ++++- harbour/config/postinst.hbs | 27 ++------------------------- harbour/contrib/hbide/hbide.hbp | 6 ++++++ harbour/contrib/make.hbs | 20 ++++++++++---------- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 74021c355e..825bffc7b7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-07 11:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * GNU Make 3.81 recommended (without 'or upper') + + Documented GNU Make 3.81.90 bug. + + * contrib/make.hbs + * Minor tweak to avoid line ending spaces in stdout. + * Minor visual cleanup. + + * contrib/hbide/hbide.hbp + + Added instfile option to install .dlls on Windows systems. + + * config/postinst.hbs + ! Fixes in comment and feedback output. + - Deleted commented .hbl generation stuff based on hbmk2. + 2010-07-07 10:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/postinst.hbs + Using hbi18n tool to generate .hbl files to utils. diff --git a/harbour/INSTALL b/harbour/INSTALL index f8bc34f5f3..c8cd2b6137 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -22,7 +22,7 @@ HARBOUR For all platforms you'll need: * Supported ANSI C compiler - * GNU Make (3.81 or upper recommended, minimum 3.79 required) + * GNU Make (3.81 recommended, minimum 3.79 required) * Harbour sources (2.0.0 or upper) on Windows hosts @@ -1151,6 +1151,9 @@ HARBOUR - Try to do no or only small modifications at once to command examples included in this document. If it doesn't work, fall back to documented examples as is. + - GNU Make 3.81.90 has known bug which prevents autodetection to work + in certain situations: http://savannah.gnu.org/bugs/?27591 + Use 3.81 if in doubt. 11. QUICK START TO BUILD YOUR OWN HARBOUR APPLICATIONS diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index b70a7d978f..88716801cd 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -88,32 +88,11 @@ PROCEDURE Main() NEXT ENDIF - /* Creating shared version of Harbour binaries */ + /* Creating language files */ IF ! Empty( GetEnv( "HB_HOST_BIN_DIR" ) ) -#if 0 - OutStd( "! Making hbmk2 to create .hbl files..." + hb_osNewLine() ) - - tmp := "" - IF GetEnv( "HB_BUILD_MODE" ) == "cpp" - tmp += " -cpp=yes" - ELSEIF GetEnv( "HB_BUILD_MODE" ) == "c" - tmp += " -cpp=no" - ENDIF - IF GetEnv( "HB_BUILD_DEBUG" ) == "yes" - tmp += " -debug" - ENDIF - IF GetEnv( "HB_BUILD_SHARED" ) == "yes" - tmp += " -shared" - ENDIF - - mk_hb_processRun( PathSepToSelf( GetEnv( "HB_HOST_BIN_DIR" ) ) + hb_ps() + "hbmk2" +; - " -quiet -lang=en -q0" + tmp +; - " utils/hbmk2/hbmk2.hbp" +; - " -o${HB_BIN_INSTALL}/hbmk2" ) -#else - OutStd( "! Making .hbl files..." + hb_osNewLine() ) + OutStd( "! Making .hbl files..." + hb_eol() ) FOR EACH tmp IN Directory( "utils" + hb_ps() + hb_osFileMask(), "D" ) IF "D" $ tmp[ F_ATTR ] .AND. !( tmp[ F_NAME ] == "." ) .AND. !( tmp[ F_NAME ] == ".." ) @@ -124,8 +103,6 @@ PROCEDURE Main() NEXT ENDIF NEXT -#endif - ENDIF /* Creating install packages */ diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index 739ffd4c39..34d9b8a884 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -10,6 +10,12 @@ -ldflag={msvc}-defaultlib:libcmt.lib -icon={allwin}hbide.ico +-instfile={win}{HB_WITH_QT}/../bin/libgcc_s_dw2-1.dll +-instfile={win}{HB_WITH_QT}/../bin/mingwm10.dll +-instfile={win}{HB_WITH_QT}/../bin/QtCore4.dll +-instfile={win}{HB_WITH_QT}/../bin/QtGui4.dll +-instfile={win}{HB_WITH_QT}/../bin/QtNetwork4.dll + ../hbxbp/hbxbp.hbc ideparseexpr.c diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs index e293134751..63e2f629ed 100644 --- a/harbour/contrib/make.hbs +++ b/harbour/contrib/make.hbs @@ -150,7 +150,7 @@ PROCEDURE Main( ... ) s_lMigr := "migr" $ hb_cmdLine() IF s_lMigr - OutStd( "! New contrib make orchestrator test run. |" + hb_cmdLine() + "|" + GetEnv( "HB_MAKECMDGOALS" ) + "|" + hb_dirBase() + "|" + CurDir() + "|", hb_eol() ) + OutStd( "! New contrib make orchestrator test run. |" + hb_cmdLine() + "|" + GetEnv( "HB_MAKECMDGOALS" ) + "|" + hb_dirBase() + "|" + CurDir() + "|" + hb_eol() ) /* testing with a limited set of contribs */ aLibsPass1 := {; @@ -274,10 +274,10 @@ PROCEDURE Main( ... ) hb_setenv( "HB_INC_INSTALL", cRoot + "include" ) /* Using shorter vars to save on cmdline length */ - hb_setenv( "__HB_B", GetEnv( "HB_BIN_INSTALL" ) ) - hb_setenv( "__HB_L", GetEnv( "HB_LIB_INSTALL" ) ) - hb_setenv( "__HB_D", GetEnv( "HB_DYN_INSTALL" ) ) - hb_setenv( "__HB_I", GetEnv( "HB_INC_INSTALL" ) ) + hb_setenv( "_HB_B_", GetEnv( "HB_BIN_INSTALL" ) ) + hb_setenv( "_HB_L_", GetEnv( "HB_LIB_INSTALL" ) ) + hb_setenv( "_HB_D_", GetEnv( "HB_DYN_INSTALL" ) ) + hb_setenv( "_HB_I_", GetEnv( "HB_INC_INSTALL" ) ) /* Parse filter */ @@ -325,11 +325,11 @@ PROCEDURE Main( ... ) SWITCH hItem[ "type" ] CASE "lib" CASE "implib" - cTargetDir := "${__HB_L}" + cTargetDir := "${_HB_L_}" cInstallDirVar := "_HB_LIB_INSTALL" EXIT CASE "bin" - cTargetDir := "${__HB_B}" + cTargetDir := "${_HB_B_}" cInstallDirVar := "_HB_BIN_INSTALL" IF GetEnv( "HB_BUILD_SHARED" ) == "yes" cOptionsPre += " -shared" @@ -386,7 +386,7 @@ PROCEDURE Main( ... ) call_hbmk2( cBase + cProject, cTargetDir, cOptionsPre, cOptionsPost, .T. ) ENDIF ELSE - /* OutStd( hb_StrFormat( "'%s' project skipped", cProject ), hb_eol() ) */ + /* OutStd( hb_StrFormat( "! project '%s' skipped", cProject ) + hb_eol() ) */ ENDIF ENDIF NEXT @@ -413,7 +413,7 @@ STATIC FUNCTION call_hbmk2( cProject, cTargetDir, cOptionsPre, cOptionsPost, lDy " -workdir=" + cTargetDir + "/${hb_work}/" + cName + iif( lDyn, "${hb_workdynsub}", "" ) +; " -o" + cTargetDir + "/" ) IF nErrorLevel != 0 - OutStd( hb_StrFormat( "'%s' returned status: %s", cProject, hb_ntos( nErrorLevel ) ), hb_eol() ) + OutStd( hb_StrFormat( "! '%s' returned status: %s", cProject, hb_ntos( nErrorLevel ) ) + hb_eol() ) RETURN .F. ENDIF @@ -421,7 +421,7 @@ STATIC FUNCTION call_hbmk2( cProject, cTargetDir, cOptionsPre, cOptionsPost, lDy STATIC FUNCTION mk_hb_processRun( cCommand ) - OutStd( cCommand, hb_eol() ) + OutStd( cCommand + hb_eol() ) RETURN iif( s_lTest, 0, hb_processRun( cCommand ) )