aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2017-11-17 12:03:03 +0000
committerGraham Bloice <graham.bloice@trihedral.com>2017-11-17 12:56:52 +0000
commit252ea22b97c0c0fe7a7ab1c712f275d52f1df2cd (patch)
tree1205b9f784d447f5311f4e1e7219f68d02f87886 /docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
parent2114923ec1a133e44ebd9403f19a07e1a0e539d4 (diff)
WSDG: Improve VS2015 chocolatey install
Created an AdminDeployment.xml file for use with the chocolatey package for VS2015 Community Edition and updated the WSDG to include it. Bug: 14147 Change-Id: Id2a701067bf38874cf0bf534cca55dba9cfd30d4 Reviewed-on: https://code.wireshark.org/review/24464 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc13
1 files changed, 9 insertions, 4 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index 4efe2986c7..36cd714166 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -65,14 +65,19 @@ You need to install, in exactly this order:
. C compiler:
https://go.microsoft.com/fwlink/?LinkId=532606&clcid=0x409[Download]
-and install "Microsoft Visual Studio 2015 Community Edition." This is a small download that then downloads all the other required parts (which are quite large).
+and install "Microsoft Visual Studio 2015 Community Edition." This is a small
+download that then downloads all the other required parts (which are quite large).
-Uncheck all the optional components (unless you want to use them for purposes other than Wireshark).
+Select the "Custom" install and then uncheck all the optional components other
+than "Common Tools for Visual C++ 2015" (unless you want to use them for purposes
+other than Wireshark).
-You can use Chocolatey to install Visual Studio:
+You can use Chocolatey to install Visual Studio, to correctly configure the
+installation, copy the deployment XML file https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob_plain;f=tools/msvc2015AdminDeployment.xml;hb=HEAD[msvc2015AdminDeployment.xml] from the source code tools directory
+and pass the path the file to the chocolatey install command:
----
-PS$>choco install VisualStudio2015Community
+PS$>choco install VisualStudio2015Community --timeout 0 -package-parameters "--AdminFile path\to\msvc2015AdminDeployment.xml"
----
You can use other Microsoft C compiler variants, but VS2015 is used to