aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sdp/sdp.d
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-07-04 07:36:45 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commit203fa77f01c460b60ea50342676a55c4a80b5a42 (patch)
tree4d28d14dafa2395ed1e52f36e5bd88649ff34cde /src/sdp/sdp.d
parentoutput_hub sqlite introduce structure (diff)
sdl extract and composite conf (make)doc-reform_v0.0.17
Diffstat (limited to 'src/sdp/sdp.d')
-rwxr-xr-xsrc/sdp/sdp.d12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d
index 891c23f..0b90096 100755
--- a/src/sdp/sdp.d
+++ b/src/sdp/sdp.d
@@ -16,6 +16,7 @@ import
import
sdp.ao.abstraction_summary,
sdp.ao.abstract_doc_source,
+ sdp.ao.composite_make,
sdp.ao.conf_make_meta,
// sdp.ao.conf_make_meta_native,
sdp.ao.conf_make_meta_sdlang,
@@ -32,7 +33,7 @@ mixin CompileTimeInfo;
void main(string[] args) {
mixin SiSUrgxInit;
mixin SiSUregisters;
- mixin SiSUheaderExtractSDLang;
+ mixin SiSUextractSDLang;
mixin SiSUnode;
mixin SiSUbiblio;
mixin SiSUrgxInitFlags;
@@ -151,11 +152,10 @@ void main(string[] args) {
"pwd" : environment["PWD"],
"home" : environment["HOME"],
];
- auto sdl_root_configuration = configRead!()("conf.sdl", env);
- auto sdl_root_doc_make = configRead!()("sisu_document_make", env);
- auto confsdl = HeaderExtractSDL();
- auto conf_settings_aa = confsdl.configSettingsSDLangToAAmake(sdl_root_configuration);
- auto conf_doc_make_aa = confsdl.documentMakeSDLangToAAmake(sdl_root_doc_make);
+ auto sdl_root_config_share = configRead!()("config_local", env);
+ auto sdl_root_config_local = configRead!()("config_share", env);
+ auto conf_composite_static_aa = extractSDL().sdlangToAA(conf_aa_empty, sdl_root_config_share);
+ conf_composite_static_aa = extractSDL().sdlangToAA(conf_composite_static_aa, sdl_root_config_local);
if (!(opts["skip-output"])) {
outputHubOp!()(opts);
}