Changeset 88304 in vbox

Timestamp:

Mar 26, 2021 6:51:28 PM (4 years ago)

Author:

vboxsync

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

143521

Message:

Installer/linux, Installer/solaris, Installer/win: Introduce conditional suppressing packing the .chm documentation.

Location:

trunk/src/VBox/Installer

Files:

• linux/Makefile.kmk (modified) (1 diff)
• solaris/Makefile.kmk (modified) (1 diff)
• win/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -274 +274 @@
         UserManual.pdf \
         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).pdf)
- ifdef VBOX_WITH_DOCS_CHM
+ ifdef VBOX_WITH_DOCS_CHM_PACKING
   VBOX_LNX_NO_STRIP += \
         VirtualBox.chm \

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -439 +439 @@
 ifdef VBOX_WITH_DOCS_PACKING
  SOLARIS_COMMON += \
-        VirtualBox.chm \
+        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
         UserManual.pdf \
-        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)
+        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
+                $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
+                UserManual_$(f).pdf)
 endif
 

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -347 +347 @@
         $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
 ifdef VBOX_WITH_DOCS_PACKING
+ ifdef VBOX_WITH_DOCS_CHM_PACKING
         $(APPEND) $@ '  <File Id="file_VirtualBox.chm" Name="VirtualBox.chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(subst /,\,$(PATH_STAGE_BIN)/VirtualBox.chm)"></File>'
         $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
                      '  <File Id="file_VirtualBox_$(lang).chm" Name="VirtualBox_$(lang).chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(subst /,\,$(PATH_STAGE_BIN)/VirtualBox_$(lang).chm)"></File>')
+ endif
 endif
         $(APPEND) $@ '</Include>'