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

2025-10-16 22:04 UTC+0200 Aleksander Czajczynski (hb fki.pl)

Browse Source 
* utils/hbmk2/hbmk2.prg
    * remaining LEFTEQUAL() changed to hb_LeftEq() calls
    - removed LEFTEQUAL() macro
This commit is contained in:
Aleksander Czajczynski
2025-10-16 22:04:38 +02:00
parent 2818e4a4fb
commit 1465b9cc53
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@@ -7,6 +7,11 @@
Entries may not always be in chronological/commit order. Entries may not always be in chronological/commit order.
See license at the end of file. */ See license at the end of file. */
2025-10-16 22:04 UTC+0200 Aleksander Czajczynski (hb fki.pl)
* utils/hbmk2/hbmk2.prg
* remaining LEFTEQUAL() changed to hb_LeftEq() calls
- removed LEFTEQUAL() macro
2025-10-16 21:40 UTC+0200 Aleksander Czajczynski (hb fki.pl) 2025-10-16 21:40 UTC+0200 Aleksander Czajczynski (hb fki.pl)
* config/global.mk * config/global.mk
* follow up to previous, define __ARCH64BIT__ for .prg files * follow up to previous, define __ARCH64BIT__ for .prg files

55
utils/hbmk2/hbmk2.prg
View File

@@ -323,7 +323,6 @@ EXTERNAL hbmk_KEYW
#define HB_ISFIRSTIDCHAR( c ) ( HB_ISALPHA( c ) .OR. ( c ) == "_" ) #define HB_ISFIRSTIDCHAR( c ) ( HB_ISALPHA( c ) .OR. ( c ) == "_" )
#define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR( c ) .OR. hb_asciiIsDigit( c ) ) #define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR( c ) .OR. hb_asciiIsDigit( c ) )
#define LEFTEQUAL( l, r ) ( Left( l, Len( r ) ) == r )
#define hb_RightEq( s, c ) ( Right( s, Len( c ) ) == c ) #define hb_RightEq( s, c ) ( Right( s, Len( c ) ) == c )
/* Logic (hack) to automatically add some libs to their /* Logic (hack) to automatically add some libs to their
@@ -1276,15 +1275,15 @@ STATIC PROCEDURE hbmk_harbour_dirlayout_init( hbmk )
/* Detect system locations to enable shared library option by default */ /* Detect system locations to enable shared library option by default */
IF hbmk[ _HBMK_cPLAT ] == "beos" IF hbmk[ _HBMK_cPLAT ] == "beos"
hbmk[ _HBMK_lSysLoc ] := ; hbmk[ _HBMK_lSysLoc ] := ;
LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/common" ) .OR. ; hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/common" ) .OR. ;
LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/system" ) .OR. ; hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/system" ) .OR. ;
LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/home/config" ) .OR. ; hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/boot/home/config" ) .OR. ;
AScan( ListToArray( GetEnv( "LIBRARY_PATH" ), ":" ), {| tmp | LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0 AScan( ListToArray( GetEnv( "LIBRARY_PATH" ), ":" ), {| tmp | hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0
ELSE ELSE
hbmk[ _HBMK_lSysLoc ] := ; hbmk[ _HBMK_lSysLoc ] := ;
LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/local/bin" ) .OR. ; hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/local/bin" ) .OR. ;
LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/bin" ) .OR. ; hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_BIN ], "/usr/bin" ) .OR. ;
AScan( ListToArray( GetEnv( "LD_LIBRARY_PATH" ), ":" ), {| tmp | LEFTEQUAL( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0 AScan( ListToArray( GetEnv( "LD_LIBRARY_PATH" ), ":" ), {| tmp | hb_LeftEq( hbmk[ _HBMK_cHB_INSTALL_LIB ], tmp ) } ) > 0
ENDIF ENDIF
#endif #endif
@@ -5982,7 +5981,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
ENDCASE ENDCASE
l_aPRG_TO_DO := {} l_aPRG_TO_DO := {}
FOR EACH tmp IN hbmk[ _HBMK_aPRG ] FOR EACH tmp IN hbmk[ _HBMK_aPRG ]
IF LEFTEQUAL( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp" IF hb_LeftEq( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp"
tmp3 := SubStr( tmp, 1 + 1 ) tmp3 := SubStr( tmp, 1 + 1 )
ELSE ELSE
tmp3 := tmp tmp3 := tmp
@@ -6883,7 +6882,7 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
l_aPRG_TO_DO := {} l_aPRG_TO_DO := {}
FOR EACH tmp IN hbmk[ _HBMK_aPRG ] FOR EACH tmp IN hbmk[ _HBMK_aPRG ]
IF LEFTEQUAL( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp" IF hb_LeftEq( tmp, "@" ) .AND. Lower( hb_FNameExt( tmp ) ) == ".clp"
tmp3 := SubStr( tmp, 2 ) tmp3 := SubStr( tmp, 2 )
ELSE ELSE
tmp3 := tmp tmp3 := tmp
@@ -8527,7 +8526,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com
IF ! Empty( cModule ) IF ! Empty( cModule )
FOR EACH cDependency IN hb_ATokens( cModule, " " ) FOR EACH cDependency IN hb_ATokens( cModule, " " )
IF ( cDependency:__enumIndex() > 1 .OR. ; /* Skip own (module) name */ IF ( cDependency:__enumIndex() > 1 .OR. ; /* Skip own (module) name */
( LEFTEQUAL( cFileName, "@" ) .AND. cExt == ".clp" ) ) .AND. ; ( hb_LeftEq( cFileName, "@" ) .AND. cExt == ".clp" ) ) .AND. ;
! Empty( cDependency ) ! Empty( cDependency )
IF hbmk[ _HBMK_lDEBUGINC ] IF hbmk[ _HBMK_lDEBUGINC ]
_hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: HEADER (NATIVE) %1$s", cDependency ) ) _hbmk_OutStd( hbmk, hb_StrFormat( "debuginc: HEADER (NATIVE) %1$s", cDependency ) )
@@ -8580,7 +8579,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com
ENDIF ENDIF
NEXT NEXT
ELSE ELSE
IF ! lCMode .AND. LEFTEQUAL( cFileName, "@" ) .AND. cExt == ".clp" IF ! lCMode .AND. hb_LeftEq( cFileName, "@" ) .AND. cExt == ".clp"
FOR EACH cDependency IN clpfile_read( SubStr( cFileName, 2 ) ) FOR EACH cDependency IN clpfile_read( SubStr( cFileName, 2 ) )
IF ! Empty( cDependency ) IF ! Empty( cDependency )
IF hbmk[ _HBMK_lDEBUGINC ] IF hbmk[ _HBMK_lDEBUGINC ]
@@ -11469,7 +11468,7 @@ STATIC FUNCTION hbmk_builtin_Is( cFileName )
cFileName := hb_FNameNameExt( cFileName ) cFileName := hb_FNameNameExt( cFileName )
RETURN LEFTEQUAL( cFileName, _HBMK_BUILTIN_FILENAME_MARKER_ ) .AND. ; RETURN hb_LeftEq( cFileName, _HBMK_BUILTIN_FILENAME_MARKER_ ) .AND. ;
Len( cFileName ) > Len( _HBMK_BUILTIN_FILENAME_MARKER_ ) Len( cFileName ) > Len( _HBMK_BUILTIN_FILENAME_MARKER_ )
STATIC FUNCTION hbmk_builtin_Exists( cFileName ) STATIC FUNCTION hbmk_builtin_Exists( cFileName )
@@ -11956,7 +11955,7 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile )
IF cExt == ".c" IF cExt == ".c"
FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) ) FOR EACH cLine IN hb_ATokens( StrTran( hb_MemoRead( cFile ), Chr( 13 ), Chr( 10 ) ), Chr( 10 ) )
cLine := AllTrim( cLine ) cLine := AllTrim( cLine )
IF LEFTEQUAL( cLine, '{ "' ) .AND. "HB_FS_FIRST" $ cLine .AND. !( "HB_FS_STATIC" $ cLine ) IF hb_LeftEq( cLine, '{ "' ) .AND. "HB_FS_FIRST" $ cLine .AND. !( "HB_FS_STATIC" $ cLine )
n := 4 n := 4
WHILE ( c := SubStr( cLine, n++, 1 ) ) != '"' WHILE ( c := SubStr( cLine, n++, 1 ) ) != '"'
cFuncName += c cFuncName += c
@@ -12351,7 +12350,7 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, ;
IF ! Empty( cLine ) IF ! Empty( cLine )
FOR EACH cWord IN rtlnk_tokens( cLine ) FOR EACH cWord IN rtlnk_tokens( cLine )
DO CASE DO CASE
CASE LEFTEQUAL( cWord, "#" ) CASE hb_LeftEq( cWord, "#" )
EXIT EXIT
CASE nMode == RTLNK_MODE_OUT CASE nMode == RTLNK_MODE_OUT
cFileOut := hb_DirSepToOS( cWord ) cFileOut := hb_DirSepToOS( cWord )
@@ -12387,7 +12386,7 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, ;
CASE nMode == RTLNK_MODE_SKIPNEXT CASE nMode == RTLNK_MODE_SKIPNEXT
nMode := RTLNK_MODE_SKIP nMode := RTLNK_MODE_SKIP
ENDCASE ENDCASE
CASE LEFTEQUAL( cWord, "@" ) CASE hb_LeftEq( cWord, "@" )
cWord := SubStr( cWord, 2 ) cWord := SubStr( cWord, 2 )
cCommands := rtlnk_read( @cWord, aPrevFiles ) cCommands := rtlnk_read( @cWord, aPrevFiles )
IF cCommands == NIL IF cCommands == NIL
@@ -12401,28 +12400,28 @@ STATIC FUNCTION rtlnk_process( hbmk, cCommands, cFileOut, aFileList, ;
cWord := Upper( cWord ) cWord := Upper( cWord )
IF Len( cWord ) >= 2 IF Len( cWord ) >= 2
DO CASE DO CASE
CASE LEFTEQUAL( "OUTPUT", cWord ) CASE hb_LeftEq( "OUTPUT", cWord )
nMode := RTLNK_MODE_OUT nMode := RTLNK_MODE_OUT
CASE LEFTEQUAL( "FILE", cWord ) CASE hb_LeftEq( "FILE", cWord )
nMode := RTLNK_MODE_FILE nMode := RTLNK_MODE_FILE
CASE LEFTEQUAL( "LIBRARY", cWord ) CASE hb_LeftEq( "LIBRARY", cWord )
nMode := RTLNK_MODE_LIB nMode := RTLNK_MODE_LIB
CASE LEFTEQUAL( "MODULE", cWord ) .OR. ; CASE hb_LeftEq( "MODULE", cWord ) .OR. ;
LEFTEQUAL( "EXCLUDE", cWord ) .OR. ; hb_LeftEq( "EXCLUDE", cWord ) .OR. ;
LEFTEQUAL( "REFER", cWord ) .OR. ; hb_LeftEq( "REFER", cWord ) .OR. ;
LEFTEQUAL( "INTO", cWord ) hb_LeftEq( "INTO", cWord )
nMode := RTLNK_MODE_SKIP nMode := RTLNK_MODE_SKIP
/* Blinker extension */ /* Blinker extension */
CASE LEFTEQUAL( "BLINKER", cWord ) CASE hb_LeftEq( "BLINKER", cWord )
/* skip Blinker commands */ /* skip Blinker commands */
EXIT EXIT
CASE LEFTEQUAL( "ECHO", cWord ) CASE hb_LeftEq( "ECHO", cWord )
_hbmk_OutStd( hbmk, hb_StrFormat( I_( "Blinker ECHO: %1$s" ), SubStr( cLine, 6 ) ) ) _hbmk_OutStd( hbmk, hb_StrFormat( I_( "Blinker ECHO: %1$s" ), SubStr( cLine, 6 ) ) )
EXIT EXIT
CASE LEFTEQUAL( "MAP", cWord ) CASE hb_LeftEq( "MAP", cWord )
hbmk[ _HBMK_lMAP ] := .T. hbmk[ _HBMK_lMAP ] := .T.
EXIT EXIT
CASE LEFTEQUAL( "NOBELL", cWord ) CASE hb_LeftEq( "NOBELL", cWord )
hbmk[ _HBMK_lBEEP ] := .F. hbmk[ _HBMK_lBEEP ] := .F.
EXIT EXIT
OTHERWISE /* TODO: add other Blinker commands */ OTHERWISE /* TODO: add other Blinker commands */
@@ -14283,7 +14282,7 @@ STATIC PROCEDURE __hbshell_ext_static_init()
nCount := __dynsCount() nCount := __dynsCount()
FOR tmp := 1 TO nCount FOR tmp := 1 TO nCount
cName := __dynsGetName( tmp ) cName := __dynsGetName( tmp )
IF LEFTEQUAL( cName, "__HBEXTERN__" ) .AND. ; IF hb_LeftEq( cName, "__HBEXTERN__" ) .AND. ;
! HBMK_IS_IN( cName, "__HBEXTERN__HBCPAGE__" ) ! HBMK_IS_IN( cName, "__HBEXTERN__HBCPAGE__" )
hbsh[ _HBSH_hLibExt ][ Lower( SubStr( cName, Len( "__HBEXTERN__" ) + 1, Len( cName ) - Len( "__HBEXTERN__" ) - Len( "__" ) ) ) ] := NIL hbsh[ _HBSH_hLibExt ][ Lower( SubStr( cName, Len( "__HBEXTERN__" ) + 1, Len( cName ) - Len( "__HBEXTERN__" ) - Len( "__" ) ) ) ] := NIL
ENDIF ENDIF