vbox的更動 5506 路徑 trunk/configure.vbs

時間撮記:

2007-10-26 上午12:38:41 (17 年 以前)

作者:

vboxsync

訊息:

try locate midl.exe (Visual C++ PSDK problem).

檔案:

• trunk/configure.vbs (修改) (11 筆差異)

trunk/configure.vbs

@@ -36 +36 @@
 Set g_objFileSys = WScript.CreateObject("Scripting.FileSystemObject")
 
-dim g_strPathkBuild, g_strPathkBuildBin, g_strPathDev, g_strPathVCC, g_strPathPSDK, g_strSubOutput
+dim g_strPathkBuild, g_strPathkBuildBin, g_strPathDev, g_strPathVCC, g_strPathPSDK, g_strPathDDK, g_strSubOutput
 g_strPathkBuild = ""
 g_strPathDev = ""
 g_strPathVCC = ""
 g_strPathPSDK = ""
+g_strPathDDK = ""
 
 dim g_blnDisableCOM, g_strDisableCOM
@@ -444 +445 @@
    CfgPrint "# Build configuration generated by " & GetCommandline()
    CfgPrint "#"
-   if g_blnInternalMode = False then 
+   if g_blnInternalMode = False then
       CfgPrint "VBOX_OSE := 1"
    end if
@@ -1047 +1048 @@
 
    PrintResult "Windows 2003 DDK", strPathDDK
+   g_strPathDDK = strPathDDK
 end sub
 
@@ -1060 +1062 @@
    end if
 end function
+
+
+''
+' Finds midl.exe
+sub CheckForMidl()
+   dim strMidl
+   PrintHdr "Midl.exe"
+
+   ' Skip if no COM/ATL.
+   if g_blnDisableCOM then
+      PrintResult "Xerces", "Skipped (" & g_strDisableCOM & ")"
+      exit sub
+   end if
+
+   if LogFileExists(g_strPathPSDK, "bin/Midl.exe") then
+      strMidl = g_strPathPSDK & "/bin/Midl.exe"
+   elseif LogFileExists(g_strPathVCC, "Common7/Tools/Bin/Midl.exe") then
+      strMidl = g_strPathVCC & "/Common7/Tools/Bin/Midl.exe"
+   elseif LogFileExists(g_strPathDDK, "bin/x86/Midl.exe") then
+      strMidl = g_strPathDDK & "/bin/x86/Midl.exe"
+   elseif LogFileExists(g_strPathDDK, "bin/Midl.exe") then
+      strMidl = g_strPathDDK & "/bin/Midl.exe"
+   elseif LogFileExists(g_strPathDev, "win.x86/bin/Midl.exe") then
+      strMidl = g_strPathDev & "/win.x86/bin/Midl.exe"
+   else
+      MsgWarning "Midl.exe not found!"
+      exit sub
+   end if
+
+   CfgPrint "MAIN_IDL = " & strMidl
+   PrintResult "Midl.exe", strMidl
+end sub
 
 
@@ -1148 +1182 @@
    ' The specified path.
    if (strPathMingW = "") And (strOptMingW <> "") then
-      if CheckForMingWSub(strOptMingW, strOptW32API) then 
+      if CheckForMingWSub(strOptMingW, strOptW32API) then
          strPathMingW = strOptMingW
          strPathW32API = strOptW32API
@@ -1158 +1192 @@
       str = g_strPathDev & "/win.x86/mingw32/v3.3.3"
       str2 = g_strPathDev & "/win.x86/w32api/v2.5"
-      if CheckForMingWSub(str, str2) then 
+      if CheckForMingWSub(str, str2) then
          strPathMingW = str
          strPathW32API = str2
@@ -1385 +1419 @@
    ' Ignore failure if we're in 'internal' mode.
    if (strPathXerces = "") and g_blnInternalMode then
-      PrintResult "Xerces", "ignored (internal mode)" 
+      PrintResult "Xerces", "ignored (internal mode)"
       exit sub
    end if
@@ -1418 +1452 @@
     And LogFileExists(strPathXerces, "include/xercesc/validators/datatype/DatatypeValidator.hpp") _
       then
-      ' The version is encoded in the dll/lib name, so try first 
+      ' The version is encoded in the dll/lib name, so try first
       ' to find the dll and then a matching lib.
       str = LogFindFile(strPathXerces, "bin/xerces-c_*.dll")
@@ -1479 +1513 @@
    ' Ignore failure if we're in 'internal' mode.
    if (strPathXalan = "") and g_blnInternalMode then
-      PrintResult "Xalan", "ignored (internal mode)" 
+      PrintResult "Xalan", "ignored (internal mode)"
       exit sub
    end if
@@ -1514 +1548 @@
     And LogFileExists(strPathXalan, "include/xalanc/XalanDOM/XalanText.hpp") _
       then
-      ' The version is encoded in the dll/lib name, so try first 
+      ' The version is encoded in the dll/lib name, so try first
       ' to find the dll and then a matching lib.
       str = LogFindFile(strPathXalan, "bin/Xalan-C_*.dll")
@@ -1743 +1777 @@
    CheckForPlatformSDK strOptSDK
    CheckForWin2k3DDK strOptDDK
+   CheckForMidl
    CheckForDirectXSDK strOptDXSDK
    CheckForMingW strOptMingw, strOptW32API