mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-27 16:51:06 -07:00
Merge branch 'branch/2023-01-05/travis-windows' into branch/2022-12-23/hardened-runtime to get travis to test this branch on windows before merging.
This commit is contained in:
commit
61ef072ba1
2 changed files with 17 additions and 1 deletions
|
|
@ -5,6 +5,7 @@ language: c
|
|||
os:
|
||||
- linux
|
||||
- osx
|
||||
# See "include" section for Windows
|
||||
arch:
|
||||
- amd64
|
||||
- arm64
|
||||
|
|
@ -12,6 +13,11 @@ compiler:
|
|||
- clang
|
||||
- gcc
|
||||
matrix:
|
||||
include:
|
||||
- os: windows
|
||||
arch: amd64
|
||||
compiler: clang # This is a lie since we invoke MV (Microsoft C)
|
||||
script: MSYS2_ARG_CONV_EXCL='*' cmd /c 'code\w3i6mv.bat'
|
||||
exclude:
|
||||
- os: osx
|
||||
compiler: gcc
|
||||
|
|
@ -23,4 +29,4 @@ notifications:
|
|||
# - if test "$TRAVIS_OS_NAME" = "linux"; then sudo apt-get -qq update; fi
|
||||
# - if test "$TRAVIS_OS_NAME" = "linux"; then sudo apt-get install -y gcc-4.7; fi
|
||||
script:
|
||||
- ./configure --prefix=$PWD/prefix && make install && make test
|
||||
- ./configure --prefix=$PWD/prefix && make install && make test
|
||||
|
|
|
|||
10
mps/code/w3i6mv.bat
Normal file
10
mps/code/w3i6mv.bat
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
@rem w3i6mv.bat -- set up and invoke build from raw CMD on Windows
|
||||
@rem This can be invoked from a plain CMD from the MPS workspace
|
||||
@rem like this::
|
||||
@rem code\w3i6mv.bat
|
||||
@rem or from Git Bash in Travis CI build machines like this::
|
||||
@rem MSYS2_ARG_CONV_EXCL='*' cmd /k 'code\w3i6mv.bat'
|
||||
@rem which is how it's invoked from .travis.yml
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
|
||||
cd code
|
||||
nmake /f w3i6mv.nmk
|
||||
Loading…
Add table
Add a link
Reference in a new issue