Changeset 42243 in vbox

Timestamp:

Jul 20, 2012 12:30:54 AM (12 years ago)

Author:

vboxsync

Message:

Installer and build fixes for VCC100.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)
• src/VBox/Installer/win/VirtualBox.wxs (modified) (3 diffs)

trunk/Config.kmk

@@ -1835 +1835 @@
 # Windows install tools...
 VBOX_PATH_WIX       ?= $(PATH_DEVTOOLS)/win.x86/wix/v3.5.2519.0
+ifdef VBOX_USE_VCC100
+VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiTran.Exe
+VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiDb.Exe
+VBOX_PATH_WISUBSTG  ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSubStg.vbs
+VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSumInf.vbs
+else
 VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiTran.Exe
 VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiDb.Exe
 VBOX_PATH_WISUBSTG  ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSubStg.vbs
 VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSumInf.vbs
+endif
 VBOX_PATH_DIFX      ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1-r3
 VBOX_PATH_CABSDK    ?= $(PATH_DEVTOOLS)/win.x86/cabsdk/r1

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

@@ -29 +29 @@
 VBoxDisp_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
 VBoxDisp_DEFS.x86     = _WIN32_WINNT=0x0501
-VBoxDisp_DEFS.amd64   = _WIN32_WINNT=0x0500 # <- otherwise the build will fail due to DDK header inconsistencies
+ifndef VBOX_USE_VCC100
+ VBoxDisp_DEFS.amd64  = _WIN32_WINNT=0x0500 # <- otherwise the build will fail due to DDK header inconsistencies
+endif
 VBoxDisp_DEFS          = VBOX_WITH_DDRAW
 VBoxDisp_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED

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

@@ -324 +324 @@
  VBOX_MSI_DEPENDENCIES := $(filer-out %.cat, $(VBOX_MSI_DEPENDENCIES))
 endif
-ifdef VBOX_USE_VCC80
+if !defined(VBOX_USE_VCC70) && !defined(VBOX_USE_VCC80) && !defined(VBOX_USE_VCC100)
+$(error One VBOX_USE_VCC* must be defined)
+endif
+ifndef VBOX_USE_VCC100
+ VBOX_MSI_DEPENDENCIES := $(filter-out \
+        $(PATH_OUT)/bin/msvcr100.dll \
+        $(PATH_OUT)/bin/msvcp100.dll \
+        , $(VBOX_MSI_DEPENDENCIES))
+endif
+ifndef VBOX_USE_VCC80
+ VBOX_MSI_DEPENDENCIES := $(filter-out \
+        $(PATH_OUT)/bin/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
+        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcr80.dll \
+        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcp80.dll \
+        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcm80.dll \
+        , $(VBOX_MSI_DEPENDENCIES))
+endif
+ifndef VBOX_USE_VCC70
  VBOX_MSI_DEPENDENCIES := $(filter-out \
         $(PATH_OUT)/bin/msvcrt.dll \
@@ -330 +347 @@
         $(PATH_OUT)/bin/msvcp71.dll \
         $(PATH_OUT)/bin/SDL_ttf.dll \
-        , $(VBOX_MSI_DEPENDENCIES))
-else
- VBOX_MSI_DEPENDENCIES := $(filter-out \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcr80.dll \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcp80.dll \
-        $(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcm80.dll \
         , $(VBOX_MSI_DEPENDENCIES))
 endif
@@ -455 +465 @@
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
+                -E 'VBOX_USE_VCC100=$(if $(VBOX_USE_VCC100),yes,no)' \
                 -E 'VBOX_USE_VCC80=$(if $(VBOX_USE_VCC80),yes,no)' \
+                -E 'VBOX_USE_VCC70=$(if $(VBOX_USE_VCC70),yes,no)' \
                 -- \
                 $(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \

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

@@ -527 +527 @@
 <?endif?>
 
+<?if $(env.VBOX_USE_VCC100) = "yes" ?>
+                        <!-- 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_USE_VCC80) = "yes" ?>
-                        <!-- MS v8 Runtime DLL files (private assembly) -->
+                        <!-- MS C/C++ v8 Runtime DLL files (private assembly). -->
                         <File Id="file_Microsoft.VC80.CRT.manifest" Name="Microsoft.VC80.CRT.manifest"
                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" />
@@ -537 +545 @@
 <?endif?>
 
-                        <!-- MS v7 Runtime DLL files -->
-<?if $(env.VBOX_USE_VCC80) != "yes" ?>
+<?if $(env.VBOX_USE_VCC70) = "yes" ?>
+                        <!-- MS C/C++ v7 Runtime DLL files. -->
                         <File Id="file_msvcp71.dll" Name="msvcp71.dll"
                               Source="$(env.PATH_OUT)\bin\msvcp71.dll" />
@@ -544 +552 @@
                               Source="$(env.PATH_OUT)\bin\msvcrt.dll" />
 <?endif?>
-<?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
+<?if $(env.VBOX_USE_VCC100) != "yes" ?>
+    <?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
                         <File Id="msvcrdll" Name="msvcr71.dll"
                               Source="$(env.PATH_OUT)\bin\msvcr71.dll" />
-<?endif?>
+    <?endif?>
+<?endif?>
+
                         <!-- EFI firmware -->
 <?if $(env.VBOX_WITH_EFIFW_PACKING) = "yes" ?>