patch 7.4.872

Problem:    Not using CI services available.
Solution:   Add configuration files for travis and appveyor. (PR #401)

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..b8210ca
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,37 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+env:
+  - COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge
+    "CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
+  - COVERAGE=no FEATURES=small CONFOPT=
+  - COVERAGE=no FEATURES=tiny  CONFOPT=
+
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - lcov
+      - libperl-dev
+      - python-dev
+      - python3-dev
+      - liblua5.1-0-dev
+      - lua5.1
+
+before_install:
+  - pip install --user cpp-coveralls
+
+script:
+  - NPROC=$(getconf _NPROCESSORS_ONLN)
+  - ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && make -j$NPROC
+  - ./src/vim --version
+  - make test
+
+after_success:
+  - if [ x"$COVERAGE" = "xyes" ]; then ~/.local/bin/coveralls -b src -x .xs -e src/xxd -e src/if_perl.c --encodings utf-8 latin-1 EUC-KR; fi
+
+# vim:set sts=2 sw=2 tw=0 et:

diff --git a/Filelist b/Filelist
index 166e2f4fa62c96c9dd350d9b6443a76214c1eadd..2440a0cc8fbeb43ea754cc16614a3b6016a49fc3 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -4,6 +4,8 @@
 # source files for all source archives
 SRC_ALL =      \
                .hgignore \
+               .travis.yml \
+               appveyor.yml \
                src/README.txt \
                src/arabic.c \
                src/arabic.h \

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644 (file)
index 0000000..3bda489
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,15 @@
+version: "{build}"
+
+before_build:
+  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
+
+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
+
+test_script:
+  - cd testdir
+  - nmake -f Make_dos.mak VIMPROG=..\gvim

diff --git a/src/version.c b/src/version.c
index 20107c50156c1144e1f9fb99b822d2e9967f8d08..53da1ea2a3b22fe6ef75ac0c942138fa73e2d972 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    872,
 /**/
     871,
 /**/