From e72ec22c3d6dbde43ef84136e9484b9d4fd2d5ee Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 11 Dec 2010 00:14:27 +0000 Subject: [PATCH] 2010-12-11 01:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + Minor detail to HB_BUILD_WINUNI. Moved it's position towards end of option list. + Added some clarification to HB_BUILD_CONTRIB=no <...> option. * contrib/hbqt/hbqt_hbmk2_plugin.hbs + Added extra error message when .uic file is empty or unreadable. --- harbour/ChangeLog | 11 +++++++++++ harbour/INSTALL | 23 ++++++++++++---------- harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs | 21 ++++++++++---------- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8349349fbd..feda4d5934 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-11 01:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Minor detail to HB_BUILD_WINUNI. Moved it's position towards + end of option list. + + Added some clarification to HB_BUILD_CONTRIB=no <...> + option. + + * contrib/hbqt/hbqt_hbmk2_plugin.hbs + + Added extra error message when .uic file is empty or + unreadable. + 2010-12-11 00:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk * config/rules.mk diff --git a/harbour/INSTALL b/harbour/INSTALL index 01c914ffcc..ae498d7d42 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -673,14 +673,6 @@ HARBOUR [all|bin|lib|no] Strip symbols and debug information from binaries. Default: no - HB_BUILD_OPTIM=no Enable C compiler optimizations. Default: yes - - HB_BUILD_WINUNI=yes Create Unicode build. Only affects Windows (win) targets. - Default: yes. (For Windows CE targets this is the - only accepted setting, any user override is ignored. - When building on Win9x/ME host, the default is 'no'.) - If enabled, it will make Harbour use the Unicode - ("wide") flavor of Windows API calls. If you need - your app to run on Win9x/ME systems, either disable - this option, or use UNICOWS solution (recommended). - HB_BUILD_MODE=[cpp|c] Change default build mode to C++ or C. Default: c, except for msvc* compilers, where it's cpp. - HB_BUILD_PARTS= @@ -688,10 +680,20 @@ HARBOUR - HB_BUILD_NOGPLLIB=yes Disable components dependent on GPL 3rd party code, to allow Harbour for commercial (closed-source) projects. Default: no + - HB_BUILD_WINUNI=yes For Windows targets only. + If enabled, it will make Harbour use the Unicode + ("wide") flavor of Windows API calls. If you need + your app to run on Win9x/ME systems, either disable + this option, or use UNICOWS solution (recommended). + Default: yes. (For Windows CE targets this is the + only accepted setting, any user override is ignored. + When building on Win9x/ME host, the default is 'no'.) - HB_BUILD_3RDEXT=no Enable autodetection of 3rd party components on default system locations. Default: yes - HB_BUILD_CONTRIBS=no [] Don't build any (or space separated list of) - contrib packages. + contrib packages. Please note it won't prevent + building packages which are dependencies of other + (enabled) packages. - HB_BUILD_CONTRIBS=[] Build space separated list of contrib libraries. Build all if left empty (default). - HB_BUILD_ADDONS= Build space separated list of additional .hbp @@ -1223,7 +1225,8 @@ HARBOUR Use only those documented in this file. Some environment variable settings which are commonly believed by users to be useful, but which in reality are either not needed or - not even used by Harbour build process and hbmk2. You can delete them: + not even used by Harbour build process and hbmk2. + You can delete them: set HB_DIR= set HB_PATH= set HRB_DIR= diff --git a/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs index 26a48b0954..d160248ec5 100644 --- a/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs +++ b/harbour/contrib/hbqt/hbqt_hbmk2_plugin.hbs @@ -536,19 +536,20 @@ STATIC FUNCTION uic_to_prg( hbmk2, cFileNameSrc, cFileNameDst, cName ) LOCAL cFile IF hb_FileExists( cFileNameSrc ) - - aLinesPRG := hbqtui_gen_prg( hb_MemoRead( cFileNameSrc ), "hbqtui_" + cName ) - - IF ! Empty( aLinesPRG ) - cFile := "" - AEval( aLinesPRG, {| cLine | cFile += cLine + hb_eol() } ) - IF hb_MemoWrit( cFileNameDst, cFile ) - RETURN .T. + IF ! Empty( cFile := hb_MemoRead( cFileNameSrc ) ) + IF ! Empty( aLinesPRG := hbqtui_gen_prg( cFile, "hbqtui_" + cName ) ) + cFile := "" + AEval( aLinesPRG, {| cLine | cFile += cLine + hb_eol() } ) + IF hb_MemoWrit( cFileNameDst, cFile ) + RETURN .T. + ELSE + hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Cannot create file: %1$s", cFileNameDst ) ) + ENDIF ELSE - hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Cannot create file: %1$s", cFileNameDst ) ) + hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Intermediate file (%1$s) is not an .uic file.", cFileNameSrc ) ) ENDIF ELSE - hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Intermediate file (%1$s) is not an .uic file.", cFileNameSrc ) ) + hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Intermediate file (%1$s) empty or cannot be read.", cFileNameSrc ) ) ENDIF ELSE hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Cannot find intermediate file: %1$s", cFileNameSrc ) )