Changeset 7589

Timestamp:

03/27/08 11:47:35 (6 months ago)

Author:

vboxsync

Message:

Enhanced Qt configuration of "configure.vbs" script:

- Can now be used with "qtwin" Qt/Free in any location (http://qtwin.sf.net).
- Added automatic support for future Qt releases (takes always the newest ones found).
- Added support for handling own built Qt versions (VBoxQtXXX.*).
- Bugfixed slashes when using the "--with-qt" command.

Files:

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

trunk/configure.vbs

@@ -519 +519 @@
-      LogPrint "Testing '" & strPath & "': " & strPattern & " not found"
-      LogFindFile = ""
+   end if
+end function
+
+
+''
+' Finds the first directory matching the pattern.
+' If no directory is found, log the failure, 
+' else return the complete path to the found directory.
+function LogFindDir(strPath, strPattern)
+   dim str
+
+   '
+   ' Yes, there are some facy database kinda interface to the filesystem
+   ' however, breaking down the path and constructing a usable query is
+   ' too much hassle. So, we'll do it the unix way...
+   '
+
+   ' List the alphabetically last names as first entries (with /O-N).
+   if Shell("dir /B /AD /O-N """ & DosSlashes(strPath) & "\" & DosSlashes(strPattern) & """", True) = 0 _
+    And InStr(1, g_strShellOutput, Chr(13)) > 1 _
+      then
+      ' return the first word.
+      LogFindDir = strPath & "/" & Left(g_strShellOutput, InStr(1, g_strShellOutput, Chr(13)) - 1)
+   else
+      LogPrint "Testing '" & strPath & "': " & strPattern & " not found"
+      LogFindDir = ""
-   end if
-end function
@@ -1771 +1797 @@
-end function
-
-
-
+
-g_strQtVer = ""
+
+dim g_strQtLib    ' Full path to Qt .lib found
+g_strQtLib = ""
+
+dim g_strQtDll    ' Full path to Qt .dll found
+g_strQtDll = ""
-
-''
@@ -1783 +1814 @@
-
-   '
-
+ (user specified path with --with-qt=)
-   '
-   strPathQt = ""
-
+
+
+
-   if (strPathQt = "") And (strOptQt <> "") then
+      strOptQt = UnixSlashes(strOptQt)
-      if CheckForQtSub(strOptQt) then strPathQt = strOptQt
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   if strPathQt = "" then
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   end if
-
@@ -1802 +1866 @@
-      CfgPrint "VBOX_WITH_QTGUI="
-      PrintResult "Qt", "not found"
-
+                               
-      CfgPrint "VBOX_PATH_QT          := " & strPathQt
-      CfgPrint "QTDIR                  = $(VBOX_PATH_QT)"
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-''
@@ -1817 +1888 @@
-   CheckForQtSub = False
-   LogPrint "trying: strPathQt=" & strPathQt
+
+   ' For Qt 3.3.3
+   dim str
-   if   LogFileExists(strPathQt, "bin/moc.exe") _
-    And LogFileExists(strPathQt, "bin/uic.exe") _
@@ -1825 +1899 @@
-    And LogFileExists(strPathQt, "lib/dynamic/qtmain.lib") _
-      then
-      dim str
-
-      ' This check might need improving.
@@ -1832 +1905 @@
-         g_strQtVer = Mid(str, Len("qt-mt") + 1, Len(str) - Len("qt-mt.lib"))
-         if LogFileExists(strPathQt, "bin/qt-mt" & g_strQtVer & ".dll") then
+            g_strQtLib = strPathQt & "/lib/dynamic/" & str
+            g_strQtDll = strPathQt & "/bin/qt-mt" & g_strQtVer & ".dll"
-            CheckForQtSub = True
+         end if
+      end if
+   end if
+
+   ' For >= Qt 3.3.8 (no "dynamic" folder, VBoxQt338.lib /.dll instead of qt-mt33*.lib /.dll)
+   str = ""
+   if   LogFileExists(strPathQt, "bin/moc.exe") _
+    And LogFileExists(strPathQt, "bin/uic.exe") _
+    And LogFileExists(strPathQt, "include/qvbox.h") _
+    And LogFileExists(strPathQt, "include/qt_windows.h") _
+    And LogFileExists(strPathQt, "include/qapplication.h") _
+    And LogFileExists(strPathQt, "include/qtextedit.h") _
+    And LogFileExists(strPathQt, "lib/qtmain.lib") _
+      then
+
+      ' This check might need improving.
+      str = LogFindFile(strPathQt, "lib/VBoxQt3*.lib")
+      if str <> "" then
+         g_strQtVer = Mid(str, Len("VBoxQt") + 1, Len(str) - Len("VBoxQt.lib"))
+         if LogFileExists(strPathQt, "bin/VBoxQt" & g_strQtVer & ".dll") then
+            g_strQtLib = strPathQt & "/lib/" & str
+            g_strQtDll = strPathQt & "/bin/VBoxQt" & g_strQtVer & ".dll"
+            CheckForQtSub = True
+         end if
+      end if
+   end if
+
+end function
+
+
+''
+' Checks if the specified path points to an usable "qtwin" Qt/Free install or not.
+' "qtwin" is an Open Source project located at http://qtwin.sf.net and builds Qt 3.x.x sources
+' of the official GPL'ed Qt 4.x sources from Trolltech.
+function CheckForQtWinFreeSub(strPathQt)
+
+   CheckForQtWinFreeSub = False
+   LogPrint "trying: strPathQt=" & strPathQt
+   if   LogFileExists(strPathQt, "bin/moc.exe") _
+    And LogFileExists(strPathQt, "bin/uic.exe") _
+    And LogFileExists(strPathQt, "include/qvbox.h") _
+    And LogFileExists(strPathQt, "include/qt_windows.h") _
+    And LogFileExists(strPathQt, "include/qapplication.h") _
+    And LogFileExists(strPathQt, "include/qtextedit.h") _
+    And LogFileExists(strPathQt, "lib/qtmain.lib") _
+      then
+      dim str
+
+      ' This check might need improving.
+      str = LogFindFile(strPathQt, "lib/qt-mt3.lib")
+      if str <> "" then
+         g_strQtVer = Mid(str, Len("qt-mt") + 1, Len(str) - Len("qt-mt.lib"))
+         if LogFileExists(strPathQt, "bin/qt-mt" & g_strQtVer & ".dll") then
+            g_strQtLib = strPathQt & "/lib/" & str
+            g_strQtDll = strPathQt & "/bin/qt-mt" & g_strQtVer & ".dll"
+            CheckForQtWinFreeSub = True
-         end if
-      end if