[Winpcap-users] master 4d31e9a: Copy over win-setup changes from Wireshark.

[WinPcap code review]

URL: https://code.wireshark.org/review/gitweb?p=winpcap.git;a=commit;h=4d31e9adabe3e84b31add46d603b1b6e570ddeb3
Submitter: Graham Bloice (***@trihedral.com)
Changed: branch: master
Repository: winpcap

Commits:

4d31e9a by Gerald Combs (***@wireshark.org):

Copy over win-setup changes from Wireshark.

commit 99b5813
Author: Graham Bloice <***@trihedral.com>
Date: Thu Jul 23 22:36:09 2015 +0100

Fix 7-zip search

The path for a Chocolatey 7zip.commandline install is
$env:ChocolateyInstall\bin

and the version installed by Chocolatey for its own use is in
$env:ChocolateyInstall\tools

Change-Id: I2f1ee78e93f861075f8c06ed74d81d8173911299
Reviewed-on: https://code.wireshark.org/review/9762
Reviewed-by: Graham Bloice <***@trihedral.com>

commit e2561da
Author: Graham Bloice <***@trihedral.com>
Date: Fri Jul 24 16:33:27 2015 +0100

Fix CMake 7zip search

A further fix for the CMake Windows search for 7-zip.

Add the destination\bin path to the search path.

When downloading from anonsvn only pass the path within the destination
not the whole path.

Change-Id: I2beec925730fae21d6a63bee5332e1002f49d6ae
Reviewed-on: https://code.wireshark.org/review/9770
Reviewed-by: Graham Bloice <***@trihedral.com>

Change-Id: Iaa0fc0d2be3ab469b421e4fe37dca4c331bc5732
Reviewed-on: https://code.wireshark.org/review/9815
Reviewed-by: Graham Bloice <***@trihedral.com>


Actions performed:

from 73ddb61 Download support files from winpcap-libs.
adds 4d31e9a Copy over win-setup changes from Wireshark.


Summary of changes:
tools/win-setup.ps1 | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)