NSIS: Update installer scripts, bug fixes, added some new goodies #1699

MrCK1 · 2016-12-15T04:22:44Z

Summary of changes:

Main Installer Changes:

Conducted compatibility testing for installer and build scripts in NSIS 3.01
Implemented uninstall script for future version detection. If an older or equivalent PCSX2 version is detected, the user is prompted to silently uninstall/overwrite or abort the installer. (The function is not compatible with any current stable releases because they lack the new registry string required for version detection.)
We can launch PCSX2 directly from the installer now 👍

You can try the new installer(s) with version detection here

MakeNSIS:

Suppressed errors related to unused plugins
Replaced some functions
Removed an leftover parameter.

Uninstaller:

Added section that allows users to keep just memory cards/savestates.
Fixed an issue with a registry key left behind by the uninstaller.
Fixed an issue with .ini files being deleted unintentionally
Removed obsolete function

Misc:

Updated copyright, added icon to installer
Reformatted installer instructions and added additional sections, fixed broken VC++ URL.

turtleli

Indentation seems a bit weird. And I see plenty of trailing whitespace.

nsis/SectionCoreReqs.nsh

    !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-    File                                            ..\bin\Cheats\*
-    !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+    CreateDirectory                                 "$INSTDIR\Cheats"


nsis/pcsx2_full_install.nsi

+		Quit
+		${Else}
+		DetailPrint "Not the same version"
+	${EndIf}


nsis/pcsx2_full_install.nsi

 !endif
-
+	SectionEnd


ramapcsx2 · 2016-12-15T14:09:59Z

Thanks a lot for these improvements!

nsis/SectionCoreReqs.nsh

@@ -53,20 +53,13 @@
    ; in order to run (including CDVD!) -- and really there should be more but we don't have working
    ; SPU2 null plugins right now.

-    File ..\bin\Plugins\GSnull.dll
+    ;File ..\bin\Plugins\GSnull.dll


nsis/SectionCoreReqs.nsh

    ;File ..\bin\Plugins\SPU2null.dll            
    File ..\bin\Plugins\USBnull.dll
    File ..\bin\Plugins\DEV9null.dll
    File ..\bin\Plugins\FWnull.dll
-    File ..\bin\Plugins\CDVDnull.dll
+    ;File ..\bin\Plugins\CDVDnull.dll


nsis/SectionCoreReqs.nsh

@@ -18,8 +18,8 @@

  SetOutPath "$INSTDIR"
  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-    File           /oname=${APP_EXE}                ..\bin\pcsx2.exe
-    ;File /nonfatal /oname=pcsx2-dev.exe  					..\bin\pcsx2-dev.exe
+    File			..\bin\pcsx2.exe


nsis/SectionUninstaller.nsh

@@ -30,24 +30,28 @@ Section "Un.Program and Plugins ${APP_NAME}"
 SectionEnd

 ; /o for optional and unticked by default
-Section /o "Un.Configuration files (Program and Plugins)"
+Section /o "Un.Configuration files (PCSX2, GSdx, SPU2-X, ect.)"


nsis/SectionUninstaller.nsh

 SectionEnd

 ; /o for optional and unticked by default
-Section /o "Un.User files (Memory Cards, Savestates, etc)"
+Section /o "Un.User files (Cheats, logs, snaps, etc)"


nsis/pcsx2_full_install.nsi

+
+	;This check for older versions (pre 1.6.0) without InstalledVersion string will bypass this section
+	${If} $R1 == ""
+	DetailPrint "InstalledVersion string not found, skipping version check"


MrCK1 · 2016-12-20T01:45:27Z

I went ahead and updated the Uninstaller labels with FlatOut's suggestions. I also merged the remaining code from SharedRedtape into SectionUninstaller; and the deleted the unused SVN templates

@FlatOutPS2 @ramapcsx2
Do we have any thoughts on what we want to do with the null plugins? If we include them in the installer, it would look something like this:

ramapcsx2 · 2016-12-21T20:15:43Z

"Optional Plugins" looks like a good solution to me. As well as having them disabled by default.

FlatOutPS2 · 2016-12-21T20:25:23Z

I'm in favour of not including 'em at all. There are always users who click everything and then complain that they have no graphics, no sound or whatever issues Jackun's plugin can cause. The few people who really want to use these plugins can easily find them on the website.

