vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Merge branch 'appveyor' into 'master'" 

This reverts commit 6476cf3cd2, reversing
changes made to 0186b90b1d.
This commit is contained in:
Alam Ed Arias 2017-01-15 19:47:59 -05:00
parent 6476cf3cd2
commit c024d313ee
1 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
appveyor.yml
View File

@ -3,7 +3,7 @@ os: MinGW
environment: environment:
CC: ccache CC: ccache
CCACHE_CC: mingw32-gcc CCACHE_CC: i686-w64-mingw32-gcc
WINDRES: windres WINDRES: windres
MINGW_SDK: c:\msys64\mingw32 MINGW_SDK: c:\msys64\mingw32
CFLAGS: -Wall -W -Werror CFLAGS: -Wall -W -Werror
@ -15,17 +15,11 @@ environment:
CCACHE_URL: http://alam.srb2.org/ccache.exe CCACHE_URL: http://alam.srb2.org/ccache.exe
CCACHE_COMPRESS: true CCACHE_COMPRESS: true
CCACHE_DIR: C:\Users\appveyor\.ccache CCACHE_DIR: C:\Users\appveyor\.ccache
MINGW_BIN_TAR: gcc-core-4.8.1-4-mingw32-bin.tar
MINGW_BIN_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-bin.tar.lzma
MINGW_DLL_TAR: gcc-core-4.8.1-4-mingw32-dll.tar
MINGW_DLL_URL: http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-4.8.1-4/gcc-core-4.8.1-4-mingw32-dll.tar.lzma
cache: cache:
- nasm-2.12.01.zip - nasm-2.12.01.zip
- upx391w.zip - upx391w.zip
- ccache.exe - ccache.exe
- gcc-core-4.8.1-4-mingw32-dll.tar.lzma
- gcc-core-4.8.1-4-mingw32-bin.tar.lzma
- C:\Users\appveyor\.ccache - C:\Users\appveyor\.ccache
install: install:
@ -41,28 +35,19 @@ install:
- ccache -M 99M - ccache -M 99M
- xcopy /Y /V /I ccache.exe %MINGW_SDK%\bin - xcopy /Y /V /I ccache.exe %MINGW_SDK%\bin
- if not exist "%MINGW_DLL_TAR%.lzma" appveyor DownloadFile "%MINGW_DLL_URL%" -FileName "%MINGW_DLL_TAR%.lzma"
- 7z x -y "%MINGW_DLL_TAR%.lzma" -o%TMP% >null
- 7z x -y "%TMP%\%MINGW_DLL_TAR%" -o%TMP% >null
- if not exist "%MINGW_BIN_TAR%.lzma" appveyor DownloadFile "%MINGW_BIN_URL%" -FileName "%MINGW_BIN_TAR%.lzma"
- 7z x -y "%MINGW_BIN_TAR%.lzma" -o%TMP% >null
- 7z x -y "%TMP%\%MINGW_BIN_TAR%" -o%TMP% >null
- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs %TMP%\bin C:\Mingw\bin || exit 0
configuration: configuration:
- SDL - SDL
- DD - DD
before_build: before_build:
- set PATH=%MINGW_SDK%\bin;C:\Mingw\bin;%PATH% - set Path=%MINGW_SDK%\bin;%Path%
- mingw32-gcc.exe --version - i686-w64-mingw32-gcc --version
- mingw32-make --version - mingw32-make --version
- nasm -v - nasm -v
- upx -V - upx -V
- ccache -V - ccache -V
- ccache -s - ccache -s
- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC48=1 CCACHE=1 - set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC53=1 CCACHE=1
build_script: build_script:
- cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 clean - cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 clean
@ -78,21 +63,21 @@ after_build:
test: off test: off
#deploy: deploy:
# - provider: FTP - provider: FTP
# protocol: ftps protocol: ftps
# host: host:
# secure: NsLJEPIBvmwCOj8Tg8RoRQ== secure: NsLJEPIBvmwCOj8Tg8RoRQ==
# username: username:
# secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA= secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
# password: password:
# secure: Hbn6Uy3lT0YZ88yFJ3aW4w== secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
# folder: appveyor folder: appveyor
# application: application:
# active_mode: false active_mode: false
# on: on:
# branch: master branch: master
# appveyor_repo_tag: true appveyor_repo_tag: true
on_finish: on_finish: