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

2011-02-10 23:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    * Changed to use core filename functions.
      (except hb_PathMakeAbsolute() to hb_PathJoin())

  * contrib/hbqt/hbmk2_qt.hbs
    * Changed hbmk2_*() API calls to Harbour core functions.
      If you have hbmk2 plugins, pls make these API changes:
         hbmk2_cwd()                    -> hb_cwd()
         hbmk2_PathMakeAbsolute( r, a ) -> hb_PathJoin( a, r )
         hbmk2_PathNormalize( ... )     -> hb_PathNormalize( ... )
         hbmk2_PathMakeRelative( ... )  -> hb_PathRelativize( ... )
         hbmk2_DirAddPathSep( ... )     -> hb_DirSepAdd( ... )
         hbmk2_DirDelPathSep( ... )     -> hb_DirSepDel( ... )
         hbmk2_DirBuild( ... )          -> hb_DirBuild( ... )
         hbmk2_DirUnbuild( ... )        -> hb_DirUnbuild( ... )
         hbmk2_FNameDirGet( ... )       -> hb_FNameDir( ... )
         hbmk2_FNameNameGet( ... )      -> hb_FNameName( ... )
         hbmk2_FNameNameExtGet( ... )   -> hb_FNameNameExt( ... )
         hbmk2_FNameExtGet( ... )       -> hb_FNameExt( ... )
         hbmk2_FNameExtDef( ... )       -> hb_FNameExtSetDef( ... )
         hbmk2_FNameExtSet( ... )       -> hb_FNameExtSet( ... )

  * contrib/hbide/idesaveload.prg
    ! Missed to change one function to core version in
      2011-02-10 13:33 UTC+0100.
This commit is contained in:
Viktor Szakats
2011-02-10 22:47:42 +00:00
parent 6714063f6b
commit 14ad15149a
4 changed files with 402 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
harbour/ChangeLog
View File

@@ -16,6 +16,33 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-10 23:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
* Changed to use core filename functions.
(except hb_PathMakeAbsolute() to hb_PathJoin())
* contrib/hbqt/hbmk2_qt.hbs
* Changed hbmk2_*() API calls to Harbour core functions.
If you have hbmk2 plugins, pls make these API changes:
hbmk2_cwd() -> hb_cwd()
hbmk2_PathMakeAbsolute( r, a ) -> hb_PathJoin( a, r )
hbmk2_PathNormalize( ... ) -> hb_PathNormalize( ... )
hbmk2_PathMakeRelative( ... ) -> hb_PathRelativize( ... )
hbmk2_DirAddPathSep( ... ) -> hb_DirSepAdd( ... )
hbmk2_DirDelPathSep( ... ) -> hb_DirSepDel( ... )
hbmk2_DirBuild( ... ) -> hb_DirBuild( ... )
hbmk2_DirUnbuild( ... ) -> hb_DirUnbuild( ... )
hbmk2_FNameDirGet( ... ) -> hb_FNameDir( ... )
hbmk2_FNameNameGet( ... ) -> hb_FNameName( ... )
hbmk2_FNameNameExtGet( ... ) -> hb_FNameNameExt( ... )
hbmk2_FNameExtGet( ... ) -> hb_FNameExt( ... )
hbmk2_FNameExtDef( ... ) -> hb_FNameExtSetDef( ... )
hbmk2_FNameExtSet( ... ) -> hb_FNameExtSet( ... )
* contrib/hbide/idesaveload.prg
! Missed to change one function to core version in
2011-02-10 13:33 UTC+0100.
2011-02-10 21:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* package/harbour.spec
* Deleted reference to harbourmt.
@@ -66,7 +93,7 @@
* utils/hbmk2/hbmk2.prg
+ REQUESTing new filename handling function till they are
used in hbmk2 too.
; TODO: Make the switch in hbmk2 too.
; TODO: Make the switch in hbmk2 too. [DONE]
2011-02-10 12:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmysql/hbmysql.hbc

6
harbour/contrib/hbide/idesaveload.prg
View File

