diff --git a/harbour/ChangeLog b/harbour/ChangeLog index df2ae9ad96..4835f92be0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,30 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-21 12:18 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbformat/hbfmtcls.prg + + added one known and one new minor TOFIX + + Array2File() changed to strip extra EOLs from the end + of file (sometimes and extra EOL is generated by + hbformat). + + * src/debug/debugger.prg + * src/rtl/tbrowse.prg + * src/vm/harbinit.prg + * utils/hbmk2/hbmk2.prg + * formatting changed so that its fit + hbformat style + + * contrib/sddmy/tests/test1.prg + * contrib/sddoci/tests/test1.prg + * contrib/sddodbc/tests/test1.prg + * contrib/sddodbc/tests/test2.prg + + added missing #require-s, anyways they don't run as scripts + with the previously reported error. + + * ChangeLog + ! typos + 2012-10-21 01:44 UTC+0200 Viktor Szakats (harbour syenar.net) * */*.hbx * renegerated remaining ones @@ -347,7 +371,7 @@ 2012-10-18 00:18 UTC+0200 Viktor Szakats (harbour syenar.net) * src/compiler/complex.c - ! added missing HB_SIZE case + ! added missing HB_SIZE cast * src/rdd/dbffpt/dbffpt1.c * src/rdd/dbfnsx/dbfnsx1.c @@ -779,7 +803,7 @@ * contrib/hbfbird/firebird.c ! fixed to use ANSI C comments * contrib/hbfbird/tfirebrd.prg - ! fixed possible typo in prev in 'FBGetdata( qry, 1 )' + ! fixed possible typo in prev in using 'FBGetdata( qry, 1 )' instead of 'FBGetdata( qry, 3 )' ! formatted, long line split. * ChangeLog @@ -1456,7 +1480,7 @@ * contrib/hbodbc/browodbc.prg * contrib/xhb/xhbtedit.prg * use HB_DISPOUTAT() instead of @ SAY - ; TODO: hbnf + ; TODO: hbnf [DONE] * contrib/hbmisc/hbedit.prg * some unicode compatibility fixes diff --git a/harbour/contrib/hbformat/hbfmtcls.prg b/harbour/contrib/hbformat/hbfmtcls.prg index 4b916e3b76..6a7bccc9cf 100644 --- a/harbour/contrib/hbformat/hbfmtcls.prg +++ b/harbour/contrib/hbformat/hbfmtcls.prg @@ -69,6 +69,15 @@ // 5. ".T.," / ".F.," gets wrongly corrected to ".T. ," / ".F. ," // 6. "end class" is converted to "end CLASS" instead of "END CLASS" // 7. in PP commands "" should not be converted to "< var >" +// 8. Certain lines outside any procs f.e. at beginning of file, sometimes +// will be indented to one level: +// --- +// /* a1 */ +// REQUEST a1 +// ANNOUNCE a3 +// STATIC a4 +// THREAD STATIC a5 +// --- CREATE CLASS HBFORMATCODE @@ -807,7 +816,8 @@ METHOD File2Array( cFileName ) CLASS HBFORMATCODE METHOD Array2File( cFileName, aFile ) CLASS HBFORMATCODE - LOCAL handle, i, nLen := Len( aFile ), cName, cBakName, cPath + LOCAL i, nLen := Len( aFile ), cName, cBakName, cPath + LOCAL cFile cName := iif( ( i := RAt( ".", cFileName ) ) == 0, cFileName, SubStr( cFileName, 1, i - 1 ) ) IF Empty( ::cExtSave ) @@ -827,18 +837,21 @@ METHOD Array2File( cFileName, aFile ) CLASS HBFORMATCODE cFileName := cPath + Lower( iif( i == 0, cFileName, SubStr( cFileName, i + 1 ) ) ) ENDIF - handle := FCreate( cFileName ) + cFile := "" FOR i := 1 TO nLen IF aFile[ i ] == NIL EXIT ENDIF IF i < nLen .OR. ! Empty( aFile[ i ] ) - FWrite( handle, aFile[ i ] + ::cEol ) + cFile += aFile[ i ] + ::cEol ENDIF NEXT - FClose( handle ) - RETURN .T. + DO WHILE Right( cFile, Len( ::cEol ) * 2 ) == Replicate( ::cEol, 2 ) + cFile := hb_StrShrink( cFile, Len( ::cEol ) ) + ENDDO + + RETURN hb_MemoWrit( cFileName, cFile ) STATIC FUNCTION rf_AINS( arr, nItem, cItem ) diff --git a/harbour/contrib/sddmy/tests/test1.prg b/harbour/contrib/sddmy/tests/test1.prg index b67fea9a71..f4006fb788 100644 --- a/harbour/contrib/sddmy/tests/test1.prg +++ b/harbour/contrib/sddmy/tests/test1.prg @@ -2,6 +2,8 @@ * $Id$ */ +#require "sddmy" + #include "dbinfo.ch" #include "error.ch" diff --git a/harbour/contrib/sddoci/tests/test1.prg b/harbour/contrib/sddoci/tests/test1.prg index 1e7b76df35..76eaf7a66a 100644 --- a/harbour/contrib/sddoci/tests/test1.prg +++ b/harbour/contrib/sddoci/tests/test1.prg @@ -2,6 +2,8 @@ * $Id$ */ +#require "sddoci" + #include "simpleio.ch" #include "hbrddsql.ch" diff --git a/harbour/contrib/sddodbc/tests/test1.prg b/harbour/contrib/sddodbc/tests/test1.prg index 0392519d00..46ae05cc8e 100644 --- a/harbour/contrib/sddodbc/tests/test1.prg +++ b/harbour/contrib/sddodbc/tests/test1.prg @@ -2,6 +2,8 @@ * $Id$ */ +#require "sddodbc" + #include "simpleio.ch" #include "hbrddsql.ch" diff --git a/harbour/contrib/sddodbc/tests/test2.prg b/harbour/contrib/sddodbc/tests/test2.prg index e0a2ddb3c9..2dd04ea23b 100644 --- a/harbour/contrib/sddodbc/tests/test2.prg +++ b/harbour/contrib/sddodbc/tests/test2.prg @@ -2,6 +2,8 @@ * $Id$ */ +#require "sddodbc" + #include "simpleio.ch" #include "hbrddsql.ch" diff --git a/harbour/src/debug/debugger.prg b/harbour/src/debug/debugger.prg index e09a078076..71dabb637f 100644 --- a/harbour/src/debug/debugger.prg +++ b/harbour/src/debug/debugger.prg @@ -126,7 +126,7 @@ PROCEDURE __dbgAltDEntry() where ALTD() was called can have no debugger info - stop on first LINE with debugged info */ - __dbgINVOKEDEBUG( Set( _SET_DEBUG ) ) + __dbgInvokeDebug( Set( _SET_DEBUG ) ) RETURN @@ -494,17 +494,17 @@ METHOD BarDisplay() CLASS HBDebugger hb_Scroll( ::nMaxRow, 0, ::nMaxRow, ::nMaxCol ) - hb_dispOutAt( ::nMaxRow, 0, "F1-Help F2-Zoom F3-Repeat F4-User F5-Go F6-WA F7-Here F8-Step F9-BkPt F10-Trace", cClrItem ) - hb_dispOutAt( ::nMaxRow, 0, "F1", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 8, "F2", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 16, "F3", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 26, "F4", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 34, "F5", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 40, "F6", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 46, "F7", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 54, "F8", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 62, "F9", cClrHotKey ) - hb_dispOutAt( ::nMaxRow, 70, "F10", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 0, "F1-Help F2-Zoom F3-Repeat F4-User F5-Go F6-WA F7-Here F8-Step F9-BkPt F10-Trace", cClrItem ) + hb_DispOutAt( ::nMaxRow, 0, "F1", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 8, "F2", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 16, "F3", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 26, "F4", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 34, "F5", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 40, "F6", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 46, "F7", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 54, "F8", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 62, "F9", cClrHotKey ) + hb_DispOutAt( ::nMaxRow, 70, "F10", cClrHotKey ) DispEnd() @@ -544,7 +544,7 @@ METHOD BuildCommandWindow() CLASS HBDebugger ::oWndCommand:bGotFocus := {|| ::oGet:SetFocus() } ::oWndCommand:bLostFocus := {|| ::oGet:KillFocus(), SetCursor( SC_NONE ) } ::oWndCommand:bKeyPressed := {| nKey | ::CommandWindowProcessKey( nKey ) } - ::oWndCommand:bPainted := {|| hb_dispOutAt( ::oWndCommand:nBottom - 1,; + ::oWndCommand:bPainted := {|| hb_DispOutAt( ::oWndCommand:nBottom - 1,; ::oWndCommand:nLeft + 1, "> ", __DbgColors()[ 2 ] ),; ::oGet:setColor( __DbgColors()[ 2 ] ):display(),; hb_ClrArea( ::oWndCommand:nTop + 1, ::oWndCommand:nLeft + 1,; @@ -713,9 +713,10 @@ METHOD Colors() CLASS HBDebugger LOCAL oWndColors := HBDbWindow():New( 4, 5, 16, ::nMaxCol - 5,; "Debugger Colors[1..11]", ::ClrModal() ) - LOCAL aColors := { "Border", "Text", "Text High", "Text PPO", "Text Selected",; - "Text High Sel.", "Text PPO Sel.", "Menu", "Menu High",; - "Menu Selected", "Menu High Sel." } + LOCAL aColors := { ; + "Border", "Text", "Text High", "Text PPO", "Text Selected",; + "Text High Sel.", "Text PPO Sel.", "Menu", "Menu High",; + "Menu Selected", "Menu High Sel." } LOCAL oBrwColors := HBDbBrowser():New( oWndColors:nTop + 1, oWndColors:nLeft + 1,; oWndColors:nBottom - 1, oWndColors:nRight - 1 ) @@ -779,7 +780,7 @@ METHOD CommandWindowProcessKey( nKey ) CLASS HBDebugger cCommand := RTrim( ::oGet:getValue() ) IF ! Empty( cCommand ) IF ( n := hb_AScan( ::aLastCommands, cCommand, , , .T. ) ) > 0 .AND. n < Len( ::aLastCommands ) - HB_ADel( ::aLastCommands, n, .T. ) + hb_ADel( ::aLastCommands, n, .T. ) ENDIF ::nCommand := Len( ::aLastCommands ) ::aLastCommands[ ::nCommand ] := cCommand @@ -788,7 +789,7 @@ METHOD CommandWindowProcessKey( nKey ) CLASS HBDebugger ::oWndCommand:ScrollUp( 1 ) ::DoCommand( cCommand ) ENDIF - hb_dispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, "> ", ; + hb_DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, "> ", ; __DbgColors()[ 2 ] ) ::oGet:setValue( "" ):display() EXIT @@ -1051,11 +1052,11 @@ METHOD DoCommand( cCommand ) CLASS HBDebugger ENDCASE IF ::lActive - hb_dispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, ; + hb_DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, ; Space( ::oWndCommand:nRight - ::oWndCommand:nLeft - 1 ), ; __DbgColors()[ 2 ] ) IF !Empty( cResult ) - hb_dispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 3, ; + hb_DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 3, ; cResult, __DbgColors()[ 2 ] ) ::oWndCommand:ScrollUp( 1 ) ENDIF @@ -1278,7 +1279,7 @@ METHOD HandleEvent() CLASS HBDebugger IF ::nSpeed != 0 Inkey( ::nSpeed / 10 ) ENDIF - IF __dbgINVOKEDEBUG() //NextKey() == K_ALT_D + IF __dbgInvokeDebug() // NextKey() == K_ALT_D ::lAnimate := .F. ELSE ::Step() @@ -1524,7 +1525,7 @@ METHOD InputBox( cMsg, uValue, bValid, lEditable ) CLASS HBDebugger ELSE - hb_dispOutAt( nTop + 1, nLeft + 1, __dbgValToStr( uValue ), "," + __DbgColors()[ 5 ] ) + hb_DispOutAt( nTop + 1, nLeft + 1, __dbgValToStr( uValue ), "," + __DbgColors()[ 5 ] ) SetPos( nTop + 1, nLeft + 1 ) lExit := .F. @@ -1652,7 +1653,7 @@ METHOD LoadCallStack() CLASS HBDebugger // a procedure with debug info ::aProcStack[ i - nDebugLevel + 1 ] := ::aCallStack[ nPos ] ELSE - ::aProcStack[ i - nDebugLevel + 1 ] := { , ProcName( i ) + "(" + hb_NToS( ProcLine( i ) ) + ")", , nLevel, , } + ::aProcStack[ i - nDebugLevel + 1 ] := { , ProcName( i ) + "(" + hb_ntos( ProcLine( i ) ) + ")", , nLevel, , } ENDIF NEXT @@ -2285,11 +2286,11 @@ METHOD SaveSettings() CLASS HBDebugger ENDIF IF ::nSpeed != 0 - cInfo += "Run Speed " + hb_NToS( ::nSpeed ) + hb_eol() + cInfo += "Run Speed " + hb_ntos( ::nSpeed ) + hb_eol() ENDIF IF ::nTabWidth != 4 - cInfo += "Options Tab " + hb_NToS( ::nTabWidth ) + hb_eol() + cInfo += "Options Tab " + hb_ntos( ::nTabWidth ) + hb_eol() ENDIF IF ::lShowStatics @@ -2326,7 +2327,7 @@ METHOD SaveSettings() CLASS HBDebugger IF ! Empty( ::aBreakPoints ) FOR n := 1 TO Len( ::aBreakPoints ) - cInfo += "BP " + hb_NToS( ::aBreakPoints[ n ][ 1 ] ) + " " + ; + cInfo += "BP " + hb_ntos( ::aBreakPoints[ n ][ 1 ] ) + " " + ; AllTrim( ::aBreakPoints[ n ][ 2 ] ) + hb_eol() NEXT ENDIF @@ -2334,10 +2335,10 @@ METHOD SaveSettings() CLASS HBDebugger /* This part of the script must be executed after all windows are created */ FOR n := 1 TO Len( ::aWindows ) oWnd := ::aWindows[ n ] - cInfo += "Window Size " + hb_NToS( oWnd:nBottom - oWnd:nTop + 1 ) + " " - cInfo += hb_NToS( oWnd:nRight - oWnd:nLeft + 1 ) + hb_eol() - cInfo += "Window Move " + hb_NToS( oWnd:nTop ) + " " - cInfo += hb_NToS( oWnd:nLeft ) + hb_eol() + cInfo += "Window Size " + hb_ntos( oWnd:nBottom - oWnd:nTop + 1 ) + " " + cInfo += hb_ntos( oWnd:nRight - oWnd:nLeft + 1 ) + hb_eol() + cInfo += "Window Move " + hb_ntos( oWnd:nTop ) + " " + cInfo += hb_ntos( oWnd:nLeft ) + hb_eol() cInfo += "Window Next" + hb_eol() NEXT @@ -2364,7 +2365,7 @@ METHOD Show() CLASS HBDebugger ::oPullDown:Display() ::oWndCode:Show( .T. ) ::oWndCommand:Show() - hb_dispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, ">" ) + hb_DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, ">" ) ::BarDisplay() @@ -2618,7 +2619,7 @@ METHOD ShowVars() CLASS HBDebugger ::oBrwVars:Cargo[ 1 ] - nOld } oCol := HBDbColumnNew( "", ; - {|| PadR( hb_NToS( ::oBrwVars:Cargo[ 1 ] - 1 ) + ") " + ; + {|| PadR( hb_ntos( ::oBrwVars:Cargo[ 1 ] - 1 ) + ") " + ; ::VarGetInfo( ::aVars[ Max( ::oBrwVars:Cargo[ 1 ], 1 ) ] ), ; ::oWndVars:nWidth() - 2 ) } ) ::oBrwVars:AddColumn( oCol ) @@ -2857,15 +2858,16 @@ METHOD ViewSets() CLASS HBDebugger LOCAL oWndSets := HBDbWindow():New( 1, 8, ::nMaxRow - 2, ::nMaxCol - 8,; "System Settings[1..47]", ::ClrModal() ) - LOCAL aSets := { "Exact", "Fixed", "Decimals", "DateFormat", "Epoch", "Path",; - "Default", "Exclusive", "SoftSeek", "Unique", "Deleted",; - "Cancel", "Debug", "TypeAhead", "Color", "Cursor", "Console",; - "Alternate", "AltFile", "Device", "Extra", "ExtraFile",; - "Printer", "PrintFile", "Margin", "Bell", "Confirm", "Escape",; - "Insert", "Exit", "Intensity", "ScoreBoard", "Delimeters",; - "DelimChars", "Wrap", "Message", "MCenter", "ScrollBreak",; - "EventMask", "VideoMode", "MBlockSize", "MFileExt",; - "StrictRead", "Optimize", "Autopen", "Autorder", "AutoShare" } + LOCAL aSets := { ; + "Exact", "Fixed", "Decimals", "DateFormat", "Epoch", "Path",; + "Default", "Exclusive", "SoftSeek", "Unique", "Deleted",; + "Cancel", "Debug", "TypeAhead", "Color", "Cursor", "Console",; + "Alternate", "AltFile", "Device", "Extra", "ExtraFile",; + "Printer", "PrintFile", "Margin", "Bell", "Confirm", "Escape",; + "Insert", "Exit", "Intensity", "ScoreBoard", "Delimeters",; + "DelimChars", "Wrap", "Message", "MCenter", "ScrollBreak",; + "EventMask", "VideoMode", "MBlockSize", "MFileExt",; + "StrictRead", "Optimize", "Autopen", "Autorder", "AutoShare" } LOCAL oBrwSets := HBDbBrowser():new( oWndSets:nTop + 1, oWndSets:nLeft + 1,; oWndSets:nBottom - 1, oWndSets:nRight - 1 ) @@ -3080,7 +3082,7 @@ METHOD WatchpointsShow() CLASS HBDebugger oCol := HBDbColumnNew( "", ; {|| PadR( iif( Len( ::aWatch ) > 0, ; - hb_NToS( ::oBrwPnt:Cargo[ 1 ] - 1 ) + ") " + ; + hb_ntos( ::oBrwPnt:Cargo[ 1 ] - 1 ) + ") " + ; ::WatchGetInfo( Max( ::oBrwPnt:Cargo[ 1 ], 1 ) ), ; " " ), ; ::oWndPnt:nWidth() - 2 ) } ) diff --git a/harbour/src/rtl/tbrowse.prg b/harbour/src/rtl/tbrowse.prg index f98b7128b0..3bb5110df0 100644 --- a/harbour/src/rtl/tbrowse.prg +++ b/harbour/src/rtl/tbrowse.prg @@ -2620,22 +2620,23 @@ METHOD setKey( nKey, bBlock ) CLASS TBROWSE {| oTBrowse, nKey | } */ IF ::keys == NIL - ::keys := { { K_DOWN , {| o | o:Down() , TBR_CONTINUE } },; - { K_END , {| o | o:End() , TBR_CONTINUE } },; - { K_CTRL_PGDN , {| o | o:GoBottom(), TBR_CONTINUE } },; - { K_CTRL_PGUP , {| o | o:GoTop() , TBR_CONTINUE } },; - { K_HOME , {| o | o:Home() , TBR_CONTINUE } },; - { K_LEFT , {| o | o:Left() , TBR_CONTINUE } },; - { K_PGDN , {| o | o:PageDown(), TBR_CONTINUE } },; - { K_PGUP , {| o | o:PageUp() , TBR_CONTINUE } },; - { K_CTRL_END , {| o | o:PanEnd() , TBR_CONTINUE } },; - { K_CTRL_HOME , {| o | o:PanHome() , TBR_CONTINUE } },; - { K_CTRL_LEFT , {| o | o:PanLeft() , TBR_CONTINUE } },; - { K_CTRL_RIGHT , {| o | o:PanRight(), TBR_CONTINUE } },; - { K_RIGHT , {| o | o:Right() , TBR_CONTINUE } },; - { K_UP , {| o | o:Up() , TBR_CONTINUE } },; - { K_ESC , {| | TBR_EXIT } },; - { K_LBUTTONDOWN, {| o | TBMouse( o, MRow(), MCol() ) } } } + ::keys := { ; + { K_DOWN , {| o | o:Down() , TBR_CONTINUE } },; + { K_END , {| o | o:End() , TBR_CONTINUE } },; + { K_CTRL_PGDN , {| o | o:GoBottom(), TBR_CONTINUE } },; + { K_CTRL_PGUP , {| o | o:GoTop() , TBR_CONTINUE } },; + { K_HOME , {| o | o:Home() , TBR_CONTINUE } },; + { K_LEFT , {| o | o:Left() , TBR_CONTINUE } },; + { K_PGDN , {| o | o:PageDown(), TBR_CONTINUE } },; + { K_PGUP , {| o | o:PageUp() , TBR_CONTINUE } },; + { K_CTRL_END , {| o | o:PanEnd() , TBR_CONTINUE } },; + { K_CTRL_HOME , {| o | o:PanHome() , TBR_CONTINUE } },; + { K_CTRL_LEFT , {| o | o:PanLeft() , TBR_CONTINUE } },; + { K_CTRL_RIGHT , {| o | o:PanRight(), TBR_CONTINUE } },; + { K_RIGHT , {| o | o:Right() , TBR_CONTINUE } },; + { K_UP , {| o | o:Up() , TBR_CONTINUE } },; + { K_ESC , {| | TBR_EXIT } },; + { K_LBUTTONDOWN, {| o | TBMouse( o, MRow(), MCol() ) } } } #ifndef HB_CLP_STRICT AAdd( ::keys, { K_MWFORWARD , {| o | o:Up() , TBR_CONTINUE } } ) diff --git a/harbour/src/vm/harbinit.prg b/harbour/src/vm/harbinit.prg index e41df4d30d..50b487d2f1 100644 --- a/harbour/src/vm/harbinit.prg +++ b/harbour/src/vm/harbinit.prg @@ -71,7 +71,7 @@ PROCEDURE CLIPPER530() * basic VM settings like public variable GetList and ErrorBlock() by * calling ErrorSys() function. */ -PROCEDURE __HBVMINIT() +PROCEDURE __HBVMInit() MEMVAR GetList diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index dbdafe35e3..1101504c45 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -1690,8 +1690,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) ENDSWITCH CASE hbmk[ _HBMK_cPLAT ] == "dos" #if ! defined( __PLATFORM__UNIX ) - aCOMPDET := { { {|| FindInPath( "gcc" ) }, "djgpp" },; - { {|| FindInPath( "wcc386" ) }, "watcom" } } + aCOMPDET := { ; + { {|| FindInPath( "gcc" ) }, "djgpp" },; + { {|| FindInPath( "wcc386" ) }, "watcom" } } #endif aCOMPSUP := { "djgpp", "gcc", "watcom" } l_aLIBHBGT := { "gtdos" } @@ -1702,8 +1703,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) cOptPrefix := "-/" CASE hbmk[ _HBMK_cPLAT ] == "os2" #if ! defined( __PLATFORM__UNIX ) - aCOMPDET := { { {|| FindInPath( "gcc" ) }, "gcc" },; - { {|| FindInPath( "wcc386" ) }, "watcom" } } + aCOMPDET := { ; + { {|| FindInPath( "gcc" ) }, "gcc" },; + { {|| FindInPath( "wcc386" ) }, "watcom" } } #endif aCOMPSUP := { "gcc", "gccomf", "watcom" } l_aLIBHBGT := { "gtos2" } @@ -1716,35 +1718,37 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) /* Order is significant. watcom also keeps a cl.exe in its binary dir. */ #if ! defined( __PLATFORM__UNIX ) - aCOMPDET := { { {|| FindInPath( "arm-mingw32ce-gcc" ) }, "mingwarm", "arm-mingw32ce-",, "wce" } ,; - { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-",, "wce" } ,; - { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "gcc",,, "cygwin" },; - { {|| FindInPath( "gcc-dw2" ) }, "mingw", "", "-dw2" },; /* tdragon DWARF-2 build */ - { {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64" },; /* Equation Solution build */ - { {|| FindInPath( "i686-w64-mingw32-gcc" ) }, "mingw64", "i686-w64-mingw32-" },; /* mingw-w64 build */ - { {|| FindInSamePath( "x86_64-w64-mingw32-gcc.exe", "gcc" ) }, "mingw64" },; /* mingw-w64 TDM build */ - { {|| FindInPath( "x86_64-w64-mingw32-gcc" ) }, "mingw64", "x86_64-w64-mingw32-" },; /* mingw-w64 build */ - { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingw" },; - { {|| iif( Empty( GetEnv( "WATCOM" ) ),; - NIL ,; - FindInPath( "wcc386" ) ) }, "watcom" },; - { {|| FindInPath( "clarm.exe" ) }, "msvcarm" },; - { {|| FindInPath( "armasm.exe" ) }, "msvcarm" },; - { {|| FindInPath( "ml64.exe" ) }, "msvc64" },; - { {|| FindInPath( "ias.exe" ) }, "msvcia64" },; - { {|| iif( FindInPath( "wcc386" ) == NIL,; - FindInPath( "cl.exe" ),; - NIL ) }, "msvc" },; - { {|| _BCC_BIN_DETECT() }, "bcc" },; - { {|| iif( FindInPath( "dbgeng.lib", GetEnv( "LIB" ) ) != NIL .AND. ( tmp1 := FindInPath( "pocc.exe" ) ) != NIL, tmp1, NIL ) }, "pocc64" },; - { {|| FindInPath( "pocc.exe" ) }, "pocc" },; - { {|| iif( ( tmp1 := FindInPath( "icl.exe" ) ) != NIL .AND. "itanium" $ Lower( tmp1 ), tmp1, NIL ) }, "iccia64" },; - { {|| FindInPath( "icl.exe" ) }, "icc" },; - { {|| FindInPath( "xCC.exe" ) }, "xcc" },; - { {|| FindInPath( "dmc.exe" ) }, "dmc" }} + aCOMPDET := { ; + { {|| FindInPath( "arm-mingw32ce-gcc" ) }, "mingwarm", "arm-mingw32ce-",, "wce" } ,; + { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-",, "wce" } ,; + { {|| FindInSamePath( "cygstart.exe", "gcc" ) }, "gcc",,, "cygwin" },; + { {|| FindInPath( "gcc-dw2" ) }, "mingw", "", "-dw2" },; /* tdragon DWARF-2 build */ + { {|| FindInPath( "x86_64-pc-mingw32-gcc" ) }, "mingw64" },; /* Equation Solution build */ + { {|| FindInPath( "i686-w64-mingw32-gcc" ) }, "mingw64", "i686-w64-mingw32-" },; /* mingw-w64 build */ + { {|| FindInSamePath( "x86_64-w64-mingw32-gcc.exe", "gcc" ) }, "mingw64" },; /* mingw-w64 TDM build */ + { {|| FindInPath( "x86_64-w64-mingw32-gcc" ) }, "mingw64", "x86_64-w64-mingw32-" },; /* mingw-w64 build */ + { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingw" },; + { {|| iif( Empty( GetEnv( "WATCOM" ) ),; + NIL ,; + FindInPath( "wcc386" ) ) }, "watcom" },; + { {|| FindInPath( "clarm.exe" ) }, "msvcarm" },; + { {|| FindInPath( "armasm.exe" ) }, "msvcarm" },; + { {|| FindInPath( "ml64.exe" ) }, "msvc64" },; + { {|| FindInPath( "ias.exe" ) }, "msvcia64" },; + { {|| iif( FindInPath( "wcc386" ) == NIL,; + FindInPath( "cl.exe" ),; + NIL ) }, "msvc" },; + { {|| _BCC_BIN_DETECT() }, "bcc" },; + { {|| iif( FindInPath( "dbgeng.lib", GetEnv( "LIB" ) ) != NIL .AND. ( tmp1 := FindInPath( "pocc.exe" ) ) != NIL, tmp1, NIL ) }, "pocc64" },; + { {|| FindInPath( "pocc.exe" ) }, "pocc" },; + { {|| iif( ( tmp1 := FindInPath( "icl.exe" ) ) != NIL .AND. "itanium" $ Lower( tmp1 ), tmp1, NIL ) }, "iccia64" },; + { {|| FindInPath( "icl.exe" ) }, "icc" },; + { {|| FindInPath( "xCC.exe" ) }, "xcc" },; + { {|| FindInPath( "dmc.exe" ) }, "dmc" }} #endif - aCOMPSUP := { "mingw", "msvc", "bcc", "watcom", "icc", "pocc", "xcc",; - "mingw64", "msvc64", "msvcia64", "iccia64", "pocc64" } + aCOMPSUP := { ; + "mingw", "msvc", "bcc", "watcom", "icc", "pocc", "xcc",; + "mingw64", "msvc64", "msvcia64", "iccia64", "pocc64" } l_aLIBHBGT := { "gtwin", "gtwvt", "gtgui" } hbmk[ _HBMK_cGTDEFAULT ] := "gtwin" hbmk[ _HBMK_cDynLibPrefix ] := "" @@ -1756,15 +1760,16 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) l_aLIBSYSMISC := { "winspool", "comctl32", "comdlg32", "shell32", "uuid", "ole32", "oleaut32", "mpr", "winmm", "mapi32", "imm32", "msimg32", "wininet" } CASE hbmk[ _HBMK_cPLAT ] == "wce" #if ! defined( __PLATFORM__UNIX ) - aCOMPDET := { { {|| FindInPath( "clarm.exe" ) }, "msvcarm" },; - { {|| FindInPath( "armasm.exe" ) }, "msvcarm" },; - { {|| FindInPath( "pocc.exe" ) }, "poccarm" },; - { {|| FindInPath( "arm-mingw32ce-gcc" ) }, "mingwarm", "arm-mingw32ce-" } ,; - { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-" } ,; - { {|| FindInPath( "i386-mingw32ce-gcc" ) }, "mingw" , "i386-mingw32ce-" } ,; - { {|| iif( ! Empty( hbmk[ _HBMK_cCCPREFIX ] ) .OR. ! Empty( hbmk[ _HBMK_cCCPOSTFIX ] ),; - FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ),; - NIL ) }, "mingwarm" } } + aCOMPDET := { ; + { {|| FindInPath( "clarm.exe" ) }, "msvcarm" },; + { {|| FindInPath( "armasm.exe" ) }, "msvcarm" },; + { {|| FindInPath( "pocc.exe" ) }, "poccarm" },; + { {|| FindInPath( "arm-mingw32ce-gcc" ) }, "mingwarm", "arm-mingw32ce-" } ,; + { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-" } ,; + { {|| FindInPath( "i386-mingw32ce-gcc" ) }, "mingw" , "i386-mingw32ce-" } ,; + { {|| iif( ! Empty( hbmk[ _HBMK_cCCPREFIX ] ) .OR. ! Empty( hbmk[ _HBMK_cCCPOSTFIX ] ),; + FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ),; + NIL ) }, "mingwarm" } } #endif aCOMPSUP := { "mingwarm", "msvcarm", "poccarm" } l_aLIBHBGT := { "gtwvt", "gtgui" } @@ -4085,8 +4090,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) DO CASE CASE _HBMODE_IS_XHB( hbmk[ _HBMK_nHBMODE ] ) /* NOTE: Newer xhb versions use "-x.y.z" version numbers. */ - l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "xharbourmt",; - "xharbour" ) } + l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "xharbourmt", "xharbour" ) } OTHERWISE l_aLIBSHARED := { cHarbourDyn + cDL_Version_Alter + hbmk_DYNSUFFIX( hbmk ) } ENDCASE @@ -5426,15 +5430,16 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) RETURN _ERRLEV_OK ENDIF - tmp := { "platform" => hbmk[ _HBMK_cPLAT ],; - "compiler" => hbmk[ _HBMK_cCOMP ],; - "cpu" => hbmk[ _HBMK_cCPU ],; - "buildname" => hbmk[ _HBMK_cBUILD ],; - "targetname" => hbmk_TARGETNAME( hbmk ),; - "targettype" => hbmk_TARGETTYPE( hbmk ),; - "dynprefix" => iif( Empty( l_cDynLibDir ), "", l_cDynLibDir + hbmk[ _HBMK_cDynLibPrefix ] ),; - "dynsuffix" => hbmk_DYNSUFFIX( hbmk ),; - "inc" => iif( hbmk[ _HBMK_lINC ], "yes", "no" ) } + tmp := { ; + "platform" => hbmk[ _HBMK_cPLAT ],; + "compiler" => hbmk[ _HBMK_cCOMP ],; + "cpu" => hbmk[ _HBMK_cCPU ],; + "buildname" => hbmk[ _HBMK_cBUILD ],; + "targetname" => hbmk_TARGETNAME( hbmk ),; + "targettype" => hbmk_TARGETTYPE( hbmk ),; + "dynprefix" => iif( Empty( l_cDynLibDir ), "", l_cDynLibDir + hbmk[ _HBMK_cDynLibPrefix ] ),; + "dynsuffix" => hbmk_DYNSUFFIX( hbmk ),; + "inc" => iif( hbmk[ _HBMK_lINC ], "yes", "no" ) } IF ! Empty( hbmk[ _HBMK_cPROGNAME ] ) tmp[ "outputname" ] := PathSepToForward( hbmk[ _HBMK_cPROGNAME ] ) @@ -7267,8 +7272,9 @@ STATIC PROCEDURE DoLinkCalc( hbmk ) ENDIF hb_FNameSplit( hbmk[ _HBMK_cPROGNAME ],, @cName, @cExt ) - tmp := { /* */ hb_PathNormalize( PathMakeAbsolute( tmp, hb_FNameDir( hbmk[ _HBMK_cPROGNAME ] ) ) ),; - /* */ hb_FNameMerge( cDir, cName, cExt ) } + tmp := { ; + /* */ hb_PathNormalize( PathMakeAbsolute( tmp, hb_FNameDir( hbmk[ _HBMK_cPROGNAME ] ) ) ),; + /* */ hb_FNameMerge( cDir, cName, cExt ) } NEXT RETURN