Update Travis to Ubuntu 16.04, Mono 5.10, NSIS 3.03.
This commit is contained in:
committed by
Oliver Brakmann
parent
8ee11028d7
commit
5b00586de2
13
.travis.yml
13
.travis.yml
@@ -1,11 +1,9 @@
|
|||||||
# Travis-CI Build for OpenRA
|
# Travis-CI Build for OpenRA
|
||||||
# see travis-ci.org for details
|
# see travis-ci.org for details
|
||||||
|
|
||||||
|
dist: xenial
|
||||||
language: csharp
|
language: csharp
|
||||||
mono: 4.6.1
|
mono: 5.10.0
|
||||||
|
|
||||||
# http://docs.travis-ci.com/user/migrating-from-legacy
|
|
||||||
sudo: false
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
@@ -15,8 +13,6 @@ addons:
|
|||||||
apt:
|
apt:
|
||||||
packages:
|
packages:
|
||||||
- lua5.1
|
- lua5.1
|
||||||
- nsis
|
|
||||||
- nsis-common
|
|
||||||
- dpkg
|
- dpkg
|
||||||
- markdown
|
- markdown
|
||||||
- zlib1g-dev
|
- zlib1g-dev
|
||||||
@@ -36,6 +32,11 @@ env:
|
|||||||
# call OpenRA to check for YAML errors
|
# call OpenRA to check for YAML errors
|
||||||
# Run the NUnit tests
|
# Run the NUnit tests
|
||||||
script:
|
script:
|
||||||
|
- wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis-common_3.03-2_all.deb
|
||||||
|
- wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nsis/nsis_3.03-2_amd64.deb
|
||||||
|
- sudo dpkg -i nsis-common_3.03-2_all.deb
|
||||||
|
- sudo dpkg -i nsis_3.03-2_amd64.deb
|
||||||
|
- makensis -VERSION
|
||||||
- travis_retry make all-dependencies
|
- travis_retry make all-dependencies
|
||||||
- make all SDK="-sdk:4.5"
|
- make all SDK="-sdk:4.5"
|
||||||
- make check
|
- make check
|
||||||
|
|||||||
3
Makefile
3
Makefile
@@ -37,8 +37,7 @@
|
|||||||
|
|
||||||
############################## TOOLCHAIN ###############################
|
############################## TOOLCHAIN ###############################
|
||||||
#
|
#
|
||||||
SDK ?=
|
CSC = mcs
|
||||||
CSC = mcs $(SDK)
|
|
||||||
CSFLAGS = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror
|
CSFLAGS = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror
|
||||||
DEFINE = TRACE
|
DEFINE = TRACE
|
||||||
COMMON_LIBS = System.dll System.Core.dll System.Numerics.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll
|
COMMON_LIBS = System.dll System.Core.dll System.Numerics.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/Eluant.dll thirdparty/download/rix0rrr.BeaconLib.dll
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ make clean
|
|||||||
make cli-dependencies geoip-dependencies
|
make cli-dependencies geoip-dependencies
|
||||||
sed "s/@LIBLUA51@/liblua5.1.so.0/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
|
sed "s/@LIBLUA51@/liblua5.1.so.0/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
|
||||||
|
|
||||||
make core SDK="-sdk:4.5"
|
make core
|
||||||
make version VERSION="${TAG}"
|
make version VERSION="${TAG}"
|
||||||
make install-engine prefix="usr" DESTDIR="${BUILTDIR}/"
|
make install-engine prefix="usr" DESTDIR="${BUILTDIR}/"
|
||||||
make install-common-mod-files prefix="usr" DESTDIR="${BUILTDIR}/"
|
make install-common-mod-files prefix="usr" DESTDIR="${BUILTDIR}/"
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ echo "Building core files"
|
|||||||
pushd "${SRCDIR}" > /dev/null || exit 1
|
pushd "${SRCDIR}" > /dev/null || exit 1
|
||||||
make clean
|
make clean
|
||||||
make osx-dependencies
|
make osx-dependencies
|
||||||
make core SDK="-sdk:4.5"
|
make core
|
||||||
make version VERSION="${TAG}"
|
make version VERSION="${TAG}"
|
||||||
make install-core gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
|
make install-core gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
|
||||||
popd > /dev/null || exit 1
|
popd > /dev/null || exit 1
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ fi
|
|||||||
function makelauncher()
|
function makelauncher()
|
||||||
{
|
{
|
||||||
sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs
|
sed "s|DISPLAY_NAME|$2|" WindowsLauncher.cs.in | sed "s|MOD_ID|$3|" | sed "s|FAQ_URL|${FAQ_URL}|" > WindowsLauncher.cs
|
||||||
mcs -sdk:4.5 WindowsLauncher.cs -warn:4 -codepage:utf8 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
|
mcs WindowsLauncher.cs -warn:4 -codepage:utf8 -warnaserror -out:"$1" -t:winexe ${LAUNCHER_LIBS} -win32icon:"$4"
|
||||||
rm WindowsLauncher.cs
|
rm WindowsLauncher.cs
|
||||||
mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null
|
mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,7 @@ echo "Building core files"
|
|||||||
pushd "${SRCDIR}" > /dev/null || exit 1
|
pushd "${SRCDIR}" > /dev/null || exit 1
|
||||||
make clean
|
make clean
|
||||||
make windows-dependencies
|
make windows-dependencies
|
||||||
make core SDK="-sdk:4.5"
|
make core
|
||||||
make version VERSION="${TAG}"
|
make version VERSION="${TAG}"
|
||||||
make install-core gameinstalldir="" DESTDIR="${BUILTDIR}"
|
make install-core gameinstalldir="" DESTDIR="${BUILTDIR}"
|
||||||
popd > /dev/null || exit 1
|
popd > /dev/null || exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user