Changeset 85715 in vbox

Timestamp:

Aug 12, 2020 1:54:57 PM (4 years ago)

Author:

vboxsync

Message:

configure.vbs: Use curl from src/libs if no specific option. Remove duplicate PATH elements when modifying it.

File:

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

trunk/configure.vbs

@@ -764 +764 @@
 
 ''
+' Helper for EnvPrintPrepend and EnvPrintAppend.
+sub EnvPrintCleanup(strEnv, strValue, strSep)
+   dim cchValueAndSep
+   FileAppendLine g_strEnvFile, "set " & strEnv & "=%" & strEnv & ":" & strSep & strValue & strSep & "=" & strSep & "%"
+   cchValueAndSep = Len(strValue) + Len(strSep)
+   FileAppendLine g_strEnvFile, "if ""%" & strEnv & "%""==""" & strValue & """ set " & strEnv & "="
+   FileAppendLine g_strEnvFile, "if ""%" & strEnv & ":~0," & cchValueAndSep & "%""==""" & strValue & strSep & """ set " & strEnv & "=%" & strEnv & ":~" & cchValueAndSep & "%"
+   FileAppendLine g_strEnvFile, "if ""%" & strEnv & ":~-"  & cchValueAndSep & "%""==""" & strSep & strValue & """  set " & strEnv & "=%" & strEnv & ":~0,-" & cchValueAndSep & "%"
+end sub
+
+'' Use by EnvPrintPrepend to skip ';' stripping.
+dim g_strPrependCleanEnvVars
+
+''
+' Print a statement prepending strValue to strEnv, removing duplicate values.
+sub EnvPrintPrepend(strEnv, strValue, strSep)
+   ' Remove old values and any leading separators.
+   EnvPrintCleanup strEnv, strValue, strSep
+   if InStr(1, g_strPrependCleanEnvVars, "|" & strEnv & "|") = 0 then
+      FileAppendLine g_strEnvFile, "if ""%" & strEnv & ":~0,1%""==""" & strSep & """ set " & strEnv & "=%" & strEnv & ":~1%"
+      FileAppendLine g_strEnvFile, "if ""%" & strEnv & ":~0,1%""==""" & strSep & """ set " & strEnv & "=%" & strEnv & ":~1%"
+      g_strPrependCleanEnvVars = g_strPrependCleanEnvVars & "|" & strEnv & "|"
+   end if
+   ' Do the setting
+   FileAppendLine g_strEnvFile, "set " & strEnv & "=" & strValue & strSep & "%" & strEnv & "%"
+end sub
+
+
+'' Use by EnvPrintPrepend to skip ';' stripping.
+dim g_strAppendCleanEnvVars
+
+''
+' Print a statement appending strValue to strEnv, removing duplicate values.
+sub EnvPrintAppend(strEnv, strValue, strSep)
+   ' Remove old values and any trailing separators.
+   EnvPrintCleanup strEnv, strValue, strSep
+   if InStr(1, g_strAppendCleanEnvVars, "|" & strEnv & "|") = 0 then
+      FileAppendLine g_strEnvFile, "if ""%" & strEnv & ":~-1%""==""" & strSep & """ set " & strEnv & "=%" & strEnv & ":~0,-1%"
+      FileAppendLine g_strEnvFile, "if ""%" & strEnv & ":~-1%""==""" & strSep & """ set " & strEnv & "=%" & strEnv & ":~0,-1%"
+      g_strAppendCleanEnvVars = g_strAppendCleanEnvVars & "|" & strEnv & "|"
+   end if
+   ' Do the setting.
+   FileAppendLine g_strEnvFile, "set " & strEnv & "=%" & strEnv & "%" & strSep & strValue
+end sub
+
+
+''
 ' No COM
 sub DisableCOM(strReason)
@@ -968 +1015 @@
       end if
    end if
+   g_strPathkBuildBin = UnixSlashes(PathAbs(g_strPathkBuildBin))
 
    '
@@ -994 +1042 @@
    ' If PATH_DEV is set, check that it's pointing to something useful.
    '
+   ''' @todo wtf is this supposed to be again?  Nobody uses it afaikt.
    str = EnvGet("PATH_DEV")
    g_strPathDev = str
@@ -1007 +1056 @@
 
    '
-   ' Write KBUILD_PATH to the environment script if necessary.
+   ' Write KBUILD_PATH and updated PATH to the environment script if necessary.
    '
    if blnNeedEnvVars = True then
       EnvPrint "set KBUILD_PATH=" & g_strPathkBuild
       EnvSet "KBUILD_PATH", g_strPathkBuild
-      EnvPrint "set PATH=" & g_strPathkBuildBin & ";%PATH%"
+
+      if Right(g_strPathkBuildBin, 7) = "win.x86" then
+         EnvPrintCleanup "PATH", DosSlashes(Left(g_strPathkBuildBin, Len(g_strPathkBuildBin) - 7) & "win.amd64"), ";"
+      end if
+      if Right(g_strPathkBuildBin, 9) = "win.amd64" then
+         EnvPrintCleanup "PATH", DosSlashes(Left(g_strPathkBuildBin, Len(g_strPathkBuildBin) - 9) & "win.x86"), ";"
+      end if
+      EnvPrintPrepend "PATH", DosSlashes(g_strPathkBuildBin), ";"
       EnvPrepend "PATH", g_strPathkBuildBin & ";"
    end if
@@ -1159 +1215 @@
    ' and the env.bat path fix.
    if strPathVCCommon <> "" then
-      EnvPrint "set PATH=%PATH%;" & strPathVCCommon & "/IDE;"
+      EnvPrintAppend "PATH", DosSlashes(strPathVCCommon) & "\IDE", ";"
    end if
 end sub
@@ -1688 +1744 @@
    if bln32Bit = True then
        strCurl = "libcurl32"
+   end if
+
+   '
+   ' Part of tarball / svn, so we can exit immediately if no path was specified.
+   '
+   if (strOptCurl = "") then
+      PrintResult strCurl, "src/libs/curl-*"
+      exit sub
    end if
 
@@ -2019 +2083 @@
    CfgPrint "VBOX_WITH_LIBVPX := " '' @todo look for libvpx 1.1.0+
    CfgPrint "VBOX_WITH_LIBOPUS := " '' @todo look for libopus 1.2.1+
-   EnvPrint "set PATH=%PATH%;" & g_strPath& "/tools/win." & g_strTargetArch & "/bin;" '' @todo look for yasm
+
+   EnvPrintAppend "PATH", DosSlashes(g_strPath & "\tools\win." & g_strHostArch & "\bin"), ";" '' @todo look for yasm
+   if g_strHostArch = "amd64" then
+      EnvPrintAppend "PATH", DosSlashes(g_strPath & "\tools\win.x86\bin"), ";"
+   else
+      EnvPrintCleanup "PATH", DosSlashes(g_strPath & "\tools\win.amd64\bin"), ";"
+   end if
    if blnOptDisableSDL = True then
       DisableSDL "--disable-sdl"