Changeset 56729 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Jul 1, 2015 10:10:35 AM (10 years ago)

Author:

vboxsync

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

101375

Message:

Installer/win: do not create directories with components which contain no files (VBOXINST_DTRACE_SCRIPTS_FILES is currently empty, and the change also prepares for empty VBOXINST_DTRACE_TESTCASE_ARCH_FILES, but assumes that VBOXINST_DTRACE_LIB_ARCH_FILES is never empty when the dtrace feature is enabled), as this makes newer Wix tools error out. Relevant for MSM packages, where we have no control over the tools.

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)

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

@@ -316 +316 @@
                 '  <Directory Id="dir_DTrace_lib" Name="lib">' \
                 '    <Directory Id="dir_DTrace_lib_arch" Name="$(KBUILD_TARGET_ARCH)">' \
-               '      <Component Id="cp_dir_DTrace_lib_arch" Guid="7476CDF6-4157-2E17-5CCC-FF92528D2854" Win64="$$(var.Property_Win64)">' \
+                '      <Component Id="cp_dir_DTrace_lib_arch" Guid="7476CDF6-4157-2E17-5CCC-FF92528D2854" Win64="$$(var.Property_Win64)">' \
                 $(foreach file, $(VBOXINST_DTRACE_LIB_ARCH_FILES) \
                         , '        <File Id="file_dtrace_lib_arch_$(subst -,_,$(file))" Name="$(file)" Vital="yes" ' \
@@ -323 +323 @@
                 '    </Directory>' \
                 '  </Directory>' \
+        $(if $(VBOXINST_DTRACE_TESTCASE_ARCH_FILES), \
                 '  <Directory Id="dir_DTrace_testcase" Name="testcase">' \
                 '    <Directory Id="dir_DTrace_testcase_arch" Name="$(KBUILD_TARGET_ARCH)">' \
-               '      <Component Id="cp_dir_DTrace_testcase_arch" Guid="45DF7014-4431-6C40-6DB0-35AF7C690EE1" Win64="$$(var.Property_Win64)">' \
+                '      <Component Id="cp_dir_DTrace_testcase_arch" Guid="45DF7014-4431-6C40-6DB0-35AF7C690EE1" Win64="$$(var.Property_Win64)">' \
                 $(foreach file, $(VBOXINST_DTRACE_TESTCASE_ARCH_FILES) \
                         , '        <File Id="file_dtrace_testcase_arch_$(subst -,_,$(file))" Name="$(file)" Vital="yes" ' \
@@ -331 +332 @@
                 '      </Component>' \
                 '    </Directory>' \
-                '  </Directory>' \
+                '  </Directory>') \
+        $(if $(VBOXINST_DTRACE_SCRIPTS_FILES), \
                 '  <Directory Id="dir_DTrace_scripts" Name="scripts">' \
-               '    <Component Id="cp_dir_DTrace_scripts" Guid="AE07F9D5-4FD9-ACC7-C760-E9923CE01E16" Win64="$$(var.Property_Win64)">' \
+                '    <Component Id="cp_dir_DTrace_scripts" Guid="AE07F9D5-4FD9-ACC7-C760-E9923CE01E16" Win64="$$(var.Property_Win64)">' \
                 $(foreach file, $(VBOXINST_DTRACE_SCRIPTS_FILES) \
                         , '      <File Id="file_dtrace_scripts_$(subst -,_,$(file))" Name="$(file)" Vital="yes" ' \
                           '            Source="$(PATH_STAGE_BIN)/dtrace/scripts/$(file)" />' ) \
                 '    </Component>' \
-                '  </Directory>' \
+                '  </Directory>') \
                 '</Directory>'
 endif