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

A few fixes to the installer script. Not done yet, but compiles at least. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2990 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2010-05-12 18:34:31 +00:00
parent 069d1d59b8
commit 25301ec90c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nsis/pcsx2_installer_script.nsi
View File

@ -120,7 +120,7 @@ Section "${APP_NAME} (required)"
!insertmacro UNINSTALL.LOG_OPEN_INSTALL !insertmacro UNINSTALL.LOG_OPEN_INSTALL
File /oname=pcsx2-r${SVNREV}.exe ..\bin\pcsx2.exe File /oname=pcsx2-r${SVNREV}.exe ..\bin\pcsx2.exe
File /nonfatal /oname=pcsx2-dev-r${SVNREV}.exe ..\bin\pcsx2-dev.exe File /nonfatal /oname=pcsx2-dev-r${SVNREV}.exe ..\bin\pcsx2-dev.exe
File ..\bin\w32pthreads.v2.dll File ..\bin\w32pthreads.v4.dll
!insertmacro UNINSTALL.LOG_CLOSE_INSTALL !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
; -- Languages and Patches -- ; -- Languages and Patches --
@ -235,7 +235,7 @@ FunctionEnd
; -------------------------------------- ; --------------------------------------
; Uninstaller ; Uninstaller
Function .removeShorties Function un.removeShorties
; Remove shortcuts, if any ; Remove shortcuts, if any
Delete "$SMPROGRAMS\pcsx2\${UNINST_EXE}-r${SVNREV}.lnk" Delete "$SMPROGRAMS\pcsx2\${UNINST_EXE}-r${SVNREV}.lnk"
@ -250,7 +250,7 @@ FunctionEnd
; Languages, patches, and null plugins should only be removed if all previous versions of ; Languages, patches, and null plugins should only be removed if all previous versions of
; PCSX2 have been uninstalled. And we know that's happened when the pcsx2\versions registry ; PCSX2 have been uninstalled. And we know that's happened when the pcsx2\versions registry
; key is empty. ; key is empty.
Function .removeSharedJunk Function un.removeSharedJunk
!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Langs" !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Langs"
!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Patches" !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Patches"
@ -273,9 +273,9 @@ Section "Un.Basic Removal (removes only files installed by this package) ${APP_N
!insertmacro UNINSTALL.LOG_END_UNINSTALL !insertmacro UNINSTALL.LOG_END_UNINSTALL
; Remove registry keys ; Remove registry keys
DeleteRegKey HKLM ${INSTDIR_REG_KEY} DeleteRegKey HKLM "${INSTDIR_REG_KEY}"
Call .removeShorties Call un.removeShorties
DeleteRegKey ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" DeleteRegKey ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}"
@ -285,13 +285,13 @@ Section "Un.Basic Removal (removes only files installed by this package) ${APP_N
SectionEnd SectionEnd
Section Un.Full Removal (completely removes all PCSX2 program files and folders) Section "Un.Full Removal (completely removes all PCSX2 program files and folders)"
MessageBox MB_YESNO "WARNING! This will remove *all* files in $INSTDIR -- are you sure you want to proceed?" IDYES true IDNO false MessageBox MB_YESNO "WARNING! This will remove *all* files in $INSTDIR -- are you sure you want to proceed?" IDYES true IDNO false
true: true:
RMDir /r "$INSTDIR" RMDir /r "$INSTDIR"
Call .removeShorties Call un.removeShorties
DeleteRegKey ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" DeleteRegKey ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}"
DeleteRegKey HKLM Software\pcsx2 DeleteRegKey HKLM Software\pcsx2