Reviewers: lemzwerg, Jean-Charles,
Message:
On 2020/02/23 10:38:19, Jean-Charles wrote:
> Does this mean that, for example,
>
> Documentation/fr/learning.*.log and
input/regression/collated-files.texilog.log
> would respectively land in Documentation/fr/out/ and
input/regression/out/ ?
yes, that is the intention.
within our build system, all output should go into an out/ or out-*/
directory.
Description:
texinfo-rules: generate log files in $(outdir)/
Please review this at https://codereview.appspot.com/557480043/
Affected files (+8, -8 lines):
M stepmake/stepmake/texinfo-rules.make
Index: stepmake/stepmake/texinfo-rules.make
diff --git a/stepmake/stepmake/texinfo-rules.make
b/stepmake/stepmake/texinfo-rules.make
index
26b392fc68282394f0da14111254aea6bea6c05a..808de8a60229ec1e892a453a8bec22097a84e840
100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -38,31 +38,31 @@ $(outdir)/%.itexi: %.itexi
$(outdir)/%.info: $(outdir)/%.texi
$(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
$(outdir)/weblinks.itexi | $(OUT_TEXINFO_MANUALS)
$(call ly_progress,Making,$@,< texi)
ifeq ($(WEB_VERSION),yes)
- $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
-D web_version --output=$@ $<" "$*.makeinfoweb.log"
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
-D web_version --output=$@ $<" "$(outdir)/$*.makeinfoweb.log"
else
- $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$@ $<" "$*.makeinfo.log"
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--output=$@ $<" "$(outdir)/$*.makeinfo.log"
endif
$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi | $(OUT_TEXINFO_MANUALS)
$(call ly_progress,Making,$@,< texi)
ifeq ($(WEB_VERSION),yes)
- $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage -D
web_version --output=$@ $<" "$*.bigtexi.log"
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage -D
web_version --output=$@ $<" "$(outdir)/$*.bigtexi.log"
else
- $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage
--output=$@ $<" "$*.bigtexi.log"
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage
--output=$@ $<" "$(outdir)/$*.bigtexi.log"
endif
$(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi | $(OUT_TEXINFO_MANUALS)
$(call ly_progress,Making,$@,< texi)
- $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<"
"$*.texilog.log"
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<"
"$(outdir)/$*.texilog.log"
$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map
$(outdir)/version.itexi $(outdir)/weblinks.itexi $(outdir)/%.html.omf |
$(OUT_TEXINFO_MANUALS)
$(call ly_progress,Making,$@,< texi)
mkdir -p $(dir $@)
ifeq ($(WEB_VERSION),yes)
- $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS)
-D web_version --output=$(dir $@) $<" "$*.splittexi.log"
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS)
-D web_version --output=$(dir $@) $<" "$(outdir)/$*.splittexi.log"
else
- $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS)
--output=$(dir $@) $<" "$*.splittexi.log"
+ $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../
AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS)
--output=$(dir $@) $<" "$(outdir)/$*.splittexi.log"
endif
ifneq ($(ISOLANG),)
@@ -115,7 +115,7 @@ endif
$(outdir)/%.txt: $(outdir)/%.texi $(outdir)/version.itexi
$(outdir)/weblinks.itexi | $(OUT_TEXINFO_MANUALS)
$(call ly_progress,Making,$@,< texi)
- $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--no-split --no-headers --output $@ $<" "$*.makeinfotxt.log"
+ $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir)
--no-split --no-headers --output $@ $<" "$(outdir)/$*.makeinfotxt.log"
$(outdir)/%.html.omf: %.texi
$(call ly_progress,Making,$@,< texi)