diff options
Diffstat (limited to 'org/meta_read_source_files.org')
| -rw-r--r-- | org/meta_read_source_files.org | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/org/meta_read_source_files.org b/org/meta_read_source_files.org index c8355ae..c7fe354 100644 --- a/org/meta_read_source_files.org +++ b/org/meta_read_source_files.org @@ -44,13 +44,27 @@ module sdp.meta.read_config_files; #+name: meta_config_file_in #+BEGIN_SRC d -template configIn() { +static template configIn() { <<imports_std>> final string configIn(C,E)(C conf_sdl, E env) { + /+ FIX clean up conf paths ↓ +/ + string sisudoc_conf_pwd = chainPath(to!string(env["pwd"]), "sisudoc/conf").array; + string sisudoc_conf_pwd_a = chainPath(to!string(env["pwd"]), "conf").array; + string sisudoc_conf_pwd_b = chainPath(to!string(env["pwd"]), "../conf").array; + string sisudoc_conf_pwd_c = chainPath(to!string(env["pwd"]), "../../conf").array; + string sisudoc_conf_pwd_d = chainPath(to!string(env["pwd"]), "../../../conf").array; + /+ FIX clean up conf paths ↑ + (compare pwd to doc path location, and build config path) + +/ string dot_pwd = chainPath(to!string(env["pwd"]), ".sisu").array; string underscore_pwd = chainPath(to!string(env["pwd"]), "_sisu").array; string dot_home = chainPath(to!string(env["home"]), ".sisu").array; string[] possible_config_path_locations = [ + sisudoc_conf_pwd, + sisudoc_conf_pwd_a, + sisudoc_conf_pwd_b, + sisudoc_conf_pwd_c, + sisudoc_conf_pwd_d, dot_pwd, underscore_pwd, dot_home, @@ -63,6 +77,9 @@ template configIn() { pth, conf_sdl, ); + if (config_file_str.length > 0) { + break; + } try { if (exists(conf_file)) { debug(configfile) { @@ -89,7 +106,7 @@ template configIn() { /+ +/ -template ConfigSDLang() { +static template ConfigSDLang() { import sdlang; <<imports_std>> <<meta_config_file_sdlang>> @@ -120,7 +137,7 @@ auto ConfigSDLang(string configuration, string conf_sdl_filename) { #+BEGIN_SRC d /+ +/ -template configRead() { +static template configRead() { <<imports_std>> <<meta_config_file_import_sdlang>> <<meta_config_file_sdlang_hub>> @@ -156,7 +173,7 @@ final auto configRead(C,E)(C conf_sdl, E env) { - if master file scan for addional files to import/insert +/ module sdp.meta.read_source_files; -template SiSUrawMarkupContent() { +static template SiSUrawMarkupContent() { import sdp.meta.rgx; <<imports_std>> |