Changeset 6081

Timestamp:

12/15/07 05:50:59 (10 months ago)

Author:

vboxsync

Message:

Added --internal-last option for simplifying testing of the script.

Files:

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

trunk/configure.vbs

@@ -50 +50 @@
-dim g_blnInternalMode
-g_blnInternalMode = False
+
+' Whether to try the internal stuff first or last.
+dim g_blnInternalFirst
+g_blnInternalFirst = True
-
-
@@ -790 +794 @@
-   end if
-
-strPathVC = ""
+(strPathVC = "") And (g_blnInternalFirst = True)
-      strPathVC = g_strPathDev & "/win.x86/vcc/v8"
-      if CheckForVisualCPPSub(strPathVC, "", blnOptVCExpressEdition) = False then
@@ -896 +900 @@
-            strPathVC = str
-            strPathVCCommon = str2
+         end if
+      end if
+   end if
+
+   if (strPathVC = "") And (g_blnInternalFirst = False) Then
+      strPathVC = g_strPathDev & "/win.x86/vcc/v8"
+      if CheckForVisualCPPSub(strPathVC, "", blnOptVCExpressEdition) = False then
+         strPathVC = g_strPathDev & "/win.x86/vcc/v7"
+         if CheckForVisualCPPSub(strPathVC, "", blnOptVCExpressEdition) = False then
+            strPathVC = ""
-         end if
-      end if
@@ -1004 +1018 @@
-   end if
-
-
-strPathPSDK = ""
+ (first)
+(strPathPSDK = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/sdk/200604"
-      if CheckForPlatformSDKSub(str) then strPathPSDK = str
-   end if
-
-strPathPSDK = ""
+(strPathPSDK = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/sdk/200504"
-      if CheckForPlatformSDKSub(str) then strPathPSDK = str
-   end if
-
-strPathPSDK = ""
+(strPathPSDK = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/sdk/200209"
-      if CheckForPlatformSDKSub(str) then strPathPSDK = str
@@ -1067 +1081 @@
-      end if
-   Next
+
+   ' The tools location (post).
+   if (strPathPSDK = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/sdk/200604"
+      if CheckForPlatformSDKSub(str) then strPathPSDK = str
+   end if
+
+   if (strPathPSDK = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/sdk/200504"
+      if CheckForPlatformSDKSub(str) then strPathPSDK = str
+   end if
+
+   if (strPathPSDK = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/sdk/200209"
+      if CheckForPlatformSDKSub(str) then strPathPSDK = str
+   end if
-
-   ' Give up.
@@ -1116 +1146 @@
-   end if
-
-
-strPathDDK = ""
+ (first)
+(strPathDDK = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/ddkwin2k3/200503"
-      if CheckForWin2k3DDKSub(str, False) then strPathDDK = str
-   end if
-
-strPathDDK = ""
+(strPathDDK = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/ddkwin2k3/2004"
-      if CheckForWin2k3DDKSub(str, False) then strPathDDK = str
@@ -1170 +1200 @@
-   Next
-
+   ' The tools location (post).
+   if (strPathDDK = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/ddkwin2k3/200503"
+      if CheckForWin2k3DDKSub(str, False) then strPathDDK = str
+   end if
+
+   if (strPathDDK = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/ddkwin2k3/2004"
+      if CheckForWin2k3DDKSub(str, False) then strPathDDK = str
+   end if
+
+   ' Give up.
-   if strPathDDK = "" then
-      MsgError "Cannot find a suitable Windows 2003 DDK. Check configure.log and the build requirements."
@@ -1249 +1291 @@
-   end if
-
-
-strPathDXSDK = ""
+ (first)
+(strPathDXSDK = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/dxsdk/200610"
-      if CheckForDirectXSDKSub(str) then strPathDXSDK = str
@@ -1275 +1317 @@
-   Next
-
+   ' The tools location (post).
+   if (strPathDXSDK = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/dxsdk/200610"
+      if CheckForDirectXSDKSub(str) then strPathDXSDK = str
+   end if
+
+   ' Give up.
-   if strPathDXSDK = "" then
-      MsgError "Cannot find a suitable Direct X SDK. Check configure.log and the build requirements."
@@ -1326 +1375 @@
-   end if
-
-
-strPathMingW = ""
+ (first)
+(strPathMingW = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/mingw32/v3.3.3"
-      str2 = g_strPathDev & "/win.x86/w32api/v2.5"
@@ -1350 +1399 @@
-         str = PathParent(PathStripFilename(str))
-         if CheckForMingWSub(str, str) then strPathMingW = str
+      end if
+   end if
+
+   ' The tools location (post).
+   if (strPathMingW = "") And (g_blnInternalFirst = False) then
+      str = g_strPathDev & "/win.x86/mingw32/v3.3.3"
+      str2 = g_strPathDev & "/win.x86/w32api/v2.5"
+      if CheckForMingWSub(str, str2) then
+         strPathMingW = str
+         strPathW32API = str2
-      end if
-   end if
@@ -1452 +1511 @@
-   end if
-
-
-strPathlibSDL = ""
+ (first)
+(strPathlibSDL = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/libsdl/v1.2.11"
-      if CheckForlibSDLSub(str) then strPathlibSDL = str
-   end if
-
-strPathlibSDL = ""
+(strPathlibSDL = "") And (g_blnInternalFirst = True)
-      str = g_strPathDev & "/win.x86/libsdl/v1.2.7-InnoTek"
-      if CheckForlibSDLSub(str) then strPathlibSDL = str
@@ -1473 +1532 @@
-   if (strPathlibSDL = "") And (str <> "") Then
-      str = PathParent(PathStripFilename(str))
+      if CheckForlibSDLSub(str) then strPathlibSDL = str
+   end if
+
+   ' The tools location (post).
+   if (strPathlibSDL = "") And (g_blnInternalFirst = False) Then
+      str = g_strPathDev & "/win.x86/libsdl/v1.2.11"
+      if CheckForlibSDLSub(str) then strPathlibSDL = str
+   end if
+
+   if (strPathlibSDL = "") And (g_blnInternalFirst = False) Then
+      str = g_strPathDev & "/win.x86/libsdl/v1.2.7-InnoTek"
-      if CheckForlibSDLSub(str) then strPathlibSDL = str
-   end if
@@ -1777 +1847 @@
-   Print "  -h, --help"
-   Print "  --internal"
+   Print "  --internal-last"
-   Print ""
-   Print "Components:"
@@ -1876 +1947 @@
-         case "--internal"
-            g_blnInternalMode = True
+         case "--internal-last"
+            g_blnInternalFirst = False
-         case "-h", "--help", "-?"
-            usage