VirtualBox

Changeset 60723 in vbox


Ignore:
Timestamp:
Apr 27, 2016 4:00:32 PM (8 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
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.vbs

    r59479 r60723  
    1010
    1111'
    12 ' Copyright (C) 2006-2012 Oracle Corporation
     12' Copyright (C) 2006-2016 Oracle Corporation
    1313'
    1414' This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    20222022
    20232023''
    2024 ' Checks for any Qt4 binaries.
    2025 sub CheckForQt4(strOptQt4)
     2024' Checks for any Qt4/5 binaries.
     2025sub CheckForQt(strOptQt4, strOptQt5)
    20262026   dim strPathQt4
    20272027
    … …  
    20472047   ' Display the result.
    20482048   if strPathQt4 = "" then
    2049       CfgPrint "VBOX_WITH_QTGUI="
    20502049      PrintResultMsg "Qt4", "not found"
    20512050   else
     2051      PrintResult "Qt4", strPathQt4
     2052   end if
     2053
     2054   PrintHdr "Qt5"
     2055
     2056   '
     2057   ' Try to find the Qt5 installation (user specified path with --with-qt5)
     2058   '
     2059   strPathQt5 = ""
     2060
     2061   LogPrint "Checking for user specified path of Qt5 ... "
     2062   if (strPathQt5 = "") And (strOptQt5 <> "") then
     2063      strOptQt5 = UnixSlashes(strOptQt5)
     2064      if CheckForQt5Sub(strOptQt5) then strPathQt5 = strOptQt5
     2065   end if
     2066
     2067   ' Check the dev tools
     2068   if (strPathQt5 = "") Then
     2069      strPathQt5 = g_strPathDev & "/win." & g_strTargetArch & "/qt/v5.5.1-r138"
     2070      if CheckForQt5Sub(strPathQt5) = False then strPathQt5 = ""
     2071   end if
     2072
     2073   ' Display the result.
     2074   if strPathQt5 = "" then
     2075      PrintResultMsg "Qt5", "not found"
     2076   else
     2077      PrintResult "Qt5", strPathQt5
     2078   end if
     2079
     2080   if strPathQt5 <> "" then
     2081      CfgPrint "PATH_SDK_QT5          := " & strPathQt5
     2082      CfgPrint "PATH_TOOL_QT5         := $(PATH_SDK_QT5)"
     2083      CfgPrint "VBOX_PATH_QT          := $(PATH_SDK_QT5)"
     2084      if strPathQt4 <> "" then
     2085         MsgWarning "Have working path to both Qt4 ad Qt5, ignoring Qt4."
     2086      end if
     2087   elseif strPathQt4 <> "" then
    20522088      CfgPrint "PATH_SDK_QT4          := " & strPathQt4
    20532089      CfgPrint "PATH_TOOL_QT4         := $(PATH_SDK_QT4)"
    20542090      CfgPrint "VBOX_PATH_QT          := $(PATH_SDK_QT4)"
    2055       PrintResult "Qt4 ", strPathQt4
    2056    end if
    2057 end sub
    2058 
    2059 
    2060 ''
    2061 ' Checks if the specified path points to an usable Qt library.
     2091   end if
     2092   if (strPathQt4 = "") And (strPathQt5 = "") then
     2093      CfgPrint "VBOX_WITH_QTGUI       :="
     2094   end if
     2095   if strPathQt5 = "" then
     2096      CfgPrint "VBOX_WITH_QTGUI_V5    :="
     2097   end if
     2098end sub
     2099
     2100
     2101''
     2102' Checks if the specified path points to an usable Qt4 library.
    20622103function CheckForQt4Sub(strPathQt4)
    20632104
    … …  
    20782119      then
    20792120         CheckForQt4Sub = True
     2121   end if
     2122
     2123end function
     2124
     2125
     2126''
     2127' Checks if the specified path points to an usable Qt5 library.
     2128function CheckForQt5Sub(strPathQt5)
     2129
     2130   CheckForQt5Sub = False
     2131   LogPrint "trying: strPathQt5=" & strPathQt5
     2132
     2133   if   LogFileExists(strPathQt5, "bin/moc.exe") _
     2134    And LogFileExists(strPathQt5, "bin/uic.exe") _
     2135    And LogFileExists(strPathQt5, "include/QtWidgets/qwidget.h") _
     2136    And LogFileExists(strPathQt5, "include/QtWidgets/QApplication") _
     2137    And LogFileExists(strPathQt5, "include/QtGui/QImage") _
     2138    And LogFileExists(strPathQt5, "include/QtNetwork/QHostAddress") _
     2139    And (   LogFileExists(strPathQt5, "lib/Qt5Core.lib") _
     2140         Or LogFileExists(strPathQt5, "lib/Qt5CoreVBox.lib")) _
     2141    And (   LogFileExists(strPathQt5, "lib/Qt5Network.lib") _
     2142         Or LogFileExists(strPathQt5, "lib/Qt5NetworkVBox.lib")) _
     2143      then
     2144         CheckForQt5Sub = True
    20802145   end if
    20812146
    … …  
    21372202   Print "Locations:"
    21382203   Print "  --with-DDK=PATH       "
    2139    Print "  --with-DXSDK=PATH     "
    21402204   Print "  --with-kBuild=PATH    "
    21412205   Print "  --with-libSDL=PATH    "
    … …  
    21432207   Print "  --with-MinGW-w64=PATH "
    21442208   Print "  --with-Qt4=PATH       "
     2209   Print "  --with-Qt5=PATH       "
    21452210   Print "  --with-SDK=PATH       "
    21462211   Print "  --with-VC=PATH        "
    … …  
    21792244   strOptMinGWw64 = ""
    21802245   strOptQt4 = ""
     2246   strOptQt5 = ""
    21812247   strOptSDK = ""
    21822248   strOptVC = ""
    … …  
    22112277            strOptDDK = strPath
    22122278         case "--with-dxsdk"
    2213             MsgWarning "Ignornig --with-dxsdk (the DirectX SDK is no longer required)."
     2279            MsgWarning "Ignoring --with-dxsdk (the DirectX SDK is no longer required)."
    22142280         case "--with-kbuild"
    22152281            strOptkBuild = strPath
    … …  
    22222288         case "--with-qt4"
    22232289            strOptQt4 = strPath
     2290         case "--with-qt5"
     2291            strOptQt5 = strPath
    22242292         case "--with-sdk"
    22252293            strOptSDK = strPath
    … …  
    23152383   CheckForSsl strOptSsl
    23162384   CheckForCurl strOptCurl
    2317    CheckForQt4 strOptQt4
     2385   CheckForQt strOptQt4, strOptQt5
    23182386   if (strOptPython <> "") then
    23192387     CheckForPython strOptPython

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

    r59924 r60723  
    55
    66#
    7 # Copyright (C) 2006-2015 Oracle Corporation
     7# Copyright (C) 2006-2016 Oracle Corporation
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    529529                                -E 'VBOX_WIN_INST_MERGE_$(toupper $(module))=$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).msm'),) \
    530530                -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\,$(VBOX_WINDOWS_ICON_FILE))' \
     531                -E 'VBOX_QT_INFIX=$(VBOX_QT_INFIX)' \
    531532                -E 'VBOX_WITH_32_ON_64_MAIN_API=$(if $(VBOX_WITH_32_ON_64_MAIN_API),yes,no)' \
    532533                -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \

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

    r59924 r60723  
    22    VirtualBox Windows Installation Script (WiX)
    33
    4     Copyright (C) 2006-2015 Oracle Corporation
     4    Copyright (C) 2006-2016 Oracle Corporation
    55
    66    This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1515<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
    1616         xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
     17
     18<?ifdef env.VBOX_QT_INFIX ?>
     19    <?define VBOX_QT_INFIX="$(env.VBOX_QT_INFIX)" ?>
     20<?else?>
     21    <?define VBOX_QT_INFIX="" ?>
     22<?endif?>
    1723
    1824<?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
    … …  
    306312    <?endif ?>
    307313    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
    308         <File Id="file_QtCoreVBox4.dll" Name="QtCoreVBox4.dll"
    309               Source="$(env.PATH_OUT)\bin\QtCoreVBox4.dll" />
    310         <File Id="file_QtGuiVBox4.dll" Name="QtGuiVBox4.dll"
    311               Source="$(env.PATH_OUT)\bin\QtGuiVBox4.dll" />
     314        <File Id="file_QtCore$(var.VBOX_QT_INFIX)4.dll" Name="QtCore$(var.VBOX_QT_INFIX)4.dll"
     315              Source="$(env.PATH_OUT)\bin\QtCore$(var.VBOX_QT_INFIX)4.dll" />
     316        <File Id="file_QtGui$(var.VBOX_QT_INFIX)4.dll" Name="QtGui$(var.VBOX_QT_INFIX)4.dll"
     317              Source="$(env.PATH_OUT)\bin\QtGui$(var.VBOX_QT_INFIX)4.dll" />
    312318    <?else ?>
    313         <File Id="file_Qt5CoreVBox.dll" Name="Qt5CoreVBox.dll"
    314               Source="$(env.PATH_OUT)\bin\Qt5CoreVBox.dll" />
    315         <File Id="file_Qt5GuiVBox.dll" Name="Qt5GuiVBox.dll"
    316               Source="$(env.PATH_OUT)\bin\Qt5GuiVBox.dll" />
    317         <File Id="file_Qt5WidgetsVBox.dll" Name="Qt5WidgetsVBox.dll"
    318               Source="$(env.PATH_OUT)\bin\Qt5WidgetsVBox.dll" />
    319         <File Id="file_Qt5PrintSupportVBox.dll" Name="Qt5PrintSupportVBox.dll"
    320               Source="$(env.PATH_OUT)\bin\Qt5PrintSupportVBox.dll" />
    321         <File Id="file_Qt5WinExtrasVBox.dll" Name="Qt5WinExtrasVBox.dll"
    322               Source="$(env.PATH_OUT)\bin\Qt5WinExtrasVBox.dll" />
     319        <File Id="file_Qt5Core$(var.VBOX_QT_INFIX).dll" Name="Qt5Core$(var.VBOX_QT_INFIX).dll"
     320              Source="$(env.PATH_OUT)\bin\Qt5Core$(var.VBOX_QT_INFIX).dll" />
     321        <File Id="file_Qt5Gui$(var.VBOX_QT_INFIX).dll" Name="Qt5Gui$(var.VBOX_QT_INFIX).dll"
     322              Source="$(env.PATH_OUT)\bin\Qt5Gui$(var.VBOX_QT_INFIX).dll" />
     323        <File Id="file_Qt5Widgets$(var.VBOX_QT_INFIX).dll" Name="Qt5Widgets$(var.VBOX_QT_INFIX).dll"
     324              Source="$(env.PATH_OUT)\bin\Qt5Widgets$(var.VBOX_QT_INFIX).dll" />
     325        <File Id="file_Qt5PrintSupport$(var.VBOX_QT_INFIX).dll" Name="Qt5PrintSupport$(var.VBOX_QT_INFIX).dll"
     326              Source="$(env.PATH_OUT)\bin\Qt5PrintSupport$(var.VBOX_QT_INFIX).dll" />
     327        <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll"
     328              Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" />
    323329    <?endif ?>
    324330<?endif ?>
    … …  
    331337<?if $(env.VBOX_GUI_USE_QGL) = "yes" ?>
    332338    <?if $(env.VBOX_WITH_QTGUI_V5) = "no" ?>
    333         <File Id="file_QtOpenGLVBox4.dll" Name="QtOpenGLVBox4.dll"
    334               Source="$(env.PATH_OUT)\bin\QtOpenGLVBox4.dll" />
     339        <File Id="file_QtOpenGL$(var.VBOX_QT_INFIX)4.dll" Name="QtOpenGL$(var.VBOX_QT_INFIX)4.dll"
     340              Source="$(env.PATH_OUT)\bin\QtOpenGL$(var.VBOX_QT_INFIX)4.dll" />
    335341    <?else ?>
    336         <File Id="file_Qt5OpenGLVBox.dll" Name="Qt5OpenGLVBox.dll"
    337               Source="$(env.PATH_OUT)\bin\Qt5OpenGLVBox.dll" />
     342        <File Id="file_Qt5OpenGL$(var.VBOX_QT_INFIX).dll" Name="Qt5OpenGL$(var.VBOX_QT_INFIX).dll"
     343              Source="$(env.PATH_OUT)\bin\Qt5OpenGL$(var.VBOX_QT_INFIX).dll" />
    338344    <?endif ?>
    339345<?endif?>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette