epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove the thirdparty nsProcess plugin

Browse Source
This commit is contained in:
Matthias Mailänder
2015-07-26 12:31:29 +02:00
parent 4d81cc262c
commit 03ace48031
3 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appveyor.yml
View File

@@ -64,9 +64,6 @@ after_test:
- cp OpenRA.Game/OpenRA.ico . - 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 - 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% - 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' - '%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 - move /Y %APPVEYOR_BUILD_FOLDER%\packaging\windows\OpenRA.Setup.exe %APPVEYOR_BUILD_FOLDER%\OpenRA-%APPVEYOR_REPO_TAG_NAME%.exe

11
packaging/windows/OpenRA.nsi
View File

@@ -18,7 +18,6 @@
!include "MUI2.nsh" !include "MUI2.nsh"
!include "FileFunc.nsh" !include "FileFunc.nsh"
!include "WordFunc.nsh" !include "WordFunc.nsh"
!include "nsProcess.nsh"
Name "OpenRA" Name "OpenRA"
OutFile "OpenRA.Setup.exe" OutFile "OpenRA.Setup.exe"
@@ -236,17 +235,7 @@ FunctionEnd
!insertmacro Clean "un." !insertmacro Clean "un."
Section "Uninstall" 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 Call un.Clean
Goto end
gameRunning:
MessageBox MB_OK|MB_ICONEXCLAMATION "OpenRA is running. Please close it first" /SD IDOK
abort
end:
SectionEnd SectionEnd
;*************************** ;***************************

5
packaging/windows/buildpackage.sh
View File

@@ -8,11 +8,6 @@ OUTPUTDIR="$4"
if [ -x /usr/bin/makensis ]; then if [ -x /usr/bin/makensis ]; then
pushd "$SRCDIR" >/dev/null pushd "$SRCDIR" >/dev/null
popd >/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" echo "Building Windows setup.exe"
makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" OpenRA.nsi makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/download/windows" OpenRA.nsi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then