Changeset 90038 in vbox for trunk/debian

Timestamp:

Jul 5, 2021 7:29:55 PM (4 years ago)

Author:

vboxsync

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

145532

Message:

debian/rules, rpm/rules: Change from CHM help file to QHelp. bugref:9831

File:

• trunk/debian/rules (modified) (7 diffs)

trunk/debian/rules

@@ -29 +29 @@
 #                   either the subversion rev [if available] or the build date)
 #  NODOCS=1         don't build docs, use precompiled UserManual.pdf and
-#                   maybe VirtualBox.chm from $(vboxroot)/prebuild
+#                   maybe VirtualBox.qch and VirtualBox.qhc from $(vboxroot)/prebuild
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
@@ -38 +38 @@
 #  NOWEBSVC=1       don't build the webservice API, default for OSE
 #  STAGEDISO=<path> don't build the VBoxAdditions, use the precompiled .iso
-#  STAGEDCHM=<path> use VirtualBox*.chm from this directory
+#  STAGEDQHELP=<path> use VirtualBox*.qch and VirtualBox*.qhc from this directory
 #  PKGDIR=<path>    where to store the final package(s)
 #
 # NODOCS will be set if UserManual*.pdf is placed in $(vboxroot)/prebuild.
 # STAGEDISO will be set if VBoxGuestAdditions.iso is placed there.
-# STAGEDCHM will be set if VirtualBox*.chm is placed there.
-# VirtualBox*.chm is used if it is provided, but never attempted to be built.
+# STAGEDQHELP will be set if VirtualBox*.qch and VirtualBox*.qhc is placed there.
+# VirtualBox*.qch and VirtualBox*.qhc are used if they are provided, but never
+# attempted to be built.
 #
 # Wine will not be required if either NODOCS or STAGEDISO are set.
@@ -66 +67 @@
 NODOCS   ?= $(if $(wildcard $(vboxroot)/prebuild/UserManual*.pdf),1,)
 STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
-STAGEDCHM ?= $(if $(wildcard $(vboxroot)/prebuild/VirtualBox*.chm),$(vboxroot)/prebuild,)
+STAGEDQHELP ?= $(if $(and $(wildcard $(vboxroot)/prebuild/VirtualBox*.qch),$(wildcard $(vboxroot)/prebuild/VirtualBox*.qhc)),$(vboxroot)/prebuild,)
 NOWINE   := $(if $(NODOCS),1,$(if $(STAGEDISO),1,$(ose)))
 PYTHON   := $(firstword $(shell which python) $(shell which python3))
@@ -102 +103 @@
              VBOX_DO_STRIP= \
              VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
-             $(if $(STAGEDCHM),VBOX_WITH_DOCS_CHM=1,VBOX_WITH_KCHMVIEWER=) \
+             $(if $(STAGEDQHELP),VBOX_WITH_DOCS_QHELP=1,) \
              $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \
              $(if $(NODOCS),VBOX_WITH_DOCS= ,) \
@@ -119 +120 @@
         . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
         $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)
-        $(if $(STAGEDCHM),cp $(STAGEDCHM)/VirtualBox*.chm $(builddir)/bin,)
+        $(if $(STAGEDQHELP),cp $(STAGEDQHELP)/VirtualBox*.qch $(STAGEDQHELP)/VirtualBox*.qhc $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
         $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
@@ -236 +237 @@
 ifeq ($(ose),)
         dh_installdocs \
-            $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
-            $(addprefix $(archdir)/, LICENSE)
-        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
+            $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
+            LICENSE)
+        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.qch VirtualBox*.qhc \
             LICENSE)
         for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
@@ -307 +308 @@
 endif
         $(firstword $(shell which dh_python2) $(shell which dh_python3))
-        dh_compress -X.pdf -X.chm -X LICENSE -X.py
+        dh_compress -X.pdf -X LICENSE -X.py
         dh_fixperms
         dh_makeshlibs