Changeset 99065 in vbox for trunk/doc/manual

Timestamp:

Mar 20, 2023 12:16:52 PM (22 months ago)

Author:

vboxsync

Message:

manual/Makefile.kmk: Cleaning up html and qhelp outputting. The latter doesn't need an extra copy of the Docbook version of the images, since DITA-OT copies the necessary images to qhelp/topics/images/. [fix] bugref:10348 bugref:10302

File:

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

trunk/doc/manual/Makefile.kmk

@@ -167 +167 @@
  #
 
- ## @todo r=bird:Why outside the big if statement? There should be no targets if not entered...
  BLDDIRS += $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/, $(VBOX_MANUAL_ALL_LANGUAGES))
 
@@ -302 +301 @@
   endif
 
+  ifdef VBOX_WITH_DOCS_HTML
+   #
+   # target for installing the chunked HTML docs
+   #
+   INSTALLS += VBox-docs-usermanual-html
+   VBox-docs-usermanual-html_INST = $(INST_BIN)
+   VBox-docs-usermanual-html_MODE = a+r,u+w
+   VBox-docs-usermanual-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip=>UserManual-html.zip
+   VBOX_MANUAL_PACK += $(PATH_STAGE_BIN)/UserManual-html.zip
+  endif
+
   ifdef VBOX_WITH_DOCS_QHELP
    #
@@ -317 +327 @@
         $(PATH_STAGE_BIN)/UserManual.qhc
    endif
-  endif
-
-  ifdef VBOX_WITH_DOCS_HTML
-   #
-   # target for installing the chunked HTML docs
-   #
-   INSTALLS += VBox-docs-usermanual-html
-   VBox-docs-usermanual-html_INST = $(INST_BIN)
-   VBox-docs-usermanual-html_MODE = a+r,u+w
-   VBox-docs-usermanual-html_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip=>UserManual-html.zip
-   VBOX_MANUAL_PACK += $(PATH_STAGE_BIN)/UserManual-html.zip
   endif
 
@@ -401 +400 @@
 
  #
- # Shared rules for LaTeX based PDF generation - Only used for SDK & Accessability.
+ # Shared rules for LaTeX based PDF generation - Only used for SDK & Accessibility.
  #
 
@@ -423 +422 @@
 
 
- #
- # SDKRef.pdf
- #
+ #################################################################################################################################
+ #      SDKRef.pdf - xidl => Docbook => LaTeX => PDF                                                                             #
+ #################################################################################################################################
+
  VBOX_SDKREF_XML_FILES = SDKRef.xml
 
@@ -501 +501 @@
 
 
-
- #
- # Accessibility.pdf
- #
+ #################################################################################################################################
+ #      Accessibility.pdf - Docbook => LaTeX => PDF                                                                              #
+ #################################################################################################################################
 
  # Turn Accessibility.xml into LaTeX.
@@ -578 +577 @@
 
  #################################################################################################################################
- #      The UserManual in all its output variations (DITA-OT).                                                                   #
+ #      UserManual.* - The user manual in all its output variations (DITA-OT).                                                   #
  #################################################################################################################################
 
@@ -790 +789 @@
                 "/transtype:xhtml" \
                 "/outdir:$(@D)" \
-                "/tempdir:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/temp_xhtml" # "/debug"
+                "/tempdir:$(VBOX_PATH_MANUAL_OUTBASE)/en_US/dita/temp_xhtml"
 
  # disable for now
@@ -804 +803 @@
         $(QUIET)$(RM) -f $@
         $(QUIET)$(REDIRECT) -C $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ -- $(VBOX_ZIP) \
-                -9 -r $@ html-chunks
+                -9 -r "$@" "html-chunks"
 
  html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html