diff options
| author | chriseth <chris@ethereum.org> | 2018-09-05 00:18:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-05 00:18:40 +0800 |
| commit | 47f67f3567ba92b186594fec15d8400d4d9e753a (patch) | |
| tree | 6bd6df1f88360c2556ff0b503bc8bcc9aef19617 | |
| parent | 9daac90cf7d0a28f5d631b9f5234e4268b5b61b7 (diff) | |
| parent | 9695d7b38da76428ec83713b88d1218d7addb3af (diff) | |
| download | dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.tar dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.tar.gz dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.tar.bz2 dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.tar.lz dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.tar.xz dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.tar.zst dexon-solidity-47f67f3567ba92b186594fec15d8400d4d9e753a.zip | |
Merge pull request #4890 from ethereum/msvcVersionFix
Use wildcards for MSVC version in scripts/release.bat.
| -rw-r--r-- | scripts/release.bat | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/release.bat b/scripts/release.bat index 6415a040..b15b49b7 100644 --- a/scripts/release.bat +++ b/scripts/release.bat @@ -32,11 +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.14.26405\x86\Microsoft.VC141.CRT\" ( - set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\x86\Microsoft.VC141.CRT\msvc*.dll" - ) ELSE ( - set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\14.14.26405\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 ^ |