Roxen.git/ server/ base_server/ roxen.pike

1997-03-11

1997-03-11 01:19:46 by Per Hedbor <ph@opera.com>

• 8e727dae811d16637a3093b0aba598da21ec4690 (17 lines) (+13/-4) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixar i modulerna för det nya modulsystemet

Rev: server/base_server/config/low_describers.pike:1.5
Rev: server/base_server/fonts.pike:1.3
Rev: server/base_server/mainconfig.pike:1.35
Rev: server/base_server/roxen.pike:1.44
Rev: server/base_server/roxenlib.pike:1.17
Rev: server/etc/include/module.h:1.6
Rev: server/modules/directories/fastdir.pike:1.6
Rev: server/modules/filesystems/userfs.pike:1.10
Rev: server/modules/filters/htaccess.pike:1.8
Rev: server/modules/filters/redirect.pike:1.6
Rev: server/modules/graphics/graphic_text.pike:1.38
Rev: server/modules/graphics/tablist.pike:1.3
Rev: server/modules/proxies/connect.pike:1.5
Rev: server/modules/proxies/gopher.pike:1.7
Rev: server/modules/proxies/proxy.pike:1.14
Rev: server/modules/proxies/wais.pike:1.6
Rev: server/modules/scripting/fcgi.pike:1.7
Rev: server/modules/tags/htmlparse.pike:1.23

1: - string cvs_version = "$Id: roxen.pike,v 1.43 1997/03/09 18:46:04 marcus Exp $"; + string cvs_version = "$Id: roxen.pike,v 1.44 1997/03/11 01:19:23 per Exp $";   #define IN_ROXEN   #ifdef THREADS   #include <fifo.h>
971:   {    add_constant("roxen", this_object());    (object)"color.pike"; -  (object)"fonts,pike"; +  (object)"fonts.pike";    Configuration = (program)"configuration";   }   
1212:    globvar("_v", CONFIGURATION_FILE_LEVEL, 0, TYPE_INT, 0, 0, 1);       +  globvar("default_font_size", 32, 0, TYPE_INT, 0, 0, 1);    -  +  globvar("default_font", "lucida", "Fonts: Default font", TYPE_FONT, +  "The default font to use when modules request a font."); +  +  globvar("font_dir", "nfonts/", "Fonts: Font directory", TYPE_DIR, +  "This is where the fonts are located."); +     globvar("logdirprefix", "../logs/", "Log directory prefix", TYPE_DIR,    "This is the default file path that will be prepended to the log "    " file path in all the default modules and the virtual server.");
1568:    if (!(err=catch( module_info = lambda ( string file ) {    array foo;    object o; -  _master->set_inhibit_compile_errors( "" ); +     o = (compile_file(file))();   #ifdef MODULE_DEBUG    perror(" load ok - ");
1582:    +"</i>", foo[0] });    }(path + file))))    { -  _master->set_inhibit_compile_errors( 0 ); +     allmodules[ file-("."+extension(file)) ] = module_info;    } else { -  +  _master->errors += "\n"; + #if 0    perror(file+": "+describe_backtrace(err[sizeof(err)-4..])+    _master->set_inhibit_compile_errors( 0 )); -  + #endif    }   #ifdef MODULE_DEBUG    perror("\n");