Changeset 85653 in vbox for trunk

Timestamp:

Aug 9, 2020 12:22:43 PM (4 years ago)

Author:

vboxsync

Message:

configure.vbs: OpenSSL is now part of the tarball, just like libxml2 is.

File:

• trunk/configure.vbs (modified) (6 diffs)

trunk/configure.vbs

@@ -548 +548 @@
 
 ''
+' Right pads a string with spaces to the given length
+function RightPad(str, cch)
+   if Len(str) < cch then
+      RightPad = str & String(cch - Len(str), " ")
+   else
+      RightPad = str
+   end if
+end function
+
+''
 ' Append text to the log file and echo it to stdout
 sub Print(str)
@@ -566 +576 @@
 ' Prints a success message
 sub PrintResultMsg(strTest, strResult)
+   dim cchPad
    LogPrint "** " & strTest & ": " & strResult
-   Wscript.Echo " Found "& strTest & ": " & strResult
+   Wscript.Echo " Found " & RightPad(strTest & ": ", 18) & strPad & strResult
 end sub
 
@@ -577 +588 @@
    if PathAbs(strPath) <> strLongPath then
       LogPrint         "** " & strTest & ": " & strPath & " (" & UnixSlashes(strLongPath) & ")"
-      Wscript.Echo " Found " & strTest & ": " & strPath & " (" & UnixSlashes(strLongPath) & ")"
+      Wscript.Echo " Found " & RightPad(strTest & ": ", 18) & strPath & " (" & UnixSlashes(strLongPath) & ")"
    else
       LogPrint         "** " & strTest & ": " & strPath
-      Wscript.Echo " Found " & strTest & ": " & strPath
+      Wscript.Echo " Found " & RightPad(strTest & ": ", 18) & strPath
    end if
 end sub
@@ -1511 +1522 @@
    PrintHdr "libxml2"
 
+   '
+   ' Part of tarball / svn, so we can exit immediately if no path was specified.
+   '
+   if (strOptXml2 = "") then
+      PrintResultMsg "libxml2", "src/lib/libxml2-*"
+      exit sub
+   end if
+
    ' Skip if no COM/ATL.
    if g_blnDisableCOM then
@@ -1587 +1606 @@
    if bln32Bit = True then
        strOpenssl = "openssl32"
+   end if
+
+   '
+   ' Part of tarball / svn, so we can exit immediately if no path was specified.
+   '
+   if (strOptSsl = "") then
+      PrintResult strOpenssl, "src/libs/openssl-*"
+      exit sub
    end if
 
@@ -1998 +2025 @@
       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
+   CheckForXml2 strOptXml2
    CheckForSsl strOptSsl, False
    if g_strTargetArch = "amd64" then