Changeset 88323 in vbox

Timestamp:

Mar 30, 2021 3:25:06 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143544

Message:

/Config.kmk, /Makefile.kmk: More QHelp work, allow packing and deal with QHelp files from build server.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -390 +390 @@
 if1of ($(KBUILD_TARGET), win)
  VBOX_WITH_DOCS_CHM =
-endif
+ VBOX_WITH_DOCS_CHM_PACKING =
+endif
+# Include QHelp documentation in the package
+VBOX_WITH_DOCS_QHELP_PACKING = 1
 # By default only include translations in documentation-only builds
 ifdef VBOX_ONLY_DOCS
@@ -674 +677 @@
 ifeq ($(KBUILD_TARGET),darwin)
  VBOX_WITH_COCOA_QT = 1
+endif
+# Enable the QHelp based help function in UI.
+if1of ($(KBUILD_TARGET), darwin linux win)
+ VBOX_WITH_QHELP_VIEWER = 1
 endif
 # VBox Ballooning Control frontend.

trunk/Makefile.kmk

@@ -375 +375 @@
         $(addprefix $(PATH_TARGET)/, \
                 $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
+                $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
                 UserManual.pdf \
                 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
                         $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
+                        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
                         UserManual_$(f).pdf))
 buildserver-docs_CLEANS = \
@@ -384 +386 @@
         $(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip.tmp \
         $(addprefix $(PATH_TARGET)/, \
-                VirtualBox.chm UserManual.pdf \
-                $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf))
+                VirtualBox.chm UserManual.qch UserManual.qhc UserManual.pdf \
+                $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
+                        VirtualBox_$(f).chm \
+                        UserManual_$(f).qch UserManual_$(f).qhc \
+                        UserManual_$(f).pdf))
 
 $$(buildserver-docs_0_OUTDIR)/unpacked.ts +| \
         $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox.chm,) \
+        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual.qch $(PATH_TARGET)/UserManual.qhc,) \
         $(PATH_TARGET)/UserManual.pdf \
-$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_TARGET)/VirtualBox_$(f).chm $(PATH_TARGET)/UserManual_$(f).pdf): \
+$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
+        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox_$(f).chm,) \
+        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual_$(f).qch $(PATH_TARGET)/UserManual_$(f).qhc,) \
+        $(PATH_TARGET)/UserManual_$(f).pdf): \
                 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip
         $(call MSG_L1,Unpacking documentation)
@@ -396 +405 @@
         $(TOUCH) -c -- \
                 $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox.chm,) \
+                $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual.qch $(PATH_TARGET)/UserManual.qhc,) \
                 $(PATH_TARGET)/UserManual.pdf \
                 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
                         $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox_$(f).chm,) \
+                        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual_$(f).qch $(PATH_TARGET)/UserManual_$(f).qhc,) \
                         $(PATH_TARGET)/UserManual_$(f).pdf)
         $(APPEND) -t $@ "done"