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

2010-06-29 21:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Addeded support for specifying dependencies in .hbc files.

  * contrib/hbide/hbide.hbp
  * contrib/hbqt/hbqt.hbc
    * Moved qt dependency specification from local make file to
      central hbqt.hbc.

  * INSTALL
  * contrib/hbqt/hbmk2_plugin_qt.prg
    ! Minor correction to compile to hbmk2 plugin .hrb if compiled
      with harbour.
    + Added support for HB_QTPATH, HB_QTPOSTFIX envvars. This is
      now the recommended way to override QT tools autodetection.
      Kept HB_QT_MOC_BIN for compatibility. Deprecated.
      (just added support for HB_QT_UIC_BIN, HB_QT_RCC_BIN removed)
    - Deleted hardcoded hack to look for '-qt4' postfix when looking
      for QT tools. Now it's QT version agnostic. Use HB_QTPOSTFIX instead.
    ! Fixed deleting temp .uic file in stdalone mode.
    + Added -w3 pragma.
This commit is contained in:
Viktor Szakats
2010-06-29 19:06:27 +00:00
parent 031c55a801
commit 91f6641a51
6 changed files with 125 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7783,6 +7783,54 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
ENDIF
ENDIF
CASE Lower( Left( cLine, Len( "deppkgname=" ) ) ) == "deppkgname=" ; cLine := SubStr( cLine, Len( "deppkgname=" ) + 1 )
IF dep_split_arg( hbmk, cLine, @cLine, @tmp )
tmp := MacroProc( hbmk, tmp, cFileName )
AAddNewNotEmpty( hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_aPKG ], StrStripQuote( AllTrim( tmp ) ) )
ENDIF
CASE Lower( Left( cLine, Len( "depkeyhead=" ) ) ) == "depkeyhead=" ; cLine := SubStr( cLine, Len( "depkeyhead=" ) + 1 )
IF dep_split_arg( hbmk, cLine, @cLine, @tmp )
FOR EACH cItem IN hb_ATokens( tmp,, .T. )
AAddNewNotEmpty( hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_aKeyHeader ], AllTrim( StrTran( MacroProc( hbmk, cItem, cFileName ), "\", "/" ) ) )
NEXT
ENDIF
CASE Lower( Left( cLine, Len( "depoptional=" ) ) ) == "depoptional=" ; cLine := SubStr( cLine, Len( "depoptional=" ) + 1 )
IF dep_split_arg( hbmk, cLine, @cLine, @tmp )
tmp := MacroProc( hbmk, tmp, cFileName )
DO CASE
CASE Lower( tmp ) == "yes" ; hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_lOptional ] := .T.
CASE Lower( tmp ) == "no" ; hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_lOptional ] := .F.
ENDCASE
ENDIF
CASE Lower( Left( cLine, Len( "depcontrol=" ) ) ) == "depcontrol=" ; cLine := SubStr( cLine, Len( "depcontrol=" ) + 1 )
IF dep_split_arg( hbmk, cLine, @cLine, @tmp )
hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_cControl ] := AllTrim( MacroProc( hbmk, tmp, cFileName ) )
AAddNew( hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_aINCPATH ], _HBMK_DEP_CTRL_MARKER )
ENDIF
CASE Lower( Left( cLine, Len( "depincpath=" ) ) ) == "depincpath=" ; cLine := SubStr( cLine, Len( "depincpath=" ) + 1 )
IF dep_split_arg( hbmk, cLine, @cLine, @tmp )
FOR EACH cItem IN hb_ATokens( tmp,, .T. )
AAddNewNotEmpty( hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_aINCPATH ], PathNormalize( PathProc( PathSepToSelf( MacroProc( hbmk, cItem, cFileName ) ), FN_DirGet( cFileName ) ) ) )
NEXT
ENDIF
CASE Lower( Left( cLine, Len( "depincpathlocal=" ) ) ) == "depincpathlocal=" ; cLine := SubStr( cLine, Len( "depincpathlocal=" ) + 1 )
IF dep_split_arg( hbmk, cLine, @cLine, @tmp )
FOR EACH cItem IN hb_ATokens( tmp,, .T. )
AAddNewNotEmpty( hbmk[ _HBMK_hDEP ][ cLine ][ _HBMKDEP_aINCPATHLOCAL ], PathNormalize( PathProc( PathSepToSelf( MacroProc( hbmk, cItem, cFileName ) ), FN_DirGet( cFileName ) ) ) )
NEXT
ENDIF
/* .hbc identification strings. Similar to pkgconfig ones. */
CASE Lower( Left( cLine, Len( "name=" ) ) ) == "name=" ; cLine := SubStr( cLine, Len( "name=" ) + 1 )