On Mi, 17 Feb 2016, Bram Moolenaar wrote: > Thanks. I think we should also build a console version. Since testing > appears to the take bulk of the time we can run the tests once with > HUGE-console features. So perhaps we can build TINY-console with MSVC > and HUGE-console with MingW and then run the tests with the MingW > binary? That way we cover more rows & columns in the build & test > matrix.
Well, a console version is build for MSVC, since that appears to build faster than MingW. Testing happens with the gvim.exe build from MSVC, because first of all, the test I tried with MingW did stall on test47 and second of all, last time I checked with the nightly windows builds, the gui version test was a lot faster than the console test. > Perhaps the build can be made faster by not using -O3. -O2 should be > sufficient to get useful warnings. Even -O1 should be enough and quite > a bit faster. I did change that. Now MingW builds with -O2 which is indeed quite faster and I believe it did generate some more warnings. https://ci.appveyor.com/project/chrisbra/vim-ch0ci/build/47 Updated patch attached. Best, Christian -- Nichts gibt Frauen eine königlichere Haltung als das Bewußtsein, daß sie ihr Alter besiegt haben. -- Arthur Schnitzler (Aphorismen und Betrachtungen aus dem Nachlaß) -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
commit 224291e00ed76fddf0f4278c972210a103a6f319 Author: Christian Brabandt <[email protected]> Date: Mon Feb 15 20:21:59 2016 +0100 updated appveyor script diff --git a/appveyor.yml b/appveyor.yml index ab379f9..d633703 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,20 +1,28 @@ version: "{build}" -skip_tags: true +environment: + matrix: + - FEATURE: HUGE + - FEATURE: NORMAL +# disabled +# - FEATURE: TINY +# - FEATURE: SMALL +# - FEATURE: BIG + +matrix: + fast_finish: true before_build: - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release' - # Work around for Python 2.7.11's bug +# Work around for Python 2.7.11 - reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32 - reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64 build_script: - - cd src - - sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak - - nmake -f Make_mvc2.mak CPU=AMD64 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 - - .\gvim -u NONE -c "redir @a | ver | 0put a | wq!" ver.txt - - type ver.txt + - src/appveyor.bat test_script: - - cd testdir + - cd src/testdir - nmake -f Make_dos.mak VIMPROG=..\gvim + +# vim: sw=2 sts=2 et ts=2 sr diff --git a/src/appveyor.bat b/src/appveyor.bat new file mode 100644 index 0000000..4c99354 --- /dev/null +++ b/src/appveyor.bat @@ -0,0 +1,40 @@ +@echo off +:: Batch file for building/testing Vim on AppVeyor + +setlocal ENABLEDELAYEDEXPANSION +cd %APPVEYOR_BUILD_FOLDER% + +cd src +echo "Building MinGW 32bit Version" +:: Build Mingw version +set PATH=c:\msys64\mingw32\bin;%PATH% +:: Disabled for now, console version is build with MVC below +:: mingw32-make.exe -f Make_ming.mak GUI=no IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 +:: mingw32-make.exe -f Make_ming.mak clean +:: build huge version with python and channel support +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 +) +.\gvim -u NONE -c "redir @a | ver |0put a | wq!" ver1.txt +:: Build MSVC Version +echo "Building MSVC 64bit Version" +sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak +nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 +nmake -f Make_mvc2.mak clean +:: build huge version with python and channel support +:: GUI needs to be last, to that testing works +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 +) +.\gvim -u NONE -c "redir @a | ver |0put a | wq!" ver2.txt +echo "version output MinGW" +type ver1.txt +echo "version output MVC" +type ver2.txt +cd .. + +:eof
