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

Remove unused SVN templates and condense installer files. Reduced compile errors by removing output folder dependency. 

Forgot to add SharedRedtape changes to last commit

Remove unused SVN templates

Compile the installer to the NSIS folder so that the user doesn't need to worry about the output folder missing; and wonder why the installer won't compile ;)
This commit is contained in:
Christian Kenny 2016-12-19 19:12:18 -05:00 committed by Gregory Hainaut
parent b7659ea3a5
commit 5298c2016f
14 changed files with 71 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
nsis/SectionUninstaller.nsh
View File

@ -1,3 +1,61 @@
; =======================================================================
; Shared Install Functions
; =======================================================================
Function .onInit
;prepare Advanced Uninstall log always within .onInit function
!insertmacro UNINSTALL.LOG_PREPARE_INSTALL
; MORE UAC HELL ---------- >
;call IsUserAdmin
FunctionEnd
Function .onInstSuccess
;create/update log always within .onInstSuccess function
!insertmacro UNINSTALL.LOG_UPDATE_INSTALL
FunctionEnd
; =======================================================================
; Shared Uninstall Functions
; =======================================================================
Function un.removeShorties
; Remove shortcuts, if any
Delete "$DESKTOP\${APP_NAME}.lnk"
Delete "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk"
Delete "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk"
;Delete "$SMPROGRAMS\PCSX2\pcsx2-dev.lnk"
Delete "$SMPROGRAMS\PCSX2\Readme.lnk"
Delete "$SMPROGRAMS\PCSX2\Frequently Asked Questions.lnk"
RMDir "$SMPROGRAMS\PCSX2"
FunctionEnd
; begin uninstall, could be added on top of uninstall section instead
Function un.onInit
!insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
FunctionEnd
Function un.onUninstSuccess
!insertmacro UNINSTALL.LOG_END_UNINSTALL
; And remove the various install dir(s) but only if they're clean of user content:
RMDir "$DOCUMENTS\PCSX2"
RMDir "$INSTDIR\langs"
RMDir "$INSTDIR\plugins"
RMDir "$INSTDIR\docs"
RMDir "$INSTDIR"
FunctionEnd
; =======================================================================
; Un.Installer Sections
; =======================================================================
@ -30,7 +88,7 @@ Section "Un.Program and Plugins ${APP_NAME}"
SectionEnd
; /o for optional and unticked by default
Section /o "Un.Configuration files (PCSX2, GSdx, SPU2-X, ect.)"
Section /o "Un.Configuration files (Programs and Plugins)"
SetShellVarContext current
RMDir /r "$DOCUMENTS\PCSX2\inis\"
@ -40,12 +98,12 @@ SectionEnd
Section /o "Un.Memory cards/savestates"
SetShellVarContext current
RMDir /r "$DOCUMENTS\PCSX2\memcards"
RMDir /r "$DOCUMENTS\PCSX2\sstates"
RMDir /r "$DOCUMENTS\PCSX2\memcards\"
RMDir /r "$DOCUMENTS\PCSX2\sstates\"
SectionEnd
; /o for optional and unticked by default
Section /o "Un.User files (Cheats, logs, snaps, etc)"
Section /o "Un.User files (Cheats, Logs, Snapshots)"
SetShellVarContext current
RMDir /r "$DOCUMENTS\PCSX2\Cheats_ws\"

10
nsis/SharedBase.nsh
View File

@ -12,13 +12,6 @@
!define INC_PLUGINS 1
!endif
!ifndef USE_PACKAGE_REV
; When enabled, all exe and plugins use a single revision based ont he trunk/HEAD svn revision.
; When disabled, each plugin and the main exe get their own revision number based on the actual
; revision the component was last updated.
!define USE_PACKAGE_REV 0
!endif
; Notes on Uninstall Log Location (UNINSTALL_LOG)
; The name of the uninstall log determines whether or not future installers
; fall under the same single uninstall entry, or if they use multiple (separate)
@ -45,7 +38,8 @@ SetCompressorDictSize 24
; The name of the installer
Name "${APP_NAME}"
OutFile "output\pcsx2-${APP_VERSION}-${OUTFILE_POSTFIX}.exe"
; Output the installer to the nsis folder (in git repo)
OutFile "pcsx2-${APP_VERSION}-${OUTFILE_POSTFIX}.exe"
; The default installation directory
InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}"

62
nsis/SharedRedtape.nsh
View File

