To: vim_dev@googlegroups.com Subject: Patch 7.4.2311 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2311 Problem: Appveyor 64 bit build still using Python 3.4 Solution: Switch to Python 3.5. (Ken Takata, closes #1032) Files: appveyor.yml, src/appveyor.bat *** ../vim-7.4.2310/appveyor.yml 2016-02-24 22:27:01.016713821 +0100 --- appveyor.yml 2016-09-02 22:23:53.143479174 +0200 *************** *** 26,34 **** test_script: - cd src/testdir # Testing with MSVC gvim - 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 --- 26,35 ---- 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=8 sr *** ../vim-7.4.2310/src/appveyor.bat 2016-02-24 21:02:01.397693481 +0100 --- src/appveyor.bat 2016-09-02 22:21:47.956546196 +0200 *************** *** 16,22 **** :: 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 ) ELSE ( mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) --- 16,22 ---- :: 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=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,37 **** :: 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 ) ELSE ( nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) --- 31,37 ---- :: 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=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 ) *** ../vim-7.4.2310/src/version.c 2016-09-02 22:18:45.462101097 +0200 --- src/version.c 2016-09-02 22:23:12.011829791 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2311, /**/ -- hundred-and-one symptoms of being an internet addict: 140. You'd rather catch a score on the web than watch the game as it is being played on tv. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///