summaryrefslogtreecommitdiff
path: root/src/config.sml.in
diff options
context:
space:
mode:
authorGravatar Edward Z. Yang <ezyang@mit.edu>2012-05-02 17:17:57 -0400
committerGravatar Edward Z. Yang <ezyang@mit.edu>2012-05-02 17:17:57 -0400
commit5e29700b15fad9e4ccbbea59b8312c53447df01b (patch)
tree91cc80e8e50847ab4c3b37714f133417df65f59a /src/config.sml.in
parent1ca9408089542b282078cc1b7f3c8aa71659f00c (diff)
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.)
Diffstat (limited to 'src/config.sml.in')
-rw-r--r--src/config.sml.in10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/config.sml.in b/src/config.sml.in
index 51d572eb..ebcdb7b6 100644
--- a/src/config.sml.in
+++ b/src/config.sml.in
@@ -1,17 +1,13 @@
structure Config :> CONFIG = struct
+val builddir = "@abs_top_builddir@"
+
val bin = "@BIN@"
+val srclib = "@SRCLIB@"
val lib = "@LIB@"
val includ = "@INCLUDE@"
val sitelisp = "@SITELISP@"
-val libUr = OS.Path.joinDirFile {dir = lib,
- file = "ur"}
-val libC = OS.Path.joinDirFile {dir = lib,
- file = "c"}
-val libJs = OS.Path.joinDirFile {dir = lib,
- file = "js"}
-
val ccompiler = "@CC@"
val ccArgs = "@CCARGS@"