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

2010-07-08 11:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* bin/hbxpatch.hbs
  * utils/hbmk2/hbmk2.prg
  * contrib/make.hbs
  * config/postinst.hbs
  * contrib/hbide/idemisc.prg
  * contrib/hbide/idefunctions.prg
    * hbmk2 rooted filename/path handling functions renamed.
      Now they are in sync with hbmk2_*() (plugin) flavour.
      With their new names they could even be included in core,
      by adding an hb_ prefix to them.
    * Renamed one internal constant in hbmk2.

  * contrib/hbide/idemisc.prg
    - Deleted unused hbmk2 function.
This commit is contained in:
Viktor Szakats
2010-07-08 09:57:52 +00:00
parent f673cc2124
commit 408c49807b
7 changed files with 366 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -15,6 +15,23 @@
under different terms, please contact respective author(s).
The license applies to all entries newer than 2009-04-28.
*/
2010-07-08 11:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/hbxpatch.hbs
* utils/hbmk2/hbmk2.prg
* contrib/make.hbs
* config/postinst.hbs
* contrib/hbide/idemisc.prg
* contrib/hbide/idefunctions.prg
* hbmk2 rooted filename/path handling functions renamed.
Now they are in sync with hbmk2_*() (plugin) flavour.
With their new names they could even be included in core,
by adding an hb_ prefix to them.
* Renamed one internal constant in hbmk2.
* contrib/hbide/idemisc.prg
- Deleted unused hbmk2 function.
2010-07-08 10:32 UTC+0200 Jacek Kubica (kubica@wssk.wroc.pl)
* contrib/hbmysql/tmysql.prg
! Fixed: variable name problem from previous commit.

30
harbour/bin/hbxpatch.hbs
View File

