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

Timestamp:

Apr 27, 2016 4:00:32 PM (9 years ago)

Author:

vboxsync

Message:

configure.vbs + Installer/win: make the configure script deal with Qt5 properly and fix the Windows installer packing to use the Qt infix properly.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (4 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2015 Oracle Corporation
+# Copyright (C) 2006-2016 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -529 +529 @@
                                 -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm'),) \
                 -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\,$(VBOX_WINDOWS_ICON_FILE))' \
+                -E 'VBOX_QT_INFIX=$(VBOX_QT_INFIX)' \
                 -E 'VBOX_WITH_32_ON_64_MAIN_API=$(if $(VBOX_WITH_32_ON_64_MAIN_API),yes,no)' \
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \

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

@@ -2 +2 @@
     VirtualBox Windows Installation Script (WiX)
 
-    Copyright (C) 2006-2015 Oracle Corporation
+    Copyright (C) 2006-2016 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -15 +15 @@
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
          xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+
+<?ifdef env.VBOX_QT_INFIX ?>
+    <?define VBOX_QT_INFIX="$(env.VBOX_QT_INFIX)" ?>
+<?else?>
+    <?define VBOX_QT_INFIX="" ?>
+<?endif?>
 
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
@@ -306 +312 @@
     <?endif ?>
     <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
-        <File Id="file_QtCoreVBox4.dll" Name="QtCoreVBox4.dll"
-              Source="$(env.PATH_OUT)\bin\QtCoreVBox4.dll" />
-        <File Id="file_QtGuiVBox4.dll" Name="QtGuiVBox4.dll"
-              Source="$(env.PATH_OUT)\bin\QtGuiVBox4.dll" />
+        <File Id="file_QtCore$(var.VBOX_QT_INFIX)4.dll" Name="QtCore$(var.VBOX_QT_INFIX)4.dll"
+              Source="$(env.PATH_OUT)\bin\QtCore$(var.VBOX_QT_INFIX)4.dll" />
+        <File Id="file_QtGui$(var.VBOX_QT_INFIX)4.dll" Name="QtGui$(var.VBOX_QT_INFIX)4.dll"
+              Source="$(env.PATH_OUT)\bin\QtGui$(var.VBOX_QT_INFIX)4.dll" />
     <?else ?>
-        <File Id="file_Qt5CoreVBox.dll" Name="Qt5CoreVBox.dll"
-              Source="$(env.PATH_OUT)\bin\Qt5CoreVBox.dll" />
-        <File Id="file_Qt5GuiVBox.dll" Name="Qt5GuiVBox.dll"
-              Source="$(env.PATH_OUT)\bin\Qt5GuiVBox.dll" />
-        <File Id="file_Qt5WidgetsVBox.dll" Name="Qt5WidgetsVBox.dll"
-              Source="$(env.PATH_OUT)\bin\Qt5WidgetsVBox.dll" />
-        <File Id="file_Qt5PrintSupportVBox.dll" Name="Qt5PrintSupportVBox.dll"
-              Source="$(env.PATH_OUT)\bin\Qt5PrintSupportVBox.dll" />
-        <File Id="file_Qt5WinExtrasVBox.dll" Name="Qt5WinExtrasVBox.dll"
-              Source="$(env.PATH_OUT)\bin\Qt5WinExtrasVBox.dll" />
+        <File Id="file_Qt5Core$(var.VBOX_QT_INFIX).dll" Name="Qt5Core$(var.VBOX_QT_INFIX).dll"
+              Source="$(env.PATH_OUT)\bin\Qt5Core$(var.VBOX_QT_INFIX).dll" />
+        <File Id="file_Qt5Gui$(var.VBOX_QT_INFIX).dll" Name="Qt5Gui$(var.VBOX_QT_INFIX).dll"
+              Source="$(env.PATH_OUT)\bin\Qt5Gui$(var.VBOX_QT_INFIX).dll" />
+        <File Id="file_Qt5Widgets$(var.VBOX_QT_INFIX).dll" Name="Qt5Widgets$(var.VBOX_QT_INFIX).dll"
+              Source="$(env.PATH_OUT)\bin\Qt5Widgets$(var.VBOX_QT_INFIX).dll" />
+        <File Id="file_Qt5PrintSupport$(var.VBOX_QT_INFIX).dll" Name="Qt5PrintSupport$(var.VBOX_QT_INFIX).dll"
+              Source="$(env.PATH_OUT)\bin\Qt5PrintSupport$(var.VBOX_QT_INFIX).dll" />
+        <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll"
+              Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" />
     <?endif ?>
 <?endif ?>
@@ -331 +337 @@
 <?if $(env.VBOX_GUI_USE_QGL) = "yes" ?>
     <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
-        <File Id="file_QtOpenGLVBox4.dll" Name="QtOpenGLVBox4.dll"
-              Source="$(env.PATH_OUT)\bin\QtOpenGLVBox4.dll" />
+        <File Id="file_QtOpenGL$(var.VBOX_QT_INFIX)4.dll" Name="QtOpenGL$(var.VBOX_QT_INFIX)4.dll"
+              Source="$(env.PATH_OUT)\bin\QtOpenGL$(var.VBOX_QT_INFIX)4.dll" />
     <?else ?>
-        <File Id="file_Qt5OpenGLVBox.dll" Name="Qt5OpenGLVBox.dll"
-              Source="$(env.PATH_OUT)\bin\Qt5OpenGLVBox.dll" />
+        <File Id="file_Qt5OpenGL$(var.VBOX_QT_INFIX).dll" Name="Qt5OpenGL$(var.VBOX_QT_INFIX).dll"
+              Source="$(env.PATH_OUT)\bin\Qt5OpenGL$(var.VBOX_QT_INFIX).dll" />
     <?endif ?>
 <?endif?>