Changeset 99075 in vbox for trunk/doc

Timestamp:

Mar 20, 2023 11:52:00 PM (22 months ago)

Author:

vboxsync

Message:

manual/Makefile.kmk: Nuke the output directories prior to running DITA-OT when possible, also make sure they exists to prevent trouble with newer DITA-OT plugins. bugref:10302

File:

• trunk/doc/manual/Makefile.kmk (modified) (5 diffs)

trunk/doc/manual/Makefile.kmk

@@ -794 +794 @@
                 $$(VBOX_USER_MANUAL_DITA_STAGED_FILES_$(lang)) \
                 $$(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_$(lang))
-        $$(QUIET)$(RM) -f -- "$$@"
-        $$(QUIET)$(RM) -Rf -- "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-pdf/"
+        $$(QUIET)$$(RM) -f -- "$$@" "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/UserManual_pdf.log" \
+        $$(QUIET)$$(RM) -Rf -- "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-pdf/"
         $$(QUIET)$$(call VBOX_DITA_RUN_DOST,$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-pdf,, \
                 "/i:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap" \
@@ -824 +824 @@
                 $(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_en_US)
         $(call MSG_L1,Building html chunks $@)
-        $(QUIET)$(RM) -Rf -- "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-chunks/"
+        $(QUIET)$(RM) -Rf -- "$(@D)" "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-chunks/"
+        $(QUIET)$(MKDIR) -- "$(@D)"
         $(QUIET)$(call VBOX_DITA_RUN_DOST,$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-chunks,, \
                 "/i:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual.ditamap" \
@@ -845 +846 @@
                 $(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_en_US)
         $(call MSG_L1,Building html chunks $@)
-        $(QUIET)$(RM) -Rf -- "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/"
         $(QUIET)$(RM) -f -- "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual-Single.ditamap"
         $(SED) -r -e 's/ chunk=["][^"]+["]//g' -e 's/<bookmap /<bookmap chunk="to-content" /' \
                 --output "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual-Single.ditamap" \
                 "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual.ditamap"
-        $(QUIET)$(RM) -Rf -- "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-single/"
+        $(QUIET)$(RM) -Rf -- "$(@D)" "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-single/"
+        $(QUIET)$(MKDIR) -- "$(@D)"
         $(QUIET)$(call VBOX_DITA_RUN_DOST,$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-single,, \
                 "/i:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual-Single.ditamap" \
@@ -937 +938 @@
    # compilation step that produces the .chm-file, since we don't need it and it
    # mangles the path so it always fails anyway.
+   ## @todo front page.
    $(2)/UserManual.hhp: \
                 $(VBOX_USER_MANUAL_DITA_STAGED_FILES_$(1)) \
                 $(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_$(1))
-        $$(QUIET)$(RM) -Rf -- "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-qhelp/"
+        $$(QUIET)$$(RM) -Rf -- "$$(@D)" "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-qhelp/"
+        $$(QUIET)$$(MKDIR) -- "$$(@D)"
         $$(QUIET)$$(call VBOX_DITA_RUN_DOST,$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-qhelp, -EHHCDIR="$$(@D)", \
                 "/i:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap" \
@@ -962 +965 @@
 
    # 3. Copy the Qt help configuration file from source to the output dir.
-   $(2)/UserManual.qhcp: $$(VBOX_PATH_MANUAL_SRC)/UserManual.qhcp | $$$$(dir $$$$@)
+   $(2)/UserManual.qhcp: \
+                $$(VBOX_PATH_MANUAL_SRC)/UserManual.qhcp \
+                | $(2)/UserManual.hhp # (Must not run parallel to UserManual.hpp, so it can safely nuke the output dir.)
         $$(QUIET)$$(INSTALL_STAGING) -m0644 -- '$$<' '$$(@D)'