pike.git/ lib/ master.pike.in

2000-04-13

2000-04-13 18:54:16 by Per Hedbor <ph@opera.com>

• 4c3f7d4a4a1ce0e6120b45d11833950192807df6 (25 lines) (+17/-8) ^{[ Show | Annotate ]}
  Branch: 7.9

Added normalize_path (it is needed on NT to avoid things like c:\foo\bar _and_ c:/foo\bar to be in the module path at the same time, thus creating spurious joinnode-modules)

Rev: lib/master.pike.in:1.116

1:   /* -*- Pike -*-    * -  * $Id: master.pike.in,v 1.115 2000/04/12 18:39:38 hubbe Exp $ +  * $Id: master.pike.in,v 1.116 2000/04/13 18:54:16 per Exp $    *    * Master-file for Pike.    *
204:    environment[var]=val;   }    + string normalize_path( string X ) + { + #ifndef __NT__ +  return X; + #else +  return replace(X,"\\","/"); + #endif + }      void add_include_path(string tmp)   { -  tmp=combine_path_with_cwd(tmp); +  tmp=normalize_path(combine_path_with_cwd(tmp));    pike_include_path-=({tmp});    pike_include_path=({tmp})+pike_include_path;   }      void remove_include_path(string tmp)   { -  tmp=combine_path_with_cwd(tmp); +  tmp=normalize_path(combine_path_with_cwd(tmp));    pike_include_path-=({tmp});   }      void add_module_path(string tmp)   { -  tmp=combine_path_with_cwd(tmp); +  tmp=normalize_path(combine_path_with_cwd(tmp));    pike_module_path-=({tmp});    pike_module_path=({tmp})+pike_module_path;   }
228:      void remove_module_path(string tmp)   { -  tmp=combine_path_with_cwd(tmp); +  tmp=normalize_path(combine_path_with_cwd(tmp));    pike_module_path-=({tmp});   }         void add_program_path(string tmp)   { -  tmp=combine_path_with_cwd(tmp); +  tmp=normalize_path(combine_path_with_cwd(tmp));    pike_program_path-=({tmp});    pike_program_path=({tmp})+pike_program_path;   }
243:      void remove_program_path(string tmp)   { -  tmp=combine_path_with_cwd(tmp); +  tmp=normalize_path(combine_path_with_cwd(tmp));    pike_program_path-=({tmp});   }   
495:    "describe_error",    "new",    "clone", -  +  "normalize_path",    "getenv",    "putenv",