Skip to content

Commit

Permalink
Additional tweaks to Windows installer
Browse files Browse the repository at this point in the history
This should resolve the issue with the installer freezing for some people. If the user installed xPilot in a folder that contained other non-xPilot files, the installer would try to add all non-xPilot files also inside the folder to the uninstaller; if there were lots of files, the installer would essentially freeze. Now the installer doesn't explicitly include all files in the install directory. The uninstaller will now only remove the files that were installed by the installer (read: only xPilot application files).
  • Loading branch information
justinshannon committed Feb 26, 2023
1 parent 68d5218 commit b685e85
Showing 1 changed file with 0 additions and 41 deletions.
41 changes: 0 additions & 41 deletions installer/windows.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,6 @@
</setInstallerVariable>
</preInstallationActionList>
<readyToInstallActionList>
<!-- Add the files installed by the previous installation to the uninstaller -->
<addDirectoriesToUninstaller>
<addContents>1</addContents>
<matchHiddenFiles>1</matchHiddenFiles>
<files>${installdir}</files>
<ruleList>
<isTrue value="${isUpgradeMode}"/>
</ruleList>
</addDirectoriesToUninstaller>
<actionGroup>
<actionList>
<!-- Remove ARP entries from previous versions... ugly but it works I guess -->
Expand Down Expand Up @@ -305,24 +296,6 @@
</actionGroup>
</readyToInstallActionList>
<postInstallationActionList>
<!-- delete old client files -->
<deleteFile path="${installdir}/.sentry-native" />
<deleteFile path="${installdir}/audio" />
<deleteFile path="${installdir}/bearer" />
<deleteFile path="${installdir}/iconengines" />
<deleteFile path="${installdir}/imageformats" />
<deleteFile path="${installdir}/mediaservice" />
<deleteFile path="${installdir}/platforms" />
<deleteFile path="${installdir}/playlistformats" />
<deleteFile path="${installdir}/qmltooling" />
<deleteFile path="${installdir}/scenegraph" />
<deleteFile path="${installdir}/styles" />
<deleteFile path="${installdir}/translations" />
<deleteFile path="${installdir}/Qt*" />
<deleteFile path="${installdir}/*.dll" />
<deleteFile path="${installdir}/*.pdb" />
<deleteFile path="${installdir}/crashpad_handler.exe" />
<!-- //////////////////////// -->
<createDirectory>
<path>${windows_folder_local_appdata}/org.vatsim.xpilot</path>
<ruleList>
Expand Down Expand Up @@ -470,20 +443,6 @@ ADVANCED USERS: If X-Plane 11 is not installed on this computer, leave the folde
<mustBeWritable>1</mustBeWritable>
<mustExist>0</mustExist>
<width>40</width>
<validationActionList>
<throwError>
<text>Error: Installing xPilot in the root X-Plane folder is not recommended. Please choose a different folder to install xPilot.

The recommended installation path folder is:

${platform_install_prefix}\${product_fullname}
</text>
<ruleList>
<fileExists negate="0" path="${installdir}/X-Plane.exe"/>
<platformTest type="windows"/>
</ruleList>
</throwError>
</validationActionList>
</directoryParameter>
</parameterList>
</project>

0 comments on commit b685e85

Please sign in to comment.