diff --git a/.travis.yml b/.travis.yml index af100e2f79..2f6b3984dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,9 @@ # Travis-CI Build for OpenRA # see travis-ci.org for details +dist: xenial language: csharp -mono: 4.6.1 - -# http://docs.travis-ci.com/user/migrating-from-legacy -sudo: false +mono: 5.10.0 cache: directories: @@ -15,8 +13,6 @@ addons: apt: packages: - lua5.1 - - nsis - - nsis-common - dpkg - markdown - zlib1g-dev @@ -36,6 +32,11 @@ env: # call OpenRA to check for YAML errors # Run the NUnit tests 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 - make all SDK="-sdk:4.5" - make check diff --git a/Makefile b/Makefile index c63b5ae725..d3aca61e2a 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,7 @@ ############################## TOOLCHAIN ############################### # -SDK ?= -CSC = mcs $(SDK) +CSC = mcs CSFLAGS = -nologo -warn:4 -codepage:utf8 -langversion:5 -unsafe -warnaserror 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 diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 4ef2977ead..8a73c1b18e 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -52,7 +52,7 @@ make clean make cli-dependencies geoip-dependencies 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 install-engine prefix="usr" DESTDIR="${BUILTDIR}/" make install-common-mod-files prefix="usr" DESTDIR="${BUILTDIR}/" diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 49a41b83b8..c078918bc6 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -73,7 +73,7 @@ echo "Building core files" pushd "${SRCDIR}" > /dev/null || exit 1 make clean make osx-dependencies -make core SDK="-sdk:4.5" +make core make version VERSION="${TAG}" make install-core gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app" popd > /dev/null || exit 1 diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 0a7f93ee43..02dff2af77 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -30,7 +30,7 @@ fi function makelauncher() { 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 mono "${SRCDIR}/fixheader.exe" "$1" > /dev/null } @@ -40,7 +40,7 @@ echo "Building core files" pushd "${SRCDIR}" > /dev/null || exit 1 make clean make windows-dependencies -make core SDK="-sdk:4.5" +make core make version VERSION="${TAG}" make install-core gameinstalldir="" DESTDIR="${BUILTDIR}" popd > /dev/null || exit 1