fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-05-04 18:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbole/tests/testole.prg
    + Readded CDO and OO open examples (working).

  * utils/hbmk2/hbmk2.hbm
    + Added .hbl file generation.

  * utils/hbmk2/hbmk2.prg
    + Added translator info to banner.
    ! Minor fix to now display job # if single-threaded compilation is done.
      (Thanks for __enumBase() trick to Przemek)
    * Some steps to better support xhb shared mode (untested).
    + Added filter support for .prg and .c/.cpp input files.
      (This also means that input files with '{' '}' char pairs in them
      aren't supported anymore).
    ! Minor terminology fix in one of the rare error messages.
    ; TODO: ? Adding GNU Make support to .pot -> .hbl generation, plus
            we'd also need to develop a common rule for naming and
            placement for these translation files. Current hbmk2 method
            cannot be considered final.

  + utils/hbmk2/hbmk2.hu_HU.pot
    + Added Hungarian translation (not complete/final yet).
This commit is contained in:
Viktor Szakats
2009-05-04 16:19:30 +00:00
parent 3f49491bb8
commit cf2450c135
5 changed files with 939 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
harbour/ChangeLog
View File

@@ -17,12 +17,36 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-04 18:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbole/tests/testole.prg
+ Readded CDO and OO open examples (working).
* utils/hbmk2/hbmk2.hbm
+ Added .hbl file generation.
* utils/hbmk2/hbmk2.prg
+ Added translator info to banner.
! Minor fix to now display job # if single-threaded compilation is done.
(Thanks for __enumBase() trick to Przemek)
* Some steps to better support xhb shared mode (untested).
+ Added filter support for .prg and .c/.cpp input files.
(This also means that input files with '{' '}' char pairs in them
aren't supported anymore).
! Minor terminology fix in one of the rare error messages.
; TODO: ? Adding GNU Make support to .pot -> .hbl generation, plus
we'd also need to develop a common rule for naming and
placement for these translation files. Current hbmk2 method
cannot be considered final.
+ utils/hbmk2/hbmk2.hu_HU.pot
+ Added Hungarian translation (not complete/final yet).
2009-05-04 17:40 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/hbole/oleauto.prg
* harbour/contrib/hbole/olecore.c
* added runtime error on descend FOR EACH ICollection enumeration
* added a few more runtime errors
* fixed reference counter managament if OLE object is used as
* fixed reference counter managament if OLE object is used as
parameter for another OLE function call
+ implemented array parameter support
TODO/TOCHECK: multidimentional array support

120
harbour/contrib/hbole/tests/testole.prg
View File

@@ -8,9 +8,11 @@
* hbole library demo/test code
*
* Copyright 2007 Enrico Maria Giordano e.m.giordano at emagsoftware.it
* Copyright 2009, Mindaugas Kavaliauskas <dbtopas at dbtopas.lt>
* Copyright 2009 Mindaugas Kavaliauskas <dbtopas at dbtopas.lt>
* Copyright 2008 Viktor Szakats <harbour.01 syenar.hu>
* Exm_CDO(), Exm_OOOpen()
*
* WWW - http://www.harbour-project.org
* www - http://www.harbour-project.org
*
*/
@@ -27,13 +29,15 @@ PROCEDURE Main()
? "5) Internet Explorer"
? "6) OpenOffice Calc"
? "7) OpenOffice Writer"
? "8) OpenOffice Open"
? "9) Send mail via CDO"
? "0) Quit"
? "> "
nOption := INKEY(0)
?? CHR(nOption)
nOption := Inkey( 0 )
?? Chr( nOption )
nOption -= ASC("0")
nOption -= Asc( "0" )
IF nOption == 1
Exm_MSExcel()
@@ -49,6 +53,10 @@ PROCEDURE Main()
Exm_OOCalc()
ELSEIF nOption == 7
Exm_OOWriter()
ELSEIF nOption == 8
Exm_OOOpen()
ELSEIF nOption == 9
Exm_CDO()
ELSEIF nOption == 0
EXIT
ENDIF
@@ -78,7 +86,7 @@ STATIC PROCEDURE Exm_MSExcel()
? oWorkBook:WorkSheets:Item(nI):Name
NEXT
// OLE also allows to access collection elements by passing
// OLE also allows to access collection elements by passing
// indices to :Worksheets property
FOR nI := 1 TO nCount
? oWorkBook:WorkSheets(nI):Name
@@ -224,24 +232,24 @@ STATIC PROCEDURE Exm_OOCalc()
oSheet := oDoc:getSheets:getByIndex(0)
oSheet:getCellRangeByName( "A1" ):setString( "OLE from Harbour" )
oSheet:getCellRangeByName( "A1" ):setString( "OLE from Harbour" )
oSheet:getCellRangeByName( "A3" ):setString( "String:" )
oSheet:getCellRangeByName( "B3" ):setString( "Hello, World!" )
oSheet:getCellRangeByName( "A3" ):setString( "String:" )
oSheet:getCellRangeByName( "B3" ):setString( "Hello, World!" )
oSheet:getCellRangeByName( "A4" ):setString( "Numeric:" )
oSheet:getCellRangeByName( "B4" ):setValue( 1234.56 )
oSheet:getCellRangeByName( "A4" ):setString( "Numeric:" )
oSheet:getCellRangeByName( "B4" ):setValue( 1234.56 )
oSheet:getCellRangeByName( "A5" ):setString( "Logical:" )
oSheet:getCellRangeByName( "B5" ):setValue( .T. )
oSheet:getCellRangeByName( "A5" ):setString( "Logical:" )
oSheet:getCellRangeByName( "B5" ):setValue( .T. )
oSheet:getCellRangeByName( "B5" ):setPropertyValue( "NumberFormat", 99 ) // BOOLEAN
oSheet:getCellRangeByName( "A6" ):setString( "Date:" )
oSheet:getCellRangeByName( "B6" ):setValue( DATE() )
oSheet:getCellRangeByName( "A6" ):setString( "Date:" )
oSheet:getCellRangeByName( "B6" ):setValue( DATE() )
oSheet:getCellRangeByName( "B6" ):setPropertyValue( "NumberFormat", 36 ) // YYYY-MM-DD
oSheet:getCellRangeByName( "A7" ):setString( "Timestamp:" )
oSheet:getCellRangeByName( "B7" ):setValue( HB_DATETIME() )
oSheet:getCellRangeByName( "A7" ):setString( "Timestamp:" )
oSheet:getCellRangeByName( "B7" ):setValue( HB_DATETIME() )
oSheet:getCellRangeByName( "B7" ):setPropertyValue( "NumberFormat", 51 ) // YYYY-MM-DD HH:MM:SS
oSheet:getCellRangeByName( "A3" ):setPropertyValue( "IsCellBackgroundTransparent", .F. )
@@ -305,3 +313,81 @@ STATIC PROCEDURE Exm_OOWriter()
ENDIF
RETURN
STATIC PROCEDURE Exm_OOOpen()
LOCAL oOO_ServiceManager
LOCAL oOO_Desktop
LOCAL oOO_PropVal01
LOCAL oOO_Doc
LOCAL cDir
IF ( oOO_ServiceManager := CreateObject( "com.sun.star.ServiceManager" ) ) != NIL
hb_FNameSplit( hb_ArgV( 0 ), @cDir )
oOO_Desktop := oOO_ServiceManager:createInstance( "com.sun.star.frame.Desktop" )
oOO_PropVal01 := oOO_ServiceManager:Bridge_GetStruct( "com.sun.star.beans.PropertyValue" )
oOO_Doc := oOO_Desktop:loadComponentFromURL( OO_ConvertToURL( hb_FNameMerge( cDir, "sample.odt" ) ), "_blank", 0, { oOO_PropVal01 } )
? "Press any key to close OpenOffice"
Inkey( 0 )
oOO_Doc:Close( .T. )
oOO_Doc := NIL
oOO_Desktop:Terminate()
oOO_Desktop := NIL
oOO_PropVal01 := NIL
ELSE
? "Error: OpenOffice not available.", OLEErrorText()
ENDIF
RETURN
STATIC FUNCTION OO_ConvertToURL( cString )
// ; Handle UNC paths
IF !( Left( cString, 2 ) == "\\" )
cString := StrTran( cString, ":", "|" )
cString := "///" + cString
ENDIF
cString := StrTran( cString, "\", "/" )
cString := StrTran( cString, " ", "%20" )
RETURN "file:" + cString
STATIC PROCEDURE Exm_CDO()
LOCAL oCDOMsg
LOCAL oCDOConf
IF ( oCDOMsg := CreateObject( "CDO.Message" ) ) != NIL
oCDOConf := CreateObject( "CDO.Configuration" )
oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/sendusing"):Value := 2 // ; cdoSendUsingPort
oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/smtpserver"):Value := "localhost"
oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/smtpserverport"):Value := 25
oCDOConf:Fields("http://schemas.microsoft.com/cdo/configuration/smtpconnectiontimeout"):Value := 120
oCDOConf:Fields:Update()
oCDOMsg:Configuration := oCDOConf
oCDOMsg:BodyPart:Charset := "iso-8859-2" // "iso-8859-1" "utf-8"
oCDOMsg:To := "test@localhost"
oCDOMsg:From := "sender@localhost"
oCDOMsg:Subject := "Test message"
oCDOMsg:TextBody := "Test message body"
BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
oCDOMsg:Send()
RECOVER
? "Error: CDO send error.", OLEErrorText()
END SEQUENCE
ELSE
? "Error: CDO subsystem not available (needs Windows XP or upper).", OLEErrorText()
ENDIF
RETURN

4
harbour/utils/hbmk2/hbmk2.hbm
View File

@@ -5,3 +5,7 @@
-nulrdd
-mt
hbmk2.prg
hbmk2.${lng}.pot
-hbl=hbmk2.${lng}.hbl
-lng=hu_HU

728
harbour/utils/hbmk2/hbmk2.hu_HU.pot Normal file
View File

@@ -0,0 +1,728 @@
#
# This file is generated by Harbour 1.1.0dev (Rev. 10646)
#
#: hbmk2.prg:1178
#, c-format
msgid "Warning: Invalid -main value ignored: %1$s"
msgstr "Figyelem: Hib s -main ‚rt‚k figyelmen k¡v<C2A1>l hagyva: %1$s"
#: hbmk2.prg:2976
#, c-format
msgid "Warning: C compiler script couldn't be created, continuing in command line."
msgstr "Figyelem: C ford¡t¢ param‚ter llom ny t nem siker<65>lt l‚trehozni, folytat s parancssorban."
#: hbmk2.prg:202
#, c-format
msgid "Press any key to continue..."
msgstr "Folytat shoz <20>ss”n le egy billentût..."
#: hbmk2.prg:5291
#, c-format
msgid "Translation (%1$s): (add your name here)"
msgstr "Ford¡t s (%1$s): Szak ts Viktor"
#: hbmk2.prg:730
#, c-format
msgid "Error: Architecture value unknown: %1$s"
msgstr "Hiba: Ismeretlen arhitekt£ra: %1$s"
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to linker (dynamic library)"
msgstr "param‚ter tov bb¡t sa (dinamikus f<>ggv‚nyk”nyvt r) linkernek"
#: hbmk2.prg:3576
#, c-format
msgid "Autodetected header dir for %1$s: %2$s"
msgstr "Detekt lt k”nyvt r %1$s fejl‚chez: %2$s"
#: hbmk2.prg:2600
#, c-format
msgid "Error: Running Harbour compiler. %1$s"
msgstr "Hiba: Harbour ford¡t¢ futtat sakor. %1$s"
#: hbmk2.prg:3200
#, c-format
msgid "Creating dynamic library... %1$s"
msgstr "Dinamikus f<>ggv‚nyk”nyvt r l‚trehoz sa... %1$s"
#: hbmk2.prg:5396
#, c-format
msgid "list of languages to be replaced in ${lng} macros in .pot filenames and output .hbl filenames. Comma separared list:\\n-lng=en-EN,hu-HU,de"
msgstr ""
#: hbmk2.prg:2588
#, c-format
msgid "Harbour compiler command (internal):"
msgstr "Habour ford¡t si parancs (bels‹):"
#: hbmk2.prg:5396
#, c-format
msgid "clean (in incremental build mode)"
msgstr ""
#: hbmk2.prg:3002 hbmk2.prg:3391
#, c-format
msgid "Error: Running C compiler. %1$s:"
msgstr "Hiba: C ford¡t¢ futtat sakor: %1$s:"
#: hbmk2.prg:854
#, c-format
msgid "Error: Compiler value unknown: %1$s"
msgstr "Hiba: Ismeretlen ford¡t¢: %1$s"
#: hbmk2.prg:899
#, c-format
msgid "Using Harbour: %1$s %2$s %3$s %4$s"
msgstr "Detekt lt Harbour: %1$s %2$s %3$s %4$s"
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to linker (executable)"
msgstr "param‚ter tov bb¡t sa (program) linkernek"
#: hbmk2.prg:619
#, c-format
msgid "Autodetected architecture: %1$s"
msgstr "Detekt lt architekt£ra: %1$s"
#: hbmk2.prg:842
#, c-format
msgid "Autodetected compiler: %1$s"
msgstr "Detekt lt ford¡t¢: %1$s"
#: hbmk2.prg:2992
#, c-format
msgid "C compiler script:"
msgstr "C ford¡t¢ parancs llom ny:"
#: hbmk2.prg:783
#, c-format
msgid "Error: Harbour locations couldn't be determined."
msgstr "Hiba: Harbour k”nyt rakat nem siker<65>lt meghat rozni."
#: hbmk2.prg:2639
#, c-format
msgid "Error: Running Harbour compiler. %1$s:"
msgstr "Hiba: Harbour ford¡t¢ futtat sakor. %1$s:"
#: hbmk2.prg:2746
#, c-format
msgid "Warning: Stub helper .c program couldn't be created."
msgstr "Figyelem: .c seg‚d llom nyt nem siker<65>lt l‚trehozni."
#: hbmk2.prg:3346
#, c-format
msgid "Running executable:"
msgstr "Program futtat sa:"
#: hbmk2.prg:5335
#, c-format
msgid "additional path to search for libraries"
msgstr "tov bbi keres‚si £tvonal k”nyvt rakhoz"
#: hbmk2.prg:5335
#, c-format
msgid "link with multi/single-thread VM"
msgstr "t”bbsz l£/egysz l£ virtu lis g‚p haszn lata"
#: hbmk2.prg:4749
#, c-format
msgid "Error: Cannot create temporary file."
msgstr "Hiba: Ideiglenes f jl nem hozhat¢ l‚tre."
#: hbmk2.prg:2834 hbmk2.prg:2873
#, c-format
msgid "Error: Running resource compiler. %1$s:"
msgstr "Hiba: Er‹forr s ford¡t¢ futtat sakor. %1$s:"
#: hbmk2.prg:1480
#, c-format
msgid "Error: No source files were specified."
msgstr "Hiba: Nincs megadva forr s f jl."
#: hbmk2.prg:4576
#, c-format
msgid "Warning: File cannot be found: %1$s"
msgstr "Figyelem: F jl nem tal lhat¢: %1$s"
#: hbmk2.prg:763
#, c-format
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect."
msgstr "Hiba: HB_INSTALL_PREFIX nincs megadva, automata detekt l s nem j rt sikerrel."
#: hbmk2.prg:1186
#, c-format
msgid "Warning: Invalid -gt value ignored: %1$s"
msgstr "Figyelem: Hib s -gt ‚rt‚k figyelmen k¡v<C2A1>l hagyva: %1$s"
#: hbmk2.prg:1374 hbmk2.prg:4196
#, c-format
msgid "Processing: %1$s"
msgstr "Feldolgoz s alatt: %1$s"
#: hbmk2.prg:5396
#, c-format
msgid "show commands executed"
msgstr "mutassa a v‚grehajtott parancsokat"
#: hbmk2.prg:5335
#, c-format
msgid "output file name"
msgstr "kimeneti f jln‚v"
#: hbmk2.prg:4974
#, c-format
msgid "Blinker ECHO: %1$s"
msgstr "Blinker ECHO: %1$s"
#: hbmk2.prg:5396
#, c-format
msgid "link with nulrdd"
msgstr "nulrdd haszn lata"
#: hbmk2.prg:5076 hbmk2.prg:5092
#, c-format
msgid "pot: %1$s -> %2$s"
msgstr "pot: %1$s -> %2$s"
#: hbmk2.prg:4159
#, c-format
msgid "Processing configuration: %1$s"
msgstr "Alapbe ll¡t sok feldolgoz sa: %1$s"
#: hbmk2.prg:5109 hbmk2.prg:5114
#, c-format
msgid ".pot error: %1$s"
msgstr ".pot hiba: %1$s"
#: hbmk2.prg:5396
#, c-format
msgid "inherit all/no (default) flags from Harbour build"
msgstr "”r”k”lj”n minden/semmi (alap‚rt.) opci¢t a Harbourt¢l"
#: hbmk2.prg:4337
#, c-format
msgid "%1$s"
msgstr "%1$s"
#: hbmk2.prg:846
#, c-format
msgid "Please choose a compiler by using -comp= option or envvar HB_COMPILER.\\nYou have the following choices on your platform: %1$s"
msgstr ""
#: hbmk2.prg:848
#, c-format
msgid "Harbour Make couldn't detect any supported C compiler in your PATH.\\nPlease setup one or set -comp= option or envvar HB_COMPILER to one of these values: %1$s"
msgstr ""
#: hbmk2.prg:3389
#, c-format
msgid "Error: Running C compiler job #%1$s. %2$s:"
msgstr "Hiba: C ford¡t¢ futtat sa. %1$s. sz l. %2$s:"
#: hbmk2.prg:5396
#, c-format
msgid "output .hbl filename. ${lng} macro is accepted in filename"
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid "Certain .hbp lines (prgflags=, cflags=, ldflags=, libpaths=, inctrypaths=,echo=) and corresponding command line parameters will accept macros: ${hb_root}, ${hb_self}, ${hb_arch}, ${hb_comp}, ${hb_cpu}, ${<envvar>}"
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid "Platform filters are accepted in each .hbp line and with several options.\\nFilter format: {[!][<arch>|<comp>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!owatcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allpocc}, {allgcc}, {allmingw}, {allmsvc}, {x86|x86_64|ia64|arm}"
msgstr ""
#: hbmk2.prg:5335
#, c-format
msgid "additional path to search for headers"
msgstr "tov bbi keres‚si £tvonal a fejl‚cekhez"
#: hbmk2.prg:1491
#, c-format
msgid "Error: Working directory cannot be created: %1$s"
msgstr "Hiba: Munkak”nyvt r nem hozhat¢ l‚tre: %1$s"
#: hbmk2.prg:2808
#, c-format
msgid "Compiling resources..."
msgstr "Er‹forr sok ford¡t sa..."
#: hbmk2.prg:3324
#, c-format
msgid "Compression command:"
msgstr "T”m”r¡t‚si parancs:"
#: hbmk2.prg:5308
#, c-format
msgid " hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.pot|.hbl]>"
msgstr ""
#: hbmk2.prg:5014
#, c-format
msgid "Error: Cannot open file: %1$s"
msgstr "Hiba: F jl nem nyithat¢ meg: %1$s"
#: hbmk2.prg:5335
#, c-format
msgid "link with GT<name> GT driver, can be repeated to link with more GTs. First one will be the default at runtime"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to output executable when -run option is used"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "show commands to be executed, but don't execute them"
msgstr ""
#: hbmk2.prg:5057
#, c-format
msgid "pot: in: %1$s"
msgstr ""
#: hbmk2.prg:5136
#, c-format
msgid "Error: Cannot create file: %1$s"
msgstr "Hiba: F jl nem hozhat¢ l‚tre: %1$s"
#: hbmk2.prg:2987 hbmk2.prg:3381
#, c-format
msgid "C compiler command:"
msgstr "C ford¡t¢ parancsa:"
#: hbmk2.prg:5396
#, c-format
msgid "output Harbour static library directory"
msgstr "visszat‚r a Harbour statikus f<>ggv‚nyk”nyvt rak k”nyvt r val"
#: hbmk2.prg:5312
#, c-format
msgid "Notes:"
msgstr "Megjegyz‚sek:"
#: hbmk2.prg:5308 hbmk2.prg:5308 hbmk2.prg:5312 hbmk2.prg:5326 hbmk2.prg:5396 hbmk2.prg:5396
#, c-format
msgid " "
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "stop after creating the object files\\ncreate link/copy hbmk to hbcmp/clipper for the same effect"
msgstr ""
#: hbmk2.prg:5308
#, c-format
msgid "Syntax:"
msgstr "Haszn lat:"
#: hbmk2.prg:5308
#, c-format
msgid "Options:"
msgstr "Opci¢k:"
#: hbmk2.prg:5326
#, c-format
msgid "Supported <comp> values for each supported <arch> value:"
msgstr ""
#: hbmk2.prg:5335
#, c-format
msgid "link with static/shared libs"
msgstr ""
#: hbmk2.prg:5335
#, c-format
msgid "link with <libname> library"
msgstr ""
#: hbmk2.prg:5338
#, c-format
msgid "long help"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "link with all static libs"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "create (or not) a map file"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "strip (no strip) binaries"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "run/don't run output executable"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "stop without doing anything"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to Harbour"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to C compiler"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "enable incremental build mode"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "output Harbour dynamic library directory"
msgstr "visszat‚r a Harbour dinamikus f<>ggv‚nyk”nyvt rak k”nyvt r val"
#: hbmk2.prg:5396
#, c-format
msgid "start n compilation threads (MT platforms/builds only)"
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid "Multiple -l, -L and <script> parameters are accepted."
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid ".hbp option files in current dir are automatically processed."
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "enable xhb mode (experimental)"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "assume specific architecure. Same as HB_ARCHITECTURE envvar"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "accept raw linker flags"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "create static library"
msgstr "statikus f<>ggv‚nyk”nyvt r l‚trehoz sa"
#: hbmk2.prg:5396
#, c-format
msgid "create dynamic library"
msgstr "dinamikus f<>ggv‚nyk”nyvt r l‚trehoz sa"
#: hbmk2.prg:5396
#, c-format
msgid "output Harbour binary directory"
msgstr "visszat‚r a Harbour program k”nyvt rral"
#: hbmk2.prg:5396
#, c-format
msgid "output Harbour header directory"
msgstr "visszat‚r a Harbour fejl‚c k”nyvt rral"
#: hbmk2.prg:5396
#, c-format
msgid "display version header only"
msgstr "csak a verzi¢sz m megmutat sa"
#: hbmk2.prg:5407
#, c-format
msgid "%1$s option file in hbmk directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk directory. The file format is the same as .hbp."
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid "Defaults and feature support vary by architecture/compiler."
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "turn on informational messages"
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid "Regular Harbour compiler options are also accepted."
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "suppress all screen messages"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "create GUI/console executable"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "override the name of starting function/procedure"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "toggle C compiler optimizations (default: on)"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "compress executable/dynamic lib (needs UPX)\\n<lev> can be: min, max, def"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "inherit .prg/.c/linker flags (or none) from Harbour build"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "control source header parsing (in incremental build mode)\\n<m> can be: full, partial (default), off"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk to hbcc for the same effect"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "use specific compiler. Same as HB_COMPILER envvar\\nSpecial value:\\n - bld: use original build settings (default on *nix)"
msgstr ""
#: hbmk2.prg:5407
#, c-format
msgid ".hbp options (they should come in separate lines): libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[Linker flags], libpaths=[paths], pots=[.pot files], incpaths=[paths], inctrypaths=[paths], gui|mt|shared|nulrdd|debug|opt|map|strip|run|inc=[yes|no], compr=[yes|no|def|min|max], head=[off|partial|full], echo=<text>\\nLines starting with '#' char are ignored"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect"
msgstr ""
#: hbmk2.prg:2633
#, c-format
msgid "Harbour compiler command:"
msgstr ""
#: hbmk2.prg:2481
#, c-format
msgid "Generating VCS header: %1$s"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "working directory for incremental build mode\\n(default: arch/comp)"
msgstr ""
#: hbmk2.prg:3080
#, c-format
msgid "Target up to date: %1$s"
msgstr ""
#: hbmk2.prg:2566
#, c-format
msgid "Compiling Harbour sources..."
msgstr ""
#: hbmk2.prg:2586
#, c-format
msgid "Harbour compiler command (internal) job #%1$s:"
msgstr ""
#: hbmk2.prg:2612
#, c-format
msgid "Error: Running Harbour compiler job #%1$s. %2$s"
msgstr ""
#: hbmk2.prg:3295
#, c-format
msgid "Post processor command:"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "generate .ch header file with local repository information SVN, Git and Mercurial are currently supported. Generated header will define macro _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository"
msgstr ""
#: hbmk2.prg:3358
#, c-format
msgid "Running time: %1$ss"
msgstr ""
#: hbmk2.prg:2867
#, c-format
msgid "Resource compiler script:"
msgstr ""
#: hbmk2.prg:3186
#, c-format
msgid "Error: Running lib command. %1$s:"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "add/exclude C compiler debug info"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to linker (static library)"
msgstr ""
#: hbmk2.prg:2828 hbmk2.prg:2863
#, c-format
msgid "Resource compiler command:"
msgstr "Er‹forr s ford¡t¢ parancsa:"
#: hbmk2.prg:2855
#, c-format
msgid "Warning: Resource compiler script couldn't be created, continuing in command line."
msgstr ""
#: hbmk2.prg:2916
#, c-format
msgid "Compiling..."
msgstr "Ford¡t s..."
#: hbmk2.prg:2985 hbmk2.prg:3379
#, c-format
msgid "C compiler command job #%1$s:"
msgstr ""
#: hbmk2.prg:3145
#, c-format
msgid "Creating static library... %1$s"
msgstr "Statikus f<>ggv‚nyk”nyvt r l‚trehoz sa... %1$s"
#: hbmk2.prg:3176
#, c-format
msgid "Lib command:"
msgstr ""
#: hbmk2.prg:3168
#, c-format
msgid "Warning: Lib script couldn't be created, continuing in command line."
msgstr ""
#: hbmk2.prg:3180
#, c-format
msgid "Lib script:"
msgstr ""
#: hbmk2.prg:3225
#, c-format
msgid "Warning: Dynamic lib link script couldn't be created, continuing in command line."
msgstr ""
#: hbmk2.prg:3233
#, c-format
msgid "Dynamic lib link command:"
msgstr ""
#: hbmk2.prg:3237
#, c-format
msgid "Dynamic lib link script:"
msgstr ""
#: hbmk2.prg:3243
#, c-format
msgid "Error: Running dynamic lib link command. %1$s:"
msgstr ""
#: hbmk2.prg:3262
#, c-format
msgid "Stub kept for debug: %1$s"
msgstr ""
#: hbmk2.prg:3301
#, c-format
msgid "Warning: Running post processor command. %1$s:"
msgstr "Figyelem: Ut¢feldolgoz si parancs hib t adott vissza. %1$s:"
#: hbmk2.prg:3330
#, c-format
msgid "Warning: Running compression command. %1$s:"
msgstr "Figyelem: T”m”r¡t‹ futtat sa hib t adott vissza. %1$s:"
#: hbmk2.prg:5396
#, c-format
msgid "additional path to autodetect .c header locations"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "do not process .hbp files in current directory"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "rebuild all (in incremental build mode)"
msgstr ""
#: hbmk2.prg:5396
#, c-format
msgid "pass flag to resource compiler (Windows only)"
msgstr ""
#: hbmk2.prg:3020
#, c-format
msgid "Error: Running C compiler job #%1$s. %2$s"
msgstr "Hiba: C ford¡t¢ futtat sakor. %1$s. sz l. %2$s"
#: hbmk2.prg:3030
#, c-format
msgid "Error: This architecture/compiler isn't implemented."
msgstr "Hiba: Ez a platform/ford¡t¢ nincs megval¢s¡tva."
#: hbmk2.prg:3131
#, c-format
msgid "Error: Running linker. %1$s:"
msgstr "Hiba: Linker futtat sa k”zben. %1$s:"
#: hbmk2.prg:3125
#, c-format
msgid "Linker script:"
msgstr "Linker parancs llom ny:"
#: hbmk2.prg:3086
#, c-format
msgid "Linking... %1$s"
msgstr "Linkel‚s... %1$s"
#: hbmk2.prg:3121
#, c-format
msgid "Linker command:"
msgstr "Linker parancs:"
#: hbmk2.prg:5407
#, c-format
msgid "<script> can be <@script> (.hbm file), <script.hbm> or <script.hbp>."
msgstr ""
#: hbmk2.prg:3113
#, c-format
msgid "Warning: Link script couldn't be created, continuing in command line."
msgstr "Figyelem: Linker parancs llom ny t nem siker<65>lt l‚trehozni, folytat s parancssorban."

135
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -147,6 +147,7 @@ STATIC s_lREBUILD := .F.
STATIC s_lTRACE := .F.
STATIC s_lDONTEXEC := .F.
STATIC s_lXHB := .F.
STATIC s_cUILNG
STATIC s_lDEBUGTIME := .F.
STATIC s_lDEBUGINC := .F.
@@ -289,7 +290,6 @@ FUNCTION hbmk( aArgs )
LOCAL s_aLNG
LOCAL s_cVCSDIR
LOCAL s_cVCSHEAD
LOCAL s_cUILNG
LOCAL s_lCPP := NIL
LOCAL s_lSHARED := NIL
@@ -388,11 +388,8 @@ FUNCTION hbmk( aArgs )
LOCAL cSelfFlagC := hb_Version( HB_VERSION_FLAG_C )
LOCAL cSelfFlagL := hb_Version( HB_VERSION_FLAG_LINKER )
LOCAL cDL_Version_Alter := hb_ntos( hb_Version( HB_VERSION_MAJOR ) ) +;
hb_ntos( hb_Version( HB_VERSION_MINOR ) )
LOCAL cDL_Version := hb_ntos( hb_Version( HB_VERSION_MAJOR ) ) + "." +;
hb_ntos( hb_Version( HB_VERSION_MINOR ) ) + "." +;
hb_ntos( hb_Version( HB_VERSION_RELEASE ) )
LOCAL cDL_Version_Alter
LOCAL cDL_Version
LOCAL aTODO
LOCAL aThreads
@@ -461,6 +458,14 @@ FUNCTION hbmk( aArgs )
IF ! s_lXHB
cDL_Version_Alter := "-" +;
hb_ntos( hb_Version( HB_VERSION_MAJOR ) ) +;
hb_ntos( hb_Version( HB_VERSION_MINOR ) )
cDL_Version := "." +;
hb_ntos( hb_Version( HB_VERSION_MAJOR ) ) + "." +;
hb_ntos( hb_Version( HB_VERSION_MINOR ) ) + "." +;
hb_ntos( hb_Version( HB_VERSION_RELEASE ) )
aLIB_BASE1 := {;
"hbcpage" ,;
"hblang" ,;
@@ -512,6 +517,9 @@ FUNCTION hbmk( aArgs )
ELSE
cDL_Version_Alter := ""
cDL_Version := ""
aLIB_BASE1 := {;
"codepage" ,;
"lang" ,;
@@ -757,16 +765,16 @@ FUNCTION hbmk( aArgs )
ENDCASE
/* Detect special *nix dir layout (/bin, /lib/harbour, /include/harbour) */
IF hb_FileExists( DirAddPathSep( s_cHB_INSTALL_PREFIX ) + "include" +;
hb_osPathSeparator() + "harbour" +;
hb_osPathSeparator() + iif( s_lXHB, "xharbour", "harbour" ) +;
hb_osPathSeparator() + "hbvm.h" )
IF Empty( s_cHB_BIN_INSTALL )
s_cHB_BIN_INSTALL := PathNormalize( s_cHB_INSTALL_PREFIX ) + "bin"
ENDIF
IF Empty( s_cHB_LIB_INSTALL )
s_cHB_LIB_INSTALL := PathNormalize( s_cHB_INSTALL_PREFIX ) + "lib" + hb_osPathSeparator() + "harbour"
s_cHB_LIB_INSTALL := PathNormalize( s_cHB_INSTALL_PREFIX ) + "lib" + hb_osPathSeparator() + iif( s_lXHB, "xharbour", "harbour" )
ENDIF
IF Empty( s_cHB_INC_INSTALL )
s_cHB_INC_INSTALL := PathNormalize( s_cHB_INSTALL_PREFIX ) + "include" + hb_osPathSeparator() + "harbour"
s_cHB_INC_INSTALL := PathNormalize( s_cHB_INSTALL_PREFIX ) + "include" + hb_osPathSeparator() + iif( s_lXHB, "xharbour", "harbour" )
ENDIF
ENDIF
ENDIF
@@ -1395,6 +1403,7 @@ FUNCTION hbmk( aArgs )
CASE FN_ExtGet( cParamL ) == ".prg"
cParam := ArchCompFilter( cParam )
FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ) )
AAdd( s_aPRG , PathSepToTarget( cParam ) )
DEFAULT s_cFIRST TO PathSepToSelf( cParam )
@@ -1437,6 +1446,7 @@ FUNCTION hbmk( aArgs )
CASE FN_ExtGet( cParamL ) == ".c" .OR. ;
FN_ExtGet( cParamL ) == ".cpp" /* .cc, .cxx, .cx */
cParam := ArchCompFilter( cParam )
FOR EACH cParam IN FN_Expand( PathProc( cParam, aParam[ _PAR_cFileName ] ) )
AAdd( s_aC , PathSepToTarget( cParam ) )
DEFAULT s_cFIRST TO PathSepToSelf( cParam )
@@ -1521,7 +1531,7 @@ FUNCTION hbmk( aArgs )
cPostfix := ""
HB_SYMBOL_UNUSED( cDL_Version )
#else
cPostfix := "-" + cDL_Version
cPostfix := cDL_Version
#endif
DO CASE
@@ -1824,14 +1834,14 @@ FUNCTION hbmk( aArgs )
ENDIF
DO CASE
CASE s_cCOMP == "mingw64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64",;
"harbour-" + cDL_Version_Alter + "-x64" ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-x64",;
"harbour" + cDL_Version_Alter + "-x64" ) }
CASE s_cCOMP == "mingwarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
"harbour-" + cDL_Version_Alter + "-arm" ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-arm",;
"harbour" + cDL_Version_Alter + "-arm" ) }
OTHERWISE
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter,;
"harbour-" + cDL_Version_Alter ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter,;
"harbour" + cDL_Version_Alter ) }
ENDCASE
s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" }
@@ -2039,8 +2049,8 @@ FUNCTION hbmk( aArgs )
AAdd( s_aOPTL, "OP MAP" )
ENDIF
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + cLibExt,;
"harbour-" + cDL_Version_Alter + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + cLibExt,;
"harbour" + cDL_Version_Alter + cLibExt ) }
IF s_lSHARED
AAdd( s_aOPTL, "FILE " + FN_ExtSet( s_cHB_LIB_INSTALL + hb_osPathSeparator() + iif( s_lGUI, "hbmainwin", "hbmainstd" ), cLibExt ) )
@@ -2204,8 +2214,8 @@ FUNCTION hbmk( aArgs )
IF s_lSHARED
AAdd( s_aLIBPATH, s_cHB_BIN_INSTALL )
ENDIF
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-bcc" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-bcc" + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-bcc" + cLibExt,;
"harbour" + cDL_Version_Alter + "-bcc" + cLibExt ) }
s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" }
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
@@ -2323,17 +2333,17 @@ FUNCTION hbmk( aArgs )
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
DO CASE
CASE s_cCOMP $ "msvc|icc"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + cLibExt,;
"harbour-" + cDL_Version_Alter + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + cLibExt,;
"harbour" + cDL_Version_Alter + cLibExt ) }
CASE s_cCOMP == "msvc64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-x64" + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-x64" + cLibExt,;
"harbour" + cDL_Version_Alter + "-x64" + cLibExt ) }
CASE s_cCOMP $ "msvcia64|iccia64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-ia64" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-ia64" + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-ia64" + cLibExt,;
"harbour" + cDL_Version_Alter + "-ia64" + cLibExt ) }
CASE s_cCOMP == "msvcarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-arm" + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-arm" + cLibExt,;
"harbour" + cDL_Version_Alter + "-arm" + cLibExt ) }
ENDCASE
s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" }
@@ -2415,14 +2425,14 @@ FUNCTION hbmk( aArgs )
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
DO CASE
CASE s_cCOMP == "pocc64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-x64" + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-x64" + cLibExt,;
"harbour" + cDL_Version_Alter + "-x64" + cLibExt ) }
CASE s_cCOMP == "poccarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm" + cLibExt,;
"harbour-" + cDL_Version_Alter + "-arm" + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + "-arm" + cLibExt,;
"harbour" + cDL_Version_Alter + "-arm" + cLibExt ) }
OTHERWISE
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + cLibExt,;
"harbour-" + cDL_Version_Alter + cLibExt ) }
s_aLIBSHARED := { iif( s_lMT, "harbourmt" + cDL_Version_Alter + cLibExt,;
"harbour" + cDL_Version_Alter + cLibExt ) }
ENDCASE
s_aLIBSHAREDPOST := { "hbmainstd", "hbmainwin" }
@@ -2574,7 +2584,7 @@ FUNCTION hbmk( aArgs )
IF s_lTRACE
IF ! s_lQuiet
IF hb_mtvm()
IF Len( aTODO:__enumBase() ) > 1
hbmk_OutStd( hb_StrFormat( I_( "Harbour compiler command (internal) job #%1$s:" ), hb_ntos( aTODO:__enumIndex() ) ) )
ELSE
hbmk_OutStd( I_( "Harbour compiler command (internal):" ) )
@@ -2601,7 +2611,11 @@ FUNCTION hbmk( aArgs )
FOR EACH thread IN aThreads
hb_threadJoin( thread[ 1 ], @tmp )
IF tmp != 0
hbmk_OutErr( hb_StrFormat( I_( "Error: Running Harbour compiler job #%1$s. %2$s" ), hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ) )
IF Len( aThreads ) > 1
hbmk_OutErr( hb_StrFormat( I_( "Error: Running Harbour compiler job #%1$s. %2$s" ), hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ) )
ELSE
hbmk_OutErr( hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s" ), hb_ntos( tmp ) ) )
ENDIF
OutErr( ArrayToList( thread[ 2 ] ), hb_osNewLine() )
RETURN 6
ENDIF
@@ -2932,7 +2946,7 @@ FUNCTION hbmk( aArgs )
aThreads := {}
FOR EACH aTODO IN ArraySplit( ArrayJoin( ListDirExt( s_aPRG_TODO, cWorkDir, ".c" ), s_aC_TODO ), s_nJOBS )
IF hb_mtvm()
AAdd( aThreads, hb_threadStart( @CompileCLoop(), aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, aTODO:__enumIndex() ) )
AAdd( aThreads, hb_threadStart( @CompileCLoop(), aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, aTODO:__enumIndex(), Len( aTODO:__enumBase() ) ) )
ELSE
IF ! CompileCLoop( aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt )
nErrorLevel := 6
@@ -2973,7 +2987,7 @@ FUNCTION hbmk( aArgs )
IF s_lTRACE
IF ! s_lQuiet
IF hb_mtvm()
IF Len( aTODO:__enumBase() ) > 1
hbmk_OutStd( hb_StrFormat( I_( "C compiler command job #%1$s:" ), hb_ntos( aTODO:__enumIndex() ) ) )
ELSE
hbmk_OutStd( I_( "C compiler command:" ) )
@@ -3009,7 +3023,11 @@ FUNCTION hbmk( aArgs )
FOR EACH thread IN aThreads
hb_threadJoin( thread[ 1 ], @tmp )
IF tmp != 0
hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s" ), hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ) )
IF Len( aThreads ) > 1
hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s" ), hb_ntos( thread:__enumIndex() ), hb_ntos( tmp ) ) )
ELSE
hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s" ), hb_ntos( tmp ) ) )
ENDIF
IF ! s_lQuiet
OutErr( thread[ 2 ], hb_osNewLine() )
ENDIF
@@ -3019,7 +3037,7 @@ FUNCTION hbmk( aArgs )
ENDIF
ENDIF
ELSE
hbmk_OutErr( I_( "Error: This compiler/platform isn't implemented." ) )
hbmk_OutErr( I_( "Error: This architecture/compiler isn't implemented." ) )
nErrorLevel := 8
ENDIF
ENDIF
@@ -3352,7 +3370,7 @@ FUNCTION hbmk( aArgs )
RETURN nErrorLevel
STATIC FUNCTION CompileCLoop( aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, nJob )
STATIC FUNCTION CompileCLoop( aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt, nJob, nJobs )
LOCAL lResult := .T.
LOCAL cCommand
LOCAL tmp, tmp1
@@ -3367,7 +3385,7 @@ STATIC FUNCTION CompileCLoop( aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt,
IF s_lTRACE
IF ! s_lQuiet
IF nJob != NIL
IF nJobs > 1
hbmk_OutStd( hb_StrFormat( I_( "C compiler command job #%1$s:" ), hb_ntos( nJob ) ) )
ELSE
hbmk_OutStd( I_( "C compiler command:" ) )
@@ -3377,7 +3395,7 @@ STATIC FUNCTION CompileCLoop( aTODO, cBin_CompC, cOpt_CompC, cWorkDir, cObjExt,
ENDIF
IF ! s_lDONTEXEC .AND. ( tmp1 := hbmk_run( cCommand ) ) != 0
IF nJob != NIL
IF nJobs > 1
hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler job #%1$s. %2$s:" ), hb_ntos( nJob ), hb_ntos( tmp1 ) ) )
ELSE
hbmk_OutErr( hb_StrFormat( I_( "Error: Running C compiler. %1$s:" ), hb_ntos( tmp1 ) ) )
@@ -5277,8 +5295,13 @@ STATIC PROCEDURE ShowHeader()
OutStd( "Harbour Make " + HBRawVersion() + hb_osNewLine() +;
"Copyright (c) 1999-2009, Viktor Szakats" + hb_osNewLine() +;
"http://www.harbour-project.org/" + hb_osNewLine() +;
hb_osNewLine() )
"http://www.harbour-project.org/" + hb_osNewLine() )
IF !( s_cUILNG == "en_EN" )
OutStd( hb_StrFormat( I_( "Translation (%1$s): (add your name here)" ), s_cUILNG ), hb_osNewLine() )
ENDIF
OutStd( hb_osNewLine() )
RETURN
@@ -5289,17 +5312,17 @@ STATIC PROCEDURE ShowHelp( lLong )
LOCAL aText_Basic := {;
I_( "Syntax:" ),;
I_( " " ),;
"",;
I_( " hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.pot|.hbl]>" ),;
I_( " " ),;
"",;
I_( "Options:" ) }
LOCAL aText_Notes := {;
I_( " " ),;
"",;
I_( "Notes:" ) }
LOCAL aText_Supp := {;
I_( " " ),;
"",;
I_( "Supported <comp> values for each supported <arch> value:" ),;
" - linux : gcc, owatcom, icc",;
" - darwin : gcc",;
@@ -5325,7 +5348,7 @@ STATIC PROCEDURE ShowHelp( lLong )
{ "-help|--help" , I_( "long help" ) } }
LOCAL aOpt_Long := {;
{},;
NIL,;
{ "-gui|-std" , I_( "create GUI/console executable" ) },;
{ "-main=<mainfunc>" , I_( "override the name of starting function/procedure" ) },;
{ "-fullstatic" , I_( "link with all static libs" ) },;
@@ -5341,7 +5364,7 @@ STATIC PROCEDURE ShowHelp( lLong )
{ "-vcshead=<file>" , I_( "generate .ch header file with local repository information SVN, Git and Mercurial are currently supported. Generated header will define macro _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" ) },;
{ "-nohbp" , I_( "do not process .hbp files in current directory" ) },;
{ "-stop" , I_( "stop without doing anything" ) },;
{},;
NIL,;
{ "-bldf[-]" , I_( "inherit all/no (default) flags from Harbour build" ) },;
{ "-bldf=[p][c][l]" , I_( "inherit .prg/.c/linker flags (or none) from Harbour build" ) },;
{ "-inctrypath=<p>" , I_( "additional path to autodetect .c header locations" ) },;
@@ -5358,24 +5381,24 @@ STATIC PROCEDURE ShowHelp( lLong )
{ "-rebuild" , I_( "rebuild all (in incremental build mode)" ) },;
{ "-clean" , I_( "clean (in incremental build mode)" ) },;
{ "-workdir=<dir>" , I_( "working directory for incremental build mode\n(default: arch/comp)" ) },;
{},;
NIL,;
{ "-hbl[=<output>]" , I_( "output .hbl filename. ${lng} macro is accepted in filename" ) },;
{ "-lng=<languages>" , I_( "list of languages to be replaced in ${lng} macros in .pot filenames and output .hbl filenames. Comma separared list:\n-lng=en-EN,hu-HU,de" ) },;
{},;
NIL,;
{ "-hbcmp|-clipper" , I_( "stop after creating the object files\ncreate link/copy hbmk to hbcmp/clipper for the same effect" ) },;
{ "-hbcc" , I_( "stop after creating the object files and accept raw C flags\ncreate link/copy hbmk to hbcc for the same effect" ) },;
{ "-hblnk" , I_( "accept raw linker flags" ) },;
{ "-hblib" , I_( "create static library" ) },;
{ "-hbdyn" , I_( "create dynamic library" ) },;
{ "-xhb" , I_( "enable xhb mode (experimental)" ) },;
{ "-rtlink" , I_( " " ) },;
{ "-blinker" , I_( " " ) },;
{ "-rtlink" , "" },;
{ "-blinker" , "" },;
{ "-exospace" , I_( "emulate Clipper compatible linker behavior\ncreate link/copy hbmk to rtlink/blinker/exospace for the same effect" ) },;
{ "--hbdirbin" , I_( "output Harbour binary directory" ) },;
{ "--hbdirdyn" , I_( "output Harbour dynamic library directory" ) },;
{ "--hbdirlib" , I_( "output Harbour static library directory" ) },;
{ "--hbdirinc" , I_( "output Harbour header directory" ) },;
{},;
NIL,;
{ "-arch=<arch>" , I_( "assume specific architecure. Same as HB_ARCHITECTURE envvar" ) },;
{ "-comp=<comp>" , I_( "use specific compiler. Same as HB_COMPILER envvar\nSpecial value:\n - bld: use original build settings (default on *nix)" ) },;
{ "--version" , I_( "display version header only" ) },;