@@ -767,11 +767,11 @@ FUNCTION hbide_getIniPath( cHbideIni )
IF empty( cHbideIni )
IF ! hb_FileExists( cIni := hb_dirBase() + "hbide.ini" )
#if defined( __PLATFORM__WINDOWS )
cPath := hbide_DirAddPathSep( GetEnv( "APPDATA" ) ) + "hbide\"
cPath := hb_DirSepAdd( GetEnv( "APPDATA" ) ) + "hbide\"
#elif defined( __PLATFORM__UNIX )
cPath := hbide_DirAddPathSep( GetEnv( "HOME" ) ) + ".hbide/"
cPath := hb_DirSepAdd( GetEnv( "HOME" ) ) + ".hbide/"
#elif defined( __PLATFORM__OS2 )
cPath := hbide_DirAddPathSep( GetEnv( "HOME" ) ) + ".hbide/"
cPath := hb_DirSepAdd( GetEnv( "HOME" ) ) + ".hbide/"
#endif
IF ! hb_dirExists( cPath )
hb_DirCreate( cPath )

26
harbour/contrib/hbqt/hbmk2_qt.hbs
View File

@@ -90,7 +90,7 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
hbmk2[ "vars" ][ "qthdocdir" ] := SubStr( cSrc, Len( "-qthdocdir=" ) + 1 )
ENDCASE
ELSE
SWITCH Lower( hbmk2_FNameExtGet( cSrc ) )
SWITCH Lower( hb_FNameExt( cSrc ) )
CASE ".qrc"
AAdd( hbmk2[ "vars" ][ "aQRC_Src" ], cSrc )
EXIT
@@ -113,23 +113,23 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
hbmk2[ "vars" ][ "aQRC_Dst" ] := {}
hbmk2[ "vars" ][ "aQRC_PRG" ] := {}
FOR EACH cSrc IN hbmk2[ "vars" ][ "aQRC_Src" ]
cDst := hbmk2_FNameDirExtSet( "rcc_" + hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".qrb" )
cDst := hbmk2_FNameDirExtSet( "rcc_" + hb_FNameName( cSrc ), hbmk2[ "cWorkDir" ], ".qrb" )
AAdd( hbmk2[ "vars" ][ "aQRC_Dst" ], cDst )
cDst := hbmk2_FNameDirExtSet( "rcc_" + hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".prg" )
cDst := hbmk2_FNameDirExtSet( "rcc_" + hb_FNameName( cSrc ), hbmk2[ "cWorkDir" ], ".prg" )
AAdd( hbmk2[ "vars" ][ "aQRC_PRG" ], cDst )
hbmk2_AddInput_PRG( hbmk2, cDst )
NEXT
hbmk2[ "vars" ][ "aUIC_Dst" ] := {}
FOR EACH cSrc IN hbmk2[ "vars" ][ "aUIC_Src" ]
cDst := hbmk2_FNameDirExtSet( "uic_" + hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".prg" )
cDst := hbmk2_FNameDirExtSet( "uic_" + hb_FNameName( cSrc ), hbmk2[ "cWorkDir" ], ".prg" )
AAdd( hbmk2[ "vars" ][ "aUIC_Dst" ], cDst )
hbmk2_AddInput_PRG( hbmk2, cDst )
NEXT
hbmk2[ "vars" ][ "aMOC_Dst" ] := {}
FOR EACH cSrc IN hbmk2[ "vars" ][ "aMOC_Src" ]
cDst := hbmk2_FNameDirExtSet( "moc_" + hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".cpp" )
cDst := hbmk2_FNameDirExtSet( "moc_" + hb_FNameName( cSrc ), hbmk2[ "cWorkDir" ], ".cpp" )
AAdd( hbmk2[ "vars" ][ "aMOC_Dst" ], cDst )
hbmk2_AddInput_CPP( hbmk2, cDst )
NEXT
@@ -138,13 +138,13 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
hbmk2[ "vars" ][ "aQTH_PRG" ] := {}
hbmk2[ "vars" ][ "aQTH_DOC" ] := {}
FOR EACH cSrc IN hbmk2[ "vars" ][ "aQTH_Src" ]
cDst := hbmk2_FNameDirExtSet( hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".cpp" )
cDst := hbmk2_FNameDirExtSet( hb_FNameName( cSrc ), hbmk2[ "cWorkDir" ], ".cpp" )
AAdd( hbmk2[ "vars" ][ "aQTH_CPP" ], cDst )
hbmk2_AddInput_CPP( hbmk2, cDst )
cDst := hbmk2_FNameDirExtSet( "T" + hbmk2_FNameNameGet( cSrc ), hbmk2[ "cWorkDir" ], ".prg" )
cDst := hbmk2_FNameDirExtSet( "T" + hb_FNameName( cSrc ), hbmk2[ "cWorkDir" ], ".prg" )
AAdd( hbmk2[ "vars" ][ "aQTH_PRG" ], cDst )
hbmk2_AddInput_PRG( hbmk2, cDst )
cDst := hbmk2_PathNormalize( hbmk2_FNameDirExtSet( "class_" + Lower( hbmk2_FNameNameGet( cSrc ) ), hbmk2_FNameDirGet( cSrc ) + hbmk2[ "vars" ][ "qthdocdir" ] + "en" + hb_ps(), ".txt" ) )
cDst := hb_PathNormalize( hbmk2_FNameDirExtSet( "class_" + Lower( hb_FNameName( cSrc ) ), hb_FNameDir( cSrc ) + hbmk2[ "vars" ][ "qthdocdir" ] + "en" + hb_ps(), ".txt" ) )
AAdd( hbmk2[ "vars" ][ "aQTH_DOC" ], cDst )
NEXT
@@ -222,8 +222,8 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
hb_eol() +;
"#pragma -km+" + hb_eol() +;
hb_eol() +;
"FUNCTION hbqtres_" + hbmk2_FNameToSymbol( hbmk2_FNameNameGet( cSrc ) ) + "()" + hb_eol() +;
" #pragma __binarystreaminclude " + Chr( 34 ) + hbmk2_FNameNameExtGet( cDst ) + Chr( 34 ) + "|RETURN %s" + hb_eol()
"FUNCTION hbqtres_" + hbmk2_FNameToSymbol( hb_FNameName( cSrc ) ) + "()" + hb_eol() +;
" #pragma __binarystreaminclude " + Chr( 34 ) + hb_FNameNameExt( cDst ) + Chr( 34 ) + "|RETURN %s" + hb_eol()
IF ! hb_MemoWrit( cPRG, cTmp )
hbmk2_OutErr( hbmk2, hb_StrFormat( "Error: Cannot create file: %1$s", cPRG ) )
@@ -283,7 +283,7 @@ FUNCTION hbmk2_plugin_qt( hbmk2 )
EXIT
ENDIF
ELSE
IF ! uic_to_prg( hbmk2, cTmp, cDst, hbmk2_FNameToSymbol( hbmk2_FNameNameGet( cSrc ) ) )
IF ! uic_to_prg( hbmk2, cTmp, cDst, hbmk2_FNameToSymbol( hb_FNameName( cSrc ) ) )
IF ! hbmk2[ "lIGNOREERROR" ]
FErase( cTmp )
cRetVal := "error"
@@ -436,13 +436,13 @@ STATIC FUNCTION qt_tool_detect( hbmk2, cName, cEnvQT, lPostfix )
/* Return silently. It shall fail at dependency detection inside hbmk2 */
RETURN NIL
ELSE
IF ! hb_FileExists( cBIN := hbmk2_PathNormalize( GetEnv( "HB_WITH_QT" ) + "\..\bin\" + cName + ".exe" ) )
IF ! hb_FileExists( cBIN := hb_PathNormalize( GetEnv( "HB_WITH_QT" ) + "\..\bin\" + cName + ".exe" ) )
hbmk2_OutErr( hbmk2, hb_StrFormat( "Warning: HB_WITH_QT points to incomplete QT installation. '%1$s' executable not found.", cName ) )
cBIN := ""
ENDIF
ENDIF
ELSE
cBIN := hbmk2_DirAddPathSep( hb_DirBase() ) + cName + ".exe"
cBIN := hb_DirSepAdd( hb_DirBase() ) + cName + ".exe"
IF ! hb_FileExists( cBIN )
cBIN := ""
ENDIF

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

File diff suppressed because it is too large Load Diff