2009-12-13 22:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* src/compiler/hbmain.c
  * src/compiler/cmdcheck.c
  * src/compiler/hbcomp.c
  * src/compiler/hbusage.c
  * include/hbcompdf.h
    + Added support for -i- and -i+ options. They will disable/enable 
      handling of INCLUDE envvar.

  * config/rules.mk
    + Added -i- Harbour compiler switch to avoid any interference 
      with user set INCLUDE envvars.

harbour/ChangeLog

@@ -17,13 +17,26 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
-2009-12-03 12:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+2009-12-13 22:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/compiler/hbmain.c
+  * src/compiler/cmdcheck.c
+  * src/compiler/hbcomp.c
+  * src/compiler/hbusage.c
+  * include/hbcompdf.h
+    + Added support for -i- and -i+ options. They will disable/enable
+      handling of INCLUDE envvar.
+
+  * config/rules.mk
+    + Added -i- Harbour compiler switch to avoid any interference
+      with user set INCLUDE envvars.
+
+2009-12-13 12:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt_hbqmainwindow.cpp
   * contrib/hbqt/hbqt_hbqmainwindow.h
   * contrib/hbxbp/xbpwindow.prg
     + Implemented GC collectible pointer for HBQMainWindow().
 
-      /* Please do not commit anything in HBQT/HBXBP/HBIDE as I will be cleaning 
+      /* Please do not commit anything in HBQT/HBXBP/HBIDE as I will be cleaning
          up the code. BTW how can I invoke HBXBP_DEBUG() functionality.
 
          I was just busy with the preparations of my daughter's wedding.

harbour/config/rules.mk

@@ -24,7 +24,7 @@ endif
 
 # How to run Harbour
 HB := $(HB_HOST_BIN_DIR)/harbour$(HB_HOST_BIN_EXT)
-HB_FLAGS := -n1 -q0 -w3 -es2 -kmo $(HB_PRGFLAGS)
+HB_FLAGS := -n1 -q0 -w3 -es2 -kmo -i- $(HB_PRGFLAGS)
 HB_RULE = $(HB) $? $(HB_INC_DEPEND) -i$(HB_INC_COMPILE) $(HB_FLAGS) $(HB_USER_PRGFLAGS)
 
 # Use default rules if platform/compiler specific rule is not defined

harbour/include/hbcompdf.h

@@ -719,6 +719,7 @@ typedef struct _HB_COMP
    BOOL              fError;              /* error appeared during compilation */
    BOOL              fNoArchDefs;         /* do not define architecture dependent macros: __PLATFORM__*, __ARCH??BIT__, __*_ENDIAN__ */
    BOOL              fMeaningful;         /* do not generate warnings about meaningless expression usage */
+   BOOL              fINCLUDE;            /* use INCLUDE envvar as header path (default) */
 }
 HB_COMP, * HB_COMP_PTR;
 

harbour/src/compiler/cmdcheck.c

@@ -298,7 +298,19 @@ static void hb_compChkEnvironVar( HB_COMP_DECL, const char *szSwitch )
                 */
             case 'i':
             case 'I':
-               hb_pp_addSearchPath( HB_COMP_PARAM->pLex->pPP, s + 1, FALSE );
+               switch( *( s + 1 ) )
+               {
+                  case '-':
+                     HB_COMP_PARAM->fINCLUDE = FALSE;
+                     break;
+
+                  case '+':
+                     HB_COMP_PARAM->fINCLUDE = TRUE;
+                     break;
+
+                  default:
+                     hb_pp_addSearchPath( HB_COMP_PARAM->pLex->pPP, s + 1, FALSE );
+               }
                break;
 
             case 'j':

harbour/src/compiler/hbcomp.c

@@ -231,6 +231,7 @@ HB_COMP_PTR hb_comp_new( void )
       pComp->fLogo            = TRUE;     /* print logo */
       pComp->fSingleModule    = FALSE;
       pComp->fError           = FALSE;
+      pComp->fINCLUDE         = TRUE;
 
       pComp->iSyntaxCheckOnly = 0;        /* syntax check only */
       pComp->iStartProc       = 0;        /* no implicit starting procedure */

harbour/src/compiler/hbmain.c

@@ -113,7 +113,8 @@ int hb_compMain( int argc, const char * const argv[],
       }
 
       /* Set Search Path */
-      hb_compChkPaths( HB_COMP_PARAM );
+      if( HB_COMP_PARAM->fINCLUDE )
+         hb_compChkPaths( HB_COMP_PARAM );
 
       /* Set standard rules */
       hb_compInitPP( HB_COMP_PARAM, argc, argv );

harbour/src/compiler/hbusage.c

@@ -79,6 +79,7 @@ void hb_compPrintUsage( HB_COMP_DECL, const char * szSelf )
            "\n          %cgh              output type: Harbour Portable Object (.hrb)",
            "\n          %cgd[.<destext>]  generate dependencies list into (.d) file",
            "\n          %ci<path>         #include file search path",
+           "\n          %ci[-|+]          disable/enable support for INCLUDE envvar",
            "\n          %cj[<file>]       generate i18n gettext file (.pot)",
            "\n          %ck               compilation mode (type -k? for more data)",
            "\n          %cl               suppress line number information",