aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-09-07 01:31:10 +0800
committerGitHub <noreply@github.com>2018-09-07 01:31:10 +0800
commit61ee88ff0e624e87872ad9ba47654d8bfe80f047 (patch)
treee5e06c2dc005c46663655e09d40ebc5116f483a9
parentba5625063cbbd7ad287cb356e8dcdaa24200d8c2 (diff)
parentf531dd9fa0cfad50fef4e17c4c734e91187debfd (diff)
downloaddexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.tar
dexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.tar.gz
dexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.tar.bz2
dexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.tar.lz
dexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.tar.xz
dexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.tar.zst
dexon-solidity-61ee88ff0e624e87872ad9ba47654d8bfe80f047.zip
Merge pull request #4928 from ethereum/v0425_appveyor_fix
[BACKPORT] Use wildcards for MSVC version in scripts/release.bat.
-rw-r--r--scripts/release.bat9
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/release.bat b/scripts/release.bat
index be95b35e..b15b49b7 100644
--- a/scripts/release.bat
+++ b/scripts/release.bat
@@ -32,12 +32,9 @@ set VERSION=%2
IF "%VERSION%"=="2015" (
set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll"
) ELSE (
-
- IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.13.26020\x86\Microsoft.VC141.CRT\" (
- set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.13.26020\x86\Microsoft.VC141.CRT\msvc*.dll"
- ) ELSE (
- set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.13.26020\x86\Microsoft.VC141.CRT\msvc*.dll"
- )
+ set "DLLS=MSVC_DLLS_NOT_FOUND"
+ FOR /d %%d IN ("C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\*"
+ "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\*") DO set "DLLS=%%d\x86\Microsoft.VC141.CRT\msvc*.dll"
)
7z a solidity-windows.zip ^