From 9b0570c818bf5a417df37f3a1d041b6462ae1253 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 6 Dec 2010 17:05:49 +0000 Subject: [PATCH] 2010-12-06 18:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * utils/hbrun/hbrun.prg + Readded -I option. (partial revert of 2010-11-23 19:05 UTC+0100) --- harbour/ChangeLog | 7 ++++++- harbour/utils/hbrun/hbrun.prg | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8344816e23..0ebc02cf1d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-06 18:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * utils/hbrun/hbrun.prg + + Readded -I option. + (partial revert of 2010-11-23 19:05 UTC+0100) + 2010-12-05 12:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/tests/cpinfo.prg * small modification for non latin CPs having first lower letter before @@ -41,7 +46,7 @@ // uppers and lowers are mixed: AaBbCcDdEe.... #define HB_CP_CSSORT HB_CDP_CSSORT_MIXED // ignore case - #define HB_CP_CSSORT HB_CDP_CSSORT_IGNORE + #define HB_CP_CSSORT HB_CDP_CSSORT_IGNORE 2010-12-04 19:32 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/dbinfo.ch diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg index d868e67603..dfc333db33 100644 --- a/harbour/utils/hbrun/hbrun.prg +++ b/harbour/utils/hbrun/hbrun.prg @@ -161,7 +161,7 @@ PROCEDURE _APPMAIN( cFile, ... ) ENDIF cFile := HB_COMPILEBUF( hHeaders, HB_ARGV( 0 ), "-n2", "-w", "-es2", "-q0", ; - s_aCompOptions, "-D" + "__HBSCRIPT__HBRUN", cFile ) + s_aCompOptions, "-I" + FNameDirGet( cFile ), "-D" + "__HBSCRIPT__HBRUN", cFile ) IF cFile == NIL ERRORLEVEL( 1 ) EXIT @@ -180,6 +180,13 @@ PROCEDURE _APPMAIN( cFile, ... ) RETURN +STATIC FUNCTION FNameDirGet( cFileName ) + LOCAL cDir + + hb_FNameSplit( cFileName, @cDir ) + + RETURN cDir + STATIC FUNCTION hbrun_CoreHeaderFiles() LOCAL hHeaders