refractionpcsx2 · 2016-12-21T21:28:52Z

I'm inclined to agree with @FlatOutPS2 at least as far as the null plugins go. The useful USB plugins should be included along with any additional pad plugins like pokopom IMO.

FlatOutPS2 · 2016-12-21T21:43:14Z

I'm inclined to agree with @FlatOutPS2 at least as far as the null plugins go. The useful USB plugins should be included along with any additional pad plugins like pokopom IMO.

If you add 'em, you need to support 'em too. And the USB plugins are functional at best. They're not very user friendly and still suffer many issues. And we already have three PAD plugins, no sense in adding anymore.

refractionpcsx2 · 2016-12-21T21:58:07Z

If you add 'em, you need to support 'em too. And the USB plugins are functional at best. They're not very user friendly and still suffer many issues.

True but they do add a lot of functionality people like.

And we already have three PAD plugins, no sense in adding anymore.

Do we? In my git repo I have xpad and LilyPad

FlatOutPS2 · 2016-12-21T22:04:13Z

True but they do add a lot of functionality people like.

And they can download those plugins if they wish. It's not like those plugins see a lot of maintenance. I posted an issue including a possible solution for the USB mic plugin, but the dev never even responded to any of the posts in the thread @bositman made.

Do we? In my git repo I have xpad and LilyPad

And OnePad for Linux. I don't see the use of more PAD plugins. Just gives more room for new issues. We could possibly replace xpad with Pokopom. I'm not sure anyone actually uses xpad regularly. :p

refractionpcsx2 · 2016-12-21T22:06:28Z

It depends which of the two is going to be more useful :P

MrCK1 · 2016-12-22T01:55:31Z

I guess you guys can figure out which PAD plugins we want to include and whether or not to include Jackun's USB plugin.

For the future, I was also thinking about replacing the FAQ .pdf with a link to a configuration on the wiki. The current Windows guide was written for 1.2.1 and contains obsolete information. The readme could possibly be simplified to a .txt file containing the patch notes.

turtleli · 2016-12-22T20:35:15Z

I don't think xpad should be included - it's not as compatible as LilyPad. If xpad is used and you try to play Xenosaga 2, you get the following message:

The DUALSHOCK®2 Analog controller has been removed.

Please insert a DUALSHOCK®2 analog controller into controller port 1 to continue.

lightningterror · 2016-12-23T00:50:59Z

Hmm is it a good idea to include generic usb gamepad drivers ?

In "Other" category.(not installed by default) The latest version is 3.70a if I'm not mistaken.

What do you guys think about it ?

If not then a great alternative would be adding links on the website. Of some optional but required installation packages like DirectX , visual 2015 , different types of gamepad drivers ..etc that are required for pcsx2 to run.

MrCK1 · 2016-12-24T21:32:45Z

Generic USB drivers are probably best left to be handled by the user's operating system. It's also much easier to bundle DirectX packages with the installer than to host them separately and introduce additional user error to the equation ;)

toehead2001 · 2016-12-27T18:06:16Z

It would be a good idea to make it scale properly on HiDPI.

Add this to the pcsx2_full_install.nsi file:
ManifestDPIAware true

MrCK1 · 2016-12-28T01:42:41Z

I'll add that in when I get a chance ;)

MrCK1 · 2016-12-28T21:29:57Z

@turtleli Looking at your previous comment, maybe you should also remove xpad from the VS solution?

turtleli · 2016-12-29T00:15:36Z

Looking at your previous comment, maybe you should also remove xpad from the VS solution?

I suppose it could be removed from the solution. Or moved to legacy. Dunno.

nsis/SharedBase.nsh

@@ -38,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"


MrCK1 · 2016-12-30T08:46:53Z

I just checked the current gitignore - I see what I forgot to do when I removed the svn templates earlier. I'll remove the directories tomorrow

MrCK1 · 2017-01-18T05:43:20Z

Here's a summary of the additional changes in the past few weeks:

Fixed a regression I introduced in the registry that caused random FTW configuration issues to occur after a reinstall/upgrade.
Reduced version detection into a single function and added a message reminding users to back up files before a silent uninstall.
Removed unnecessary description text and parameters.
Installation is now blocked on XP and support for high DPI screens has been added.

