diff options
| -rw-r--r-- | org/default_paths.org | 4 | ||||
| -rw-r--r-- | org/output_sisupod.org | 5 | ||||
| -rw-r--r-- | src/sdp/output/paths_source.d | 4 | ||||
| -rw-r--r-- | src/sdp/output/source_sisupod.d | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/org/default_paths.org b/org/default_paths.org index 9bb5c28..ff14d50 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -371,10 +371,10 @@ template ConfigFilePaths() { ) { struct ConfFilePaths { auto config_filename_document_toml() { - return "sisu_document_make.toml"; + return "sisu_document_make"; } auto config_filename_site_toml() { - return "config_local_site.toml"; + return "config_local_site"; } auto possible_config_path_locations() { struct _ConfFilePaths { diff --git a/org/output_sisupod.org b/org/output_sisupod.org index ef1a85f..5b1f6ab 100644 --- a/org/output_sisupod.org +++ b/org/output_sisupod.org @@ -152,16 +152,15 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; } } } { /+ bundle sisu_document_make +/ - auto extension = ".toml"; auto fn_src_in = ((doc_matters.src.is_pod) ? doc_matters.src.conf_dir_path : pth_sisudoc_src.conf_root).to!string - ~ "/" ~ "sisu_document_make" ~ extension; + ~ "/" ~ "sisu_document_make"; auto fn_src_out_sisupod_zip_base = pths_sisupod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "sisu_document_make"; auto fn_src_out_filesystem = pths_sisupod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string - ~ "/" ~ "sisu_document_make" ~ extension; // TODO + ~ "/" ~ "sisu_document_make"; if (exists(fn_src_in)) { debug(io) { writeln("WARNING (io debug) src out found: ", fn_src_in); diff --git a/src/sdp/output/paths_source.d b/src/sdp/output/paths_source.d index 1be04d2..59cb618 100644 --- a/src/sdp/output/paths_source.d +++ b/src/sdp/output/paths_source.d @@ -312,10 +312,10 @@ template ConfigFilePaths() { ) { struct ConfFilePaths { auto config_filename_document_toml() { - return "sisu_document_make.toml"; + return "sisu_document_make"; } auto config_filename_site_toml() { - return "config_local_site.toml"; + return "config_local_site"; } auto possible_config_path_locations() { struct _ConfFilePaths { diff --git a/src/sdp/output/source_sisupod.d b/src/sdp/output/source_sisupod.d index d0e4e11..6c50cf2 100644 --- a/src/sdp/output/source_sisupod.d +++ b/src/sdp/output/source_sisupod.d @@ -97,16 +97,15 @@ template SiSUpod() { } } } { /+ bundle sisu_document_make +/ - auto extension = ".toml"; auto fn_src_in = ((doc_matters.src.is_pod) ? doc_matters.src.conf_dir_path : pth_sisudoc_src.conf_root).to!string - ~ "/" ~ "sisu_document_make" ~ extension; + ~ "/" ~ "sisu_document_make"; auto fn_src_out_sisupod_zip_base = pths_sisupod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "sisu_document_make"; auto fn_src_out_filesystem = pths_sisupod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string - ~ "/" ~ "sisu_document_make" ~ extension; // TODO + ~ "/" ~ "sisu_document_make"; if (exists(fn_src_in)) { debug(io) { writeln("WARNING (io debug) src out found: ", fn_src_in); |