summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2017-09-07 16:44:42 (GMT)
committerThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-03-12 11:24:12 (GMT)
commitc57ffc95daa7e9fef8663979d01b08a122447ba4 (patch)
tree27bc9483be322837a4408431304dd992e0fff9f5 /DEVELOPMENT.md
parent863c72980c9c25c81ef8864b310e1fd9cb9a57df (diff)
downloadswift-c57ffc95daa7e9fef8663979d01b08a122447ba4.zip
swift-c57ffc95daa7e9fef8663979d01b08a122447ba4.tar.bz2
Enable per user installations on Windows
This patch will allow the installer to perform per-user installations that doesn't require elevated rights. If the Visual Studio prerequisites are missing, the installer will ask the user if he wants to install them. If the user chooses not to, the installer will deploy the necessary files in the installation folder. Installations for all users (per machine) are still available. Upon upgrading in per-user installs from previous versions, the user can still access the settings that were stored in the registry, but not the settings stored in system-settings.xml. Test-Information: Build and tested with Wix3.11, Qt 5.8 and Visual Studio 2015 on Windows 10 and Windows 7. Tested fresh install and upgrade, for per-machine and per-user installations. Tested the vcredist install and the dll deployment when the installation is not present. Verified that the installer uses the registry settings in per-user installations. Change-Id: I1879e2fb7ee347dab58852eb73d4ddddec15b35d
Diffstat (limited to 'DEVELOPMENT.md')
-rw-r--r--DEVELOPMENT.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 3e48510..5873300 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -46,10 +46,11 @@ The Windows package consist of a Widnows Installer (.msi) file. This is generate
For packaging use:
- Microsoft VS 2013 Express
- WiX
-- Download the C++ redistributable package from Microsoft and put it at `C:\Program Files (x86)\Common Files\Merge Modules\`
+- Swift has a dependency on C++ redistributable package from Microsoft that needs to be deployed during install. If the common tools for Visual C++ is installed, then the installation file should be located under `C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\` (for Visual Studio 2013). If not download from Microsoft and put it at `C:\Program Files (x86)\Common Files\Merge Modules\`
- `config.py` should contain:
qt = "c:\\qt\\5.4.2"
- vcredist = "C:\\Program Files (x86)\\Common Files\\Merge Modules\\vcredist_x86.exe"
+ vcredist = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\redist\\vcredist_x86.exe"
+ vcredistdir = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\redist\\x86\Microsoft.VC120.CRT\\"
debug = 1
optimize = 1
wix_bindir = "c:\\program files\\Windows Installer XML v3.5\\bin"