Commit Graph

19 Commits

Author SHA1 Message Date
Pascal Quantin ae316e2d88 Compile sshdump and ciscodump for Windows
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support

Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43
Reviewed-on: https://code.wireshark.org/review/12117
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-25 07:22:28 +00:00
Pascal Quantin c39c365f86 Update USBPcap installer packaged in our Windows installer and add a warning
The newer version creates a system restore point during installation
Also add an explicit note in Wireshark installer explaining that USBPcap is
experimental and some hints on how to recover in case of issue

Bug: 12316
Change-Id: Ifb15ee98bf9db843debe5878f3df8c78f846d8d0
Reviewed-on: https://code.wireshark.org/review/14854
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-09 10:45:52 +00:00
Graham Bloice 434bbd67a0 Fix CMake VC Redist message
The usage message was using the wrong variable

Change-Id: I5ca261240db49134f3d48a5e322d9272f8af7adf
Reviewed-on: https://code.wireshark.org/review/14865
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-08 13:32:33 +00:00
AndersBroman 8a6cb4267f Fix a typo
Change-Id: I32c551fc39ef496e8bbaba288c4ad4dafa2412c9
Reviewed-on: https://code.wireshark.org/review/14862
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-08 07:57:22 +00:00
AndersBroman 5601d6057b [MSVC2015] Fix finding of vcredist when using MSVC2015.
Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a
Reviewed-on: https://code.wireshark.org/review/14831
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: Anders Broman <a.broman58@gmail.com>
2016-04-08 04:46:36 +00:00
Gerald Combs 42333aa353 CMake+PortableApps: Include the VC runtime (second try).
Move the code that finds the Visual C++ redistributable DLLs to its
own module. Run it before we create our NSIS and PortableApps targets.
Add a PortableApps target that copies the redistributable

This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4.

Bug: 11800
Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df
Reviewed-on: https://code.wireshark.org/review/12431
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f)
Reviewed-on: https://code.wireshark.org/review/12432
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-04 22:32:32 +00:00
Pascal Quantin b20d5bbc0b CMake: set WinPcap version in top CMakeLists.txt file like for NMake
This allows displaying the WinPcap version in about dialog

Change-Id: Ic3f4256d81db68314a158fc55682dfd9dbf799a0
Reviewed-on: https://code.wireshark.org/review/11726
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-11 17:47:45 +00:00
Pascal Quantin 4a20f576da Blind attempt trying to fix CMake based installer
Looks like Petri-Dish does not generate it

Change-Id: I90823d82ac9d223d840ab20331a856550dffdc87
Reviewed-on: https://code.wireshark.org/review/10872
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08 05:50:13 +00:00
Pascal Quantin 29b87a368a Add USBPcapPage.ini file to distribution
Change-Id: I05ed2c561818fd4293543199063551dd65fb5c55
Reviewed-on: https://code.wireshark.org/review/10871
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-08 05:31:10 +00:00
Graham Bloice 1e8ad87d46 Cosmetic tidy up for the projects in the Visual Studio solution
Change-Id: Ie4ed28ee7e59def2e8a15433334988b4d0225d1d
Reviewed-on: https://code.wireshark.org/review/10675
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-09-28 20:26:20 +00:00
Graham Bloice 0997129e0f Fix CMake install of lua scripts
The CMake generation of all-manifest.nsh is missing the 3
lua scripts, init.lua, console.lua and dtd_gen.lua.

Change-Id: I2d34cfe075c5195d1d8816c0d816015195756fa2
Reviewed-on: https://code.wireshark.org/review/9551
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-08 10:21:25 +00:00
Gerald Combs 5ae8c92aa0 Try to fix NSIS packaging dependencies.
Split the nsis_package target into nsis_package_prep which has
dependencies and nsis_package which has no dependencies and as a result
blindly builds the package. Remove the nsis_uninstaller target since
that's now handled by nsis_package_prep. Nsis_package_prep *should*
also take care of the dependencies for portableapps_package, but that
hasn't been tested.

Update the Developer's Guide.

This requires coordination with the Windows buildbots.

Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1
Reviewed-on: https://code.wireshark.org/review/9217
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-29 17:07:06 +00:00
Gerald Combs 973b2884c6 Revert "CMake: Try not to clobber our gspawn exes."
This accidentally reverted code from g40ce324. Will try again shortly.

This reverts commit 8d9fdda991.

Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e
Reviewed-on: https://code.wireshark.org/review/8081
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15 23:22:34 +00:00
Gerald Combs 8d9fdda991 CMake: Try not to clobber our gspawn exes.
Try not to overwrite gspawn*.exe between signing them and packaging them.

Change-Id: I9f224b64537c3b0dd6f7f8b94a8837bd427ad2ca
Reviewed-on: https://code.wireshark.org/review/8080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15 22:19:47 +00:00
Gerald Combs 6a41349132 CMake: Fix an NSIS dependency.
Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a
Reviewed-on: https://code.wireshark.org/review/8070
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 21:39:40 +00:00
Gerald Combs 495740f801 CMake: Initial PortableApps targets.
Add portableapps_app_dir and portableapps_package targets.

Change-Id: Ifea3d952eef0e267de6364999d45807236d99102
Reviewed-on: https://code.wireshark.org/review/8025
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14 19:11:50 +00:00
Graham Bloice 680dfc1e2f CMake cleanup for VS solution
Add FOLDER properties to targets to tidy up the VS solution

Change-Id: Ia42e0e89fb490cd3dcd33b7c5f59eb0a27b74c7a
Reviewed-on: https://code.wireshark.org/review/7822
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-26 10:35:30 +00:00
Gerald Combs 60b4f20c5b CMake: Fix an uninstall.exe dependency.
Make sure building nsis_package doesn't clobber uninstall.exe.

Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb
Reviewed-on: https://code.wireshark.org/review/7710
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-16 22:07:57 +00:00
Gerald Combs 2ef72cb7aa CMake: Add a top-level nsis_package target.
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include
file. Add macros to generate packaging-related targets and invoke them
from the top-level CMakeLists.txt.

Add a top-level "plugins" target. Copy plugins to "plugins" in each of
our staging directories instead of "plugins/$VERSION".

Add missing files to the copy_data_files and copy_cli_dlls targets.

Add all files in the NSIS package from the staging directory.

Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT.

Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa
Reviewed-on: https://code.wireshark.org/review/6459
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-12 22:47:42 +00:00