Changeset - r22890:7221eb475acb
[Not reviewed]
master
0 1 0
Niels Martin Hansen - 6 years ago 2018-03-21 17:29:30
nielsm@indvikleren.dk
Update: Install DOS music data in Windows installer
1 file changed with 5 insertions and 0 deletions:
0 comments (0 inline, 0 general)
os/windows/installer/install.nsi
Show inline comments
 
@@ -283,48 +283,49 @@ Section "Download OpenMSX (free music se
 

	
 
	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\baseset\openmsx.7z"
 
	Pop $R0 ;Get the return value
 
	StrCmp $R0 "success" +3
 
		MessageBox MB_OK "Downloading of OpenMSX failed"
 
		Goto Done
 

	
 
	; Let's extract the files
 
	SetOutPath "$INSTDIR\baseset\"
 
	NSIS7z::Extract "$INSTDIR\baseset\openmsx.7z"
 

	
 
	Delete "$INSTDIR\baseset\openmsx.7z"
 
	SetOutPath "$INSTDIR\"
 
Done:
 

	
 
SectionEnd
 

	
 
;----------------------------------------------------------------------------------
 
; TTDLX files install section. Copies all needed TTDLX files from CD or install dir
 
Section /o "Copy data from Transport Tycoon Deluxe CD-ROM" Section2
 
	SetOverwrite try
 
	; Let's copy the files with size approximation
 
	SetOutPath "$INSTDIR\baseset"
 
	CopyFiles "$CDDRIVE\gm\*.gm" "$INSTDIR\baseset\" 1028
 
	CopyFiles "$CDDRIVE\gm.cat" "$INSTDIR\baseset\gm.cat" 415
 
	CopyFiles "$CDDRIVE\sample.cat" "$INSTDIR\baseset\sample.cat" 1566
 
	; Copy Windows files
 
	CopyFiles "$CDDRIVE\trg1r.grf" "$INSTDIR\baseset\trg1r.grf" 2365
 
	CopyFiles "$CDDRIVE\trgcr.grf" "$INSTDIR\baseset\trgcr.grf" 260
 
	CopyFiles "$CDDRIVE\trghr.grf" "$INSTDIR\baseset\trghr.grf" 400
 
	CopyFiles "$CDDRIVE\trgir.grf" "$INSTDIR\baseset\trgir.grf" 334
 
	CopyFiles "$CDDRIVE\trgtr.grf" "$INSTDIR\baseset\trgtr.grf" 546
 
	; Copy DOS files
 
	CopyFiles "$CDDRIVE\trg1.grf" "$INSTDIR\baseset\trg1.grf" 2365
 
	CopyFiles "$CDDRIVE\trgc.grf" "$INSTDIR\baseset\trgc.grf" 260
 
	CopyFiles "$CDDRIVE\trgh.grf" "$INSTDIR\baseset\trgh.grf" 400
 
	CopyFiles "$CDDRIVE\trgi.grf" "$INSTDIR\baseset\trgi.grf" 334
 
	CopyFiles "$CDDRIVE\trgt.grf" "$INSTDIR\baseset\trgt.grf" 546
 
	SetOutPath "$INSTDIR\"
 
SectionEnd
 

	
 
;-------------------------------------------
 
; Install the uninstaller (option is hidden)
 
Section -FinishSection
 
	WriteUninstaller "$INSTDIR\uninstall.exe"
 
SectionEnd
 

	
 
