On Di, 23 Feb 2016, Bram Moolenaar wrote:
> The output of :version should tell you if there is a fall-back for
> $VIMRUNTIME. If it's not set, then check the Makefile, in Make_mvc.mak
> it's done around line 1323. However, the default is empty.
>
> It should work to find the runtime files relative to the binary. This
> happens in vim_getenv(), around line 4320 in misc1.c. No idea why this
> would not work in this setup.
Ah, it was a user error. Updated patch attached.
I think the patch is now ready to be included.
Just to recap:
This builds for Huge and Normal Feature Set a console and gui version
(the huge version with +python/dyn and +python3/dyn) using MSVC and
MingW.
The test then runs with the MSVC gvim and the MingW console version (for
both huge and normal versions).
Best,
Christian
--
--
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.
diff --git a/appveyor.yml b/appveyor.yml
index ab379f9..28bd382 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,16 @@
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'
@@ -9,12 +19,14 @@ before_build:
- 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
+ # 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
diff --git a/src/appveyor.bat b/src/appveyor.bat
new file mode 100644
index 0000000..61ee57b
--- /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, 1)console version, 2) gvim version
+set PATH=c:\msys64\mingw32\bin;%PATH%
+mingw32-make.exe -f Make_ming.mak GUI=no OPTIMIZE=speed IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
+:: Save vim.exe before Make clean
+copy vim.exe testdir
+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" ver_ming.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" ver_msvc.txt
+move /Y testdir\vim.exe .
+echo "version output MinGW"
+type ver_ming.txt
+echo "version output MVC"
+type ver_msvc.txt
+cd ..
