summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-01-26 16:20:21 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-26 16:20:21 +0000
commit47d1666d605998a97d3827eca4d467ad0930b284 (patch)
treeb61a572d2361815c6a28b2de9783354a40948064 /ci
parenta827bf3ea8fe465aa456ef7a7a37d6afe6a47628 (diff)
downloadvim-git-47d1666d605998a97d3827eca4d467ad0930b284.tar.gz
patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CIv8.2.4222
Problem: MS-Windows: clumsy way to suppress progress on CI. Solution: Check for "$CI" in the Makefile itself. (Ken Takata, closes #9631)
Diffstat (limited to 'ci')
-rw-r--r--ci/appveyor.bat8
1 files changed, 3 insertions, 5 deletions
diff --git a/ci/appveyor.bat b/ci/appveyor.bat
index 5d5a9f182..92ec936f9 100644
--- a/ci/appveyor.bat
+++ b/ci/appveyor.bat
@@ -5,11 +5,9 @@ setlocal ENABLEDELAYEDEXPANSION
cd %APPVEYOR_BUILD_FOLDER%
cd src
-:: Filter out the progress bar from the build log
-sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
echo "Building MSVC 64bit console Version"
-nmake -f Make_mvc2.mak CPU=AMD64 ^
+nmake -f Make_mvc.mak CPU=AMD64 ^
OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE%
if not exist vim.exe (
@@ -21,13 +19,13 @@ if not exist vim.exe (
:: GUI needs to be last, so that testing works
echo "Building MSVC 64bit GUI Version"
if "%FEATURE%" == "HUGE" (
- nmake -f Make_mvc2.mak CPU=AMD64 ^
+ nmake -f Make_mvc.mak CPU=AMD64 ^
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
FEATURES=%FEATURE%
) ELSE (
- nmake -f Make_mvc2.mak CPU=AMD64 ^
+ nmake -f Make_mvc.mak CPU=AMD64 ^
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE%
)