ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[skip ci] NSIS: Add code comments, small tweaks, misc. copyright changes 

blorp
This commit is contained in:
Christian Kenny 2019-01-25 22:45:37 -05:00 committed by lightningterror
parent 61c68f20f0
commit d71dac0918
5 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nsis/ApplyExeProps.nsh
View File

@ -3,10 +3,8 @@
; =======================================================================
; (for the professionalism!!)
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A test comment"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2017 PCSX2 Dev Team"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2019 PCSX2 Dev Team"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC."
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"

5
nsis/SectionUninstaller.nsh
View File

@ -66,6 +66,11 @@ Section "Un.Program and Plugins ${APP_NAME}"
RMDir /r "$INSTDIR\Docs"
RMDir /r "$INSTDIR\Shaders"
; FIXME: PCSX2 currently does not account for non-default file paths in the uninstaller
; These paths would either have to be written to the registry by PCSX2 itself or read directly
; using a script in NSIS.
SetShellVarContext current
Delete $DOCUMENTS\PCSX2\inis\PCSX2_ui.ini
SectionEnd

2
nsis/SectionVersionCheck.nsh
View File

@ -1,4 +1,4 @@
; Copyright (C) 2017 Christian Kenny
; Copyright (C) 2019 PCSX2 Team
Function UninstallPrevious

4
nsis/pcsx2_full_install.nsi
View File

@ -55,13 +55,14 @@ SectionEnd
Section ""
; Write the installation path into the registry
; Write the installation path into the registry
WriteRegStr HKLM Software\PCSX2 "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayName" "PCSX2 - Playstation 2 Emulator"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "Publisher" "PCSX2 Team"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayIcon" "$INSTDIR\pcsx2.exe"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "DisplayVersion" "${APP_VERSION}"
WriteRegStr HKLM "${INSTDIR_REG_KEY}" "HelpLink" "https://forums.pcsx2.net"
${GetSize} "$INSTDIR" "/S=0K" $6 $7 $8
IntFmt $6 "0x%08X" $6
WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "EstimatedSize" "$6"
@ -74,6 +75,7 @@ SectionEnd
Section "" SID_PCSX2
SectionEnd
; Gives the user a fancy checkbox to run PCSX2 right from the installer!
Function ModifyRunCheckbox
${IfNot} ${SectionIsSelected} ${SID_PCSX2}
SendMessage $MUI.FINISHPAGE.RUN ${BM_SETCHECK} ${BST_UNCHECKED} 0

75
nsis/pcsx2_shared_init.nsi
View File

