Hi,
On Sonntag, 11. Juni 2017 11:34:02 CEST Sameeh Jubran wrote:
> I am trying to compile VirtualBox for Windows x64 target and facing some
> issues. According to this documentation https://www.
> virtualbox.org/wiki/Windows%20build%20instructions
>
> "*For building the 64-bit target you need to add --with-openssl32= to
> specify the path to the 32-bit OpenSSL development package as both OpenSSL
> variants (32-bit and 64-bit) are required then."*
>
> However looking at the "configure.vbs" script it seems that it lacks this
> parameter at all, what environment variable should be set in order to
> configure the openssl32 path? ( and has the same issue libcurl32 too)
these instructions are currently only valid for the repository which
can be found here:
https://www.virtualbox.org/browser/vbox/trunk
To use these instructions for VBox 5.1.22 you have to apply the attached
patch.
Kind regards,
Frank
--
Dr.-Ing. Frank Mehnert | Software Development Director, VirtualBox
ORACLE Deutschland B.V. & Co. KG | Werkstr. 24 | 71384 Weinstadt, Germany
ORACLE Deutschland B.V. & Co. KG
Hauptverwaltung: Riesstraße 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603
Komplementärin: ORACLE Deutschland Verwaltung B.V.
Hertogswetering 163/167, 3543 AS Utrecht, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Alexander van der Ven, Jan Schultheiss, Val Maher
Index: Config.kmk
===================================================================
--- Config.kmk (revision 115126)
+++ Config.kmk (working copy)
@@ -1135,6 +1135,10 @@
if1of ($(KBUILD_TARGET), solaris)
VBOX_WITH_32_ON_64_MAIN_API=
endif
+ if1of ($(KBUILD_TARGET), win)
+ # tar/gzip uncommon on Windows
+ VBOX_WITH_EXTPACK_VBOXDTRACE=
+ endif
# Enable any translations in OSE, even partial ones.
ifndef ($(VBOX_NO_DOCS_TRANSLATIONS))
VBOX_WITH_DOCS_TRANSLATIONS = 1
@@ -1934,8 +1938,15 @@
VBOX_MKISOFS ?= mkisofs
endif
-ifeq ($(KBUILD_HOST),win)
- VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p
+# zip
+VBOX_ZIP ?= zip$(HOSTSUFF_EXE)
+
+ifeq ($(KBUILD_TARGET),win)
+ ifeq ($(KBUILD_TARGET_ARCH),x86) # Normally we should test for KBUILD_HOST_ARCH but we only require MINGWW64 for 64-bit _targets_
+ VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p
+ else
+ VBOX_NM ?= $(PATH_TOOL_MINGWW64)/bin/nm.exe -p
+ endif
else ifeq ($(KBUILD_HOST),darwin) # Xcode 7.3.1 nm doesn't like -t, and -x behaves very differently. Throwing in -B (bsd) to make sure.
VBOX_NM ?= $(TOOL_$(VBOX_GCC_TOOL)_ENV_SETUP) $(PATH_TOOL_$(VBOX_GCC_TOOL)_TOOLCHAIN_BIN_SLASH)nm -p $(if-expr \
$(VBOX_XCODE_VERSION_MAJOR) > 7 || ($(VBOX_XCODE_VERSION_MAJOR) == 7 && $(VBOX_XCODE_VERSION_MINOR) >= 3),-B,)
Index: configure.vbs
===================================================================
--- configure.vbs (revision 115126)
+++ configure.vbs (working copy)
@@ -43,7 +43,7 @@
g_strPathDDK = ""
dim g_strTargetArch
-g_strTargetArch = "x86"
+g_strTargetArch = ""
dim g_blnDisableCOM, g_strDisableCOM
g_blnDisableCOM = False
@@ -869,14 +869,25 @@
MsgWarning "Found unknown KBUILD_TARGET_ARCH value '" & str &"' in your environment. Setting it to 'x86'."
str = "x86"
end if
- if str <> "" then
- g_strTargetArch = str
- elseif (EnvGet("PROCESSOR_ARCHITEW6432") = "AMD64" ) _
- Or (EnvGet("PROCESSOR_ARCHITECTURE") = "AMD64" ) then
- g_strTargetArch = "amd64"
+ if g_strTargetArch = "" then '' command line parameter --target-arch=x86|amd64 has priority
+ if str <> "" then
+ g_strTargetArch = str
+ elseif (EnvGet("PROCESSOR_ARCHITEW6432") = "AMD64" ) _
+ Or (EnvGet("PROCESSOR_ARCHITECTURE") = "AMD64" ) then
+ g_strTargetArch = "amd64"
+ else
+ g_strTargetArch = "x86"
+ end if
else
- g_strTargetArch = "x86"
+ if InStr(1, "x86|amd64", g_strTargetArch) <= 0 then
+ EnvPrint "set KBUILD_TARGET_ARCH=x86"
+ EnvSet "KBUILD_TARGET_ARCH", "x86"
+ MsgWarning "Unknown --target-arch=" & str &". Setting it to 'x86'."
+ end if
end if
+ LogPrint " Target architecture: " & g_strTargetArch & "."
+ Wscript.Echo " Target architecture: " & g_strTargetArch & "."
+ EnvPrint "set KBUILD_TARGET_ARCH=" & g_strTargetArch
str = EnvGetFirst("KBUILD_TARGET_CPU", "BUILD_TARGET_CPU")
' perhaps a bit pedantic this since this isn't clearly define nor used much...
@@ -896,12 +907,20 @@
end if
str = EnvGetFirst("KBUILD_HOST_ARCH", "BUILD_PLATFORM_ARCH")
- if (str <> "") _
- And (InStr(1, "x86|amd64", str) <= 0) then
- EnvPrint "set KBUILD_HOST_ARCH=x86"
- EnvSet "KBUILD_HOST_ARCH", "x86"
- MsgWarning "Found unknown KBUILD_HOST_ARCH value '" & str &"' in your environment. Setting it to 'x86'."
+ if str <> "" then
+ if InStr(1, "x86|amd64", str) <= 0 then
+ str = "x86"
+ MsgWarning "Found unknown KBUILD_HOST_ARCH value '" & str &"' in your environment. Setting it to 'x86'."
+ end if
+ elseif (EnvGet("PROCESSOR_ARCHITEW6432") = "AMD64" ) _
+ Or (EnvGet("PROCESSOR_ARCHITECTURE") = "AMD64" ) then
+ str = "amd64"
+ else
+ str = "x86"
end if
+ LogPrint " Host architecture: " & str & "."
+ Wscript.Echo " Host architecture: " & str & "."
+ EnvPrint "set KBUILD_HOST_ARCH=" & str
str = EnvGetFirst("KBUILD_HOST_CPU", "BUILD_PLATFORM_CPU")
' perhaps a bit pedantic this since this isn't clearly define nor used much...
@@ -1530,7 +1549,6 @@
''
' Checks for a MinGW-w64 suitable for building the recompiler.
-'
sub CheckForMinGWw64(strOptMinGWw64)
dim strPathMingWw64, str
PrintHdr "MinGW-w64 GCC (unprefixed)"
@@ -1813,94 +1831,16 @@
''
-' Checks for libxslt.
-sub CheckForXslt(strOptXslt)
- dim strPathXslt, str
- PrintHdr "libxslt"
-
- ' Skip if no COM/ATL.
- if g_blnDisableCOM then
- PrintResultMsg "libxslt", "Skipped (" & g_strDisableCOM & ")"
- exit sub
- end if
-
- '
- ' Try find some libxslt dll/lib.
- '
- strPathXslt = ""
- if (strPathXslt = "") And (strOptXslt <> "") then
- if CheckForXsltSub(strOptXslt) then strPathXslt = strOptXslt
- end if
-
- if strPathXslt = "" Then
- str = Which("libxslt.lib")
- if str <> "" Then
- str = PathParent(PathStripFilename(str))
- if CheckForXsltSub(str) then strPathXslt = str
- end if
- end if
-
- if strPathXslt = "" Then
- str = Which("libxslt.dll")
- if str <> "" Then
- str = PathParent(PathStripFilename(str))
- if CheckForXsltSub(str) then strPathXslt = str
- end if
- end if
-
- ' Ignore failure if we're in 'internal' mode.
- if (strPathXslt = "") and g_blnInternalMode then
- PrintResultMsg "libxslt", "ignored (internal mode)"
- exit sub
- end if
-
- ' Success?
- if strPathXslt = "" then
- if strOptXslt = "" then
- MsgError "Can't locate libxslt. Try specify the path with the --with-libxslt=<path> argument. " _
- & "If still no luck, consult the configure.log and the build requirements."
- else
- MsgError "Can't locate libxslt. Please consult the configure.log and the build requirements."
- end if
- exit sub
- end if
-
- strPathXslt = UnixSlashes(PathAbs(strPathXslt))
- CfgPrint "SDK_VBOX_LIBXSLT_INCS := " & strPathXslt & "/include"
- CfgPrint "SDK_VBOX_LIBXSLT_LIBS := " & strPathXslt & "/lib/libxslt.lib"
-
- PrintResult "libxslt", strPathXslt
-end sub
-
-
-''
-' Checks if the specified path points to an usable libxslt or not.
-function CheckForXsltSub(strPathXslt)
- dim str
-
- CheckForXsltSub = False
- LogPrint "trying: strPathXslt=" & strPathXslt
-
- if LogFileExists(strPathXslt, "include/libxslt/namespaces.h") _
- And LogFileExists(strPathXslt, "include/libxslt/xsltutils.h") _
- then
- str = LogFindFile(strPathXslt, "lib/libxslt.dll")
- if str <> "" then
- if LogFileExists(strPathXslt, "lib/libxslt.lib") _
- then
- CheckForXsltSub = True
- end if
- end if
- end if
-end function
-
-
-''
' Checks for openssl
-sub CheckForSsl(strOptSsl)
+sub CheckForSsl(strOptSsl, bln32Bit)
dim strPathSsl, str
PrintHdr "openssl"
+ strOpenssl = "openssl"
+ if bln32Bit = True then
+ strOpenssl = "openssl32"
+ end if
+
'
' Try find some openssl dll/lib.
'
@@ -1910,7 +1850,7 @@
end if
if strPathSsl = "" Then
- str = Which("ssleay32.lib")
+ str = Which("libssl.lib")
if str <> "" Then
str = PathParent(PathStripFilename(str))
if CheckForSslSub(str) then strPathSsl = str
@@ -1919,7 +1859,7 @@
' Ignore failure if we're in 'internal' mode.
if (strPathSsl = "") and g_blnInternalMode then
- PrintResultMsg "openssl", "ignored (internal mode)"
+ PrintResultMsg strOpenssl, "ignored (internal mode)"
exit sub
end if
@@ -1926,20 +1866,28 @@
' Success?
if strPathSsl = "" then
if strOptSsl = "" then
- MsgError "Can't locate openssl. Try specify the path with the --with-openssl=<path> argument. " _
+ MsgError "Can't locate " & strOpenssl & ". " _
+ & "Try specify the path with the --with-" & strOpenssl & "=<path> argument. " _
& "If still no luck, consult the configure.log and the build requirements."
else
- MsgError "Can't locate openssl. Please consult the configure.log and the build requirements."
+ MsgError "Can't locate " & strOpenssl & ". " _
+ & "Please consult the configure.log and the build requirements."
end if
exit sub
end if
strPathSsl = UnixSlashes(PathAbs(strPathSsl))
- CfgPrint "SDK_VBOX_OPENSSL_INCS := " & strPathSsl & "/include"
- CfgPrint "SDK_VBOX_OPENSSL_LIBS := " & strPathSsl & "/lib/ssleay32.lib" & " " & strPathSsl & "/lib/libeay32.lib"
- CfgPrint "SDK_VBOX_BLD_OPENSSL_LIBS := " & strPathSsl & "/lib/ssleay32.lib" & " " & strPathSsl & "/lib/libeay32.lib"
+ if bln32Bit = True then
+ CfgPrint "SDK_VBOX_OPENSSL-x86_INCS := " & strPathSsl & "/include"
+ CfgPrint "SDK_VBOX_OPENSSL-x86_LIBS := " & strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
+ CfgPrint "SDK_VBOX_BLD_OPENSSL-x86_LIBS := " & strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
+ else
+ CfgPrint "SDK_VBOX_OPENSSL_INCS := " & strPathSsl & "/include"
+ CfgPrint "SDK_VBOX_OPENSSL_LIBS := " & strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
+ CfgPrint "SDK_VBOX_BLD_OPENSSL_LIBS := " & strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
+ end if
- PrintResult "openssl", strPathSsl
+ PrintResult strOpenssl, strPathSsl
end sub
''
@@ -1949,10 +1897,7 @@
CheckForSslSub = False
LogPrint "trying: strPathSsl=" & strPathSsl
if LogFileExists(strPathSsl, "include/openssl/md5.h") _
- And LogFindFile(strPathSsl, "bin/ssleay32.dll") <> "" _
- And LogFindFile(strPathSsl, "lib/ssleay32.lib") <> "" _
- And LogFindFile(strPathSsl, "bin/libeay32.dll") <> "" _
- And LogFindFile(strPathSsl, "lib/libeay32.lib") <> "" _
+ And LogFindFile(strPathSsl, "lib/libssl.lib") <> "" _
then
CheckForSslSub = True
end if
@@ -1961,10 +1906,15 @@
''
' Checks for libcurl
-sub CheckForCurl(strOptCurl)
+sub CheckForCurl(strOptCurl, bln32Bit)
dim strPathCurl, str
PrintHdr "libcurl"
+ strCurl = "libcurl"
+ if bln32Bit = True then
+ strCurl = "libcurl32"
+ end if
+
'
' Try find some cURL dll/lib.
'
@@ -1983,7 +1933,7 @@
' Ignore failure if we're in 'internal' mode.
if (strPathCurl = "") and g_blnInternalMode then
- PrintResultMsg "curl", "ignored (internal mode)"
+ PrintResultMsg strCurl, "ignored (internal mode)"
exit sub
end if
@@ -1990,19 +1940,26 @@
' Success?
if strPathCurl = "" then
if strOptCurl = "" then
- MsgError "Can't locate libcurl. Try specify the path with the --with-libcurl=<path> argument. " _
+ MsgError "Can't locate " & strCurl & ". " _
+ & "Try specify the path with the --with-" & strCurl & "=<path> argument. " _
& "If still no luck, consult the configure.log and the build requirements."
else
- MsgError "Can't locate libcurl. Please consult the configure.log and the build requirements."
+ MsgError "Can't locate " & strCurl & ". " _
+ & "Please consult the configure.log and the build requirements."
end if
exit sub
end if
strPathCurl = UnixSlashes(PathAbs(strPathCurl))
- CfgPrint "SDK_VBOX_LIBCURL_INCS := " & strPathCurl & "/include"
- CfgPrint "SDK_VBOX_LIBCURL_LIBS := " & strPathCurl & "/libcurl.lib"
+ if bln32Bit = True then
+ CfgPrint "SDK_VBOX_LIBCURL-x86_INCS := " & strPathCurl & "/include"
+ CfgPrint "SDK_VBOX_LIBCURL-x86_LIBS.x86 := " & strPathCurl & "/libcurl.lib"
+ else
+ CfgPrint "SDK_VBOX_LIBCURL_INCS := " & strPathCurl & "/include"
+ CfgPrint "SDK_VBOX_LIBCURL_LIBS := " & strPathCurl & "/libcurl.lib"
+ end if
- PrintResult "libcurl", strPathCurl
+ PrintResult strCurl, strPathCurl
end sub
''
@@ -2022,36 +1979,8 @@
''
-' Checks for any Qt4/5 binaries.
-sub CheckForQt(strOptQt4, strOptQt5)
- dim strPathQt4
-
- PrintHdr "Qt4"
-
- '
- ' Try to find the Qt4 installation (user specified path with --with-qt4)
- '
- strPathQt4 = ""
-
- LogPrint "Checking for user specified path of Qt4 ... "
- if (strPathQt4 = "") And (strOptQt4 <> "") then
- strOptQt4 = UnixSlashes(strOptQt4)
- if CheckForQt4Sub(strOptQt4) then strPathQt4 = strOptQt4
- end if
-
- ' Check the dev tools
- if (strPathQt4 = "") Then
- strPathQt4 = g_strPathDev & "/win." & g_strTargetArch & "/qt/v4.7.3-vcc100"
- if CheckForQt4Sub(strPathQt4) = False then strPathQt4 = ""
- end if
-
- ' Display the result.
- if strPathQt4 = "" then
- PrintResultMsg "Qt4", "not found"
- else
- PrintResult "Qt4", strPathQt4
- end if
-
+' Checks for any Qt5 binaries.
+sub CheckForQt(strOptQt5)
PrintHdr "Qt5"
'
@@ -2082,15 +2011,8 @@
CfgPrint "PATH_SDK_QT5 := " & strPathQt5
CfgPrint "PATH_TOOL_QT5 := $(PATH_SDK_QT5)"
CfgPrint "VBOX_PATH_QT := $(PATH_SDK_QT5)"
- if strPathQt4 <> "" then
- MsgWarning "Have working path to both Qt4 ad Qt5, ignoring Qt4."
- end if
- elseif strPathQt4 <> "" then
- CfgPrint "PATH_SDK_QT4 := " & strPathQt4
- CfgPrint "PATH_TOOL_QT4 := $(PATH_SDK_QT4)"
- CfgPrint "VBOX_PATH_QT := $(PATH_SDK_QT4)"
end if
- if (strPathQt4 = "") And (strPathQt5 = "") then
+ if strPathQt5 = "" then
CfgPrint "VBOX_WITH_QTGUI :="
end if
if strPathQt5 = "" then
@@ -2100,31 +2022,6 @@
''
-' Checks if the specified path points to an usable Qt4 library.
-function CheckForQt4Sub(strPathQt4)
-
- CheckForQt4Sub = False
- LogPrint "trying: strPathQt4=" & strPathQt4
-
- if LogFileExists(strPathQt4, "bin/moc.exe") _
- And LogFileExists(strPathQt4, "bin/uic.exe") _
- And LogFileExists(strPathQt4, "include/Qt/qwidget.h") _
- And LogFileExists(strPathQt4, "include/QtGui/QApplication") _
- And LogFileExists(strPathQt4, "include/QtNetwork/QHostAddress") _
- And ( LogFileExists(strPathQt4, "lib/QtCore4.lib") _
- Or LogFileExists(strPathQt4, "lib/VBoxQtCore4.lib") _
- Or LogFileExists(strPathQt4, "lib/QtCoreVBox4.lib")) _
- And ( LogFileExists(strPathQt4, "lib/QtNetwork4.lib") _
- Or LogFileExists(strPathQt4, "lib/VBoxQtNetwork4.lib") _
- Or LogFileExists(strPathQt4, "lib/QtNetworkVBox4.lib")) _
- then
- CheckForQt4Sub = True
- end if
-
-end function
-
-
-''
' Checks if the specified path points to an usable Qt5 library.
function CheckForQt5Sub(strPathQt5)
@@ -2195,6 +2092,7 @@
Print " -h, --help"
Print " --internal"
Print " --internal-last"
+ Print " --target-arch=x86|amd64"
Print ""
Print "Components:"
Print " --disable-COM"
@@ -2201,13 +2099,12 @@
Print " --disable-UDPTunnel"
Print ""
Print "Locations:"
- Print " --with-DDK=PATH "
Print " --with-kBuild=PATH "
Print " --with-libSDL=PATH "
Print " --with-MinGW32=PATH "
Print " --with-MinGW-w64=PATH "
- Print " --with-Qt4=PATH "
Print " --with-Qt5=PATH "
+ Print " --with-DDK=PATH "
Print " --with-SDK=PATH "
Print " --with-VC=PATH "
Print " --with-VC-Common=PATH "
@@ -2214,10 +2111,12 @@
Print " --with-VC-Express-Edition"
Print " --with-W32API=PATH "
Print " --with-libxml2=PATH "
- Print " --with-libxslt=PATH "
Print " --with-openssl=PATH "
+ Print " --with-openssl32=PATH (only for 64-bit targets)"
Print " --with-libcurl=PATH "
+ Print " --with-libcurl32=PATH (only for 64-bit targets)"
Print " --with-python=PATH "
+ Print " --with-mkisofs=PATH "
end sub
@@ -2243,7 +2142,6 @@
strOptlibSDL = ""
strOptMinGW32 = ""
strOptMinGWw64 = ""
- strOptQt4 = ""
strOptQt5 = ""
strOptSDK = ""
strOptVC = ""
@@ -2251,9 +2149,10 @@
blnOptVCExpressEdition = False
strOptW32API = ""
strOptXml2 = ""
- strOptXslt = ""
strOptSsl = ""
+ strOptSsl32 = ""
strOptCurl = ""
+ strOptCurl32 = ""
strOptPython = ""
strOptMkisofs = ""
blnOptDisableCOM = False
@@ -2286,8 +2185,6 @@
strOptMinGW32 = strPath
case "--with-mingw-w64"
strOptMinGWw64 = strPath
- case "--with-qt4"
- strOptQt4 = strPath
case "--with-qt5"
strOptQt5 = strPath
case "--with-sdk"
@@ -2302,12 +2199,14 @@
strOptW32API = strPath
case "--with-libxml2"
strOptXml2 = strPath
- case "--with-libxslt"
- strOptXslt = strPath
case "--with-openssl"
strOptSsl = strPath
+ case "--with-openssl32"
+ strOptSsl32 = strPath
case "--with-libcurl"
strOptCurl = strPath
+ case "--with-libcurl32"
+ strOptCurl32 = strPath
case "--with-python"
strOptPython = strPath
case "--with-mkisofs"
@@ -2322,6 +2221,8 @@
g_blnInternalMode = True
case "--internal-last"
g_blnInternalFirst = False
+ case "--target-arch"
+ g_strTargetArch = strPath
case "-h", "--help", "-?"
usage
Wscript.Quit(0)
@@ -2364,7 +2265,7 @@
CheckSourcePath
CheckForkBuild strOptkBuild
CheckForWinDDK strOptDDK
- CfgPrint "VBOX_WITH_WDDM_W8 := " '' @todo look for WinDDKv8; Check with Misha if we _really_ need the v8 DDK...
+ CfgPrint "VBOX_WITH_WDDM_W8 := " '' @todo look for WinDDKv8
CheckForVisualCPP strOptVC, strOptVCCommon, blnOptVCExpressEdition
CheckForPlatformSDK strOptSDK
CheckForMidl
@@ -2372,18 +2273,27 @@
CheckForMinGWw64 strOptMinGWw64
CfgPrint "VBOX_WITH_OPEN_WATCOM := " '' @todo look for openwatcom 1.9+
EnvPrint "set PATH=%PATH%;" & g_strPath& "/tools/win." & g_strTargetArch & "/bin;" '' @todo look for yasm
- CheckForlibSDL strOptlibSDL
- ' Don't check for these libraries by default as they are part of OSE
- ' Using external libs can add a dependency to iconv
+ if blnOptDisableSDL = True then
+ DisableSDL "--disable-sdl"
+ else
+ CheckForlibSDL strOptlibSDL
+ end if
+ ' Don't check for this library by default as it's part of the tarball
+ ' Using an external library can add a dependency to iconv
if (strOptXml2 <> "") then
CheckForXml2 strOptXml2
end if
- if (strOptXslt <> "") then
- CheckForXslt strOptXslt
+ CheckForSsl strOptSsl, False
+ if g_strTargetArch = "amd64" then
+ ' 32-bit openssl required as well
+ CheckForSsl strOptSsl32, True
end if
- CheckForSsl strOptSsl
- CheckForCurl strOptCurl
- CheckForQt strOptQt4, strOptQt5
+ CheckForCurl strOptCurl, False
+ if g_strTargetArch = "amd64" then
+ ' 32-bit Curl required as well
+ CheckForCurl strOptCurl32, True
+ end if
+ CheckForQt strOptQt5
if (strOptPython <> "") then
CheckForPython strOptPython
end if
Index: doc/manual/Makefile.kmk
===================================================================
--- doc/manual/Makefile.kmk (revision 115126)
+++ doc/manual/Makefile.kmk (working copy)
@@ -772,7 +772,7 @@
$(PATH_STAGE_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK)
$(call MSG_L1,Packing documentation $@)
$(QUIET)$(RM) -f $@
- $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^)
+ $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -9 $@ $(notdir $^)
endif # VBOX_WITH_DOCS_CHM
@@ -823,7 +823,7 @@
$(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html
$(call MSG_L1,Packing documentation $@)
$(QUIET)$(RM) -f $@
- $(QUIET)$(REDIRECT) -C $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ -- zip$(HOSTSUFF_EXE) \
+ $(QUIET)$(REDIRECT) -C $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ -- $(VBOX_ZIP) \
-9 -r $@ html-single html-chunks $(VBOX_MANUAL_PNG_FILES_en_US)
html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html
Index: src/VBox/Additions/Makefile.kmk
===================================================================
--- src/VBox/Additions/Makefile.kmk (revision 115126)
+++ src/VBox/Additions/Makefile.kmk (working copy)
@@ -131,7 +131,7 @@
# The packing target rule, but only if we're on the local build box.
# (VBOX_WITHOUT_ADDITIONS_ISO is used by the additions build box, see the root makefile.)
ifndef VBOX_WITHOUT_ADDITIONS_ISO
- PACKING += $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip
+ PACKING += $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
endif
endif # !VBOX_ONLY_VALIDATIONKIT
@@ -333,11 +333,11 @@
$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
$(call MSG_L1,Zipping image $@)
$(QUIET)$(RM) -f $@
- $(QUIET)$(REDIRECT) -C $(VBOX_PATH_ADDITIONS_ISO) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^)
+ $(QUIET)$(REDIRECT) -C $(VBOX_PATH_ADDITIONS_ISO) -- $(VBOX_ZIP) -9 $@ $(notdir $^)
# Alias for creating the iso.
.PHONY: additions-iso
-additions-iso: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.zip
+additions-iso: $(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso
endif
Index: src/VBox/Installer/Makefile.kmk
===================================================================
--- src/VBox/Installer/Makefile.kmk (revision 115126)
+++ src/VBox/Installer/Makefile.kmk (working copy)
@@ -57,7 +57,6 @@
OTHER_CLEANS += $(VBOX_SDK_ZIP) \
$(wildcard $(PATH_STAGE_BIN)/VirtualBoxSDK-*-r*.zip)
- VBOX_ZIP ?= zip
# @todo: wrong, it must depend on everything included in SDK
$(VBOX_SDK_ZIP): \
$(PATH_STAGE_BIN)/sdk \
Index: src/VBox/ValidationKit/Makefile.kmk
===================================================================
--- src/VBox/ValidationKit/Makefile.kmk (revision 115126)
+++ src/VBox/ValidationKit/Makefile.kmk (working copy)
@@ -102,7 +102,7 @@
$(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 \
,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
- -- zip$(HOSTSUFF_EXE) -r9 $@ $(INST_VALIDATIONKIT) -x '*.pyc',)))
+ -- $(VBOX_ZIP) -r9 $@ $(INST_VALIDATIONKIT) -x '*.pyc',)))
#
# VBoxTestBoxScript.zip - For setting up the testboxes.
@@ -117,7 +117,7 @@
$(foreach os, darwin freebsd linux os2 solaris win,$(foreach arch, x86 amd64 \
,$(if-expr defined(VBOX_WITH_VALIDATIONKIT_PACKING.$(os).$(arch))\
,$(NLTAB)$(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE)/$(os).$(arch)/$(KBUILD_TYPE)/ \
- -- zip$(HOSTSUFF_EXE) -r9 $@ $(INST_TESTBOXSCRIPT) -x '*.pyc',)))
+ -- $(VBOX_ZIP) -r9 $@ $(INST_TESTBOXSCRIPT) -x '*.pyc',)))
endif # !VBOX_WITHOUT_VALIDATIONKIT_ZIP
Index: src/VBox
===================================================================
--- src/VBox (revision 115126)
+++ src/VBox (working copy)
Property changes on: src/VBox
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/src/VBox:r116033,116035
Merged /branches/VBox-5.1/src/VBox:r116038
Index: src/recompiler/Makefile.kmk
===================================================================
--- src/recompiler/Makefile.kmk (revision 115126)
+++ src/recompiler/Makefile.kmk (working copy)
@@ -323,7 +323,8 @@
$$(VBoxREMImp_0_OUTDIR)/VBoxREMRes.o: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.rc $(MAKEFILE_CURRENT) $(VBOX_VERSION_MK) | $$(dir $$@)
$(call MSG_GENERATE,,$@)
- $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' -- $(TOOL_MINGWW64_PREFIX)windres \
+ $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' \
+ -- $(TOOL_$(VBoxRemPrimary_TOOL.win.$(KBUILD_TARGET_ARCH))_PREFIX)windres \
$(addprefix -I,$(INCS) $(PATH_SDK_$(VBOX_WINPSDK)_INC) $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)) \
-DVBOX_SVN_REV=$(VBOX_SVN_REV) \
-DVBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000) \
_______________________________________________
vbox-dev mailing list
[email protected]
https://www.virtualbox.org/mailman/listinfo/vbox-dev
