From d076d3da2fed53e135c600777c156a2f63e4c29d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 17 Aug 2009 17:48:05 +0000 Subject: [PATCH] 2009-08-17 19:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg * contrib/hbtip/hbtipssl/Makefile * doc/gmake.txt * doc/dirstruc.txt * examples/hbdoc/examples/core_es/dirstruc.txt * Renaming .cf files to .mk. Pass 4. Final touches. Renaming is now complete. * utils/hbmk2/hbmk2.prg ! Applied fix from Przemek to 'nm' output processing. --- harbour/ChangeLog | 12 ++++++++++ harbour/contrib/hbtip/hbtipssl/Makefile | 6 ++--- harbour/doc/dirstruc.txt | 2 +- harbour/doc/gmake.txt | 22 +++++++++---------- .../hbdoc/examples/core_es/dirstruc.txt | 2 +- harbour/utils/hbmk2/hbmk2.prg | 6 ++++- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ff93f38c14..c2b8b7b918 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,18 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-17 19:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + * contrib/hbtip/hbtipssl/Makefile + * doc/gmake.txt + * doc/dirstruc.txt + * examples/hbdoc/examples/core_es/dirstruc.txt + * Renaming .cf files to .mk. + Pass 4. Final touches. Renaming is now complete. + + * utils/hbmk2/hbmk2.prg + ! Applied fix from Przemek to 'nm' output processing. + 2009-08-17 19:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/hbproces.c ! fixed hb_fsProcessRun() (__RUN() and HB_RUN()) in WinCE builds diff --git a/harbour/contrib/hbtip/hbtipssl/Makefile b/harbour/contrib/hbtip/hbtipssl/Makefile index 81c67fc6c2..5d0eedc383 100644 --- a/harbour/contrib/hbtip/hbtipssl/Makefile +++ b/harbour/contrib/hbtip/hbtipssl/Makefile @@ -4,7 +4,7 @@ ROOT := ../../../ -include $(TOP)$(ROOT)config/global.cf +include $(TOP)$(ROOT)config/global.mk vpath %.c ../ vpath %.prg ../ @@ -39,8 +39,8 @@ PRG_SOURCES := \ thtml.prg \ url.prg \ -include $(TOP)$(ROOT)config/lib.cf +include $(TOP)$(ROOT)config/lib.mk else -include $(TOP)$(ROOT)config/none.cf +include $(TOP)$(ROOT)config/none.mk endif diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt index 5d03c22760..6ece0b2d06 100644 --- a/harbour/doc/dirstruc.txt +++ b/harbour/doc/dirstruc.txt @@ -17,7 +17,7 @@ track of all files (read the FAQ if you don't know what SVN is). +---bin - Executable and build scripts. | Should contain harbour.exe and other executable. (*) | -+---config - Configuration Files (.cf) for the GNU Make system. ++---config - Configuration Files (.mk) for the GNU Make system. | | | +---bsd - Configuration files specific to FreeBSD. | | diff --git a/harbour/doc/gmake.txt b/harbour/doc/gmake.txt index fa4321c44f..7b624412b9 100644 --- a/harbour/doc/gmake.txt +++ b/harbour/doc/gmake.txt @@ -40,7 +40,7 @@ C_SOURCES=\ LIB=vm -include $(TOP)$(ROOT)config/lib.cf +include $(TOP)$(ROOT)config/lib.mk -- Cut here --------------------------------------- What this means is: @@ -62,18 +62,18 @@ Let's look at another Makefile, this one for the Harbour compiler: # $Id$ # -ROOT = ../../ +ROOT := ../../ -YACC_SOURCE=harbour.y +YACC_SOURCE := harbour.y -LEX_SOURCE=harbour.l +LEX_SOURCE := harbour.l -C_SOURCES=\ +C_SOURCES := \ genobj32.c \ C_MAIN=harbour.c -include $(TOP)$(ROOT)config/bin.cf +include $(TOP)$(ROOT)config/bin.mk -- Cut here --------------------------------------- Notice how we now have other kinds of source files: yacc sources and @@ -89,9 +89,9 @@ One final Makefile, this one from the source directory: # -- Cut here --------------------------------------- -ROOT = ../ +ROOT := ../ -DIRS=\ +DIRS := \ compiler \ hbpp \ rtl \ @@ -99,7 +99,7 @@ DIRS=\ rdd \ tools \ -include $(ROOT)config/dir.cf +include $(ROOT)config/dir.mk -- Cut here --------------------------------------- This Makefile is used to traverse the subdirectories hanging from the @@ -175,7 +175,7 @@ For GCC on BSD: gtsln In which case you'll also need to export HB_SCREEN_LIB with the name of the appropriate screen library, if it doesn't - match the default value in config/bsd/gcc.cf + match the default value in config/bsd/gcc.mk For GCC on Linux: HB_ARCHITECTURE linux @@ -188,7 +188,7 @@ For GCC on Linux: gtsln In which case you'll also need to export HB_SCREEN_LIB with the name of the appropriate screen library, if it doesn't - match the default value in config/linux/gcc.cf. + match the default value in config/linux/gcc.mk. 2) If you want to take advantage of compiler cache programs (such as http://ccaache.samba.org), you may set environment variable HB_CCACHE with the value containing the name of program. diff --git a/harbour/examples/hbdoc/examples/core_es/dirstruc.txt b/harbour/examples/hbdoc/examples/core_es/dirstruc.txt index c48f7dc962..48287ed6e1 100644 --- a/harbour/examples/hbdoc/examples/core_es/dirstruc.txt +++ b/harbour/examples/hbdoc/examples/core_es/dirstruc.txt @@ -40,7 +40,7 @@ busca de remover directorios vac +---bin - Ejecutables y batch de construcci¢n | deber¡a contener harbour.exe y otros ejecutables (*) | -+---config - Archivos de Config. (.cf) para the GNU Make system ++---config - Archivos de Config. (.mk) para the GNU Make system | | | +---bsd - Archivos de Configuraci¢n espec¡ficos para FreeBSD | | diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 3d59eaa9bd..eece83277d 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2623,7 +2623,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 ) AAdd( hbmk[ _HBMK_aOPTD ], "/map" ) ENDIF IF hbmk[ _HBMK_cCOMP ] == "msvcarm" - /* NOTE: Copied from .cf. Probably needs cleaning. */ + /* NOTE: Copied from .mk. Probably needs cleaning. */ AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x420" ) AAdd( hbmk[ _HBMK_aOPTC ], "-DUNDER_CE=0x420" ) AAdd( hbmk[ _HBMK_aOPTC ], "-DWIN32_PLATFORM_PSPC" ) @@ -5646,6 +5646,10 @@ STATIC FUNCTION getFirstFunc( hbmk, cFile ) hb_processRun( cExecNM + " " + cFile + " -g -n" + iif( hbmk[ _HBMK_cCOMP ] == "darwin", "", " --defined-only -C" ),, @cFuncList ) IF ( n := At( " T HB_FUN_", cFuncList ) ) != 0 n += 10 + ELSEIF ( n := At( " T _HB_FUN_", cFuncList ) ) != 0 + n += 11 + ENDIF + IF n != 0 DO WHILE ( c := SubStr( cFuncList, n++, 1 ) ) == "_" .OR. ; IsDigit( c ) .OR. IsAlpha( c ) IF c == "x" .AND. IsHexDigit( SubStr( cFuncList, n, 1 ) ) .AND. ;