@@ -341,8 +341,8 @@ PROCEDURE Main( ... )
aRegexMatch[ TWOARG_ARG1 ] := StrTran( aRegexMatch[ TWOARG_ARG1 ], "/", hb_ps() )
ENDIF
/* The destination argument must fit in the 8+3 scheme */
IF Len( FN_NameGet( aRegexMatch[ TWOARG_ARG2 ] ) ) > 8 .OR. ;
Len( FN_ExtGet( aRegexMatch[ TWOARG_ARG2 ] ) ) > 3
IF Len( FNameNameGet( aRegexMatch[ TWOARG_ARG2 ] ) ) > 8 .OR. ;
Len( FNameExtGet( aRegexMatch[ TWOARG_ARG2 ] ) ) > 3
OutStd( hb_strFormat( "E: Destination does not fit 8+3, offending "+ ;
"line %d:%s", nMemoLine, hb_eol() ) )
OutStd( aRegexMatch[ 1 ] + hb_eol() )
@@ -392,11 +392,11 @@ PROCEDURE Main( ... )
cRoot := cCWD + hb_ps()
#endif
FClose( hb_FTempCreateEx( @s_cTempDir, cRoot, FN_NameGet( hb_ProgName() ) + "_" ) )
FClose( hb_FTempCreateEx( @s_cTempDir, cRoot, FNameNameGet( hb_ProgName() ) + "_" ) )
FErase( s_cTempDir )
MakeDir( s_cTempDir )
cThisComponent := FN_NameGet( cCWD )
cThisComponent := FNameNameGet( cCWD )
MakeDir( CombinePath( s_cTempDir, cThisComponent ) )
MakeDir( CombinePath( s_cTempDir, cThisComponent + ".orig" ) )
@@ -678,13 +678,13 @@ STATIC FUNCTION FetchAndExtract( cArchiveURL )
IF cArchiver == NIL
OutStd( "E: Can not find archiver for `" + ;
FN_NameExtGet( cArchiveURL ) + "'" + hb_eol() )
FNameNameExtGet( cArchiveURL ) + "'" + hb_eol() )
RETURN .F.
ELSE
/* Fetch */
cCommand := hb_strFormat( "%s -L -# -o %s %s", s_aTools[ "curl" ], ;
CombinePath( s_cTempDir, cFileName ), ;
FN_Escape( cArchiveURL ) )
FNameEscape( cArchiveURL ) )
TRACE( "Running " + cCommand )
nResult := hb_processRun( cCommand, , , @cStdErr, .F. )
SaveLog( "fetch", cStdOut, cStdErr )
@@ -725,7 +725,7 @@ STATIC FUNCTION FetchAndExtract( cArchiveURL )
RETURN .T.
PROCEDURE SaveLog( cFNTemplate, cStdOut, cStdErr )
STATIC PROCEDURE SaveLog( cFNTemplate, cStdOut, cStdErr )
LOCAL nLogFD
@@ -743,9 +743,9 @@ PROCEDURE SaveLog( cFNTemplate, cStdOut, cStdErr )
RETURN
PROCEDURE Usage( nExitVal )
STATIC PROCEDURE Usage( nExitVal )
OutStd( "Usage: " + FN_NameExtGet( hb_ProgName() ) + " [-h|-help|-rediff]" + hb_eol() )
OutStd( "Usage: " + FNameNameExtGet( hb_ProgName() ) + " [-h|-help|-rediff]" + hb_eol() )
OutStd( " Documentation is provided in the source code." + hb_eol() )
ErrorLevel( nExitVal )
QUIT
@@ -754,7 +754,7 @@ PROCEDURE Usage( nExitVal )
/* from hbmk2 */
STATIC FUNCTION FN_DirGet( cFileName )
STATIC FUNCTION FNameDirGet( cFileName )
LOCAL cDir
@@ -762,7 +762,7 @@ STATIC FUNCTION FN_DirGet( cFileName )
RETURN cDir
STATIC FUNCTION FN_NameGet( cFileName )
STATIC FUNCTION FNameNameGet( cFileName )
LOCAL cName
@@ -770,7 +770,7 @@ STATIC FUNCTION FN_NameGet( cFileName )
RETURN cName
STATIC FUNCTION FN_NameExtGet( cFileName )
STATIC FUNCTION FNameNameExtGet( cFileName )
LOCAL cName, cExt
@@ -778,7 +778,7 @@ STATIC FUNCTION FN_NameExtGet( cFileName )
RETURN hb_FNameMerge( NIL, cName, cExt )
STATIC FUNCTION FN_ExtGet( cFileName )
STATIC FUNCTION FNameExtGet( cFileName )
LOCAL cExt
@@ -831,7 +831,7 @@ STATIC FUNCTION hb_FileTran( cFileName )
/* This is a shot in the dark. Haru works with this transform,
* but other components may very well need different handling. */
cChangeFrom := FN_NameExtGet( aChange[ 1 ] )
cChangeFrom := FNameNameExtGet( aChange[ 1 ] )
cChangeTo := aChange[ 2 ]
/* Local-style includes */
@@ -848,7 +848,7 @@ STATIC FUNCTION hb_FileTran( cFileName )
RETURN hb_MemoWrit( cFileName, cTransformedContent )
STATIC FUNCTION FN_Escape( cFileName )
STATIC FUNCTION FNameEscape( cFileName )
#if defined( __PLATFORM__UNIX )
RETURN cFileName
#else

12
harbour/config/postinst.hbs
View File

