summaryrefslogtreecommitdiff
path: root/docbook/wsdg_src
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-04-07 14:05:52 -0700
committerGerald Combs <gerald@wireshark.org>2015-04-14 19:09:30 +0000
commit1404605513cedd34070154aa355663b8e4734bc4 (patch)
treea01b87e146eb6a948c7177f197b43fba5add1e2c /docbook/wsdg_src
parent311758aff7b21d877addac447d9216a22bc1af5e (diff)
downloadwireshark-1404605513cedd34070154aa355663b8e4734bc4.tar.gz
Start moving win-setup to PowerShell.
Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/wsdg_src')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc8
-rw-r--r--docbook/wsdg_src/WSDG_chapter_tools.asciidoc12
2 files changed, 10 insertions, 10 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index 14333b43f0..456a607ecc 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -197,8 +197,7 @@ Navigate to the required Category/Package row and, if the package
has a "Skip" item in the "New" column, click on the "Skip" item
so it shows a version number for:
-// Only used by win-setup.sh
-* Archive/unzip
+* Archive/unzip (not needed if using CMake)
* Devel/bison (or install Win flex-bison - see Chocolatey below)
@@ -210,8 +209,7 @@ so it shows a version number for:
* Utils/patch (only if needed) (may be Devel/patch instead)
-// Only used by win-setup.sh
-* Web/wget
+* Web/wget (not needed if using CMake)
* asciidoc
@@ -237,7 +235,7 @@ Alternatively you can install Cygwin and its packages using Chocolatey:
----
PS$>choco install cygwin
PS$>choco install cyg-get
-PS$>choco install unzip wget asciidoc [...] -source cygwin
+PS$>choco install sed asciidoc [...] -source cygwin
----
Chocolatey installs Cygwin in 'C:\tools\cygwin' by default.
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
index f3baa93580..1af6f42ff0 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
@@ -176,7 +176,7 @@ Chocolatey installs Cygwin in 'C:\tools\cygwin' by default.
One or more Cygwin packages can be installed using "-source cygwin":
----
-PS$>choco install unzip wget asciidoc -source cygwin
+PS$>choco install sed asciidoc -source cygwin
----
[[ChToolsGNUChain]]
@@ -1149,7 +1149,8 @@ installation should be straightforward.
=== Windows: GNU wget (optional)
-GNU wget is used to download files from the internet using the command line.
+GNU wget is used by the Nmake toolchain to download files from the internet
+using the command line. It is not needed when building with CMake.
GNU wget is available for most of the UNIX-like platforms and as the wget
package from the <<ChToolsCygwin,Cygwin setup>> and also using Chocolatey.
@@ -1161,7 +1162,7 @@ PS$> choco install wget -source cygwin
----
You will only need wget if you want to use the Windows automated library
-download, see <<ChLibsSetup>>for details.
+download. See <<ChLibsSetup>>for details.
If GNU wget isn't already installed or available as a package for your platform
(well, for Windows it is available as a Cygwin package), you can get it at
@@ -1186,12 +1187,13 @@ If you are unsure about the settings, you might ask your system administrator.
=== Windows: GNU unzip (optional)
GNU unzip is used to, well, unzip the zip files downloaded using the wget tool.
+As with wget it is not needed when building with CMake.
GNU unzip is available for most of the UNIX-like platforms and as the unzip
package from the <<ChToolsCygwin,Cygwin setup>>.
-You will only need unzip, if you want to use the Windows automated library
-download, see <<ChLibsSetup>>for details.
+You will only need unzip if you want to use the Windows automated library
+download. See <<ChLibsSetup>>for details.
If GNU unzip isn't already installed or available as a package for your platform
(well, for Windows it is available as a Cygwin package), you can get it at