@ -1,62 +0,0 @@
; =======================================================================
; Shared Install Functions
; =======================================================================
Function .onInit
;prepare Advanced Uninstall log always within .onInit function
!insertmacro UNINSTALL.LOG_PREPARE_INSTALL
; MORE UAC HELL ---------- >
;call IsUserAdmin
FunctionEnd
Function .onInstSuccess
;create/update log always within .onInstSuccess function
!insertmacro UNINSTALL.LOG_UPDATE_INSTALL
FunctionEnd
; =======================================================================
; Shared Uninstall Functions
; =======================================================================
Function un.removeShorties
; Remove shortcuts, if any
Delete "$DESKTOP\${APP_NAME}.lnk"
Delete "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk"
Delete "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk"
;Delete "$SMPROGRAMS\PCSX2\pcsx2-dev.lnk"
Delete "$SMPROGRAMS\PCSX2\Readme.lnk"
Delete "$SMPROGRAMS\PCSX2\Frequently Asked Questions.lnk"
RMDir "$SMPROGRAMS\PCSX2"
FunctionEnd
; begin uninstall, could be added on top of uninstall section instead
Function un.onInit
!insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
FunctionEnd
Function un.onUninstSuccess
!insertmacro UNINSTALL.LOG_END_UNINSTALL
; And remove the various install dir(s) but only if they're clean of user content:
RMDir "$DOCUMENTS\PCSX2"
RMDir "$INSTDIR\langs"
RMDir "$INSTDIR\plugins"
RMDir "$INSTDIR\docs"
RMDir "$INSTDIR\Cheats"
RMDir "$INSTDIR"
FunctionEnd

4
nsis/nsis_instructions.txt
View File

@ -54,9 +54,7 @@
* Once you have downloaded both Microsoft packages and built the required plugins; you are ready to compile! :)
* Open MakeNSIS.exe and compile script (pcsx2_full_install.nsi)!
Output executables will be generated to the local git repo; in the "pcsx2/nsis/output" folder.
* If compiler fails, make sure that the output folder in the path shown above
Output executables will be generated to the local git repo; in the "pcsx2/nsis" folder.
--------------------------------------------
Recommendations to Developers

5
nsis/templates/svnrev_cdvdiso.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_CDVDISO $WCREV$
!else
!define SVNREV_CDVDISO ${SVNREV_PACKAGE}
!endif

5
nsis/templates/svnrev_gsdx.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_GSDX $WCREV$
!else
!define SVNREV_GSDX ${SVNREV_PACKAGE}
!endif

5
nsis/templates/svnrev_lilypad.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_LILYPAD $WCREV$
!else
!define SVNREV_LILYPAD ${SVNREV_PACKAGE}
!endif

3
nsis/templates/svnrev_package.nsh
View File

@ -1,3 +0,0 @@
!define SVNREV_PACKAGE $WCREV$
!define SVNMOD_PACKAGE $WCMODS?1:0$

8
nsis/templates/svnrev_pcsx2.nsh
View File

@ -1,8 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_PCSX2 $WCREV$
!define SVNMOD_PCSX2 $WCMODS?1:0$
!else
!define SVNREV_PCSX2 ${SVNREV_PACKAGE}
!define SVNMOD_PCSX2 ${SVMOD_PACKAGE}
!endif

7
nsis/templates/svnrev_plugins.nsh
View File

@ -1,7 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_PLUGINS $WCREV$
!define SVNMOD_PLUGINS $WCMODS?1:0$
!else
!define SVNREV_PLUGINS ${SVNREV_PACKAGE}
!define SVNMOD_PLUGINS ${SVMOD_PACKAGE}
!endif

5
nsis/templates/svnrev_spu2x.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_SPU2X $WCREV$
!else
!define SVNREV_SPU2X ${SVNREV_PACKAGE}
!endif

5
nsis/templates/svnrev_zerogs.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_ZEROGS $WCREV$
!else
!define SVNREV_ZEROGS ${SVNREV_PACKAGE}
!endif

5
nsis/templates/svnrev_zerospu2.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_ZEROSPU2 $WCREV$
!else
!define SVNREV_ZEROSPU2 ${SVNREV_PACKAGE}
!endif

5
nsis/templates/svnrev_zzogl.nsh
View File

@ -1,5 +0,0 @@
!if ${USE_PACKAGE_REV} == 0
!define SVNREV_ZZOGL $WCREV$
!else
!define SVNREV_ZZOGL ${SVNREV_PACKAGE}
!endif