@@ -98,7 +98,7 @@ PROCEDURE Main()
IF "D" $ tmp[ F_ATTR ] .AND. !( tmp[ F_NAME ] == "." ) .AND. !( tmp[ F_NAME ] == ".." )
FOR EACH aFile IN Directory( "utils" + hb_ps() + tmp[ F_NAME ] + hb_ps() + "*.po" )
mk_hbl( PathSepToSelf( "utils" + hb_ps() + tmp[ F_NAME ] + hb_ps() + aFile[ F_NAME ] ),;
PathSepToSelf( GetEnv( "HB_BIN_INSTALL" ) ) + hb_ps() + FN_ExtSet( aFile[ F_NAME ], ".hbl" ) )
PathSepToSelf( GetEnv( "HB_BIN_INSTALL" ) ) + hb_ps() + FNameExtSet( aFile[ F_NAME ], ".hbl" ) )
NEXT
ENDIF
NEXT
@@ -127,8 +127,8 @@ PROCEDURE Main()
mk_hb_processRun( PathSepToSelf( GetEnv( "HB_DIR_ZIP" ) ) + "zip" +;
" -q -9 -X -r -o" +;
" " + FN_Escape( tmp ) +;
" . -i " + FN_Escape( GetEnv( "HB_PKGNAME" ) + hb_ps() + "*" ) +;
" " + FNameEscape( tmp ) +;
" . -i " + FNameEscape( GetEnv( "HB_PKGNAME" ) + hb_ps() + "*" ) +;
" -x *.tds -x *.exp" )
DirChange( cOldDir )
@@ -141,7 +141,7 @@ PROCEDURE Main()
mk_hb_processRun( PathSepToSelf( GetEnv( "HB_DIR_NSIS" ) ) + "makensis.exe" +;
" -V2" +;
" " + FN_Escape( StrTran( "package/mpkg_win.nsi", "/", hb_ps() ) ) )
" " + FNameEscape( StrTran( "package/mpkg_win.nsi", "/", hb_ps() ) ) )
ENDIF
ENDIF
@@ -173,10 +173,10 @@ STATIC FUNCTION mk_hb_processRun( cCommand )
RETURN hb_processRun( cCommand )
STATIC FUNCTION FN_Escape( cFN )
STATIC FUNCTION FNameEscape( cFN )
RETURN Chr( 34 ) + cFN + Chr( 34 )
STATIC FUNCTION FN_ExtSet( cFileName, cExt )
STATIC FUNCTION FNameExtSet( cFileName, cExt )
LOCAL cDir, cName
hb_FNameSplit( cFileName, @cDir, @cName )

4
harbour/contrib/hbide/idefunctions.prg
View File

@@ -449,7 +449,7 @@ METHOD IdeFunctions:loadTags( aProjects )
FOR EACH cProjectTitle IN a_
cProjFile := ::oPM:getProjectFileNameFromTitle( cProjectTitle )
IF ! empty( cProjFile ) .AND. hb_fileExists( cProjFile )
cTagFile := FN_ExtSet( cProjFile, ".tag" )
cTagFile := FNameExtSet( cProjFile, ".tag" )
IF hb_fileExists( cTagFile )
lPopulate := .t.
@@ -546,7 +546,7 @@ METHOD IdeFunctions:tagProject( cProjectTitle )
::aTags[ n, 2 ] := aCTags
ENDIF
hb_memowrit( FN_ExtSet( cProjFile, ".tag" ), hb_serialize( aCTags ) )
hb_memowrit( FNameExtSet( cProjFile, ".tag" ), hb_serialize( aCTags ) )
::consolidateList()
::populateTable()

54
harbour/contrib/hbide/idemisc.prg
View File

