diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6fd0220c50..adee638936 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-05 14:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbplist + + Added hbrunext to contrib list, so it's now built for everyone. + ; It also builds nicely using full shared mode (on win platform + with '-env:__HB_DYN__=_dll -shared' options). .exe is 1MB with + mingw. + But, there is one catch, harbourmt.dll and harbour.dll are mixed + (mt pulled by hbrunexp, st pulled by contrib dlls), + which is tricky business. What's best solution for this? (Obviously, + building both ST and MT versions of all .dlls doesn't seem like + a very good idea) + + * utils/hbmk2/hbmk2.prg + * utils/hbmk2/hbmk2.pt_BR.po + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.es_PE.po + + Added 'requests=' command to .hbc files. + + * utils/hbrun/hbrun.prg + + Added my name to copyright banner. + 2011-02-05 13:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbbz2/hbbz2.hbp + contrib/hbbz2/hbbz2.hbx diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist index 3c627e7eb8..53623f1828 100644 --- a/harbour/contrib/hbplist +++ b/harbour/contrib/hbplist @@ -39,6 +39,7 @@ hbnf/hbnf.hbp hbodbc/hbodbc.hbp hbpgsql/hbpgsql.hbp hbqt/hbqt_all.hbp +hbrunext/hbrunext.hbp hbsms/hbsms.hbp hbsqlit3/hbsqlit3.hbp # uses: sqlite3 (locally hosted) hbssl/hbssl.hbp diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po index 58ce890759..5a3d14a637 100644 --- a/harbour/utils/hbmk2/hbmk2.es_PE.po +++ b/harbour/utils/hbmk2/hbmk2.es_PE.po @@ -478,8 +478,8 @@ msgstr "las opciones regulares de compilador Harbour también son aceptadas.\\n( #: hbmk2.prg:7960 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\nLines starting with '#' char are ignored" -msgstr "Opciones de .hbc (que debe estar en líneas separadas): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\nLas líneas que empiezan con en carácter '#' son ignoradas" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\nLines starting with '#' char are ignored" +msgstr "Opciones de .hbc (que debe estar en líneas separadas): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\nLas líneas que empiezan con en carácter '#' son ignoradas" #: hbmk2.prg:7942 hbmk2.prg:11633 #, c-format diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index 6d6a18e61f..96cda666ba 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -1009,7 +1009,7 @@ msgstr "cél futtatása" #: hbmk2.prg:7959 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\nLines starting with '#' char are ignored" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\nLines starting with '#' char are ignored" msgstr ".hbc opciók (külön sorokba írandók): libs=[], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], autohbcs=[<.ch>:<.hbc>], plugins=[plugin-ek], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" #: hbmk2.prg:11633 diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index fcf27ba696..58dc2ab61c 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -387,70 +387,71 @@ REQUEST hbmk_KEYW #define _HBMK_aDEF 81 #define _HBMK_aINSTFILE 82 #define _HBMK_hDEPTS 83 +#define _HBMK_aREQUEST 84 -#define _HBMK_aPO 84 -#define _HBMK_cHBL 85 -#define _HBMK_cHBLDir 86 -#define _HBMK_aLNG 87 -#define _HBMK_cPO 88 +#define _HBMK_aPO 85 +#define _HBMK_cHBL 86 +#define _HBMK_cHBLDir 87 +#define _HBMK_aLNG 88 +#define _HBMK_cPO 89 -#define _HBMK_hPLUGINHRB 89 -#define _HBMK_hPLUGINVars 90 -#define _HBMK_aPLUGINPars 91 -#define _HBMK_hPLUGINExt 92 +#define _HBMK_hPLUGINHRB 90 +#define _HBMK_hPLUGINVars 91 +#define _HBMK_aPLUGINPars 92 +#define _HBMK_hPLUGINExt 93 -#define _HBMK_lDEBUGTIME 93 -#define _HBMK_lDEBUGINC 94 -#define _HBMK_lDEBUGSTUB 95 -#define _HBMK_lDEBUGI18N 96 -#define _HBMK_lDEBUGDEPD 97 -#define _HBMK_lDEBUGPARS 98 +#define _HBMK_lDEBUGTIME 94 +#define _HBMK_lDEBUGINC 95 +#define _HBMK_lDEBUGSTUB 96 +#define _HBMK_lDEBUGI18N 97 +#define _HBMK_lDEBUGDEPD 98 +#define _HBMK_lDEBUGPARS 99 -#define _HBMK_cCCPATH 99 -#define _HBMK_cCCPREFIX 100 -#define _HBMK_cCCPOSTFIX 101 -#define _HBMK_cCCEXT 102 +#define _HBMK_cCCPATH 100 +#define _HBMK_cCCPREFIX 101 +#define _HBMK_cCCPOSTFIX 102 +#define _HBMK_cCCEXT 103 -#define _HBMK_cWorkDir 103 -#define _HBMK_cWorkDirDynSub 104 -#define _HBMK_nCmd_Esc 105 -#define _HBMK_nScr_Esc 106 -#define _HBMK_nCmd_FNF 107 -#define _HBMK_nScr_FNF 108 -#define _HBMK_nErrorLevel 109 +#define _HBMK_cWorkDir 104 +#define _HBMK_cWorkDirDynSub 105 +#define _HBMK_nCmd_Esc 106 +#define _HBMK_nScr_Esc 107 +#define _HBMK_nCmd_FNF 108 +#define _HBMK_nScr_FNF 109 +#define _HBMK_nErrorLevel 110 -#define _HBMK_cPROGDIR 110 -#define _HBMK_cPROGNAME 111 +#define _HBMK_cPROGDIR 111 +#define _HBMK_cPROGNAME 112 -#define _HBMK_hAUTOHBC 112 /* trigger header => .hbc associations */ -#define _HBMK_hAUTOHBCFOUND 113 /* trigger headers found */ +#define _HBMK_hAUTOHBC 113 /* trigger header => .hbc associations */ +#define _HBMK_hAUTOHBCFOUND 114 /* trigger headers found */ -#define _HBMK_aDEPTHBC 114 /* .hbc references found */ -#define _HBMK_hDEPTSDIR 115 /* Header dirs found for dependencies */ +#define _HBMK_aDEPTHBC 115 /* .hbc references found */ +#define _HBMK_hDEPTSDIR 116 /* Header dirs found for dependencies */ -#define _HBMK_lStopAfterInit 116 -#define _HBMK_lStopAfterHarbour 117 +#define _HBMK_lStopAfterInit 117 +#define _HBMK_lStopAfterHarbour 118 -#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_lAutoHBM 121 /* Toggles processing of hbmk.hbm file in current directory */ -#define _HBMK_lContainer 122 /* Target type: container */ -#define _HBMK_lShowLevel 123 /* Show project nesting level in all output lines */ -#define _HBMK_hFiles 124 /* Cache for the header parser (common for C and Harbour) */ -#define _HBMK_cDynLibPrefix 125 /* Dynamic lib filename prefix */ -#define _HBMK_cDynLibExt 126 /* Dynamic lib filename extension */ -#define _HBMK_aLINK 127 /* Links to be created and pointing to the target */ -#define _HBMK_hDEPTMACRO 128 /* Links to be created and pointing to the target */ +#define _HBMK_nCOMPVer 119 +#define _HBMK_lDEPIMPLIB 120 /* Generate import libs configured in dependecy specification */ +#define _HBMK_lInstForce 121 /* Force to install target even if was up to date */ +#define _HBMK_lAutoHBM 122 /* Toggles processing of hbmk.hbm file in current directory */ +#define _HBMK_lContainer 123 /* Target type: container */ +#define _HBMK_lShowLevel 124 /* Show project nesting level in all output lines */ +#define _HBMK_hFiles 125 /* Cache for the header parser (common for C and Harbour) */ +#define _HBMK_cDynLibPrefix 126 /* Dynamic lib filename prefix */ +#define _HBMK_cDynLibExt 127 /* Dynamic lib filename extension */ +#define _HBMK_aLINK 128 /* Links to be created and pointing to the target */ +#define _HBMK_hDEPTMACRO 129 /* Links to be created and pointing to the target */ -#define _HBMK_aArgs 129 -#define _HBMK_nArgTarget 130 -#define _HBMK_lPause 131 -#define _HBMK_nLevel 132 +#define _HBMK_aArgs 130 +#define _HBMK_nArgTarget 131 +#define _HBMK_lPause 132 +#define _HBMK_nLevel 133 -#define _HBMK_cHBX 133 +#define _HBMK_cHBX 134 -#define _HBMK_MAX_ 133 +#define _HBMK_MAX_ 134 #define _HBMK_DEP_CTRL_MARKER ".control." /* must be an invalid path */ @@ -786,7 +787,6 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) LOCAL l_aOBJA LOCAL l_aCLEAN LOCAL l_cMAIN := NIL - LOCAL l_aREQUEST := {} LOCAL l_cVCSDIR LOCAL l_cVCSHEAD LOCAL l_cTSHEAD @@ -1928,6 +1928,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) hbmk[ _HBMK_aIMPLIBSRC ] := {} hbmk[ _HBMK_aDEF ] := {} hbmk[ _HBMK_aINSTFILE ] := {} + hbmk[ _HBMK_aREQUEST ] := {} l_aOBJA := {} hbmk[ _HBMK_cPROGDIR ] := NIL hbmk[ _HBMK_cPROGNAME ] := NIL @@ -2312,7 +2313,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) CASE Left( cParamL, 9 ) == "-request=" IF IsValidHarbourID( cParam := SubStr( cParam, 10 ) ) - AAdd( l_aREQUEST, cParam ) + AAddNew( hbmk[ _HBMK_aREQUEST ], Upper( cParam ) ) ELSE hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Invalid -request value ignored: %1$s" ), cParam ) ) ENDIF @@ -5060,7 +5061,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) and override the GT if requested by user. */ IF ( ( ! lStopAfterCComp .OR. hbmk[ _HBMK_lDynVM ] ) .AND. ; ( l_cMAIN != NIL .OR. ; - ! Empty( l_aREQUEST ) .OR. ; + ! Empty( hbmk[ _HBMK_aREQUEST ] ) .OR. ; ! Empty( hbmk[ _HBMK_aLIBUSERGT ] ) .OR. ; hbmk[ _HBMK_cGT ] != NIL .OR. ; l_cCMAIN != NIL ) ) .OR. lHBMAINDLLP @@ -5105,7 +5106,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) IF ! Empty( hbmk[ _HBMK_aLIBUSERGT ] ) AEval( hbmk[ _HBMK_aLIBUSERGT ], {| tmp | AAdd( array, "HB_GT_" + Upper( SubStr( tmp, 3 ) ) ) } ) ENDIF - AEval( l_aREQUEST, {| tmp | AAdd( array, Upper( tmp ) ) } ) + AEval( hbmk[ _HBMK_aREQUEST ], {| tmp | AAdd( array, tmp ) } ) /* Build C stub */ /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */ @@ -9149,6 +9150,14 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) ENDIF NEXT + CASE Lower( Left( cLine, Len( "requests=" ) ) ) == "requests=" ; cLine := SubStr( cLine, Len( "requests=" ) + 1 ) + FOR EACH cItem IN hb_ATokens( cLine,, .T. ) + cItem := MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) + IF IsValidHarbourID( cItem ) + AAddNew( hbmk[ _HBMK_aREQUEST ], cItem ) + ENDIF + NEXT + CASE Lower( Left( cLine, Len( "syslibs=" ) ) ) == "syslibs=" ; cLine := SubStr( cLine, Len( "syslibs=" ) + 1 ) FOR EACH cItem IN hb_ATokens( cLine,, .T. ) AAddNewNotEmpty( hbmk[ _HBMK_aLIBUSERSYS ], MacroProc( hbmk, StrStripQuote( cItem ), cFileName ) ) @@ -12048,7 +12057,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) I_( "Regular Harbour compiler options are also accepted.\n(see them with -harbourhelp option)" ),; hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, /etc/harbour, /etc are checked (in that order) before the hbmk2 directory." ), _HBMK_AUTOHBC_NAME ),; hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),; - I_( ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\nLines starting with '#' char are ignored" ),; + I_( ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\nLines starting with '#' char are ignored" ),; I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][|||]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allwin|allmsvc|allgcc|allmingw|allicc|allpocc|unix}, {x86|x86_64|ia64|arm|mips|sh}, {debug|nodebug|gui|std|mt|st|shared|static|unicode|ascii|xhb}" ),; I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_dir}, ${hb_name}, ${hb_plat}, ${hb_comp}, ${hb_build}, ${hb_cpu}, ${hb_bin}, ${hb_lib}, ${hb_dyn}, ${hb_inc}, ${}. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ),; I_( 'Options accepting macros also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ),; diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po index abb379cd00..dc18da4b7b 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -478,8 +478,8 @@ msgstr "Opções usadas com o compilador Harbour também são aceitas." #: hbmk2.prg:7960 #, c-format -msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\nLines starting with '#' char are ignored" -msgstr "As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=[yes|no], echo=\\nLinhas iniciadas com '#' são interpretadas como comentários e serão ignoradas" +msgid ".hbc options (they should come in separate lines): libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|map|implib|hbcppmm|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=, stop=, echo=\\nLines starting with '#' char are ignored" +msgstr "As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|shared|nulrdd|debug|opt|hbcppmm|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=[yes|no], echo=\\nLinhas iniciadas com '#' são interpretadas como comentários e serão ignoradas" #: hbmk2.prg:7942 hbmk2.prg:11633 #, c-format diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index dd29f742a9..c26ec050ee 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -413,7 +413,7 @@ STATIC PROCEDURE hbrun_Prompt( cCommand ) STATIC PROCEDURE hbrun_Usage() OutStd( 'Harbour "DOt Prompt" Console / runner ' + HBRawVersion() + hb_eol() +; - "Copyright (c) 1999-2011, Przemyslaw Czerpak" + hb_eol() + ; + "Copyright (c) 1999-2011, Przemyslaw Czerpak, Viktor Szakats" + hb_eol() + ; "http://harbour-project.org/" + hb_eol() +; hb_eol() +; "Syntax: hbrun [ []]" + hb_eol() )