mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r18510) -Codechange: some further cleanups of the Windows installer; it didn't always remove all the files it installed and the downloaded free graphics/sounds are now fully extracted instead of dumped as tar in the data directory. This should make reading the readme for them quite a bit easier.

This commit is contained in:
rubidium 2009-12-15 14:29:47 +00:00
parent 7b136d1fdd
commit cc82065298
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
os/windows/installer/install.nsi
View File

@ -188,7 +188,7 @@ SectionEnd
Section "Download OpenGFX (free graphics set)" Section3 Section "Download OpenGFX (free graphics set)" Section3
SetOverwrite try SetOverwrite try
NSISdl::download "http://binaries.openttd.org/installer/opengfx-${OPENGFX_BASE_VERSION}.tar.7z" "$INSTDIR\data\opengfx.tar.7z" NSISdl::download "http://binaries.openttd.org/installer/opengfx-${OPENGFX_BASE_VERSION}.7z" "$INSTDIR\data\opengfx.7z"
Pop $R0 ;Get the return value Pop $R0 ;Get the return value
StrCmp $R0 "success" +3 StrCmp $R0 "success" +3
MessageBox MB_OK "Downloading of OpenGFX failed" MessageBox MB_OK "Downloading of OpenGFX failed"
@ -196,9 +196,9 @@ Section "Download OpenGFX (free graphics set)" Section3
; Let's extract the files ; Let's extract the files
SetOutPath "$INSTDIR\data\" SetOutPath "$INSTDIR\data\"
NSIS7z::Extract "$INSTDIR\data\opengfx.tar.7z" NSIS7z::Extract "$INSTDIR\data\opengfx.7z"
Delete "$INSTDIR\data\opengfx.tar.7z" Delete "$INSTDIR\data\opengfx.7z"
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
Done: Done:
@ -209,7 +209,7 @@ SectionEnd
Section "Download OpenSFX (free sound set)" Section4 Section "Download OpenSFX (free sound set)" Section4
SetOverwrite try SetOverwrite try
NSISdl::download "http://binaries.openttd.org/installer/opensfx-${OPENSFX_BASE_VERSION}.tar.7z" "$INSTDIR\data\opensfx.tar.7z" NSISdl::download "http://binaries.openttd.org/installer/opensfx-${OPENSFX_BASE_VERSION}.7z" "$INSTDIR\data\opensfx.7z"
Pop $R0 ;Get the return value Pop $R0 ;Get the return value
StrCmp $R0 "success" +3 StrCmp $R0 "success" +3
MessageBox MB_OK "Downloading of OpenSFX failed" MessageBox MB_OK "Downloading of OpenSFX failed"
@ -217,9 +217,9 @@ Section "Download OpenSFX (free sound set)" Section4
; Let's extract the files ; Let's extract the files
SetOutPath "$INSTDIR\data\" SetOutPath "$INSTDIR\data\"
NSIS7z::Extract "$INSTDIR\data\opensfx.tar.7z" NSIS7z::Extract "$INSTDIR\data\opensfx.7z"
Delete "$INSTDIR\data\opensfx.tar.7z" Delete "$INSTDIR\data\opensfx.7z"
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
Done: Done:
@ -230,7 +230,7 @@ SectionEnd
Section "Download NoSound (free sound set)" Section5 Section "Download NoSound (free sound set)" Section5
SetOverwrite try SetOverwrite try
NSISdl::download "http://binaries.openttd.org/installer/nosound-${NOSOUND_BASE_VERSION}.tar.7z" "$INSTDIR\data\nosound.tar.7z" NSISdl::download "http://binaries.openttd.org/installer/nosound-${NOSOUND_BASE_VERSION}.7z" "$INSTDIR\data\nosound.7z"
Pop $R0 ;Get the return value Pop $R0 ;Get the return value
StrCmp $R0 "success" +3 StrCmp $R0 "success" +3
MessageBox MB_OK "Downloading of NoSound failed" MessageBox MB_OK "Downloading of NoSound failed"
@ -238,9 +238,9 @@ Section "Download NoSound (free sound set)" Section5
; Let's extract the files ; Let's extract the files
SetOutPath "$INSTDIR\data\" SetOutPath "$INSTDIR\data\"
NSIS7z::Extract "$INSTDIR\data\nosound.tar.7z" NSIS7z::Extract "$INSTDIR\data\nosound.7z"
Delete "$INSTDIR\data\nosound.tar.7z" Delete "$INSTDIR\data\nosound.7z"
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
Done: Done:
@ -383,10 +383,13 @@ Section "Uninstall"
; Music ; Music
Delete "$INSTDIR\gm\*.gm" Delete "$INSTDIR\gm\*.gm"
; Downloaded OpenGFX/OpenSFX ; Downloaded OpenGFX/OpenSFX/NoSound
Delete "$INSTDIR\data\opengfx-*.tar" Delete "$INSTDIR\data\opengfx\*"
Delete "$INSTDIR\data\opensfx-*.tar" RMDir "$INSTDIR\data\opengfx"
Delete "$INSTDIR\data\nosound-*.tar" Delete "$INSTDIR\data\opensfx\*"
RMDir "$INSTDIR\data\opensfx"
Delete "$INSTDIR\data\nosound\*"
RMDir "$INSTDIR\data\nosound"
; Language files ; Language files
Delete "$INSTDIR\lang\*.lng" Delete "$INSTDIR\lang\*.lng"
@ -397,9 +400,11 @@ Section "Uninstall"
; Remove remaining directories ; Remove remaining directories
RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\" RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
RMDir "$SMPROGRAMS\$SHORTCUTS" RMDir "$SMPROGRAMS\$SHORTCUTS"
RMDir "$INSTDIR\ai"
RMDir "$INSTDIR\data"
RMDir "$INSTDIR\gm" RMDir "$INSTDIR\gm"
RMDir "$INSTDIR\lang" RMDir "$INSTDIR\lang"
RMDir "$INSTDIR\data" RMDir "$INSTDIR\scripts"
RMDir "$INSTDIR" RMDir "$INSTDIR"
SectionEnd SectionEnd