From ffc3c345f9c5decd16daade8a9aac84b2de26c32 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 3 Jun 2009 05:59:36 +0000 Subject: [PATCH] 2009-06-03 07:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * INSTALL * One 'sf.net' URL changed to sourceforge.net. (for consistency only. both name works.) * utils/hbmk2/hbmk2.prg * Formatting. + Added comment to help screen on -l switch, that the mustn't contain path, extension and lib prefix. --- harbour/ChangeLog | 10 +++++++++ harbour/INSTALL | 2 +- harbour/utils/hbmk2/hbmk2.prg | 40 +++++++++++++++++------------------ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 57a64cf661..813cb1ac49 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-06-03 07:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * INSTALL + * One 'sf.net' URL changed to sourceforge.net. + (for consistency only. both name works.) + + * utils/hbmk2/hbmk2.prg + * Formatting. + + Added comment to help screen on -l switch, that the + mustn't contain path, extension and lib prefix. + 2009-06-02 21:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch * source/rtl/Makefile diff --git a/harbour/INSTALL b/harbour/INSTALL index 2acba9af1b..defc7989e4 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -543,7 +543,7 @@ HOW TO GET THE HARBOUR SOURCES You'll need Subversion (SVN) version control software installed on your system, and issue this command: - svn co https://harbour-project.svn.sf.net/svnroot/harbour-project/trunk/harbour + svn co https://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour You can get subsequent updates using this command: svn update diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 94d5bd3b31..86c03f7fbc 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -162,6 +162,8 @@ REQUEST hbmk_KEYW #define _LNG_MARKER "${lng}" +#define _HBMK_CFG_NAME "hbmk.cfg" + #define _WORKDIR_BASE_ ".hbmk" #define _WORKDIR_DEF_ ( _WORKDIR_BASE_ + hb_osPathSeparator() + hbmk[ _HBMK_cARCH ] + hb_osPathSeparator() + hbmk[ _HBMK_cCOMP ] ) @@ -4539,8 +4541,6 @@ STATIC FUNCTION FN_HasWildcard( cFileName ) RETURN "?" $ cFileName .OR. ; "*" $ cFileName -#define HBMK_CFG_NAME "hbmk.cfg" - STATIC PROCEDURE HBC_ProcessAll( hbmk, lConfigOnly ) LOCAL aFile LOCAL cDir @@ -4559,7 +4559,7 @@ STATIC PROCEDURE HBC_ProcessAll( hbmk, lConfigOnly ) #endif FOR EACH cDir IN aCFGDirs - IF hb_FileExists( cFileName := ( PathNormalize( DirAddPathSep( cDir ) ) + HBMK_CFG_NAME ) ) + IF hb_FileExists( cFileName := ( PathNormalize( DirAddPathSep( cDir ) ) + _HBMK_CFG_NAME ) ) IF ! hbmk[ _HBMK_lQuiet ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing configuration: %1$s" ), cFileName ) ) ENDIF @@ -4571,7 +4571,7 @@ STATIC PROCEDURE HBC_ProcessAll( hbmk, lConfigOnly ) IF ! lConfigOnly FOR EACH aFile IN Directory( "*" + ".hbc" ) cFileName := aFile[ F_NAME ] - IF !( cFileName == HBMK_CFG_NAME ) .AND. Lower( FN_ExtGet( cFileName ) ) == ".hbc" + IF !( cFileName == _HBMK_CFG_NAME ) .AND. Lower( FN_ExtGet( cFileName ) ) == ".hbc" IF ! hbmk[ _HBMK_lQuiet ] hbmk_OutStd( hbmk, hb_StrFormat( I_( "Processing: %1$s" ), cFileName ) ) ENDIF @@ -4582,7 +4582,7 @@ STATIC PROCEDURE HBC_ProcessAll( hbmk, lConfigOnly ) RETURN -#define _EOL Chr( 10 ) +#define _EOL Chr( 10 ) STATIC PROCEDURE HBC_ProcessOne( hbmk, cFileName ) LOCAL cFile := MemoRead( cFileName ) /* NOTE: Intentionally using MemoRead() which handles EOF char. */ @@ -5190,14 +5190,14 @@ STATIC PROCEDURE PlatformPRGFlags( hbmk, aOPTPRG ) RETURN -#define RTLNK_MODE_NONE 0 -#define RTLNK_MODE_OUT 1 -#define RTLNK_MODE_FILE 2 -#define RTLNK_MODE_FILENEXT 3 -#define RTLNK_MODE_LIB 4 -#define RTLNK_MODE_LIBNEXT 5 -#define RTLNK_MODE_SKIP 6 -#define RTLNK_MODE_SKIPNEXT 7 +#define RTLNK_MODE_NONE 0 +#define RTLNK_MODE_OUT 1 +#define RTLNK_MODE_FILE 2 +#define RTLNK_MODE_FILENEXT 3 +#define RTLNK_MODE_LIB 4 +#define RTLNK_MODE_LIBNEXT 5 +#define RTLNK_MODE_SKIP 6 +#define RTLNK_MODE_SKIPNEXT 7 STATIC PROCEDURE rtlnk_libtrans( aLibList ) STATIC hTrans := { ; @@ -5649,11 +5649,11 @@ STATIC FUNCTION GenHBL( hbmk, aFiles, cFileOut, lEmpty ) RETURN lRetVal -#define _VCS_UNKNOWN 0 -#define _VCS_SVN 1 -#define _VCS_GIT 2 -#define _VCS_MERCURIAL 3 -#define _VCS_CVS 4 +#define _VCS_UNKNOWN 0 +#define _VCS_SVN 1 +#define _VCS_GIT 2 +#define _VCS_MERCURIAL 3 +#define _VCS_CVS 4 STATIC FUNCTION VCSDetect( cDir ) @@ -5888,7 +5888,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) LOCAL aOpt_Basic := {; { "-o" , I_( "output file name" ) },; - { "-l" , I_( "link with library" ) },; + { "-l" , I_( "link with library. should be without path, extension and lib prefix (unless part of libname)." ) },; { "-L" , I_( "additional path to search for libraries" ) },; { "-i

|-incpath=

", I_( "additional path to search for headers" ) },; { "-static|-shared" , I_( "link with static/shared libs" ) },; @@ -5982,7 +5982,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) I_( "