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