@ -1,6 +1,5 @@
; PCSX2 Pre-Installer Script
; Copyright (C) 2017 Christian Kenny
; Copyright (C) 2017 PCSX2 Team
; Copyright (C) 2019 PCSX2 Team
!include "SharedDefs.nsh"
@ -13,7 +12,7 @@ Var UserPrivileges
Var IsAdmin
Var DirectXSetupError
; Dialog Vars
; Dialogs and Controls
Var hwnd
Var PreInstall_Dialog
Var PreInstall_DlgBack
@ -23,8 +22,13 @@ Var InstallMode_Dialog
Var InstallMode_DlgBack
Var InstallMode_DlgNext
Var InstallMode_Label
Var InstallMode_Full
# Normal installer mode (writes to Program Files)
Var InstallMode_Normal
# Portable installer mode
Var InstallMode_Portable
!include "nsDialogs.nsh"
Page Custom IsUserAdmin
@ -33,6 +37,7 @@ Page Custom InstallMode InstallModeLeave
Function IsUserAdmin
!include WinVer.nsh
# No user should ever have to experience this pain ;)
${IfNot} ${AtLeastWinVista}
MessageBox MB_OK "Your operating system is unsupported by PCSX2. Please upgrade your operating system or install PCSX2 1.4.0."
Quit
@ -73,9 +78,6 @@ Pop $PreInstall_Dialog
GetDlgItem $PreInstall_DlgNext $HWNDPARENT 1
EnableWindow $PreInstall_DlgNext 0
${NSD_CreateProgressBar} 0 75 100% 10% "Test"
Pop $hwnd
${NSD_CreateTimer} NSD_Timer.Callback 1
nsDialogs::Show
@ -87,13 +89,18 @@ ${NSD_KillTimer} NSD_Timer.Callback
!include WinVer.nsh
!include "X64.nsh"
# If the user is running at least Windows 8.1
# or has no admin rights, don't waste time trying
# to install the DX and VS2015 runtimes.
# (head straight to the first installer section)
${If} ${AtLeastWin8.1}
${OrIf} $IsAdmin == 0
Call PreInstall_UsrWait
SendMessage $HWNDPARENT ${WM_COMMAND} 1 0
${EndIf}
# Check if the VC 2015 runtimes are installed
${If} ${RunningX64}
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
${Else}
@ -101,10 +108,12 @@ ${Else}
${EndIf}
Pop $R0
# If the runtimes are already here, check for DX.
${If} $R0 == "1"
Goto ExecDxSetup
${EndIf}
# Download and install the VC 2015 redistributable from the internet
${NSD_CreateLabel} 0 45 100% 10u "Downloading Visual C++ 2015 package"
Pop $hwnd
inetc::get "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" "$TEMP\vcredist_2015_Update_1_x86.exe" /SILENT /CONNECTTIMEOUT 30 /RECEIVETIMEOUT 30 /END
@ -114,8 +123,9 @@ inetc::get "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E
SendMessage $hwnd ${PBM_SETPOS} 40 0
Delete "$TEMP\vcredist_2015_Update_1_x86.exe"
ExecDxSetup:
# Download and install DirectX
ExecDxSetup:
${NSD_CreateLabel} 0 45 100% 10u "Installing DXWebSetup package"
Pop $hwnd
SendMessage $hwnd ${PBM_SETPOS} 80 0
@ -129,7 +139,6 @@ Delete "$TEMP\dxwebsetup.exe"
Sleep 20
Call PreInstall_UsrWait
SendMessage $HWNDPARENT ${WM_COMMAND} 1 0
FunctionEnd
Function PreInstall_UsrWait
@ -137,46 +146,64 @@ GetDlgItem $PreInstall_DlgNext $HWNDPARENT 1
EnableWindow $PreInstall_DlgNext 1
FunctionEnd
# Creates the first dialog "section" to display a choice of installer modes.
Function InstallMode
nsDialogs::Create /NOUNLOAD 1018
Pop $InstallMode_Dialog
GetDlgItem $InstallMode_DlgBack $HWNDPARENT 3
EnableWindow $InstallMode_DlgBack 0
GetDlgItem $InstallMode_DlgBack $HWNDPARENT 3
EnableWindow $InstallMode_DlgBack 0
GetDlgItem $InstallMode_DlgNext $HWNDPARENT 1
EnableWindow $InstallMode_DlgNext 0
GetDlgItem $InstallMode_DlgNext $HWNDPARENT 1
EnableWindow $InstallMode_DlgNext 0
${NSD_CreateLabel} 0 0 100% 10u "Select an installation mode for PCSX2."
Pop $InstallMode_Label
${NSD_CreateRadioButton} 0 35 100% 10u "Full Installation"
Pop $InstallMode_Full
${NSD_CreateRadioButton} 0 35 100% 10u "Normal Installation"
Pop $InstallMode_Normal
# If the user doesn't have admin rights, disable the button for the normal (non-portable) installer
${If} $IsAdmin == 0
EnableWindow $InstallMode_Full 0
EnableWindow $InstallMode_Normal 0
${EndIf}
${NSD_OnClick} $InstallMode_Full InstallMode_UsrWait
# Create labels/buttons for the normal installation
${NSD_OnClick} $InstallMode_Normal InstallMode_UsrWait
${NSD_CreateLabel} 10 55 100% 20u "PCSX2 will be installed in Program Files unless another directory is specified. User files are stored in the Documents/PCSX2 directory."
# Create labels/buttons for the portable installation
${NSD_CreateRadioButton} 0 95 100% 10u "Portable Installation"
Pop $InstallMode_Portable
${NSD_OnClick} $InstallMode_Portable InstallMode_UsrWait
${NSD_CreateLabel} 10 115 100% 20u "Install PCSX2 to any directory you want. Choose this option if you prefer to have all of your files in the same folder or frequently update PCSX2 through Orphis' Buildbot."
${NSD_OnClick} $InstallMode_Portable InstallMode_UsrWait
${NSD_CreateLabel} 10 115 100% 20u "Install PCSX2 to any directory you want. Choose this option if you prefer to have all of your files in the same folder or frequently update PCSX2 through Orphis' Buildbot."
nsDialogs::Show
FunctionEnd
# Disables the "next" button until a selection has been made
Function InstallMode_UsrWait
GetDlgItem $InstallMode_DlgNext $HWNDPARENT 1
EnableWindow $InstallMode_DlgNext 1
# Displays a UAC shield on the button
${NSD_GetState} $InstallMode_Normal $0
${NSD_GetState} $InstallMode_Portable $1
${If} ${BST_CHECKED} == $0
SendMessage $InstallMode_DlgNext ${BCM_SETSHIELD} 0 1
${Else}
SendMessage $InstallMode_DlgNext ${BCM_SETSHIELD} 0 0
${EndIf}
FunctionEnd
# Runs the elevated installer and quits the current one
# If they chose portable mode, the current (unelevated installer)
# will still be used.
Function InstallModeLeave
${NSD_GetState} $InstallMode_Full $0
${NSD_GetState} $InstallMode_Normal $0
${NSD_GetState} $InstallMode_Portable $1
${If} ${BST_CHECKED} == $0
@ -203,11 +230,10 @@ FunctionEnd
; The default installation directory for the portable binary.
InstallDir "$DOCUMENTS\$R8\PCSX2 ${APP_VERSION}"
; Installed files are housed here
; Files to be installed are housed here
!include "SharedCore.nsh"
Section "" INST_PORTABLE
SetOutPath "$INSTDIR"
File portable.ini
SectionEnd
@ -215,6 +241,7 @@ SectionEnd
Section "" SID_PCSX2
SectionEnd
# Gives the user a fancy checkbox to run PCSX2 right from the installer!
Function ModifyRunCheckbox
${IfNot} ${SectionIsSelected} ${SID_PCSX2}
SendMessage $MUI.FINISHPAGE.RUN ${BM_SETCHECK} ${BST_UNCHECKED} 0