Branch: Tag:

2009-03-05

2009-03-05 11:44:17 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Use the #-character as prefix and suffix for placeholders in master.pike.in
instead of the currency sign, to avoid 8-bit character encoding issues.

Rev: bin/install.pike:1.200
Rev: lib/master.pike.in:1.461
Rev: packaging/windows/installer.vbs:1.5
Rev: src/Makefile.in:1.473

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.460 2008/10/12 21:55:33 mast Exp $ + // $Id: master.pike.in,v 1.461 2009/03/05 11:44:17 grubba Exp $      #pike __REAL_VERSION__   //#pragma strict_types    - // Some programs destroys character pairs beginning with the currency - // symbol when running in chinese locale. - #if "¤/" != "\244/" - #error "master.pike.in is corrupted." - #endif -  +    //! @appears predef::MasterObject   //!   //! Master control program for Pike.
163:    object low_cast_to_object(string oname, string current_file);    extern array(string) pike_include_path;    string pike_library_path = - #if "¤lib_prefix¤"[0]!='¤' -  "¤lib_prefix¤" + #if "#lib_prefix#"[0]!='#' +  "#lib_prefix#"   #else    __DIR__   #endif
2089:    CO(remove_call_out);    CO(call_out_info);    - #if "¤share_prefix¤"[0]!='¤' + #if "#share_prefix#"[0]!='#'    // add path for architecture-independant files -  add_include_path("¤share_prefix¤/include"); -  add_module_path("¤share_prefix¤/modules"); +  add_include_path("#share_prefix#/include"); +  add_module_path("#share_prefix#/modules");   #endif    - #if "¤lib_prefix¤"[0]!='¤' + #if "#lib_prefix#"[0]!='#'    // add path for architecture-dependant files -  add_include_path("¤lib_prefix¤/include"); -  add_module_path("¤lib_prefix¤/modules"); +  add_include_path("#lib_prefix#/include"); +  add_module_path("#lib_prefix#/modules");   #endif    - #if "¤cflags¤ "[0]!='¤' -  cflags = "¤cflags¤"; + #if "#cflags# "[0]!='#' +  cflags = "#cflags#";   #endif    - #if "¤ldflags¤ "[0]!='¤' -  ldflags = "¤ldflags¤"; + #if "#ldflags# "[0]!='#' +  ldflags = "#ldflags#";   #endif    - #if "¤include_prefix¤"[0]!='¤' -  include_prefix = "¤include_prefix¤"; + #if "#include_prefix#"[0]!='#' +  include_prefix = "#include_prefix#";    cflags = (cflags || "") + " -I" + dirname(include_prefix);   #endif    - #if "¤doc_prefix¤"[0]!='¤' -  doc_prefix = "¤doc_prefix¤"; + #if "#doc_prefix#"[0]!='#' +  doc_prefix = "#doc_prefix#";   #endif      #if constant(__embedded_resource_directory)
5599:    array(string) files;    array(Version) available=({});    - #if "¤share_prefix¤"[0]!='¤' -  if (!(files = master_get_dir("¤share_prefix¤"))) { + #if "#share_prefix#"[0]!='#' +  if (!(files = master_get_dir("#share_prefix#"))) {    werror ("Error listing directory %O: %s\n", -  "¤share_prefix¤", strerror (errno())); +  "#share_prefix#", strerror (errno()));    files = ({});    }    foreach(files, string ver)
5616:    }   #endif    - #if "¤lib_prefix¤"[0]!='¤' -  if (!(files = master_get_dir("¤lib_prefix¤"))) { + #if "#lib_prefix#"[0]!='#' +  if (!(files = master_get_dir("#lib_prefix#"))) {    werror ("Error listing directory %O: %s\n", -  "¤lib_prefix¤", strerror (errno())); +  "#lib_prefix#", strerror (errno()));    files = ({});    }    foreach(files, string ver)
5670:    }       string base; - #if "¤lib_prefix¤"[0]!='¤' -  base=combine_path("¤lib_prefix¤",sprintf("%s",tmp)); + #if "#lib_prefix#"[0]!='#' +  base=combine_path("#lib_prefix#",sprintf("%s",tmp));    compat_handler->add_module_path(combine_path(base,"modules"));    compat_handler->add_include_path(combine_path(base,"include"));   #endif    - #if "¤share_prefix¤"[0]!='¤' -  base=combine_path("¤share_prefix¤",sprintf("%s",tmp)); + #if "#share_prefix#"[0]!='#' +  base=combine_path("#share_prefix#",sprintf("%s",tmp));    compat_handler->add_module_path(combine_path(base,"modules"));    compat_handler->add_include_path(combine_path(base,"include"));   #endif