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

Timestamp:

May 22, 2020 11:26:31 AM (5 years ago)

Author:

vboxsync

Message:

Installer/win: CRT dll adjustments for VC++ 14.x and later. bugref:8489

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxMergeApp.wxi (modified) (2 diffs)
• VBoxMergeCOM32On64.wxi (modified) (1 diff)

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

@@ -609 +609 @@
                                 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                                 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
+                                $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi \
+                                $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi \
                                 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
                                 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
@@ -765 +767 @@
                 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
+                $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi \
+                $(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
                 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
@@ -945 +949 @@
 
 #
+# Generate the list of CRT DLLs.
+#
+ifndef TOOL_$(VBOX_VCC_TOOL)
+ include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL).kmk
+endif
+$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi)
+$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi: | $$(dir $$@)
+        $(APPEND) -t -n $@ \
+                '<?xml version="1.0" ?>' \
+                '<Include>' \
+                $(foreach dll \
+                ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC100",msvcr100.dll msvcp100.dll \
+                  ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr110.dll msvcp110.dll \
+                   ,$(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS))) \
+               ,'  <File Id="file_$(dll)" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\$(dll)" />') \
+                '</Include>'
+
+#
+# Generate the list of 32-bit CRT DLLs.
+#
+ifndef TOOL_$(VBOX_VCC_TOOL_STEM)X86
+ include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL_STEM)X86.kmk
+endif
+$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi)
+$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi: | $$(dir $$@)
+        $(APPEND) -t -n $@ \
+                '<?xml version="1.0" ?>' \
+                '<Include>' \
+                $(foreach dll \
+                ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC100",msvcr100.dll msvcp100.dll \
+                  ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr110.dll msvcp110.dll \
+                   ,$(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS))) \
+               ,'  <File Id="file_$(dll)_x86" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\x86\$(dll)" disk="$$(var.Property_DiskIdCommon)" />') \
+                '</Include>'
+#
 # Generate the list of unattended template script files.
 #

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -356 +356 @@
 <?endif?>
 
-<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
-        <!-- MS C/C++ v10.0 Runtime DLL files -->
-        <File Id="file_msvcr100.dll" Name="msvcr100.dll"
-              Source="$(env.PATH_OUT)\bin\msvcr100.dll" />
-        <File Id="file_msvcp100.dll" Name="msvcp100.dll"
-              Source="$(env.PATH_OUT)\bin\msvcp100.dll" />
-<?endif?>
-<?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
-        <!-- MS C/C++ v11.0 Runtime DLL files -->
-        <File Id="file_msvcr110.dll" Name="msvcr110.dll"
-              Source="$(env.PATH_OUT)\bin\msvcr110.dll" />
-        <File Id="file_msvcp110.dll" Name="msvcp110.dll"
-              Source="$(env.PATH_OUT)\bin\msvcp110.dll" />
-<?endif?>
+        <!-- Include CRT Dlls (specific to the compiler). -->
+        <?include $(env.PATH_TARGET)\VBoxCrtDlls.wxi ?>
 
         <!-- EFI firmware -->
@@ -389 +377 @@
     <?endif ?>
 <?endif ?>
-        <!-- Include key for VBox version -->
+        <!-- Include registry key for VBox version -->
         <?include $(env.PATH_TARGET)\VBoxKey.wxi ?>
 

trunk/src/VBox/Installer/win/VBoxMergeCOM32On64.wxi

@@ -45 +45 @@
             </File>
             <?include $(env.PATH_TARGET)\VirtualBox_TypeLib_x86.wxi ?>
-    <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC100" ?>
-            <!-- MS C/C++ v10.0 32 bit Runtime DLL files -->
-            <File Id="file_msvcr100_x86" Name="msvcr100.dll"
-                  Source="$(env.PATH_OUT)\bin\x86\msvcr100.dll"
-                  DiskId="$(var.Property_DiskIdCommon)" />
-            <File Id="file_msvcp100_x86" Name="msvcp100.dll"
-                  Source="$(env.PATH_OUT)\bin\x86\msvcp100.dll"
-                  DiskId="$(var.Property_DiskIdCommon)" />
-    <?endif?>
-    <?if $(env.VBOX_VCC_TOOL_STEM) = "VCC110" ?>
-            <!-- MS C/C++ v11.0 Runtime DLL files -->
-            <File Id="file_msvcr110_x86" Name="msvcr110.dll"
-                  Source="$(env.PATH_OUT)\bin\x86\msvcr110.dll"
-                  DiskId="$(var.Property_DiskIdCommon)" />
-            <File Id="file_msvcp110_x86" Name="msvcp110.dll"
-                  Source="$(env.PATH_OUT)\bin\x86\msvcp110.dll"
-                  DiskId="$(var.Property_DiskIdCommon)" />
-    <?endif?>
+
+            <!-- Include CRT Dlls (specific to the compiler). -->
+            <?include $(env.PATH_TARGET)\VBoxCrtDlls32.wxi ?>
         </Component>
     </Directory>