MrCK1 · 2017-04-10T06:24:12Z

@mirh I needed to push some changes to work on my other PR; but are there any more files besides the two you mentioned (XAudio2_7.dll and D3DCompiler_43.dll) that we need to look for on Win 8.0 and older? I'm asking because (if this is the case) I can skip the DXWebSetup if both are present on the user's system. 😃

mirh · 2017-04-10T08:20:48Z

Well, that would be the point.
Anyway, those were just two examples. I could have said XInput1_3 too. One alone is good as the others.

gregory38 · 2017-04-10T10:30:42Z

Could we stop adding more goodies to this PR ? It would be nice to validate the already huge work, merge it. And then do another PR with more goodies.

Note that I'm also fine if people prefer to do it in one shot.

MrCK1 · 2017-04-10T12:30:56Z

OK, there's really nothing else to be added besides the new code for skipping DxWebSetup, but I'll leave this as-is for now. The changes in the last commit should address most of the remaining concerns.

danilaml · 2017-04-10T14:17:53Z

@MrCK1 you don't really need to skip DxWebSetup manually since it will do all the necessary detection by itself (try running it yourself after you already installed dx9).

MrCK1 · 2017-04-10T15:06:47Z

Well that's good then, not sure how I got so worried about skipping the package in the first place. 😛

mirh · 2017-04-10T18:49:51Z

you don't really need to skip DxWebSetup manually since it will do all the necessary detection by itself

Doesn't it still need internet?

danilaml · 2017-04-10T19:43:25Z

@mirh to install dx, yes. It's Web Installer after all. But you'll need internet either way if you don't want to bundle dx9 with pcsx2 installer.

mirh · 2017-04-10T20:10:11Z

But you'll need internet either way if you don't want to bundle dx9 with pcsx2 installer.

You also don't need internet if we detect in the first place the thing is not needed.

danilaml · 2017-04-10T20:20:23Z

@mirh it want burn your computer and kill your dog if there is no internet. It just won't install anything. So if you have no internet connection the result will be the same, whether you have dx9 installed or not.

mirh · 2017-04-10T21:03:53Z

Assuming we can detect return codes, having no internet from dx setup should abort pcsx2 installation.

danilaml · 2017-04-10T21:09:45Z

@mirh should it? Can't pcsx2 work without dx9 redist?

MrCK1 · 2017-04-10T21:40:41Z

Don't forget this is only here for legacy systems.

@mirh I see little point in adding a code for detection. I don't think that a noticable speed improvement will be seen by searching the registry for .Dlls versus just letting the package abort itself.

mirh · 2017-04-11T07:54:17Z

should it? Can't pcsx2 work without dx9 redist?

I'm not sure if we crash or just fallback to whatever, but at least no XAudio and no XInput is a pretty big deal imo.
Don't know about gsdx requirements then.

I don't think that a noticable speed improvement will be seen by searching the registry for .Dlls versus just letting the package abort itself.

It wasn't about speed. It was more about: "no ignorant left behind".
If this details bothers you, we can even discuss it separately sometime else.

MrCK1 · 2017-04-19T14:43:30Z

@gregory38 does this PR still need a review/anything before we merge it?

I'll resolve/add the registry detection to skip dxwebsetup in another PR later. Other than that, the scripts are fully functional as-is.

gregory38 · 2017-04-19T16:12:57Z

@MrCK1 lol don't ask me.

@turtleli @refractionpcsx2 @ramapcsx2
Can we merge this branch ?

nsis/pcsx2_shared_init.nsi

+ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
+
+${NSD_CreateLabel} 0 45 100% 20u "Finished installing Visual C++ Redistributables. Click Next to continue."
+${NSD_CreateLabel} 0 45 100% 20u "Finished installing Visual C++ Redistributables. Click Next to continue."


nsis/SectionVersionCheck.nsh

+${StrContains} "$4" "1.0.0" "$R7"
+StrCmp $4 "" +1
+${If} $R7 == ""
+${EndIf}


nsis/SectionVersionCheck.nsh

+; This will become the primary version check once more stable builds
+ReadRegStr $R1 HKLM "${INSTDIR_REG_KEY}" "DisplayVersion"
+${If} $R1 == ""
+${EndIf}


