VirtualBox

Changeset 99033 in vbox for trunk/doc


Ignore:
Timestamp:
Mar 17, 2023 10:14:59 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
156398
Message:

manual/Makefile.kmk: dita_common and correct_reference_targets must be real files, or anyone depending on them will always be remade as stat() fails. Various cleanups. bugref:10302

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/doc/manual/Makefile.kmk

    r99029 r99033  
    150150
    151151 ifdef VBOX_WITH_DOCS_QHELP
    152   INSTALLS += VBox-docs-usermanual-qhc
    153   INSTALLS += VBox-docs-usermanual-qch
     152  INSTALLS += VBox-docs-usermanual-qhelp
    154153  ifdef VBOX_WITH_QT6
    155154   USES += qt6
    … …  
    162161 endif
    163162 ifdef VBOX_WITH_DOCS_QHELP_PACKING
    164   VBOX_PATH_BIN_QHELP = $(PATH_STAGE_BIN)/UserManual.qch
    165   VBOX_PATH_BIN_QHELP += $(PATH_STAGE_BIN)/UserManual.qhc
     163  VBOX_PATH_BIN_QHELP = \
     164        $(PATH_STAGE_BIN)/UserManual.qch \
     165        $(PATH_STAGE_BIN)/UserManual.qhc
    166166 else  # Do not install/pack qhelp.
    167   VBOX_PATH_BIN_QHELP =
     167  VBOX_PATH_BIN_QHELP :=
    168168 endif
    169169
    170  .NOTPARALLEL: \
    171                 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch + $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.qhc \
     170 ## @todo r=bird: Explanations for all of this is required!
     171 .NOTPARALLEL: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch  \
     172                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.qhc \
    172173                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf \
    173174                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip
    … …  
    177178        $(PATH_STAGE_BIN)/UserManual.pdf \
    178179        $(VBOX_PATH_BIN_HTML) \
    179         $(VBOX_PATH_BIN_CHM) \
    180180        $(VBOX_PATH_BIN_QHELP)
    181181  INSTALLS += VBox-docs-usermanual
    … …  
    339339VBox-docs-usermanual_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf
    340340
    341 VBox-docs-usermanual-qhc_INST = $(INST_BIN)
    342 VBox-docs-usermanual-qhc_MODE = a+r,u+w
    343 VBox-docs-usermanual-qhc_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qhc
    344 
    345 VBox-docs-usermanual-qch_INST = $(INST_BIN)
    346 VBox-docs-usermanual-qch_MODE = a+r,u+w
    347 VBox-docs-usermanual-qch_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch
     341VBox-docs-usermanual-qhelp_INST = $(INST_BIN)
     342VBox-docs-usermanual-qhelp_MODE = a+r,u+w
     343VBox-docs-usermanual-qhelp_SOURCES = \
     344        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qhc \
     345        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch
    348346
    349347#
    … …  
    360358VBox-docs-usermanual-html_MODE = a+r,u+w
    361359VBox-docs-usermanual-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip=>UserManual-html.zip
    362 
    363 #
    364 # target for installing VirtualBox.chm
    365 #
    366 VBox-docs-usermanual-chm_INST = $(INST_BIN)
    367 VBox-docs-usermanual-chm_MODE = a+r,u+w
    368 VBox-docs-usermanual-chm_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
    369 
    370 #
    371 # target for installing translated VirtualBox_*.chm
    372 #
    373 VBox-docs-usermanual-l10n-chm_INST = $(INST_BIN)
    374 VBox-docs-usermanual-l10n-chm_MODE = a+r,u+w
    375 VBox-docs-usermanual-l10n-chm_SOURCES = $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/VirtualBox.chm=>VirtualBox_$(f).chm)
    376360
    377361#
    … …  
    449433
    450434 # copy the PNG files.
    451  # Note: out_dir needs to be referenced with an escaped $ so it doesn't expand as eval expands it input.
     435 # Note: out_dir referenced with double $$ to delay expansion to the eval step when out_dir has been defined.
    452436 define def_vbox_cp_images_pdf
    453437  local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)
    … …  
    468452 ifdef TO_BE_REMOVED
    469453  # Generate PDF from LaTeX
    470   # Note: out_dir needs to be referenced with an escaped $ so it doesn't expand as eval expands it input.
     454  # Note: out_dir referenced with double $$ to delay expansion to the eval step when out_dir has been defined.
    471455  define def_vbox_usermanual_tex_to_pdf
    472456   local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)
    … …  
    490474
    491475  # Generate LaTeX from XML
    492   # Note: out_dir needs to be referenced with an escaped $ so it doesn't expand as eval expands it input.
     476  # Note: out_dir referenced with double $$ to delay expansion to the eval step when out_dir has been defined.
    493477  define def_vbox_usermanual_xml_to_tex
    494478   local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)
    … …  
    778762
    779763 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html: \
    780                 dita_common
     764                $(VBOX_PATH_MANUAL_OUTBASE)/dita_common
    781765        $(call MSG_L1,Building html chunks $@)
    782         $(QUIET)$(call VBOX_DITA_ENV_SETUP) \
    783                 $(VBOX_JAVA) -jar $(VBOX_DITA_PATH_LIB)/dost.jar /i:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual.ditamap \
    784                         /transtype:xhtml /ditadir:$(VBOX_DITA_PATH) /outdir:$(@D) /tempdir:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/temp_xhtml
     766        $(QUIET)$(call VBOX_DITA_ENV_SETUP) $(VBOX_JAVA) -jar $(VBOX_DITA_PATH_LIB)/dost.jar \
     767                /i:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual.ditamap \
     768                /transtype:xhtml \
     769                /ditadir:$(VBOX_DITA_PATH) \
     770                /outdir:$(@D) \
     771                /tempdir:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/temp_xhtml
    785772
    786773 # disable for now
    … …  
    820807        $(QUIET)$(INSTALL_STAGING) -m0644 -- $(VBOX_PATH_MANUAL_SRC)/en_US/$(notdir $@) "$(@D)"
    821808
    822  correct_reference_targets: \
     809 $(VBOX_PATH_MANUAL_OUTBASE)/correct_reference_targets: \
    823810                $$(VBOX_PATH_MANUAL_SRC)/correct_references.py \
    824811                $$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics/ \
    … …  
    826813        $(call MSG_L1,correct_references.py -d $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics)
    827814        $(QUIET)$(VBOX_BLD_PYTHON) $(VBOX_PATH_MANUAL_SRC)/correct_references.py -d $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics
    828 
    829  dita_common: \
     815        $(QUIET)$(TOUCH) -- "$@"
     816
     817 $(VBOX_PATH_MANUAL_OUTBASE)/dita_common: \
    830818                $$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/UserManual.ditamap \
    831819                $$(VBOX_DITA_PATH) \
    832                 correct_reference_targets
     820                $(VBOX_PATH_MANUAL_OUTBASE)/correct_reference_targets
    833821        $(call MSG_L1, Running common dita steps)
     822        $(QUIET)$(TOUCH) -- "$@"
     823
    834824
    835825 ##########################################################################################
    … …  
    899889                $$(VBOX_MANUAL_XML_FILES_COMMON) \
    900890                $$(VBOX_MANUAL_XML_FILES_GENERATED_$(lang)) \
    901                 dita_common
    902         $(QUIET)$(call VBOX_DITA_ENV_SETUP) \
    903                 $(VBOX_JAVA) -jar $(VBOX_DITA_PATH_LIB)/dost.jar /i:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap \
    904                         /transtype:pdf /ditadir:$(VBOX_DITA_PATH) /outdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1) /tempdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_pdf
     891                $(VBOX_PATH_MANUAL_OUTBASE)/dita_common
     892        $(QUIET)$(call VBOX_DITA_ENV_SETUP) $(VBOX_JAVA) -jar $(VBOX_DITA_PATH_LIB)/dost.jar \
     893                /i:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap \
     894                /transtype:pdf \
     895                /ditadir:$(VBOX_DITA_PATH) \
     896                /outdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1) \
     897                /tempdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_pdf
     898
    905899
    906900 endef
    … …  
    977971
    978972 # Generate QCH from QHelp source
    979  # Note: out_dir needs to be referenced with an escaped $ so it doesn't expand as eval expands it input.
     973 # Note: out_dir referenced with double $$ to delay expansion to the eval step when out_dir has been defined.
    980974 define def_vbox_usermanual_qhp_to_qch
    981975  local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)
    982   $$(out_dir)/qhelp/UserManual.qch + \
    983   $$(out_dir)/qhelp/UserManual.qhc: \
     976  $$(out_dir)/qhelp/UserManual.qch \
     977  + $$(out_dir)/qhelp/UserManual.qhc: \
    984978                $$(out_dir)/qhelp/UserManual.qhcp \
    985979                $$(out_dir)/qhelp/UserManual.qhp \
    … …  
    994988
    995989 # Generate QHP from HHP for QHelp
    996  # Note: out_dir needs to be referenced with an escaped $ so it doesn't expand as eval expands it input.
     990 # Note: out_dir referenced with double $$ to delay expansion to the eval step when out_dir has been defined.
    997991 define def_vbox_usermanual_hhp_qhelp_to_qhp
    998992  local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)
    … …  
    10111005  ditamap-to-htmlhelp: $$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/qhelp/UserManual.hhp
    10121006  $$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/qhelp/UserManual.hhp: \
    1013                 dita_common
    1014         $(QUIET)$(call VBOX_DITA_ENV_SETUP) \
    1015                 $(VBOX_JAVA) -jar $(VBOX_DITA_PATH_LIB)/dost.jar /i:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap \
    1016                         /transtype:htmlhelp /ditadir:$(VBOX_DITA_PATH) /outdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/qhelp /tempdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_htmlhelp
     1007                $(VBOX_PATH_MANUAL_OUTBASE)/dita_common
     1008        $(QUIET)$(call VBOX_DITA_ENV_SETUP) $(VBOX_JAVA) -jar $(VBOX_DITA_PATH_LIB)/dost.jar \
     1009                /i:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/UserManual.ditamap \
     1010                /transtype:htmlhelp \
     1011                /ditadir:$(VBOX_DITA_PATH) \
     1012                /outdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/qhelp \
     1013                /tempdir:$$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/dita/temp_htmlhelp
    10171014
    10181015 endef
    … …  
    10291026
    10301027 # copy the PNG files.
    1031  # Note: out_dir needs to be referenced with an escaped $ so it doesn't expand as eval expands it input.
     1028 # Note: out_dir referenced with double $$ to delay expansion to the eval step when out_dir has been defined.
    10321029 define def_vbox_cp_images_qhelp
    10331030  local out_dir := $(VBOX_PATH_MANUAL_OUTBASE)/$(lang)/qhelp
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