re-add Windows visual studio build back into the travis-ci tests
New procedures added to win/win32/vs2017/travisci.sh for travis-ci testing. - use curl to obtain Lua from http://www.lua.org/ftp/lua-5.3.5.tar.gz - use tar to unzip lua into lib/lua-5.3.5/... Note: curl and tar were both added as part of Windows 10 in late Dec 2017 https://techcommunity.microsoft.com/t5/Containers/Tar-and-Curl-Come-to-Windows/ba-p/382409 - use git to clone pdcurses into lib/pdcurses - use git to clone universal-ctags into lib/ctags - build universal-ctags ahead of building NetHack + lua + pdcurses - adjust sys/winnt/Makefile.msc to look for those things in their lib locations when building under travis
This commit is contained in:
+5
-5
@@ -69,6 +69,11 @@ matrix:
|
|||||||
sed -i 's/^#define TEXTCOLOR//' include/unixconf.h
|
sed -i 's/^#define TEXTCOLOR//' include/unixconf.h
|
||||||
make fetch-lua && make install
|
make fetch-lua && make install
|
||||||
cat dat/options
|
cat dat/options
|
||||||
|
- os: windows
|
||||||
|
env: DESCR=windows-visualstudio
|
||||||
|
language: shell
|
||||||
|
script:
|
||||||
|
- ./win/win32/vs2017/travisci.sh
|
||||||
- os: linux
|
- os: linux
|
||||||
env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5
|
env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
@@ -80,11 +85,6 @@ matrix:
|
|||||||
- sh sys/msdos/msdos-cross-compile.sh
|
- sh sys/msdos/msdos-cross-compile.sh
|
||||||
exclude:
|
exclude:
|
||||||
- os: windows
|
- os: windows
|
||||||
env: DESCR=windows-visualstudio
|
|
||||||
language: shell
|
|
||||||
script:
|
|
||||||
- ./win/win32/vs2017/travisci.sh
|
|
||||||
- os: windows
|
|
||||||
# install: choco install mingw
|
# install: choco install mingw
|
||||||
env: DESCR=windows-mingw
|
env: DESCR=windows-mingw
|
||||||
script:
|
script:
|
||||||
|
|||||||
@@ -527,7 +527,12 @@ DATABASE = $(DAT)\data.base
|
|||||||
# ctags options
|
# ctags options
|
||||||
#
|
#
|
||||||
#CTAGSCMD=ctags-orig.exe
|
#CTAGSCMD=ctags-orig.exe
|
||||||
|
!IF "$(TRAVIS_BUILD_DIR)" != ""
|
||||||
|
CTAGSCMD=..\lib\ctags\ctags.exe
|
||||||
|
!ELSE
|
||||||
CTAGSCMD=..\..\..\ctags\ctags.exe
|
CTAGSCMD=..\..\..\ctags\ctags.exe
|
||||||
|
!ENDIF
|
||||||
|
|
||||||
CTAGSOPT =--language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern
|
CTAGSOPT =--language-force=c --sort=no -D"Bitfield(x,n)=unsigned x : n" --excmd=pattern
|
||||||
#
|
#
|
||||||
# ctags wants unix-style pathnames
|
# ctags wants unix-style pathnames
|
||||||
|
|||||||
@@ -24,9 +24,17 @@ export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER
|
|||||||
export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
|
export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
|
||||||
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
|
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
|
||||||
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
|
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
|
||||||
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
|
mkdir -p lib
|
||||||
|
cd lib
|
||||||
|
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
|
||||||
|
git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
|
||||||
|
curl -R -O http://www.lua.org/ftp/lua-5.3.5.tar.gz
|
||||||
|
tar zxf lua-5.3.5.tar.gz
|
||||||
|
cd ctags
|
||||||
|
nmake -f mk_mvc.mak
|
||||||
|
cd ../../
|
||||||
export ADD_CURSES=Y
|
export ADD_CURSES=Y
|
||||||
export PDCURSES_TOP=../../pdcurses
|
export PDCURSES_TOP=../lib/pdcurses
|
||||||
export
|
export
|
||||||
cd src
|
cd src
|
||||||
cp ../sys/winnt/Makefile.msc ./Makefile
|
cp ../sys/winnt/Makefile.msc ./Makefile
|
||||||
|
|||||||
Reference in New Issue
Block a user