nsis/SectionVersionCheck.nsh

+${StrContains} "$2" "1.4.0" "$R2"
+    StrCmp $2 "" +1
+${If} $R2 == ""
+${EndIf}


nsis/SectionVersionCheck.nsh

+${StrContains} "$3" "1.2.1" "$R3"
+    StrCmp $3 "" +1
+${If} $R3 == ""
+${EndIf}


nsis/SectionVersionCheck.nsh

+    CopyFiles /SILENT /FILESONLY "$R3\Uninst-pcsx2-r5875.exe" "$TEMP"
+        ExecWait '"$TEMP\Uninst-pcsx2-r5875.exe" /S _?=$R3'
+        Delete "$TEMP\Uninst-pcsx2-r5875.exe"
+        Goto Done


nsis/SectionVersionCheck.nsh

+    CopyFiles /SILENT /FILESONLY "$R5\Uninst-pcsx2-r4600.exe" "$TEMP"
+        ExecWait '"$TEMP\Uninst-pcsx2-r4600.exe" /S _?=$R5'
+        Delete "$TEMP\Uninst-pcsx2-r4600.exe"
+        Goto Done


nsis/pcsx2_shared_init.nsi

+ExecShell open "$TEMP\pcsx2-${APP_VERSION}-include_standard.exe"
+Quit
+${Else}
+Goto +2


nsis/SectionVersionCheck.nsh

+true:
+Goto SetUninstPath
+    false:
+        Quit


nsis/SectionVersionCheck.nsh

+SetOutPath "$DOCUMENTS"
+CopyFiles /SILENT "$DOCUMENTS\PCSX2" "$DOCUMENTS\PCSX2_backup"
+RMDir /r "$DOCUMENTS\PCSX2"
+    SetOutPath "$TEMP"


nsis/SectionVersionCheck.nsh

+
+; Installing another version
+MessageBox MB_ICONEXCLAMATION|MB_OKCANCEL "Another version of PCSX2 is already installed. The current configuration folder in Documents will be duplicated and renamed as PCSX2_backup. Click OK to uninstall PCSX2 or Cancel to abort the setup." IDOK SetUninstPath
+


…ninstaller, automatically backup old configuration folder, misc. changes. Automatically backup old configuration folder to avoid conflicts, misc. changes. Added reviewed changes

MrCK1 · 2017-05-02T16:15:28Z

@turtleli I'm ready for another review :)

nsis/SectionVersionCheck.nsh

+; Installing another version
+MessageBox MB_ICONEXCLAMATION|MB_OKCANCEL "Another version of PCSX2 is already installed. The current configuration folder in Documents will be duplicated and renamed as PCSX2_backup. Click OK to uninstall PCSX2 or Cancel to abort the setup." IDOK SetUninstPath IDCANCEL false
+
+false:


turtleli · 2017-05-06T20:54:14Z

I've reviewed what I can (well, I'm completely ignoring whitespace issues, otherwise it may never end). I doubt I'll be creating the final installer package when it's time to do so, so I'm not the right person to ask to merge this (I also didn't test this at all).

gregory38 · 2017-05-11T09:08:24Z

Let's merge the code. It won't create regression anyway and PR is already huge

ramapcsx2 · 2017-05-15T22:05:46Z

@turtleli @refractionpcsx2 @ramapcsx2
Can we merge this branch ?

This PR is so huge, it can't be managed anymore anyway.
Merge it and we'll go from there, making references back. Only if absolutely necessary.

Edit: Some more justification, I guess.
This improves about 10 things, leaves 2 things in limbo and maybe makes 1 thing worse. So yea :p

turtleli reviewed Dec 15, 2016

View reviewed changes

turtleli assigned ramapcsx2 and refractionpcsx2 Dec 15, 2016

turtleli added the Installer | Package label Dec 15, 2016

ramapcsx2 reviewed Dec 15, 2016

View reviewed changes

FlatOutPS2 reviewed Dec 15, 2016

View reviewed changes

nsis/SectionCoreReqs.nsh Outdated

@@ -18,8 +18,8 @@

SetOutPath "$INSTDIR"

!insertmacro UNINSTALL.LOG_OPEN_INSTALL

File /oname=${APP_EXE} ..\bin\pcsx2.exe

