diff --git a/harbour/ChangeLog b/harbour/ChangeLog index be307f10c1..4eea221f34 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,32 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-14 10:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.pt_BR.po + * utils/hbmk2/hbmk2.hu_HU.po + * utils/hbmk2/hbmk2.prg + * Renamed header parsing mode 'real' to 'native'. + Looks to be the final. + ! Fixed minor error in prev: one debug message was always on. + ! Turn off native .prg header parsing in -xhb and -hb10 operating + modes. + ; TODO: for .prg header parsing use one compiler call instead of + one for each .prg. + ; TODO: with gcc family compilers use 'gcc -MM' mode for header + parsing. Probably needs separate control, as (at first) + it seems to be much slower than current simple method. + + * src/codepage/cpes850c.c + ! Updated to be compatible with CA-Cl*pper. + Submitted by Maurizio Faccio. + + * src/codepage/cpesisoc.c + * src/codepage/cpeswinc.c + * Synced with cpes850c. + + * contrib/hbwin/tests/testole.prg + * Minor cleanups. + 2009-10-13 17:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qth/QBitmap.qth * contrib/hbqt/qth/QBrush.qth diff --git a/harbour/contrib/hbwin/tests/testole.prg b/harbour/contrib/hbwin/tests/testole.prg index 1412be2130..1e29744c3f 100644 --- a/harbour/contrib/hbwin/tests/testole.prg +++ b/harbour/contrib/hbwin/tests/testole.prg @@ -87,7 +87,7 @@ STATIC PROCEDURE Exm_MSExcel() // Elements of collection can be accessed using :Item() method FOR nI := 1 TO nCount - ? oWorkBook:WorkSheets:Item(nI):Name + ? oWorkBook:WorkSheets:Item( nI ):Name NEXT // OLE also allows to access collection elements by passing @@ -106,7 +106,7 @@ STATIC PROCEDURE Exm_MSExcel() oAS:Cells( 1, 1 ):Font:Size := 16 // oAS:Cells( 1, 1 ) is object, but oAS:Cells( 1, 1 ):Value has value of the cell - ? "Object valtype:", VALTYPE(oAS:Cells( 1, 1 )), "Value:", oAS:Cells( 1, 1 ):Value + ? "Object valtype:", ValType( oAS:Cells( 1, 1 ) ), "Value:", oAS:Cells( 1, 1 ):Value oAS:Cells( 3, 1 ):Value := "String:" oAS:Cells( 3, 2 ):Value := "Hello, World!" @@ -145,7 +145,7 @@ STATIC PROCEDURE Exm_MSExcel() oExcel:Quit() ELSE - Alert( "Error: MS Excel not available. [" + win_oleErrorText()+ "]" ) + ? "Error: MS Excel not available. [" + win_oleErrorText()+ "]" ENDIF RETURN diff --git a/harbour/src/codepage/cpes850c.c b/harbour/src/codepage/cpes850c.c index 8430e29507..6a423c1220 100644 --- a/harbour/src/codepage/cpes850c.c +++ b/harbour/src/codepage/cpes850c.c @@ -85,8 +85,8 @@ static HB_CODEPAGE s_codepage = { "ES850C", HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS, - "AľBCDEFGHIÖJKLMNĽOŕPQRSTUéšVWXYZ", - "a bcde‚fghiĄjklmn¤o˘pqrstuŁvwxyz", + "AABCDEFGHIIJKLMNĽOOPQRSTUUVWXYšZŽ™", + " abcde‚fghĄijklmn¤˘opqrstŁuvwxyz†„”", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; HB_CODEPAGE_INIT( ES850C ) diff --git a/harbour/src/codepage/cpesisoc.c b/harbour/src/codepage/cpesisoc.c index 399a93887d..fd32fcd823 100644 --- a/harbour/src/codepage/cpesisoc.c +++ b/harbour/src/codepage/cpesisoc.c @@ -85,8 +85,8 @@ static HB_CODEPAGE s_codepage = { "ESISOC", HB_CPID_8859_1, HB_UNITB_8859_1, NUMBER_OF_CHARACTERS, - "AÁBCDEÉFGHIÍJKLMNŃOÓPQRSTUÚÜVWXYZ", - "aábcdeéfghiíjklmnńoópqrstuúüvwxyz", + "AABCDEÉFGHIIJKLMNŃOOPQRSTUUVWXYÜZĹÄÖ", + "áabcdeéfghíijklmnńóopqrstúuvwxyüzĺäö", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; HB_CODEPAGE_INIT( ESISOC ) diff --git a/harbour/src/codepage/cpeswinc.c b/harbour/src/codepage/cpeswinc.c index d441747df9..8ddc64b0ac 100644 --- a/harbour/src/codepage/cpeswinc.c +++ b/harbour/src/codepage/cpeswinc.c @@ -85,8 +85,8 @@ static HB_CODEPAGE s_codepage = { "ESWINC", HB_CPID_1252, HB_UNITB_1252, NUMBER_OF_CHARACTERS, - "AÁBCDEÉFGHIÍJKLMNŃOÓPQRSTUÚÜVWXYZ", - "aábcdeéfghiíjklmnńoópqrstuúüvwxyz", + "AABCDEÉFGHIIJKLMNŃOOPQRSTUUVWXYÜZĹÄÖ", + "áabcdeéfghíijklmnńóopqrstúuvwxyüzĺäö", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; HB_CODEPAGE_INIT( ESWINC ) diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po index 761aee1cbf..ea00aab0c6 100644 --- a/harbour/utils/hbmk2/hbmk2.hu_HU.po +++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po @@ -4,8 +4,8 @@ #: hbmk2.prg:7106 #, 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], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|real], skip=[yes|no], 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], inctrypaths=[útvonalak], instpaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|real], skip=[yes|no], echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" +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], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], 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], inctrypaths=[útvonalak], instpaths=[útvonalak], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja" #: hbmk2.prg:799 #, c-format @@ -234,8 +234,8 @@ msgstr "teljes s #: hbmk2.prg:7088 #, c-format -msgid "control source header parsing (in incremental build mode)\\n can be: real, full, partial (default), off" -msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\\n lehet: real, full, partial (default), off" +msgid "control source header parsing (in incremental build mode)\\n can be: native, full, partial (default), off" +msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\\n lehet: native, full, partial (default), off" #: hbmk2.prg:3299 hbmk2.prg:3333 #, c-format diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 16191b4e1e..226a6b354c 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -146,7 +146,7 @@ REQUEST hbmk_KEYW #define _HEAD_OFF 0 #define _HEAD_PARTIAL 1 #define _HEAD_FULL 2 -#define _HEAD_REAL 3 +#define _HEAD_NATIVE 3 #define _COMPDET_bBlock 1 #define _COMPDET_cCOMP 2 @@ -1513,10 +1513,10 @@ FUNCTION hbmk( aArgs, /* @ */ lPause ) Left( cParamL, 6 ) == "-head=" DO CASE - CASE SubStr( cParamL, 7 ) == "off" ; hbmk[ _HBMK_nHEAD ] := _HEAD_OFF - CASE SubStr( cParamL, 7 ) == "full" ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL - CASE SubStr( cParamL, 7 ) == "real" ; hbmk[ _HBMK_nHEAD ] := _HEAD_REAL - OTHERWISE ; hbmk[ _HBMK_nHEAD ] := _HEAD_PARTIAL + CASE SubStr( cParamL, 7 ) == "off" ; hbmk[ _HBMK_nHEAD ] := _HEAD_OFF + CASE SubStr( cParamL, 7 ) == "full" ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL + CASE SubStr( cParamL, 7 ) == "native" ; hbmk[ _HBMK_nHEAD ] := _HEAD_NATIVE + OTHERWISE ; hbmk[ _HBMK_nHEAD ] := _HEAD_PARTIAL ENDCASE CASE cParamL == "-head-" .OR. ; @@ -4640,9 +4640,11 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc /* TODO: Add filter based on extension to avoid binary files */ - IF ! lCMode .AND. hbmk[ _HBMK_nHEAD ] == _HEAD_REAL + IF ! lCMode .AND. hbmk[ _HBMK_nHEAD ] == _HEAD_NATIVE .AND. hbmk[ _HBMK_nHBMODE ] == _HBMODE_NATIVE - hbmk_OutStd( hb_StrFormat( "debuginc: Calling Harbour compiler to detect dependencies of %1$s", cFileName ) ) + IF hbmk[ _HBMK_lDEBUGINC ] + hbmk_OutStd( hb_StrFormat( "debuginc: Calling Harbour compiler to detect dependencies of %1$s", cFileName ) ) + ENDIF aCommand := ArrayAJoin( { { "-q0", "-sm", "-kj" },; { iif( hbmk[ _HBMK_lCreateLib ] .OR. hbmk[ _HBMK_lCreateDyn ], "-n1", "-n2" ) },; @@ -4662,7 +4664,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc IF cDependency:__enumIndex() > 1 .AND. ; /* Skip own (module) name */ ! Empty( cDependency ) IF hbmk[ _HBMK_lDEBUGINC ] - hbmk_OutStd( hb_StrFormat( "debuginc: HEADER (REAL) %1$s", cDependency ) ) + hbmk_OutStd( hb_StrFormat( "debuginc: HEADER (NATIVE) %1$s", cDependency ) ) ENDIF IF ! hb_FGetDateTime( cDependency, @tTimeDependency ) RETURN .F. @@ -5764,7 +5766,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel ) DO CASE CASE Lower( cLine ) == "off" ; hbmk[ _HBMK_nHEAD ] := _HEAD_OFF CASE Lower( cLine ) == "full" ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL - CASE Lower( cLine ) == "real" ; hbmk[ _HBMK_nHEAD ] := _HEAD_REAL + CASE Lower( cLine ) == "native" ; hbmk[ _HBMK_nHEAD ] := _HEAD_NATIVE CASE Lower( cLine ) == "partial" ; hbmk[ _HBMK_nHEAD ] := _HEAD_PARTIAL ENDCASE @@ -7190,7 +7192,7 @@ STATIC PROCEDURE ShowHelp( lLong ) { "-runflag=" , I_( "pass flag to output executable when -run option is used" ) },; { "-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: real, full, partial (default), off" ) },; + { "-[no]head[=]" , I_( "control source header parsing (in incremental build mode)\n can be: native, full, partial (default), off" ) },; { "-rebuild" , I_( "rebuild all (in incremental build mode)" ) },; { "-clean" , I_( "clean (in incremental build mode)" ) },; { "-workdir=" , hb_StrFormat( I_( "working directory for incremental build mode\n(default: %1$s/plat/comp)" ), _WORKDIR_BASE_ ) },; @@ -7242,7 +7244,7 @@ STATIC PROCEDURE ShowHelp( lLong ) 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. The file format is the same as .hbc." ), _HBMK_CFG_NAME ),; hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),; I_( ".hbc config files in current dir are automatically processed." ),; - 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], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|real], skip=[yes|no], 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], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], 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}, {allpocc|allgcc|allmingw|unix}, {allmsvc}, {x86|x86_64|ia64|arm}, {debug|nodebug|gui|std|mt|st|xhb}" ),; I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=, 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 c7d9bdd44b..522e79c56f 100644 --- a/harbour/utils/hbmk2/hbmk2.pt_BR.po +++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po @@ -4,8 +4,8 @@ #: hbmk2.prg:7106 #, 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], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|real], skip=[yes|no], 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], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|real], 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], libpaths=[paths], sources=[source files], incpaths=[paths], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], 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], inctrypaths=[paths], instpaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|implib|strip|run|inc=[yes|no], cpp=[yes|no|def], compr=[yes|no|def|min|max], head=[off|partial|full|native], skip=[yes|no], echo=\\nLinhas iniciadas com '#' sĆo interpretadas como coment rios e serĆo ignoradas" #: hbmk2.prg:799 #, c-format @@ -234,8 +234,8 @@ msgstr "Ajuda detalhada" #: hbmk2.prg:7088 #, c-format -msgid "control source header parsing (in incremental build mode)\\n can be: real, full, partial (default), off" -msgstr "controla a an lise de cabe‡alhos (no modo de compila‡Ćo incremental)\\n pode ser: real, full, partial (padrĆo), off" +msgid "control source header parsing (in incremental build mode)\\n can be: native, full, partial (default), off" +msgstr "controla a an lise de cabe‡alhos (no modo de compila‡Ćo incremental)\\n pode ser: native, full, partial (padrĆo), off" #: hbmk2.prg:3299 hbmk2.prg:3333 #, c-format