q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-28 06:32:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix and resync Windows installer

Browse source 
Fix wrong file paths.
Merge installer changes from ioquake3.
This commit is contained in:
Zack Middleton 2023-08-21 13:20:03 -05:00
parent a496080c2b
commit 8bf79baf63
2 changed files with 47 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/misc/nsis/Makefile
View file

@ -42,6 +42,13 @@ ifndef OPENALDLL
OPENALDLL=OpenAL32.dll
endif
endif
ifndef EXE_SUFFIX
ifeq ($(ARCH),x86_64)
EXE_SUFFIX=.x86_64
else
EXE_SUFFIX=
endif
endif
DEFINES=
ifeq ($(USE_RENDERER_DLOPEN),1)
@ -64,7 +71,7 @@ endif
all: q3rally-$(VERSION)-$(RELEASE).$(ARCH).exe
q3rally.$(ARCH).nsi: q3rally.nsi.in
sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/mingw32/$(PLATFORM)/g;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/g;s/OpenAL32.dll/$(OPENALDLL)/g' < $< > $@
sed 's/XXXVERSIONXXX/$(VERSION)/;s/XXXRELEASEXXX/$(RELEASE)/;s/mingw32/$(PLATFORM)/g;s/x86/$(ARCH)/g;s/SDL2.dll/$(SDLDLL)/g;s/OpenAL32.dll/$(OPENALDLL)/g;s/XXXEXE_SUFFIXXXX/$(EXE_SUFFIX)/g' < $< > $@
q3rally-$(VERSION)-$(RELEASE).$(ARCH).exe: q3rally.$(ARCH).nsi
makensis $(DEFINES) q3rally.$(ARCH).nsi

49
engine/misc/nsis/q3rally.nsi.in
View file

@ -5,20 +5,22 @@
; This file is used to automatically build the installers in the
; openSUSE build service, don't break this!
;
; you have to copy SDL2.dll and OpenAL32.dll here manually
; you have to copy assets0.pk3 and OpenAL32.dll here manually
!define VERSION "XXXVERSIONXXX"
!define RELEASE "XXXRELEASEXXX"
!define EXE_SUFFIX "XXXEXE_SUFFIXXXX"
!define MODDIR "baseq3r"
!define PUBLISHER "The Q3Rally Team"
!define URL "http://q3rally.com/"
!define GAMENAME "Q3Rally"
!define CLIENT "q3rally.exe"
!define SERVER "q3rally_ded.exe"
!define CLIENT "q3rally${EXE_SUFFIX}.exe"
!define SERVER "q3rally-server${EXE_SUFFIX}.exe"
!define GAMEDIR "Q3Rally"
!define GAME_FSNAME "q3rally"
!define PROTOCOL_HANDLER "q3rally"
!define MULTIUSER_MUI
!define MULTIUSER_EXECUTIONLEVEL Highest
@ -58,7 +60,7 @@ OutFile "${GAME_FSNAME}-${VERSION}-${RELEASE}.x86.exe"
!insertmacro MULTIUSER_PAGE_INSTALLMODE
;!insertmacro MUI_PAGE_LICENSE "../../COPYING.txt"
!define MUI_COMPONENTSPAGE_NODESC
!define MUI_COMPONENTSPAGE_SMALLDESC
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
@ -84,7 +86,7 @@ Function un.onInit
FunctionEnd
; The stuff to install
Section "${GAMENAME} ${VERSION}-${RELEASE} (required)"
Section "${GAMENAME} ${VERSION}-${RELEASE} (required)" game
SectionIn RO
@ -107,8 +109,8 @@ Section "${GAMENAME} ${VERSION}-${RELEASE} (required)"
File "../../build/release-mingw32-x86/renderer_opengl2_x86.dll"
!endif
File "../../COPYING.txt"
File "/oname=README.txt" "../../README"
File "../../docs/COPYING.txt"
File "/oname=README.txt" "../../docs/README.md"
SetOutPath "$INSTDIR\${MODDIR}"
File "assets0.pk3"
@ -133,7 +135,7 @@ Section "${GAMENAME} ${VERSION}-${RELEASE} (required)"
SectionEnd
; Optional section (can be disabled by the user)
Section "Start Menu Shortcuts"
Section "Start Menu Shortcuts" StartMenuShortcuts
CreateDirectory "$SMPROGRAMS\${GAMENAME}"
CreateShortCut "$SMPROGRAMS\${GAMENAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
@ -141,8 +143,18 @@ Section "Start Menu Shortcuts"
SectionEnd
Section "Protocol Handler" ProtocolHandler
WriteRegStr SHCTX "Software\Classes\${PROTOCOL_HANDLER}" "CustomUrlApplication" "$INSTDIR\${CLIENT}"
WriteRegStr SHCTX "Software\Classes\${PROTOCOL_HANDLER}" "CustomUrlArguments" '--uri "%1"'
WriteRegStr SHCTX "Software\Classes\${PROTOCOL_HANDLER}" "URL Protocol" ""
WriteRegStr SHCTX "Software\Classes\${PROTOCOL_HANDLER}\DefaultIcon" "" "$INSTDIR\${CLIENT},0"
WriteRegStr SHCTX "Software\Classes\${PROTOCOL_HANDLER}\shell\open\command" "" '"$INSTDIR\${CLIENT}" --uri "%1"'
SectionEnd
!ifdef USE_OPENAL_DLOPEN
Section "OpenAL-Soft library"
Section "OpenAL-Soft library" OpenAL
SetOutPath $INSTDIR
@ -152,7 +164,7 @@ SectionEnd
!endif
!ifdef USE_CURL_DLOPEN
Section "libcurl"
Section "libcurl" libcurl
SetOutPath $INSTDIR
@ -171,6 +183,11 @@ Section "Uninstall"
DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GAME_FSNAME}"
DeleteRegKey SHCTX "Software\${GAME_FSNAME}"
ReadRegStr $0 SHCTX "Software\Classes\${PROTOCOL_HANDLER}\shell\open\command" ""
${If} $0 == '"$INSTDIR\${CLIENT}" --uri "%1"'
DeleteRegKey SHCTX "Software\Classes\${PROTOCOL_HANDLER}"
${EndIf}
; Remove files and uninstaller
Delete $INSTDIR\${MODDIR}\pak0.pk3
Delete $INSTDIR\${MODDIR}\cgamex86.dll
@ -214,3 +231,15 @@ Section "Uninstall"
RMDir "$INSTDIR"
SectionEnd
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${game} "The game executables and data files."
!insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortcuts} "Create shortcuts in the start menu."
!insertmacro MUI_DESCRIPTION_TEXT ${ProtocolHandler} "The protocol handler lets you connect to a game by clicking a link in a web browser."
!ifdef USE_OPENAL_DLOPEN
!insertmacro MUI_DESCRIPTION_TEXT ${OpenAL} "Advanced audio mixer that supports surround sound."
!endif
!ifdef USE_CURL_DLOPEN
!insertmacro MUI_DESCRIPTION_TEXT ${libcurl} "Used for HTTP file downloads."
!endif
!insertmacro MUI_FUNCTION_DESCRIPTION_END