osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

WSDG: Update some of the NSIS text. 

Recommend v3 instead of v2.

Change-Id: I13260611dd6b12372aba8938a87574cd9a8e1a47
Reviewed-on: https://code.wireshark.org/review/19880
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2017-01-30 16:30:45 -08:00 committed by Anders Broman
parent 58fb6e1acd
commit 52d62a6001
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
View File

@ -546,7 +546,8 @@ you'll need NSIS.
http://nsis.sourceforge.net[Download] and install NSIS
+
Note that the 32-bit version of NSIS will work for both 32-bit and
64-bit versions of Wireshark.
64-bit versions of Wireshark. NSIS v3 is recommended and may be required
in the future.
Note: If you do not yet have a copy of vcredist_x86.exe or vcredist_x64.exe in ./wireshark-winXX-libs (where XX is 32 or 64) you will need to download the appropriate file and place it in ./wireshark-winXX-libs before starting this step.

8
docbook/wsdg_src/WSDG_chapter_sources.asciidoc
View File

@ -1073,10 +1073,10 @@ to build the OS X Package.
==== Win32: NSIS .exe installer
The _Nullsoft Install System_ is a free installer generator for Win32
based systems; instructions how to install it can be found in <<ChToolsNSIS>>.
NSIS is script based, you will find the Wireshark installer
generation script at: 'packaging/nsis/wireshark.nsi'.
The _Nullsoft Install System_ is a free installer generator for Windows
systems. Instructions on installing it can be found in <<ChToolsNSIS>>.
NSIS is script based. You can find the main Wireshark installer
generation script at 'packaging/nsis/wireshark.nsi'.
When building with CMake you must first build the 'nsis_package_prep' target,
followed by the 'nsis_package' target, e.g.

7
docbook/wsdg_src/WSDG_chapter_tools.asciidoc
View File

@ -1145,10 +1145,9 @@ The NSIS (Nullsoft Scriptable Install System) is used to generate
needed to be installed, including all required DLLs, plugins, and supporting
files.
To install it, download the latest released version (currently 2.46) from
http://nsis.sourceforge.net[] and start the downloaded installer. You will
need NSIS version 2. Version 3 is not yet supported. You can also install it
using Chocolatey:
To install it, download the latest released version from
http://nsis.sourceforge.net[]. NSIS v3 is recommended and may be
required in the future. You can also install it using Chocolatey:
----
PS$> choco install nsis