@@ -1800,65 +1800,13 @@ FUNCTION hbide_imageForFileType( cType )
/*----------------------------------------------------------------------*/
/* Borrowed from hbmk2.prg - thanks Viktor */
FUNCTION FN_DirGet( cFileName )
LOCAL cDir
hb_FNameSplit( cFileName, @cDir )
RETURN cDir
FUNCTION FN_NameGet( cFileName )
LOCAL cName
hb_FNameSplit( cFileName,, @cName )
RETURN cName
FUNCTION FN_NameExtGet( cFileName )
LOCAL cName, cExt
hb_FNameSplit( cFileName,, @cName, @cExt )
RETURN hb_FNameMerge( NIL, cName, cExt )
FUNCTION FN_ExtGet( cFileName )
LOCAL cExt
hb_FNameSplit( cFileName,,, @cExt )
RETURN cExt
FUNCTION FN_ExtDef( cFileName, cDefExt )
LOCAL cDir, cName, cExt
hb_FNameSplit( cFileName, @cDir, @cName, @cExt )
IF Empty( cExt )
cExt := cDefExt
ENDIF
RETURN hb_FNameMerge( cDir, cName, cExt )
FUNCTION FN_ExtSet( cFileName, cExt )
FUNCTION FNameExtSet( cFileName, cExt )
LOCAL cDir, cName
hb_FNameSplit( cFileName, @cDir, @cName )
RETURN hb_FNameMerge( cDir, cName, cExt )
FUNCTION FN_DirExtSet( cFileName, cDirNew, cExtNew )
LOCAL cDir, cName, cExt
hb_FNameSplit( cFileName, @cDir, @cName, @cExt )
IF cDirNew != NIL
cDir := cDirNew
ENDIF
IF cExtNew != NIL
cExt := cExtNew
ENDIF
RETURN hb_FNameMerge( cDir, cName, cExt )
/*----------------------------------------------------------------------*/
FUNCTION hbide_array2string( a_, cDlm )

18
harbour/contrib/make.hbs
View File

@@ -18,6 +18,12 @@
(move hbmk2 to core lib?)
5. gnumake mode: automatically decide about build order,
based on dependencies (implibs -> libs[TODO!] -> exes)
6. HB_CONTRIBLIBS -> HB_CONTRIBS (not only libs anymore)
7. Move in external libs to contrib area? (bz2, minizip, sqlite3)
8. Pull the list of .hbp files from an external file
(so it can be used in stdalone mode, and the script can be
moved to bin and used in more generic way f.e. for examples
and local projects)
*/
#pragma warninglevel=3
@@ -135,7 +141,7 @@ PROCEDURE StandAlone( ... )
FOR EACH cProject IN aLibs
cType := hbmk2_project_type( cBase + cProject )
cType := get_hbmk2_project_type( cBase + cProject )
cProject := StrTran( cProject, "\", "/" )
@@ -453,7 +459,7 @@ PROCEDURE GNUMake( ... )
IF ! Empty( cProject )
cType := hbmk2_project_type( cBase + cProject )
cType := get_hbmk2_project_type( cBase + cProject )
cProject := StrTran( cProject, "\", "/" )
@@ -520,13 +526,13 @@ PROCEDURE GNUMake( ... )
/* Highly experimental */
IF cType == "hblib" .AND. GetEnv( "HB_BUILD_CONTRIB_DLL" ) == "yes" .AND. ;
hb_FileExists( FN_ExtSet( cBase + cProject, ".hbc" ) )
hb_FileExists( FNameExtSet( cBase + cProject, ".hbc" ) )
cInstallDirVar := "_HB_DYN_INSTALL"
cOptionsPre := cBaseOptions
/* TOFIX: Add -implib option. It collides with static lib so needs to be resolved. */
cOptionsPost := " -hbdyn -nohblib- " + FN_ExtSet( cProject, ".hbc" )
cOptionsPost := " -hbdyn -nohblib- " + FNameExtSet( cProject, ".hbc" )
IF nAction == _ACT_CLEAN
cOptionsPre += " -clean"
@@ -589,7 +595,7 @@ STATIC FUNCTION mk_hb_processRun( cCommand )
RETURN iif( s_lTest, 0, hb_processRun( cCommand ) )
STATIC FUNCTION hbmk2_project_type( cFileName )
STATIC FUNCTION get_hbmk2_project_type( cFileName )
LOCAL cFile := MemoRead( cFileName )
IF "-hblib" $ cFile ; RETURN "hblib"
@@ -600,7 +606,7 @@ STATIC FUNCTION hbmk2_project_type( cFileName )
RETURN "hbexe"
STATIC FUNCTION FN_ExtSet( cFileName, cExt )
STATIC FUNCTION FNameExtSet( cFileName, cExt )
LOCAL cDir, cName
hb_FNameSplit( cFileName, @cDir, @cName )

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

File diff suppressed because it is too large Load Diff