Changeset 34678 in vbox for trunk/src/VBox/Installer

Timestamp:

Dec 3, 2010 8:28:42 AM (14 years ago)

Author:

vboxsync

Message:

Windows host installer: Ship license file.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (4 diffs)
• VirtualBox.wxs (modified) (1 diff)

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

@@ -107 +107 @@
                 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
         $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
-        $(if $(VBOX_WITH_LICENSE_DISPLAY), $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi)
+        $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi
 
 ifdef VBOX_WITH_COMBINED_PACKAGE
@@ -231 +231 @@
         $(APPEND) $@ '</Include>'
 
-ifdef VBOX_WITH_LICENSE_DISPLAY
 $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi: $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$<)
@@ -244 +243 @@
                      '  </File>')
         $(APPEND) $@ '</Include>'
-endif
+
 
 #
@@ -473 +472 @@
                 $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
                 $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
-                $(if $(VBOX_WITH_LICENSE_DISPLAY), $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi) \
+                $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
                 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
                 $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -400 +400 @@
                         <?include $(env.PATH_TARGET)\Files_Main.wxi ?>
 <?endif ?>
-<?if $(env.VBOX_WITH_LICENSE_DISPLAY) = "yes" ?>
                         <!-- Include all license files (file is generated by makefile). -->
                         <?include $(env.PATH_TARGET)\Files_License.wxi ?>
-<?endif ?>
 
 <?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>