VirtualBox

Changeset 99056 in vbox


Ignore:
Timestamp:
Mar 19, 2023 9:58:09 PM (2 years ago)
Author:
vboxsync
Message:

manual/Makefile.kmk: Cleaning up the makefile step by step... bugref:10348 bugref:10302

File:
1 edited

Legend:

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

    r99047 r99056  
    5959endif
    6060
    61 
    62 
    63 #
    64 # Globals
    65 #
    66 
    67 # Error out if someone tries to override old globals.
    68 ifdef DOCBOOKPATH
    69  $(error DOCBOOKPATH was renamed to VBOX_PATH_DOCBOOK!)
    70 endif
    71 ifdef DOCBOOKPATH
    72  $(error DOCBOOKPATH was renamed to VBOX_PATH_DOCBOOK!)
    73 endif
    74 ifdef XML_CATALOG
    75  $(error XML_CATALOG was renamed to VBOX_XML_CATALOG!)
    76 endif
    77 ifdef XML_CATALOG_DOCBOOK
    78  $(error XML_CATALOG_DOCBOOK was renamed to VBOX_XML_CATALOG_DOCBOOK!)
    79 endif
    80 ifdef PDFLATEX_INTERACTION
    81  $(error PDFLATEX_INTERACTION was renamed to VBOX_PDFLATEX_INTERACTION!)
    82 endif
    83 ifdef PDFLATEX
    84  $(error PDFLATEX was renamed to VBOX_PDFLATEX_CMD!)
    85 endif
    86 
    87 VBOX_QHELP_OUTPUT_FILES = \
    88         UserManual.qch \
    89         UserManual.qhc
    90 
    91 # VBOX_PDFLATEX_INTERACTION = errorstopmode - Use this when you wants to figure out build failures
    92 #                                             without catting the log a million times.
    93 VBOX_PDFLATEX_INTERACTION ?= batchmode
    94 ifeq ($(KBUILD_HOST),win)
    95  ifndef VBOX_PDFLATEX
    96   VBOX_PDFLATEX           := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/miktex-portable/*/miktex/bin/pdflatex.exe)))
    97   ifneq ($(VBOX_PDFLATEX),)
    98    VBOX_PDFLATEX_CMD       = $(VBOX_PDFLATEX) -halt-on-error -interaction $(VBOX_PDFLATEX_INTERACTION)
     61if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK)) # Whole file.
     62
     63 #
     64 # Globals
     65 #
     66
     67 ## The files that should go into VBoxDocumentation.zip (must be immediately under PATH_STAGE_BIN).
     68 VBOX_MANUAL_PACK =
     69
     70 ifndef VBOX_ONLY_SDK
     71  ifdef VBOX_WITH_DOCS_QHELP
     72   ifdef VBOX_WITH_QT6
     73    USES += qt6
     74    VBOX_QHELPGENERATOR = $(PATH_TOOL_QT6_LIBEXEC)/qhelpgenerator
     75   else
     76    USES += qt5
     77    VBOX_QHELPGENERATOR_VERSION_MINOR = $(shell $(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$(PATH_SDK_QT5)/plugins -- $(PATH_TOOL_QT5_BIN)/qhelpgenerator -v 2>/dev/null | $(SED) -ne 's/.*(Qt [1-9][0-9]*\.\([1-9][0-9]*\)\.[1-9][0-9]*).*$$/\1/p')
     78    VBOX_QHELPGENERATOR = $(PATH_TOOL_QT5_BIN)/$(if-expr $(VBOX_QHELPGENERATOR_VERSION_MINOR) >= 12,qhelpgenerator,qcollectiongenerator)
     79   endif
    9980  endif
     81
     82 endif # ! VBOX_ONLY_SDK
     83
     84 VBOX_QHELP_OUTPUT_FILES := UserManual.qch UserManual.qhc
     85
     86 # SDK related globals.
     87 VBOX_MANUAL_APIREF_TMP = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef_apiref.xml
     88 VBOX_DOC_XIDL_SRC      = $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl
     89 VBOX_DOC_XIDL_SRC_TMP  = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.xidl.tmp
     90
     91 # VBOX_PDFLATEX_INTERACTION = errorstopmode - Use this when you wants to figure out build failures
     92 #                                             without catting the log a million times.
     93 VBOX_PDFLATEX_INTERACTION ?= batchmode
     94 ifeq ($(KBUILD_HOST),win)
     95  ifndef VBOX_PDFLATEX
     96   VBOX_PDFLATEX           := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/miktex-portable/*/miktex/bin/pdflatex.exe)))
     97   ifneq ($(VBOX_PDFLATEX),)
     98    VBOX_PDFLATEX_CMD       = $(VBOX_PDFLATEX) -halt-on-error -interaction $(VBOX_PDFLATEX_INTERACTION)
     99   endif
     100  endif
     101  ifndef VBOX_PDFLATEX
     102   # Tell MiKTeX to automatically download packages if system wide install.
     103   VBOX_PDFLATEX           := pdflatex
     104   VBOX_PDFLATEX_CMD        = $(VBOX_PDFLATEX) -halt-on-error -interaction $(VBOX_PDFLATEX_INTERACTION) --enable-installer
     105  endif
     106 else
     107  VBOX_PDFLATEX            ?= pdflatex
     108  VBOX_PDFLATEX_HALT        = $(shell ( $(VBOX_PDFLATEX) -version | head -1 | grep 141592 > /dev/null ) && echo -halt-on-error )
     109  VBOX_PDFLATEX_CMD         = pdflatex $(VBOX_PDFLATEX_HALT) -interaction $(VBOX_PDFLATEX_INTERACTION)
    100110 endif
    101  ifndef VBOX_PDFLATEX
    102   # Tell MiKTeX to automatically download packages if system wide install.
    103   VBOX_PDFLATEX           := pdflatex
    104   VBOX_PDFLATEX_CMD        = $(VBOX_PDFLATEX) -halt-on-error -interaction $(VBOX_PDFLATEX_INTERACTION) --enable-installer
    105  endif
    106 else
    107  VBOX_PDFLATEX            ?= pdflatex
    108  VBOX_PDFLATEX_HALT        = $(shell ( $(VBOX_PDFLATEX) -version | head -1 | grep 141592 > /dev/null ) && echo -halt-on-error )
    109  VBOX_PDFLATEX_CMD         = pdflatex $(VBOX_PDFLATEX_HALT) -interaction $(VBOX_PDFLATEX_INTERACTION)
    110 endif
    111 
    112 # SDK related globals.
    113 VBOX_MANUAL_APIREF_TMP = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef_apiref.xml
    114 VBOX_DOC_XIDL_SRC      = $(PATH_ROOT)/src/VBox/Main/idl/VirtualBox.xidl
    115 VBOX_DOC_XIDL_SRC_TMP  = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.xidl.tmp
    116 
    117 
    118 ##
    119 # Copies DITA-OT to $1, runs the dost.jar with /ditadir given and nukes $1 when done.
    120 #
    121 # Additional options for dost.jar can be specified following the call to VBOX_DITA_RUN_DOST
    122 #
    123 # @param 1    Temporary+unique DITA-OT path.
    124 # @param 2    Additional kmk_redirect options.
    125 #
    126 VBOX_DITA_RUN_DOST ?= $(REDIRECT) \
    127         -E 'ANT_OPTS=-Xmx512m -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl' \
    128         -E 'ANT_HOME=$1/tools/ant' \
    129         -E 'DITA_DIR=$1' \
    130         -E 'JAVA_HOME=$(VBOX_JAVA_HOME)' \
    131         -A 'PATH=$(HOST_PATH_SEP)$1/tools/ant/bin' \
    132         -E 'CLASSPATH=$1/lib/dost.jar' \
    133         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib' \
    134         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/commons-codec-1.4.jar' \
    135         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/resolver.jar' \
    136         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/icu4j.jar' \
    137         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/xercesImpl.jar' \
    138         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/xml-apis.jar' \
    139         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/saxon/saxon9.jar' \
    140         -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/saxon/saxon9-dom.jar' \
    141         $2 \
    142         -- $(ASH) $(VBOX_PATH_MANUAL_SRC)/dita-ot-copy-exec.sh "$(VBOX_DITA_ORIGINAL_PATH)" "$1" \
    143         -- $(VBOX_JAVA) -jar "$1/lib/dost.jar" "/ditadir:$1" # "/outercontrol:fail" ?
    144 
    145 
    146 #
    147 # Targets
    148 #
    149 
    150 BLDDIRS += $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, $(VBOX_MANUAL_LANGUAGES))
    151 
    152 if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
    153  if defined(VBOX_ONLY_SDK) || defined(VBOX_WITH_DOCS_SDKREF)
    154   INSTALLS += VBox-docs-sdkref
    155  endif
    156 
    157  ifdef VBOX_WITH_DOCS_HTML
    158   INSTALLS += VBox-docs-usermanual-html
    159   VBOX_PATH_BIN_HTML = $(PATH_STAGE_BIN)/UserManual-html.zip
    160  else  # Do not build html.
    161   VBOX_PATH_BIN_HTML =
    162  endif
    163 
    164  ifdef VBOX_WITH_DOCS_QHELP
    165   INSTALLS += VBox-docs-usermanual-qhelp
    166   ifdef VBOX_WITH_QT6
    167    USES += qt6
    168    QHELPGENERATOR = $(PATH_TOOL_QT6_LIBEXEC)/qhelpgenerator
    169   else # Qt5
    170    USES += qt5
    171    QHELPGENERATOR_VERSION_MINOR = $(shell $(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$(PATH_SDK_QT5)/plugins -- $(PATH_TOOL_QT5_BIN)/qhelpgenerator -v 2>/dev/null | $(SED) -ne 's/.*(Qt [1-9][0-9]*\.\([1-9][0-9]*\)\.[1-9][0-9]*).*$$/\1/p')
    172    QHELPGENERATOR = $(PATH_TOOL_QT5_BIN)/$(if-expr $(QHELPGENERATOR_VERSION_MINOR) >= 12,qhelpgenerator,qcollectiongenerator)
    173   endif
    174  endif
    175  ifdef VBOX_WITH_DOCS_QHELP_PACKING
    176   VBOX_PATH_BIN_QHELP = \
    177         $(PATH_STAGE_BIN)/UserManual.qch \
    178         $(PATH_STAGE_BIN)/UserManual.qhc
    179  else  # Do not install/pack qhelp.
    180   VBOX_PATH_BIN_QHELP :=
    181  endif
    182 
    183  ifndef VBOX_ONLY_SDK
    184   VBOX_MANUAL_PACK += \
    185         $(PATH_STAGE_BIN)/UserManual.pdf \
    186         $(VBOX_PATH_BIN_HTML) \
    187         $(VBOX_PATH_BIN_QHELP)
    188   INSTALLS += VBox-docs-usermanual
    189 
    190   ifdef VBOX_WITH_DOCS_TRANSLATIONS
    191    INSTALLS += VBox-docs-usermanual-l10n
    192    VBOX_MANUAL_PACK += \
    193         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf)
    194   endif
    195  endif # !VBOX_ONLY_SDK
    196 
    197  ifdef VBOX_WITH_DOCS_ACCESSIBILITY
    198   INSTALLS += \
    199         VBox-docs-accessibility \
    200         VBox-docs-accessibility-html
    201  endif
     111
     112 ##
     113 # Copies DITA-OT to $1, runs the dost.jar with /ditadir given and nukes $1 when done.
     114 #
     115 # Additional options for dost.jar can be specified following the call to VBOX_DITA_RUN_DOST
     116 #
     117 # @param 1    Temporary+unique DITA-OT path.
     118 # @param 2    Additional kmk_redirect options.
     119 #
     120 VBOX_DITA_RUN_DOST ?= $(REDIRECT) \
     121        -E 'ANT_OPTS=-Xmx512m -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl' \
     122        -E 'ANT_HOME=$1/tools/ant' \
     123        -E 'DITA_DIR=$1' \
     124        -E 'JAVA_HOME=$(VBOX_JAVA_HOME)' \
     125        -A 'PATH=$(HOST_PATH_SEP)$1/tools/ant/bin' \
     126        -E 'CLASSPATH=$1/lib/dost.jar' \
     127        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib' \
     128        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/commons-codec-1.4.jar' \
     129        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/resolver.jar' \
     130        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/icu4j.jar' \
     131        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/xercesImpl.jar' \
     132        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/xml-apis.jar' \
     133        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/saxon/saxon9.jar' \
     134        -A 'CLASSPATH=$(HOST_PATH_SEP)$1/lib/saxon/saxon9-dom.jar' \
     135        $2 \
     136        -- $(ASH) $(VBOX_PATH_MANUAL_SRC)/dita-ot-copy-exec.sh "$(VBOX_DITA_ORIGINAL_PATH)" "$1" \
     137        -- $(VBOX_JAVA) -jar "$1/lib/dost.jar" "/ditadir:$1" # "/outercontrol:fail" ?
     138
     139
     140 #
     141 # Targets
     142 #
     143
     144 ## @todo r=bird:Why outside the big if statement? There should be no targets if not entered...
     145 BLDDIRS += $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, $(VBOX_MANUAL_LANGUAGES))
     146
    202147
    203148 ifdef VBOX_ONLY_DOCS
     
    205150 endif
    206151
     152 ## @todo r=bird: why here? We already used it VBOX_MANUAL_LANGUAGES, and BLDDIRS not being a
     153 ## simple variable this will modify the result after it's been used, which is confusing.
    207154 ifdef VBOX_WITH_DOCS_TRANSLATIONS
    208155  VBOX_MANUAL_LANGUAGES += $(VBOX_MANUAL_ADD_LANGUAGES)
     
    239186 VBOX_ACCESSIBILITY_LATEX_FILES_TARGET = \
    240187        $(addprefix Accessibility.,aux log out toc tex)
     188
     189 BLDDIRS += \
     190        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita \
     191        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics \
     192        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics/images
    241193
    242194 BLDDIRS += \
     
    340292        $(VBOX_MANUAL_APIREF_TMP)
    341293
    342 endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
    343 
    344 #
    345 # target for installing UserManual.pdf
    346 #
    347 VBox-docs-usermanual_INST = $(INST_BIN)
    348 VBox-docs-usermanual_MODE = a+r,u+w
    349 VBox-docs-usermanual_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf
    350 
    351 VBox-docs-usermanual-qhelp_INST = $(INST_BIN)
    352 VBox-docs-usermanual-qhelp_MODE = a+r,u+w
    353 VBox-docs-usermanual-qhelp_SOURCES = \
    354         $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qhc \
    355         $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch
    356 
    357 #
    358 # target for installing translated UserManual_*.pdf
    359 #
    360 VBox-docs-usermanual-l10n_INST = $(INST_BIN)
    361 VBox-docs-usermanual-l10n_MODE = a+r,u+w
    362 VBox-docs-usermanual-l10n_SOURCES = \
    363         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/UserManual.pdf=>UserManual_$(f).pdf)
    364 
    365 #
    366 # target for installing the chunked HTML docs
    367 #
    368 VBox-docs-usermanual-html_INST = $(INST_BIN)
    369 VBox-docs-usermanual-html_MODE = a+r,u+w
    370 VBox-docs-usermanual-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip=>UserManual-html.zip
    371 
    372 #
    373 # target for installing SDKRef.pdf
    374 #
    375 VBox-docs-sdkref_INST = $(INST_SDK)docs/
    376 VBox-docs-sdkref_MODE = a+r,u+w
    377 VBox-docs-sdkref_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.pdf
    378 
    379 #
    380 # target for installing Accessibility.pdf
    381 #
    382 VBox-docs-accessibility_INST = $(INST_BIN)
    383 VBox-docs-accessibility_MODE = a+r,u+w
    384 VBox-docs-accessibility_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/Accessibility.pdf
    385 
    386 #
    387 # target for installing Accessibility.html
    388 #
    389 VBox-docs-accessibility-html_INST = $(INST_BIN)
    390 VBox-docs-accessibility-html_MODE = a+r,u+w
    391 VBox-docs-accessibility-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/Accessibility.html
    392 
    393 if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
     294
     295 ifndef VBOX_ONLY_SDK
     296  #
     297  # target for installing UserManual.pdf
     298  #
     299  INSTALLS += VBox-docs-usermanual
     300  VBox-docs-usermanual_INST = $(INST_BIN)
     301  VBox-docs-usermanual_MODE = a+r,u+w
     302  VBox-docs-usermanual_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf
     303  VBOX_MANUAL_PACK += $(PATH_STAGE_BIN)/UserManual.pdf
     304
     305  ifdef VBOX_WITH_DOCS_TRANSLATIONS
     306   #
     307   # target for installing translated UserManual_*.pdf
     308   #
     309   INSTALLS += VBox-docs-usermanual-l10n
     310   VBox-docs-usermanual-l10n_INST = $(INST_BIN)
     311   VBox-docs-usermanual-l10n_MODE = a+r,u+w
     312   VBox-docs-usermanual-l10n_SOURCES = \
     313        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/UserManual.pdf=>UserManual_$(f).pdf)
     314   VBOX_MANUAL_PACK += $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf)
     315  endif
     316
     317  ifdef VBOX_WITH_DOCS_QHELP
     318   #
     319   # Installs the qhelp version of the manual.
     320   #
     321   INSTALLS += VBox-docs-usermanual-qhelp
     322   VBox-docs-usermanual-qhelp_INST = $(INST_BIN)
     323   VBox-docs-usermanual-qhelp_MODE = a+r,u+w
     324   VBox-docs-usermanual-qhelp_SOURCES = \
     325        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qhc \
     326        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch
     327   ifdef VBOX_WITH_DOCS_QHELP_PACKING
     328    VBOX_MANUAL_PACK += \
     329        $(PATH_STAGE_BIN)/UserManual.qch \
     330        $(PATH_STAGE_BIN)/UserManual.qhc
     331   endif
     332  endif
     333
     334  ifdef VBOX_WITH_DOCS_HTML
     335   #
     336   # target for installing the chunked HTML docs
     337   #
     338   INSTALLS += VBox-docs-usermanual-html
     339   VBox-docs-usermanual-html_INST = $(INST_BIN)
     340   VBox-docs-usermanual-html_MODE = a+r,u+w
     341   VBox-docs-usermanual-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip=>UserManual-html.zip
     342   VBOX_MANUAL_PACK += $(PATH_STAGE_BIN)/UserManual-html.zip
     343  endif
     344
     345  ifdef VBOX_WITH_DOCS_ACCESSIBILITY
     346   #
     347   # target for installing Accessibility.pdf
     348   #
     349   INSTALLS += VBox-docs-accessibility
     350   VBox-docs-accessibility_INST = $(INST_BIN)
     351   VBox-docs-accessibility_MODE = a+r,u+w
     352   VBox-docs-accessibility_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/Accessibility.pdf
     353
     354   #
     355   # target for installing Accessibility.html
     356   #
     357   INSTALLS += VBox-docs-accessibility-html
     358   VBox-docs-accessibility-html_INST = $(INST_BIN)
     359   VBox-docs-accessibility-html_MODE = a+r,u+w
     360   VBox-docs-accessibility-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/Accessibility.html
     361  endif
     362
     363 endif # !VBOX_ONLY_SDK
     364
     365 if defined(VBOX_ONLY_SDK) || defined(VBOX_WITH_DOCS_SDKREF)
     366  #
     367  # target for installing SDKRef.pdf
     368  #
     369  INSTALLS += VBox-docs-sdkref
     370  VBox-docs-sdkref_INST = $(INST_SDK)docs/
     371  VBox-docs-sdkref_MODE = a+r,u+w
     372  VBox-docs-sdkref_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.pdf
     373 endif
     374
    394375
    395376 ##
     
    611592
    612593 # Packing the docs into a zip file
    613  $(PATH_STAGE_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK)
     594 ifneq ($(VBOX_MANUAL_PACK),)
     595  $(PATH_STAGE_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK)
    614596        $(call MSG_L1,Packing documentation $@)
    615597        $(QUIET)$(RM) -f $@
    616598        $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -9 $@ $(notdir $^)
     599 endif
    617600
    618601
     
    636619 #
    637620 ##########################################################################################
    638 
    639  BLDDIRS += \
    640         $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita \
    641         $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics \
    642         $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics/images
    643621
    644622 VBOX_USER_MANUAL_STAGED_DITA_FILES  := $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/topics/, \
     
    825803
    826804
    827 endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
    828 
    829 
    830805#
    831806# VBoxManage man pages (parts also required by VBoxManage built-in help).
     
    885860                $$(addprefix $$(out_dir)/qhelp/,$$(VBOX_MANUAL_PNG_FILES_$(lang))) \
    886861                | $$$$(dir $$$$@)
    887         $$(call MSG_L1,$$(notdir $$(QHELPGENERATOR)) $$<,=> $$@)
     862        $$(call MSG_L1,$$(notdir $$(VBOX_QHELPGENERATOR)) $$<,=> $$@)
    888863        $$(QUIET)$$(RM) -f $$@
    889         $$(QUIET)$$(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$$(PATH_SDK_QT5)/plugins -- $$(QHELPGENERATOR) $$<
     864        $$(QUIET)$$(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$$(PATH_SDK_QT5)/plugins -- $$(VBOX_QHELPGENERATOR) $$<
    890865        $$(call MSG_L1,Fresh QCH is now at $$@)
    891866 endef
     
    959934
    960935
     936endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
     937
    961938include $(FILE_KBUILD_SUB_FOOTER)
    962939
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