From 06167087b37858d7faefaa2e24671791064d43a9 Mon Sep 17 00:00:00 2001 From: refraction Date: Tue, 8 Jul 2014 01:38:06 +0100 Subject: [PATCH] Remove SVN checks from installer files. Closes issue #20 --- nsis/ApplyExeProps.nsh | 4 ++-- nsis/SectionCoreReqs.nsh | 5 ++++- nsis/SectionShortcuts.nsh | 2 +- nsis/SharedBase.nsh | 26 ++++++-------------------- nsis/SharedRedtape.nsh | 25 +------------------------ nsis/pcsx2_full_install.nsi | 20 ++++++++++---------- nsis/pcsx2_web_install.nsi | 20 ++++++++++---------- 7 files changed, 34 insertions(+), 68 deletions(-) diff --git a/nsis/ApplyExeProps.nsh b/nsis/ApplyExeProps.nsh index 54fb4aa323..2ebf932c06 100644 --- a/nsis/ApplyExeProps.nsh +++ b/nsis/ApplyExeProps.nsh @@ -8,6 +8,6 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}" ;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A test comment" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2014 PCSX2 Dev Team" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC." -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}.${SVNREV_PACKAGE}" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}" -VIProductVersion "${APP_VERSION}.${SVNREV_PACKAGE}" +VIProductVersion "${APP_VERSION}" diff --git a/nsis/SectionCoreReqs.nsh b/nsis/SectionCoreReqs.nsh index dc5cc2e313..2b68c1a784 100644 --- a/nsis/SectionCoreReqs.nsh +++ b/nsis/SectionCoreReqs.nsh @@ -19,7 +19,7 @@ SetOutPath "$INSTDIR" !insertmacro UNINSTALL.LOG_OPEN_INSTALL File /oname=${APP_EXE} ..\bin\pcsx2.exe - ;File /nonfatal /oname=pcsx2-dev-r${SVNREV}.exe ..\bin\pcsx2-dev.exe + ;File /nonfatal /oname=pcsx2-dev.exe ..\bin\pcsx2-dev.exe ; ------------------------------------------ ; -- Shared Core Components -- @@ -73,6 +73,9 @@ ; -- Registry Section -- ; ------------------------------------------ + ; 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}" "UninstallString" "${UNINST_EXE}" diff --git a/nsis/SectionShortcuts.nsh b/nsis/SectionShortcuts.nsh index a160bcddb9..1f60e28223 100644 --- a/nsis/SectionShortcuts.nsh +++ b/nsis/SectionShortcuts.nsh @@ -17,7 +17,7 @@ Section "Start Menu Shortcuts" SEC_STARTMENU "" "" 0 "" "" "Common answers to common problems and inquiries." ;IfFileExists ..\bin\pcsx2-dev.exe 0 +2 - ; CreateShortCut "PCSX2\pcsx2-dev-r${SVNREV}.lnk" "$INSTDIR\pcsx2-dev-r${SVNREV}.exe" "" "$INSTDIR\pcsx2-dev-r${SVNREV}.exe" 0 "" "" \ + ; CreateShortCut "PCSX2\pcsx2-dev.lnk" "$INSTDIR\pcsx2-dev.exe" "" "$INSTDIR\pcsx2-dev.exe" 0 "" "" \ ; "PCSX2 Devel (has additional logging support)" SectionEnd diff --git a/nsis/SharedBase.nsh b/nsis/SharedBase.nsh index 017dbbc750..e7f080e374 100644 --- a/nsis/SharedBase.nsh +++ b/nsis/SharedBase.nsh @@ -21,35 +21,21 @@ ; 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 1 + !define USE_PACKAGE_REV 0 !endif -!if ${INC_CORE} > 0 - ; FIXME: Technically we'd want to exclude plugin revisions here, but it isn't easy to do. - !system 'SubWCRev.exe ..\ templates\svnrev_package.nsh svnrev_package.nsh' -!else - ; Revision information for all plugins; used to moniker the output file when building - ; plugin-only packages. - !system 'SubWCRev.exe ..\plugins templates\svnrev_package.nsh svnrev_package.nsh' -!endif - -!system 'SubWCRev.exe ..\pcsx2 templates\svnrev_pcsx2.nsh svnrev_pcsx2.nsh' - -!include "svnrev_package.nsh" -!include "svnrev_pcsx2.nsh" - ; 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) ; uninstall folders. !ifndef APP_VERSION - !define APP_VERSION "1.2.0" + !define APP_VERSION "1.2.1.0" !endif -!define APP_NAME "PCSX2 ${APP_VERSION} (r${SVNREV_PACKAGE})" -!define APP_FILENAME "pcsx2-r${SVNREV_PCSX2}" -!define UNINSTALL_LOG "Uninst-pcsx2-r${SVNREV_PACKAGE}" +!define APP_NAME "PCSX2 ${APP_VERSION}" +!define APP_FILENAME "pcsx2" +!define UNINSTALL_LOG "Uninst-pcsx2 ${APP_VERSION}" !define INSTDIR_REG_ROOT "HKLM" @@ -64,7 +50,7 @@ SetCompressorDictSize 24 ; The name of the installer Name "${APP_NAME}" -OutFile "output\pcsx2-${APP_VERSION}-r${SVNREV_PACKAGE}-${OUTFILE_POSTFIX}.exe" +OutFile "output\pcsx2-${APP_VERSION}-${OUTFILE_POSTFIX}.exe" ; The default installation directory InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}" diff --git a/nsis/SharedRedtape.nsh b/nsis/SharedRedtape.nsh index 5c1c19f992..32fb48be28 100644 --- a/nsis/SharedRedtape.nsh +++ b/nsis/SharedRedtape.nsh @@ -1,27 +1,4 @@ -; ======================================================================= -; Plugin Includes -; ======================================================================= -; Note that zzOgl is disabled for now because it requires CG dependencies to be installed. - -!if ${INC_PLUGINS} > 0 - !system 'SubWCRev.exe ..\plugins\gsdx templates\svnrev_gsdx.nsh svnrev_gsdx.nsh' - !system 'SubWCRev.exe ..\plugins\spu2-x templates\svnrev_spu2x.nsh svnrev_spu2x.nsh' - !system 'SubWCRev.exe ..\plugins\cdvdiso templates\svnrev_cdvdiso.nsh svnrev_cdvdiso.nsh' - !system 'SubWCRev.exe ..\plugins\lilypad templates\svnrev_lilypad.nsh svnrev_lilypad.nsh' - !system 'SubWCRev.exe ..\plugins\zerogs\dx templates\svnrev_zerogs.nsh svnrev_zerogs.nsh' - ;!system 'SubWCRev.exe ..\plugins\zzogl-pg templates\svnrev_zzogl.nsh svnrev_zzogl.nsh' - !system 'SubWCRev.exe ..\plugins\zerospu2 templates\svnrev_zerospu2.nsh svnrev_zerospu2.nsh' - - !include "svnrev_gsdx.nsh" - !include "svnrev_spu2x.nsh" - !include "svnrev_cdvdiso.nsh" - !include "svnrev_lilypad.nsh" - !include "svnrev_zerogs.nsh" - ;!include "svnrev_zzogl.nsh" - !include "svnrev_zerospu2.nsh" -!endif - ; ======================================================================= ; Shared Install Functions ; ======================================================================= @@ -81,7 +58,7 @@ Function un.removeShorties Delete "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk" Delete "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk" - ;Delete "$SMPROGRAMS\PCSX2\pcsx2-dev-r${SVNREV}.lnk" + ;Delete "$SMPROGRAMS\PCSX2\pcsx2-dev.lnk" Delete "$SMPROGRAMS\PCSX2\Readme.lnk" Delete "$SMPROGRAMS\PCSX2\Frequently Asked Questions.lnk" diff --git a/nsis/pcsx2_full_install.nsi b/nsis/pcsx2_full_install.nsi index 5fe9622876..f38bdd7bbb 100644 --- a/nsis/pcsx2_full_install.nsi +++ b/nsis/pcsx2_full_install.nsi @@ -73,20 +73,20 @@ Section "!${APP_NAME} (required)" SEC_CORE SetOutPath "$INSTDIR\Plugins" !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File /nonfatal /oname=gsdx32-sse2-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-sse2.dll - File /nonfatal /oname=gsdx32-ssse3-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-ssse3.dll - File /nonfatal /oname=gsdx32-sse4-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-sse4.dll - File /nonfatal /oname=gsdx32-avx-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx.dll - File /nonfatal /oname=gsdx32-avx2-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx2.dll - File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll ..\bin\Plugins\zerogs.dll + File /nonfatal /oname=gsdx32-sse2.dll ..\bin\Plugins\gsdx32-sse2.dll + File /nonfatal /oname=gsdx32-ssse3.dll ..\bin\Plugins\gsdx32-ssse3.dll + File /nonfatal /oname=gsdx32-sse4.dll ..\bin\Plugins\gsdx32-sse4.dll + File /nonfatal /oname=gsdx32-avx.dll ..\bin\Plugins\gsdx32-avx.dll + File /nonfatal /oname=gsdx32-avx2.dll ..\bin\Plugins\gsdx32-avx2.dll + File /nonfatal /oname=zerogs.dll ..\bin\Plugins\zerogs.dll - File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll ..\bin\Plugins\spu2-x.dll - File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll + File /nonfatal /oname=spu2-x.dll ..\bin\Plugins\spu2-x.dll + File /nonfatal /oname=zerospu2.dll ..\bin\Plugins\zerospu2.dll - File /nonfatal /oname=cdvdiso-r${SVNREV_CDVDISO}.dll ..\bin\Plugins\cdvdiso.dll + File /nonfatal /oname=cdvdiso.dll ..\bin\Plugins\cdvdiso.dll File ..\bin\Plugins\cdvdGigaherz.dll - File /nonfatal /oname=lilypad-r${SVNREV_LILYPAD}.dll ..\bin\Plugins\lilypad.dll + File /nonfatal /oname=lilypad.dll ..\bin\Plugins\lilypad.dll File ..\bin\Plugins\PadSSSPSX.dll File /nonfatal ..\bin\Plugins\padPokopom.dll diff --git a/nsis/pcsx2_web_install.nsi b/nsis/pcsx2_web_install.nsi index aa63efc37f..83b867b2c3 100644 --- a/nsis/pcsx2_web_install.nsi +++ b/nsis/pcsx2_web_install.nsi @@ -59,19 +59,19 @@ Section "!${APP_NAME} (required)" SEC_CORE SetOutPath "$INSTDIR\Plugins" !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File /nonfatal /oname=gsdx32-sse2-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-sse2.dll - File /nonfatal /oname=gsdx32-ssse3-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-ssse3.dll - File /nonfatal /oname=gsdx32-sse4-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-sse4.dll - File /nonfatal /oname=gsdx32-avx-r${SVNREV_GSDX}.dll ..\bin\Plugins\gsdx32-avx.dll - File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll ..\bin\Plugins\zerogs.dll + File /nonfatal /oname=gsdx32-sse2.dll ..\bin\Plugins\gsdx32-sse2.dll + File /nonfatal /oname=gsdx32-ssse3.dll ..\bin\Plugins\gsdx32-ssse3.dll + File /nonfatal /oname=gsdx32-sse4.dll ..\bin\Plugins\gsdx32-sse4.dll + File /nonfatal /oname=gsdx32-avx.dll ..\bin\Plugins\gsdx32-avx.dll + File /nonfatal /oname=zerogs.dll ..\bin\Plugins\zerogs.dll - File /nonfatal /oname=spu2-x-r${SVNREV_SPU2X}.dll ..\bin\Plugins\spu2-x.dll - File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll + File /nonfatal /oname=spu2-x.dll ..\bin\Plugins\spu2-x.dll + File /nonfatal /oname=zerospu2.dll ..\bin\Plugins\zerospu2.dll - File /nonfatal /oname=cdvdiso-r${SVNREV_CDVDISO}.dll ..\bin\Plugins\cdvdiso.dll + File /nonfatal /oname=cdvdiso.dll ..\bin\Plugins\cdvdiso.dll File ..\bin\Plugins\cdvdGigaherz.dll - File /nonfatal /oname=lilypad-r${SVNREV_LILYPAD}.dll ..\bin\Plugins\lilypad.dll + File /nonfatal /oname=lilypad.dll ..\bin\Plugins\lilypad.dll File ..\bin\Plugins\PadSSSPSX.dll File /nonfatal ..\bin\Plugins\padPokopom.dll @@ -88,7 +88,7 @@ Section "ZZogl Plugin (requires OpenGL)" SetOutPath "$INSTDIR\Plugins" !insertmacro UNINSTALL.LOG_OPEN_INSTALL - File /oname=zzogl-pg-r${SVNREV_ZZOGL}.dll ..\bin\Plugins\zzogl-pg.dll + File /oname=zzogl-pg.dll ..\bin\Plugins\zzogl-pg.dll !insertmacro UNINSTALL.LOG_CLOSE_INSTALL SectionEnd