; Modern install component descriptions
 
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 
@@ -405,91 +406,95 @@ Section "Uninstall"
 
	; Game Script files
 
	Delete "$INSTDIR\game\compat_*.nut"
 

	
 
	; Baseset files
 
	Delete "$INSTDIR\baseset\opntitle.dat"
 
	Delete "$INSTDIR\baseset\openttd.grf"
 
	Delete "$INSTDIR\baseset\orig_extra.grf"
 
	Delete "$INSTDIR\baseset\orig_win.obg"
 
	Delete "$INSTDIR\baseset\orig_dos.obg"
 
	Delete "$INSTDIR\baseset\orig_dos_de.obg"
 
	Delete "$INSTDIR\baseset\orig_win.obs"
 
	Delete "$INSTDIR\baseset\orig_dos.obs"
 
	Delete "$INSTDIR\baseset\no_sound.obs"
 
	Delete "$INSTDIR\baseset\sample.cat"
 
	Delete "$INSTDIR\baseset\trg1r.grf"
 
	Delete "$INSTDIR\baseset\trghr.grf"
 
	Delete "$INSTDIR\baseset\trgtr.grf"
 
	Delete "$INSTDIR\baseset\trgcr.grf"
 
	Delete "$INSTDIR\baseset\trgir.grf"
 
	Delete "$INSTDIR\baseset\trg1.grf"
 
	Delete "$INSTDIR\baseset\trgh.grf"
 
	Delete "$INSTDIR\baseset\trgt.grf"
 
	Delete "$INSTDIR\baseset\trgc.grf"
 
	Delete "$INSTDIR\baseset\trgi.grf"
 
	Delete "$INSTDIR\baseset\gm.cat"
 
	Delete "$INSTDIR\baseset\gm-tto.cat"
 
	Delete "$INSTDIR\baseset\*.gm"
 

	
 
	Delete "$INSTDIR\data\sample.cat"
 
	Delete "$INSTDIR\data\trg1r.grf"
 
	Delete "$INSTDIR\data\trghr.grf"
 
	Delete "$INSTDIR\data\trgtr.grf"
 
	Delete "$INSTDIR\data\trgcr.grf"
 
	Delete "$INSTDIR\data\trgir.grf"
 
	Delete "$INSTDIR\data\trg1.grf"
 
	Delete "$INSTDIR\data\trgh.grf"
 
	Delete "$INSTDIR\data\trgt.grf"
 
	Delete "$INSTDIR\data\trgc.grf"
 
	Delete "$INSTDIR\data\trgi.grf"
 
	Delete "$INSTDIR\gm\*.gm"
 

	
 
	; Downloaded OpenGFX/OpenSFX/OpenMSX
 
	Delete "$INSTDIR\baseset\opengfx\*"
 
	RMDir  "$INSTDIR\baseset\opengfx"
 
	Delete "$INSTDIR\baseset\opensfx\*"
 
	RMDir  "$INSTDIR\baseset\opensfx"
 
	Delete "$INSTDIR\baseset\openmsx\*"
 
	RMDir  "$INSTDIR\baseset\openmsx"
 

	
 
	Delete "$INSTDIR\data\opengfx\*"
 
	RMDir  "$INSTDIR\data\opengfx"
 
	Delete "$INSTDIR\data\opensfx\*"
 
	RMDir  "$INSTDIR\data\opensfx"
 
	Delete "$INSTDIR\gm\openmsx\*"
 
	RMDir  "$INSTDIR\gm\openmsx"
 

	
 
	; Language files
 
	Delete "$INSTDIR\lang\*.lng"
 

	
 
	; Scripts
 
	Delete "$INSTDIR\scripts\*.*"
 

	
 
	; Documentation
 
	Delete "$INSTDIR\docs\*.*"
 

	
 
	; Base sets for music
 
	Delete "$INSTDIR\gm\orig_win.obm"
 
	Delete "$INSTDIR\gm\orig_dos.obm"
 
	Delete "$INSTDIR\gm\no_music.obm"
 
	Delete "$INSTDIR\baseset\orig_win.obm"
 
	Delete "$INSTDIR\baseset\orig_dos.obm"
 
	Delete "$INSTDIR\baseset\no_music.obm"
 

	
 
	; Remove remaining directories
 
	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
 
	RMDir "$SMPROGRAMS\$SHORTCUTS\Scripts\"
 
	RMDir "$SMPROGRAMS\$SHORTCUTS\Docs\"
 
	RMDir "$SMPROGRAMS\$SHORTCUTS"
 
	RMDir "$INSTDIR\ai"
 
	RMDir "$INSTDIR\game"
 
	RMDir "$INSTDIR\data"
 
	RMDir "$INSTDIR\baseset"
 
	RMDir "$INSTDIR\gm"
 
	RMDir "$INSTDIR\lang"
 
	RMDir "$INSTDIR\scripts"
 
	RMDir "$INSTDIR\docs"
 
	RMDir "$INSTDIR"
 

	
 
SectionEnd
 

	
 
;------------------------------------------------------------
 
; Custom page function to find the TTDLX CD/install location
 
Function SelectCDEnter
 
	SectionGetFlags ${Section2} $0
 
	IntOp $1 $0 & 0x80 ; bit 7 set by upgrade, no need to copy files
0 comments (0 inline, 0 general)