diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-02 22:26:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-02 22:26:04 +0200 |
| commit | dd905a2ae14bf2ee59a068f1c3acbca1ff0b7067 (patch) | |
| tree | 940a166996e002ca0b32bb5cf19f82d379213a34 | |
| parent | a5d4121eed942bbbc672a7b00bf20866c17dc858 (diff) | |
patch 7.4.2311v7.4.2311
Problem: Appveyor 64 bit build still using Python 3.4
Solution: Switch to Python 3.5. (Ken Takata, closes #1032)
| -rw-r--r-- | appveyor.yml | 3 | ||||
| -rw-r--r-- | src/appveyor.bat | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 7f6a40a6ea..263e778df4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,9 +26,10 @@ build_script: test_script: - cd src/testdir # Testing with MSVC gvim + - path C:\Python35-x64;%PATH% - nmake -f Make_dos.mak VIMPROG=..\gvim - nmake -f Make_dos.mak clean # Testing with MingW console version - nmake -f Make_dos.mak VIMPROG=..\vim -# vim: sw=2 sts=2 et ts=2 sr +# vim: sw=2 sts=2 et ts=8 sr diff --git a/src/appveyor.bat b/src/appveyor.bat index b2e406ea13..761f9b8908 100644 --- a/src/appveyor.bat +++ b/src/appveyor.bat @@ -16,7 +16,7 @@ mingw32-make.exe -f Make_ming.mak clean :: with specified features without python. echo "Building MinGW 32bit GUI version" if "%FEATURE%" == "HUGE" ( - mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 FEATURES=%FEATURE% || exit 1 + mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35 FEATURES=%FEATURE% || exit 1 ) ELSE ( mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) @@ -31,7 +31,7 @@ nmake -f Make_mvc2.mak clean :: GUI needs to be last, so that testing works echo "Building MSVC 64bit GUI Version" if "%FEATURE%" == "HUGE" ( - nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 FEATURES=%FEATURE% || exit 1 + nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 FEATURES=%FEATURE% || exit 1 ) ELSE ( nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) diff --git a/src/version.c b/src/version.c index 784b405ae8..ff7f236859 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2311, +/**/ 2310, /**/ 2309, |