;File /nonfatal /oname=pcsx2-dev.exe ..\bin\pcsx2-dev.exe

File ..\bin\pcsx2.exe

This comment was marked as spam.

Sign in to view

FlatOutPS2 reviewed Dec 15, 2016

View reviewed changes

nsis/SectionUninstaller.nsh Outdated

SectionEnd

; /o for optional and unticked by default

Section /o "Un.User files (Memory Cards, Savestates, etc)"

Section /o "Un.User files (Cheats, logs, snaps, etc)"

This comment was marked as spam.

Sign in to view

danilaml reviewed Dec 15, 2016

View reviewed changes

toehead2001 reviewed Dec 30, 2016

View reviewed changes

turtleli reviewed Apr 24, 2017

View reviewed changes

MrCK1 force-pushed the NSIS3.01_upgrade_CK1 branch from 537a76a to fe846ad Compare April 25, 2017 04:00

turtleli reviewed Apr 25, 2017

View reviewed changes

Added pre-install dialog, updated build instructions, fix RegKey in u…

f89af40

…ninstaller, automatically backup old configuration folder, misc. changes. Automatically backup old configuration folder to avoid conflicts, misc. changes. Added reviewed changes

MrCK1 force-pushed the NSIS3.01_upgrade_CK1 branch from 7856ed2 to f89af40 Compare May 2, 2017 14:12

turtleli reviewed May 6, 2017

View reviewed changes

gregory38 merged commit e043822 into PCSX2:master May 16, 2017

MrCK1 deleted the NSIS3.01_upgrade_CK1 branch May 17, 2017 02:07

FlatOutPS2 mentioned this pull request Feb 4, 2018

Removing XPad #2293

Closed

MrCK1 mentioned this pull request Feb 22, 2018

PCSX2: Scaling Types / 16:9 FMV aspect ratio switch #1918

Closed


		; Installing another version
		MessageBox MB_ICONEXCLAMATION\|MB_OKCANCEL "Another version of PCSX2 is already installed. The current configuration folder in Documents will be duplicated and renamed as PCSX2_backup. Click OK to uninstall PCSX2 or Cancel to abort the setup." IDOK SetUninstPath

NSIS: Update installer scripts, bug fixes, added some new goodies #1699

NSIS: Update installer scripts, bug fixes, added some new goodies #1699

Conversation

MrCK1 commented Dec 15, 2016

turtleli left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ramapcsx2 commented Dec 15, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

MrCK1 commented Dec 20, 2016

ramapcsx2 commented Dec 21, 2016

FlatOutPS2 commented Dec 21, 2016

refractionpcsx2 commented Dec 21, 2016

FlatOutPS2 commented Dec 21, 2016

refractionpcsx2 commented Dec 21, 2016

FlatOutPS2 commented Dec 21, 2016

refractionpcsx2 commented Dec 21, 2016

MrCK1 commented Dec 22, 2016

turtleli commented Dec 22, 2016

lightningterror commented Dec 23, 2016 • edited Loading

MrCK1 commented Dec 24, 2016

toehead2001 commented Dec 27, 2016

MrCK1 commented Dec 28, 2016

MrCK1 commented Dec 28, 2016

turtleli commented Dec 29, 2016

This comment was marked as spam.

This comment was marked as spam.

MrCK1 commented Dec 30, 2016

MrCK1 commented Jan 18, 2017

MrCK1 commented Apr 10, 2017

mirh commented Apr 10, 2017

gregory38 commented Apr 10, 2017

MrCK1 commented Apr 10, 2017

danilaml commented Apr 10, 2017

MrCK1 commented Apr 10, 2017

mirh commented Apr 10, 2017

danilaml commented Apr 10, 2017

mirh commented Apr 10, 2017

danilaml commented Apr 10, 2017

mirh commented Apr 10, 2017

danilaml commented Apr 10, 2017

MrCK1 commented Apr 10, 2017 • edited Loading

mirh commented Apr 11, 2017

MrCK1 commented Apr 19, 2017

gregory38 commented Apr 19, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

MrCK1 commented May 2, 2017

lightningterror commented Dec 23, 2016 •

edited

Loading

MrCK1 commented Apr 10, 2017 •

edited

Loading

ramapcsx2 commented May 15, 2017 •

edited

Loading