VirtualBox

Changeset 99625 in vbox


Ignore:
Timestamp:
May 5, 2023 9:30:49 AM (17 months ago)
Author:
vboxsync
Message:

manual: More Makefile cleanup after going for dita-ot 4.0.x. bugref:10302

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/manual/Makefile.kmk

    r99619 r99625  
    665665                $$(qfirstfile , $$(qwildcard , $$(VBOX_PATH_MANUAL_SRC)/$(1)/$(2).xml) $(3) $$(VBOX_PATH_MANUAL_SRC)/en_US/$(2).xml)
    666666        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) \
    667                 $(if-expr defined(VBOX_DITA_USING_LATEST),--stringparam "g_fReplaceHypens" "true",) \
     667                --stringparam "g_fReplaceHypens" "true" \
    668668                --output "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/topics/flat-$(2).dita" \
    669669                $$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-dita.xsl \
     
    791791                $$(VBOX_PATH_MANUAL_SRC)/en_US/images/vboxlogo.png
    792792        $$(call MSG_L1,Building $$@ ($$(@D)/UserManual_pdf.log))
    793         $$(QUIET)$$(RM) -f -- "$$@" \
    794                 "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_pdf" \
    795                 $$(if-expr defined(VBOX_DITA_USING_LATEST),,"$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/UserManual_pdf.log")
    796         $$(QUIET)$$(RM) -Rf -- "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-pdf/"
     793        $$(QUIET)$$(RM) -f -- "$$@"
     794        $$(QUIET)$$(RM) -f -- "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_pdf"
    797795        $$(QUIET)$$(call VBOX_DITA_RUN_DOST,, \
    798796                "--input=$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap" \
     
    827825                $(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_en_US)
    828826        $(QUIET)$(RM) -Rf -- "$(@D)" \
    829                 "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/temp_xhtml_chunks" \
    830                 $(if-expr defined(VBOX_DITA_USING_LATEST),,"$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-chunks/")
     827                "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/temp_xhtml_chunks"
    831828        $(call MSG_L1,Building html chunks $@ ($(@D)/UserManual_xhtml.log))
    832829        $(QUIET)$(MKDIR) -- "$(@D)"
     
    878875                $(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_en_US)
    879876        $(call MSG_L1,Building html chunks $@ ($(@D)/UserManual-Single_xhtml.log))
    880         $(QUIET)$(RM) -f -- "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual-Single.ditamap"
     877        $(QUIET)$(RM) -Rf -- "$(@D)" \
     878                "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-single/" \
     879                "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual-Single.ditamap"
    881880        $(SED) -r -e 's/ chunk=["][^"]+["]//g' -e 's/<bookmap /<bookmap chunk="to-content" /' \
    882881                --output "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual-Single.ditamap" \
    883882                "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual.ditamap"
    884         $(QUIET)$(RM) -Rf -- "$(@D)" "$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita-ot-html-single/"
    885883        $(QUIET)$(MKDIR) -- "$(@D)"
    886884        $(QUIET)$(call VBOX_DITA_RUN_DOST,, \
     
    987985                $(VBOX_USER_MANUAL_CONVERTED_REFENTRY_DITA_FILES_$(1))
    988986        $$(QUIET)$$(RM) -Rf -- "$$(@D)" \
    989                 "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_qhelp" \
    990                 $(if-expr defined(VBOX_DITA_USING_LATEST),,"$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita-ot-qhelp/")
     987                "$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_qhelp"
    991988        $$(call MSG_L1,dita-ot-qhelp, => $$@ ($(2)/UserManual_htmlhelp.log))
    992989        $$(QUIET)$$(MKDIR) -- "$$(@D)"
     
    1001998                )
    1002999
    1003 
    10041000   ditamap-to-htmlhelp: $(2)/UserManual.hhp
    10051001
     
    10071003   $(2)/UserManual.qhp: \
    10081004                $(2)/UserManual.hhp \
    1009                 $$(VBOX_PATH_MANUAL_SRC)/htmlhelp-qthelp.py \
    1010                 | $$$$(dir $$$$@)
     1005                $$(VBOX_PATH_MANUAL_SRC)/htmlhelp-qthelp.py
    10111006        $$(call MSG_L1,htmlhelp-qthelp.py $$<,=> $$@)
    10121007        $$(QUIET)$$(RM) -f -- "$$@"
     
    10241019   + $(2)/UserManual.qhc: \
    10251020                $(2)/UserManual.qhcp \
    1026                 $(2)/UserManual.qhp \
    1027                 | $$$$(dir $$$$@)
     1021                $(2)/UserManual.qhp
    10281022        $$(call MSG_L1,$$(notdir $$(VBOX_QHELPGENERATOR)) $$<,=> $$@)
    10291023        $$(QUIET)$$(RM) -f -- "$$@"
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette