comparison src/cjr_print.sml @ 1739:c414850f206f

Add support for -boot flag, which allows in-tree execution of Ur/Web The boot flag rewrites most hardcoded paths to point to the build directory, and also forces static compilation. This is convenient for developing Ur/Web, or if you cannot 'sudo make install' Ur/Web. The following changes were made: * Header files were moved to include/urweb instead of include; this lets FFI users point their C_INCLUDE_PATH at this directory at write <urweb/urweb.h>. For internal Ur/Web executables, we simply pass -I$PATH/include/urweb as normal. * Differentiate between LIB and SRCLIB; SRCLIB is Ur and JavaScript source files, while LIB is compiled products from libtool. For in-tree compilation these live in different places. * No longer reference Config for paths; instead use Settings; these settings can be changed dynamically by Compiler.enableBoot () (TODO: add a disableBoot function.) * config.h is now generated directly in include/urweb/config.h, for consistency's sake (especially since it gets installed along with the rest of the headers!) * All of the autotools build products got updated. * The linkStatic field in protocols now only contains the name of the build product, and not the absolute path. Future users have to be careful not to reference the Settings files to early, lest they get an old version (this was the source of two bugs during development of this patch.)
author Edward Z. Yang <ezyang@mit.edu>
date Wed, 02 May 2012 17:17:57 -0400
parents 27e731a65934
children 95dd9f427bb2
comparison
equal deleted inserted replaced
1738:1a35e75b6967 1739:c414850f206f
3236 val now = Time.now () 3236 val now = Time.now ()
3237 val nowD = Date.fromTimeUniv now 3237 val nowD = Date.fromTimeUniv now
3238 val rfcFmt = "%a, %d %b %Y %H:%M:%S" 3238 val rfcFmt = "%a, %d %b %Y %H:%M:%S"
3239 in 3239 in
3240 box [string "#include \"", 3240 box [string "#include \"",
3241 string (OS.Path.joinDirFile {dir = Config.includ, 3241 string (OS.Path.joinDirFile {dir = !Settings.configInclude,
3242 file = "config.h"}), 3242 file = "config.h"}),
3243 string "\"", 3243 string "\"",
3244 newline, 3244 newline,
3245 string "#include <stdio.h>", 3245 string "#include <stdio.h>",
3246 newline, 3246 newline,
3260 p_list_sep (box []) (fn s => box [string "#include \"", 3260 p_list_sep (box []) (fn s => box [string "#include \"",
3261 string s, 3261 string s,
3262 string "\"", 3262 string "\"",
3263 newline]) (Settings.getHeaders ()), 3263 newline]) (Settings.getHeaders ()),
3264 string "#include \"", 3264 string "#include \"",
3265 string (OS.Path.joinDirFile {dir = Config.includ, 3265 string (OS.Path.joinDirFile {dir = !Settings.configInclude,
3266 file = "urweb.h"}), 3266 file = "urweb.h"}),
3267 string "\"", 3267 string "\"",
3268 newline, 3268 newline,
3269 newline, 3269 newline,
3270 3270