From 03ace480314a4d373db13da45fd65e217e391c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 26 Jul 2015 12:31:29 +0200 Subject: [PATCH 1/4] remove the thirdparty nsProcess plugin --- appveyor.yml | 3 --- packaging/windows/OpenRA.nsi | 11 ----------- packaging/windows/buildpackage.sh | 5 ----- 3 files changed, 19 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a6739cfe39..7bdee594ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -64,9 +64,6 @@ after_test: - cp OpenRA.Game/OpenRA.ico . - if not exist nsissetup.exe appveyor DownloadFile "http://downloads.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe - nsissetup /S /D=%NSIS_ROOT% - - if not exist NsProcess.zip appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/archive/1/18/20140806212030!NsProcess.zip" -FileName NsProcess.zip - - 7z x NsProcess.zip -o%NSIS_ROOT% -y - - move /Y %NSIS_ROOT%\Plugin\nsProcess.dll %NSIS_ROOT%\Plugins\nsProcess.dll - '%NSIS_ROOT%\makensis /DSRCDIR="%APPVEYOR_BUILD_FOLDER%" /DDEPSDIR="%APPVEYOR_BUILD_FOLDER%\thirdparty\download\windows" /V3 packaging/windows/OpenRA.nsi' - move /Y %APPVEYOR_BUILD_FOLDER%\packaging\windows\OpenRA.Setup.exe %APPVEYOR_BUILD_FOLDER%\OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 01d41cf295..2c5f5d1166 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -18,7 +18,6 @@ !include "MUI2.nsh" !include "FileFunc.nsh" !include "WordFunc.nsh" -!include "nsProcess.nsh" Name "OpenRA" OutFile "OpenRA.Setup.exe" @@ -236,17 +235,7 @@ FunctionEnd !insertmacro Clean "un." Section "Uninstall" - ${nsProcess::FindProcess} "OpenRA.Game.exe" $R0 - IntCmp $R0 0 gameRunning - ${nsProcess::FindProcess} "OpenRA.exe" $R0 - IntCmp $R0 0 gameRunning - ${nsProcess::Unload} Call un.Clean - Goto end - gameRunning: - MessageBox MB_OK|MB_ICONEXCLAMATION "OpenRA is running. Please close it first" /SD IDOK - abort - end: SectionEnd ;*************************** diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 176ef99dd7..f79b52bcd0 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -8,11 +8,6 @@ OUTPUTDIR="$4" if [ -x /usr/bin/makensis ]; then pushd "$SRCDIR" >/dev/null popd >/dev/null - if [[ ! -f /usr/share/nsis/Include/nsProcess.nsh && ! -f /usr/share/nsis/Plugin/nsProcess.dll ]]; then - echo "Installing NsProcess NSIS plugin in /usr/share/nsis" - sudo unzip -qq -o ${SRCDIR}/thirdparty/download/NsProcess.zip 'Include/*' -d /usr/share/nsis - sudo unzip -qq -j -o ${SRCDIR}/thirdparty/download/NsProcess.zip 'Plugin/*' -d /usr/share/nsis/Plugins - fi echo "Building Windows setup.exe" makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" OpenRA.nsi if [ $? -eq 0 ]; then From 0c2934a5367a8a0514bb6a2797ac84924f71dcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 26 Jul 2015 13:01:57 +0200 Subject: [PATCH 2/4] switch to the new container based infrastructure --- .travis.yml | 14 ++++++++++---- thirdparty/fetch-thirdparty-deps.sh | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcc5f39624..0cf9fd9144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,21 @@ language: csharp mono: 3.12.0 -# Don't use the container based infrastructure -sudo: true +# http://docs.travis-ci.com/user/migrating-from-legacy +sudo: false cache: directories: - thirdparty/download +addons: + apt: + packages: + - nsis + - nsis-common + - dpkg + - markdown + # Environment variables env: secure: "C0+Hlfa0YGErxUuWV00Tj6p45otC/D3YwYFuLpi2mj1rDFn/4dgh5WRngjvdDBVbXJ3duaZ78jPHWm1jr7vn2jqj9yETsCIK9psWd38ep/FEBM0SDr6MUD89OuXk/YyvxJAE+UXF6bXg7giey09g/CwBigjMW7ynET3wNAWPHPs=" @@ -20,7 +28,6 @@ env: # Check source code with StyleCop # call OpenRA to check for YAML errors script: - - sudo apt-get remove nuget # https://github.com/travis-ci/travis-ci/issues/3940 - travis_retry make all-dependencies - make all - make check @@ -50,7 +57,6 @@ notifications: skip_join: true before_deploy: - - sudo apt-get install nsis nsis-common dpkg markdown - export PATH=$PATH:$HOME/usr/bin - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"` - cd packaging diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 2ea6192d4b..37450feb7b 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -13,7 +13,8 @@ download_dir="${0%/*}/download" mkdir -p "${download_dir}" cd "${download_dir}" -if which nuget >/dev/null 2>&1; then +# https://github.com/travis-ci/travis-ci/issues/3940 +if [ ! $TRAVIS ] && which nuget >/dev/null 2>&1; then get() { nuget install $1 -Version $2 -ExcludeVersion From f3490dd8e47d61f5bdb3d685ba63b507e6c83721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 26 Jul 2015 13:03:01 +0200 Subject: [PATCH 3/4] double quote to prevent globbing and word splitting detected by http://www.shellcheck.net/ --- thirdparty/fetch-thirdparty-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 37450feb7b..6c900fa7e8 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -17,12 +17,12 @@ cd "${download_dir}" if [ ! $TRAVIS ] && which nuget >/dev/null 2>&1; then get() { - nuget install $1 -Version $2 -ExcludeVersion + nuget install "$1" -Version "$2" -ExcludeVersion } else get() { - ../noget.sh $1 $2 + ../noget.sh "$1" "$2" } fi From 1748588ec8d438accdaad1861707ac81666710f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 26 Jul 2015 14:05:22 +0200 Subject: [PATCH 4/4] remove redundant push/pop with nothing in between --- packaging/windows/buildpackage.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index f79b52bcd0..6b6987f0c1 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -6,8 +6,6 @@ SRCDIR="$3" OUTPUTDIR="$4" if [ -x /usr/bin/makensis ]; then - pushd "$SRCDIR" >/dev/null - popd >/dev/null echo "Building Windows setup.exe" makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" OpenRA.nsi if [ $? -eq 0 ]; then