libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2024-11-23 17:29:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NSIS: Don't pack files twice - reduces installer size to 7MB.

Browse Source
This commit is contained in:
Christian Kenny 2020-02-21 18:05:53 -05:00 committed by lightningterror
parent 3b380148ee
commit 6e22efe790
3 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nsis/SharedCore.nsh
View File

@ -17,34 +17,14 @@ Section "!${APP_NAME} (required)" SEC_CORE
SectionIn RO
SetOutPath "$INSTDIR"
File ..\bin\pcsx2.exe
File ..\bin\GameIndex.dbf
File ..\bin\cheats_ws.zip
File ..\bin\PCSX2_keys.ini.default
SetOutPath "$INSTDIR\Docs"
File ..\bin\docs\*
SetOutPath "$INSTDIR\Shaders"
File ..\bin\shaders\GSdx.fx
File ..\bin\shaders\GSdx_FX_Settings.ini
SetOutPath "$INSTDIR\Plugins"
File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll
File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll
File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll
File /nonfatal ..\bin\Plugins\spu2-x.dll
File /nonfatal ..\bin\Plugins\cdvdGigaherz.dll
File /nonfatal ..\bin\Plugins\lilypad.dll
File /nonfatal ..\bin\Plugins\USBnull.dll
File /nonfatal ..\bin\Plugins\DEV9null.dll
File /nonfatal ..\bin\Plugins\FWnull.dll
CopyFiles /SILENT "$TEMP\PCSX2_installer_temp" "$INSTDIR"
CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Docs" "$INSTDIR"
CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Shaders" "$INSTDIR"
CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Plugins" "$INSTDIR"
SectionEnd
Section "Additional Languages" SEC_LANGS
SetOutPath $INSTDIR\Langs
File /nonfatal /r ..\bin\Langs\*.mo
CopyFiles /SILENT "$TEMP\PCSX2_installer_temp\Langs" "$INSTDIR"
SectionEnd
!include "SharedShortcuts.nsh"

1
nsis/pcsx2_full_install.nsi
View File

@ -71,6 +71,7 @@ Section ""
WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "NoModify" 1
WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "NoRepair" 1
WriteUninstaller "${UNINST_EXE}"
RMDir /r "$TEMP\PCSX2_installer_temp"
SectionEnd
Section "" SID_PCSX2

39
nsis/pcsx2_shared_init.nsi
View File

@ -93,10 +93,9 @@ ${NSD_KillTimer} NSD_Timer.Callback
# 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 VS runtimes.
# (head straight to the first installer section)
${If} ${AtLeastWin8.1}
${OrIf} $IsAdmin == 0
Call PreInstall_UsrWait
Goto CopyInstallerFiles
SendMessage $HWNDPARENT ${WM_COMMAND} 1 0
${EndIf}
@ -123,7 +122,6 @@ inetc::get "https://aka.ms/vs/16/release/VC_redist.x86.exe" "$TEMP\vcredist_Upda
SendMessage $hwnd ${PBM_SETPOS} 40 0
Delete "$TEMP\vcredist_Update_x86.exe"
# Download and install DirectX
ExecDxSetup:
${NSD_CreateLabel} 0 45 100% 10u "Installing DXWebSetup package"
@ -137,6 +135,38 @@ ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
SendMessage $hwnd ${PBM_SETPOS} 100 0
Delete "$TEMP\dxwebsetup.exe"
Sleep 20
;-----------------------------------------
; Copy installer files to a temp directory instead of repacking twice (for each installer)
CopyInstallerFiles:
${NSD_CreateLabel} 0 45 80% 10u "Unpacking files. Maybe it's time to upgrade that computer!"
SetOutPath "$TEMP\PCSX2_installer_temp"
File ..\bin\pcsx2.exe
File ..\bin\GameIndex.dbf
File ..\bin\cheats_ws.zip
File ..\bin\PCSX2_keys.ini.default
SetOutPath "$TEMP\PCSX2_installer_temp\Docs"
File ..\bin\docs\*
SetOutPath "$TEMP\PCSX2_installer_temp\Shaders"
File ..\bin\shaders\GSdx.fx
File ..\bin\shaders\GSdx_FX_Settings.ini
SetOutPath "$TEMP\PCSX2_installer_temp\Plugins"
File /nonfatal ..\bin\Plugins\gsdx32-sse2.dll
File /nonfatal ..\bin\Plugins\gsdx32-sse4.dll
File /nonfatal ..\bin\Plugins\gsdx32-avx2.dll
File /nonfatal ..\bin\Plugins\spu2-x.dll
File /nonfatal ..\bin\Plugins\cdvdGigaherz.dll
File /nonfatal ..\bin\Plugins\lilypad.dll
File /nonfatal ..\bin\Plugins\USBnull.dll
File /nonfatal ..\bin\Plugins\DEV9null.dll
File /nonfatal ..\bin\Plugins\FWnull.dll
SetOutPath "$TEMP\PCSX2_installer_temp\Langs"
File /nonfatal /r ..\bin\Langs\*.mo
${NSD_CreateLabel} 0 45 100% 10u "Moving on"
;-----------------------------------------
Call PreInstall_UsrWait
SendMessage $HWNDPARENT ${WM_COMMAND} 1 0
FunctionEnd
@ -230,12 +260,13 @@ FunctionEnd
; The default installation directory for the portable binary.
InstallDir "$DOCUMENTS\$R8\PCSX2 ${APP_VERSION}"
; Files to be installed are housed here
; Path references for the core files here
!include "SharedCore.nsh"
Section "" INST_PORTABLE
SetOutPath "$INSTDIR"
File portable.ini
RMDir /r "$TEMP\PCSX2_installer_temp"
SectionEnd
Section "" SID_PCSX2