Branch: Tag:

2003-08-19

2003-08-19 10:49:57 by Martin Nilsson <mani@lysator.liu.se>

Different path separator for environment variables on NT and others

Rev: lib/master.pike.in:1.294

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.293 2003/08/18 13:30:59 tomas Exp $ + // $Id: master.pike.in,v 1.294 2003/08/19 10:49:57 nilsson Exp $      #pike __REAL_VERSION__   
50:   #endif /* OUT_OF_DATE_WARNING */   constant out_of_date_warning = OUT_OF_DATE_WARNING;    + #ifdef __NT__ + #define PATH_SEPARATOR ";" + #else + #define PATH_SEPARATOR ":" + #endif +    //! @decl constant out_of_date_warning = 1   //! Should Pike complain about out of date compiled files.   //! 1 means yes and 0 means no. Controlled by the OUT_OF_DATE_WARNING
118:   {    string tmp1=combine_path_with_cwd(s);   #ifdef PIKE_FAKEROOT_OMIT -  foreach(PIKE_FAKEROOT_OMIT/":", string x) +  foreach(PIKE_FAKEROOT_OMIT/PATH_SEPARATOR, string x)    if(glob(x,tmp1))    return s;   #endif
1902:      #ifndef NOT_INSTALLED    { -  array parts = (getenv("PIKE_INCLUDE_PATH")||"")/":"-({""}); +  array parts = (getenv("PIKE_INCLUDE_PATH")||"")/PATH_SEPARATOR-({""});    int i = sizeof(parts);    while(i) add_include_path(parts[--i]);    -  parts = (getenv("PIKE_PROGRAM_PATH")||"")/":"-({""}); +  parts = (getenv("PIKE_PROGRAM_PATH")||"")/PATH_SEPARATOR-({""});    i = sizeof(parts);    while(i) add_program_path(parts[--i]);    -  parts = (getenv("PIKE_MODULE_PATH")||"")/":"-({""}); +  parts = (getenv("PIKE_MODULE_PATH")||"")/PATH_SEPARATOR-({""});    i = sizeof(parts);    while(i) add_module_path(parts[--i]);    }