From 4dbffeb07552db0618bd5d963e502598cc4491f8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 26 Jun 2012 09:10:50 +0000 Subject: [PATCH] 2012-06-26 11:09 UTC+0200 Viktor Szakats (harbour syenar.net) * INSTALL * minor update * utils/hbmk2/hbmk2.prg * make sure to convert script parameter to native pathseps --- harbour/ChangeLog | 6 ++++++ harbour/INSTALL | 2 +- harbour/utils/hbmk2/hbmk2.prg | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index eedb1c8585..ab3425c70d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-26 11:09 UTC+0200 Viktor Szakats (harbour syenar.net) + * INSTALL + * minor update + * utils/hbmk2/hbmk2.prg + * make sure to convert script parameter to native pathseps + 2012-06-25 09:52 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_hbqevents.cpp ! Fixed: a heavy memory leak and optimization in event handelling. diff --git a/harbour/INSTALL b/harbour/INSTALL index 9b79928993..58bb1f0f66 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -238,7 +238,7 @@ HARBOUR If you want to rebuild one specific contrib package, use this: cd contrib/ - ..\..\bin\\\hbmk2 ..\make.hb [clean] [install] [custom hbmk2 options] + ../../bin///hbmk2 ../make.hb [clean] [install] [custom hbmk2 options] 3. HOW TO CREATE DISTRIBUTABLE PACKAGES diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 0c7941fe52..5518022b8a 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -589,7 +589,7 @@ PROCEDURE _APPMAIN( ... ) IF ( Right( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ; Left( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ; hb_PValue( 1 ) == "." .OR. ; - "|" + Lower( hb_FNameExt( hb_PValue( 1 ) ) ) + "|" $ "|.hb|.hrb|.dbf|" ) .AND. ; + "|" + Lower( hb_FNameExt( PathSepToSelf( hb_PValue( 1 ) ) ) ) + "|" $ "|.hb|.hrb|.dbf|" ) .AND. ; !( ! Empty( hb_PValue( 1 ) ) .AND. ; ( Left( hb_PValue( 1 ), 6 ) == "-hbreg" .OR. ; Left( hb_PValue( 1 ), 8 ) == "-hbunreg" ) ) @@ -12281,6 +12281,8 @@ STATIC PROCEDURE __hbshell( cFile, ... ) /* Do the thing */ + cFile := PathSepToSelf( cFile ) + IF !( cFile == "." ) .AND. ; ! Empty( hb_FNameName( cFile ) ) .AND. ; ! Empty( cFile := FindInPath( cFile,, { ".hb", ".hrb" } ) )