Dennis Schridde schreef: > This patch does NOT apply, could you please resend it? > I guess this is because of the line endings you also patched. > Had to check the RFC822 `In-Reply-To' header to be sure you meant the NSIS one. But anyway here it is.
Just been awake for an hour or so, so I hope my double checking for applicability was thorough enough. -- Giel
Index: nsis/warzone2100.nsi
===================================================================
--- nsis/warzone2100.nsi (revision 573)
+++ nsis/warzone2100.nsi (working copy)
@@ -12,7 +12,7 @@
;Name and file
Name "Warzone 2100"
- OutFile "Warzone 2100.exe"
+ OutFile "${OUTFILE}"
;Default installation folder
InstallDir "$PROGRAMFILES\Warzone 2100"
@@ -75,8 +75,8 @@
;--------------------------------
;License Language String
- LicenseLangString MUILicense ${LANG_ENGLISH} "data\License.txt"
- LicenseLangString MUILicense ${LANG_GERMAN} "data\License.txt"
+ LicenseLangString MUILicense ${LANG_ENGLISH} "..\COPYING"
+ LicenseLangString MUILicense ${LANG_GERMAN} "..\COPYING"
;--------------------------------
;Reserve Files
@@ -100,28 +100,50 @@
;ADD YOUR OWN FILES HERE...
- File "data\warzone2100.exe"
- File "data\OpenAL32.dll"
- File "data\wrap_oal.dll"
- File "data\mp.wz"
- File "data\warzone.wz"
+ ; Main executable
+ File "..\src\warzone2100.exe"
- File "data\License.txt"
- File "data\Readme.txt"
+ ; Required runtime libs
+ File "${DEVDIR}\lib\SDL.dll"
+ File "${DEVDIR}\lib\SDL_net.dll"
+ File "${DEVDIR}\lib\physfs.dll"
+ File "${DEVDIR}\lib\vorbisfile.dll"
+ File "${DEVDIR}\lib\ogg.dll"
+ File "${DEVDIR}\lib\vorbis.dll"
+ File "${DEVDIR}\lib\png13.dll"
+ File "${DEVDIR}\lib\zlib1.dll"
+ File "${DEVDIR}\lib\jpeg6b.dll"
+ File "${DEVDIR}\lib\OpenAL32.dll"
+ File "${DEVDIR}\lib\wrap_oal.dll"
+ ; Data files
+ File "..\data\mp.wz"
+ File "..\data\warzone.wz"
+ ; Information/documentation files
+ File "/oname=License.txt" "..\COPYING"
+ File "/oname=Readme.txt" "..\README"
+
+
;Store installation folder
WriteRegStr HKCU "Software\Warzone 2100" "" $INSTDIR
- ;Create uninstaller
- WriteUninstaller "$INSTDIR\Uninstall.exe"
+ ; Write the Windows-uninstall keys and create the uninstaller
+ WriteRegStr HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100"
"DisplayName" "Warzone 2100"
+ WriteRegStr HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100"
"DisplayIcon" "$INSTDIR\warzone2100.exe,0"
+ WriteRegStr HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100" "Publisher"
"Warzone Resurrection Project"
+; WriteRegStr HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100"
"DisplayVersion" "2.0.5 r571"
+ WriteRegStr HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100"
"UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegDWORD HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100" "NoModify" 1
+ WriteRegDWORD HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100" "NoRepair" 1
+ WriteUninstaller "uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
"$INSTDIR\Uninstall.exe"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Warzone 2100.lnk"
"$INSTDIR\Warzone2100.exe"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
"$INSTDIR\uninstall.exe"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Warzone 2100.lnk"
"$INSTDIR\warzone2100.exe"
!insertmacro MUI_STARTMENU_WRITE_END
@@ -134,7 +156,7 @@
SetOutPath "$INSTDIR\mods\global"
- File "data\grim.wz"
+ File "..\data\grim.wz"
SetOutPath "$INSTDIR"
@@ -210,6 +232,15 @@
;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\warzone2100.exe"
+ Delete "$INSTDIR\SDL.dll"
+ Delete "$INSTDIR\SDL_net.dll"
+ Delete "$INSTDIR\physfs.dll"
+ Delete "$INSTDIR\vorbisfile.dll"
+ Delete "$INSTDIR\ogg.dll"
+ Delete "$INSTDIR\vorbis.dll"
+ Delete "$INSTDIR\png13.dll"
+ Delete "$INSTDIR\zlib1.dll"
+ Delete "$INSTDIR\jpeg6b.dll"
Delete "$INSTDIR\OpenAL32.dll"
Delete "$INSTDIR\wrap_oal.dll"
Delete "$INSTDIR\warzone.wz"
@@ -218,7 +249,7 @@
Delete "$INSTDIR\Readme.txt"
Delete "$INSTDIR\License.txt"
- Delete "$INSTDIR\Uninstall.exe"
+ Delete "$INSTDIR\uninstall.exe"
Delete "$INSTDIR\mods\global\grim.wz"
@@ -249,6 +280,9 @@
DeleteRegValue HKCU "Software\Warzone 2100" ""
DeleteRegKey /ifempty HKCU "Software\Warzone 2100"
+ ; Unregister with Windows' uninstall system
+ DeleteRegKey HKCU
"Software\Microsoft\Windows\CurrentVersion\Uninstall\Warzone 2100"
+
SectionEnd
;--------------------------------
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
