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

2011-01-28 21:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.hu_HU.po
    ! Minor fix.

  * utils/hbmk2/hbmk2.prg
    ! Resolved TOFIXes related to cygwin.
    + Added -head=dep option. Nothing fancy, just making room for it.
This commit is contained in:
Viktor Szakats
2011-01-28 20:42:09 +00:00
parent f07d02c3a0
commit f000df1353
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-28 21:41 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.hu_HU.po
! Minor fix.
* utils/hbmk2/hbmk2.prg
! Resolved TOFIXes related to cygwin.
+ Added -head=dep option. Nothing fancy, just making room for it.
2011-01-28 11:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Changed to use hb_milliSeconds() to measure build time

2
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

@@ -235,7 +235,7 @@ msgstr ".xhp (xMate) project állomány konvertálása .hbp állományba"
#: hbmk2.prg:7959 hbmk2.prg:11650
#, c-format
msgid "Options can also be specified in environment variable %1$s"
msgstr "A kapcsolók megadhatók %1$s környezeti változóban is"
msgstr "A kapcsolók megadhatók %1$s környezeti változóban is."
#: hbmk2.prg:7941 hbmk2.prg:11633
#, c-format

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

@@ -183,6 +183,7 @@ REQUEST hbmk_KEYW
#define _HEAD_OFF 0
#define _HEAD_FULL 1
#define _HEAD_NATIVE 2
#define _HEAD_DEP 3
#define _COMPDET_bBlock 1
#define _COMPDET_cCOMP 2
@@ -2208,6 +2209,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
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
CASE SubStr( cParamL, 7 ) == "dep" ; hbmk[ _HBMK_nHEAD ] := _HEAD_DEP
OTHERWISE ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL
ENDCASE
@@ -5005,7 +5007,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
"LNK4217: locally defined symbol ... imported in function ..."
if using 'dllimport'. [vszakats] */
tmp := ""
CASE HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|cygwin" ) /* TOFIX: cygwin is now a platform */
CASE HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm" )
tmp := "__attribute__ (( dllimport ))"
CASE HBMK_ISCOMP( "bcc|watcom" )
tmp := "__declspec( dllimport )"
@@ -6698,7 +6700,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com
cExt := Lower( FNameExtGet( cFileName ) )
/* Filter out non-source format inputs for MinGW / windres */
IF HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|cygwin" ) .AND. HBMK_ISPLAT( "win|wce" ) .AND. cExt == ".res" /* TOFIX: cygwin is now a platform */
IF HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm" ) .AND. HBMK_ISPLAT( "win|wce" ) .AND. cExt == ".res"
RETURN .F.
ENDIF
@@ -6756,7 +6758,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com
ENDIF
NEXT
ELSEIF lCMode .AND. hbmk[ _HBMK_nHEAD ] == _HEAD_NATIVE .AND. HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|cygwin|djgpp|gccomf|clang|open64" ) /* TOFIX: cygwin is now a platform */
ELSEIF lCMode .AND. hbmk[ _HBMK_nHEAD ] == _HEAD_NATIVE .AND. HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|djgpp|gccomf|clang|open64" )
IF hbmk[ _HBMK_lDEBUGINC ]
hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: Calling C/C++ compiler to detect dependencies of %1$s", cFileName ) )
@@ -8526,7 +8528,7 @@ STATIC FUNCTION PathSepToTarget( hbmk, cFileName, nStart )
nStart := 1
ENDIF
IF HBMK_ISPLAT( "win|wce|dos|os2" ) .AND. ! HBMK_ISCOMP( "mingw|mingw64|mingwarm|cygwin" ) /* TOFIX: cygwin is now a platform */
IF HBMK_ISPLAT( "win|wce|dos|os2" ) .AND. ! HBMK_ISCOMP( "mingw|mingw64|mingwarm" )
RETURN Left( cFileName, nStart - 1 ) + StrTran( SubStr( cFileName, nStart ), "/", "\" )
ENDIF
@@ -9219,6 +9221,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
CASE Lower( cLine ) == "off" ; hbmk[ _HBMK_nHEAD ] := _HEAD_OFF
CASE Lower( cLine ) == "full" ; hbmk[ _HBMK_nHEAD ] := _HEAD_FULL
CASE Lower( cLine ) == "native" ; hbmk[ _HBMK_nHEAD ] := _HEAD_NATIVE
CASE Lower( cLine ) == "dep" ; hbmk[ _HBMK_nHEAD ] := _HEAD_DEP
ENDCASE
CASE Lower( Left( cLine, Len( "run=" ) ) ) == "run=" ; cLine := SubStr( cLine, Len( "run=" ) + 1 )
@@ -9742,7 +9745,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile )
LOCAL cFuncList, cExecNM, cFuncName, cExt, cLine, n, c
cFuncName := ""
IF HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|cygwin|gccomf" ) /* TOFIX: cygwin is now a platform */
IF HBMK_ISCOMP( "gcc|mingw|mingw64|mingwarm|gccomf" )
hb_FNameSplit( cFile,,, @cExt )
IF cExt == ".c"
FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) )