Commit Graph

621 Commits

Author SHA1 Message Date
Gerald Combs 4e267ba9dd Windows: Fix PowerShell 2.0 compatibility.
PowerShell 2.0's Get-ChildItem doesn't support "-File" even though
http://technet.microsoft.com/en-us/library/hh847897.aspx says otherwise.

Add a config.nmake option to test PS 2.0 compatibility.

Change-Id: I8de83cd0841d4ab0b01351c2d39084578a2c84ee
Reviewed-on: https://code.wireshark.org/review/3625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-15 16:35:41 +00:00
Gerald Combs 673247f04f Windows: Clean up text file packaging.
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending
conversion so that we don't depend on unix2dos.

Only copy the help toc and text files to the staging directory.

Add PowerShell to the Developer's Guide. Fixup some other content.

(asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not
a problem.)

Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71
Reviewed-on: https://code.wireshark.org/review/3487
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14 10:26:31 +00:00
Gerald Combs 8b364ea06b Autodiscover flex and bison in config.nmake.
Change-Id: I4683d0eeb06e5616103f3e6e25ce7f1549a2bb05
Reviewed-on: https://code.wireshark.org/review/3510
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-08 18:59:43 +00:00
Роман Донченко b8a6cfcb2a Make Python mandatory to build on Windows
While nominally optional, building without it doesn't work, so just make it
mandatory.

The verify_tools target already passes $(PYTHON) to win-setup.sh --appverify;
we just need to supply a default value for PYTHON, so that $(PYTHON) doesn't
expand to an empty string. It's also convenient for the developer if Python
can be automatically found on the PATH.

Change-Id: I4f54695625b74c5b4c758ef1e3bc9ed4467db514
Reviewed-on: https://code.wireshark.org/review/3391
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Tested-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-08 05:59:13 +00:00
Gerald Combs 714fa85d85 Win flex-bison and Chocolatey updates.
Chocolatey's latest winflexbison package is usable. Update
config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly.  Rename
CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're
finding.

Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb
Reviewed-on: https://code.wireshark.org/review/3479
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-07 21:54:54 +00:00
Evan Huus 37b5b095b9 Rip out the filetap code
We decided at sharkfest that this wasn't the right design for file dissection;
we have more-or-less settled on way forward, but nobody's shown interest in
implementing it. Whether or not that ever happens, this code is effectively
dead and should be removed.

Change-Id: I14d6086df3204fffb6485228db39d9f407661417
Reviewed-on: https://code.wireshark.org/review/3400
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-04 14:31:37 +00:00
Bill Meier 84edd1a73e (Trivial) config.nmake: fix a spelling error and add some punctuation.
Change-Id: I326dbae8fe1d3593de00c9e78a124c1221b7314b
Reviewed-on: https://code.wireshark.org/review/3231
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-28 18:39:59 +00:00
Bill Meier 3a9f126917 config.nmake: Do some minor changes (mostly in comments).
- Update comment: /O2 enables /Gs which is "Control Stack Checking Calls" not "Buffer Security Check"
- Remove explicit setting of /GS (Buffer Security Check) since it's set by default.
  (The explicit setting did not apply to the CFLAGS used to compile Wireshark
   files because the setting was in the wrong place, but, fortunately, /GS is on
   by default.
- Add a comment about /GS being on by default.
- Remove some trailing whitespace.

Change-Id: I6cf631ee1ba0fb8556171861c7e5eb6d959c8f0c
Reviewed-on: https://code.wireshark.org/review/3228
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-28 17:38:59 +00:00
Pascal Quantin 6ef2ad2f1e Fix MSVC2013 Lua package (previous one was linked against MSVC2012)
Change-Id: I632eea7250e7e60482f62d9ea62ac407fc6506d1
Reviewed-on: https://code.wireshark.org/review/3222
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-28 05:13:40 +00:00
Pascal Quantin b9183b908a Use a compatible Lua library when building with MSVC2013
Change-Id: If462dc45df9dbd418c4de2eb6bb9130a283d863c
Reviewed-on: https://code.wireshark.org/review/3211
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-27 16:34:03 +00:00
Gerald Combs 05c06306b1 Make HTML Help steps compliant with newer Nmakes.
Nmake 12 seems to be more strict about spaces in commands. Add the
hhc.exe path to PATH and use a bare command instead.

Change-Id: I9fbd9abdabf7f51ac7bac2cbe8d938ae7bb0640e
Reviewed-on: https://code.wireshark.org/review/3192
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-25 02:30:02 +00:00
Gerald Combs 5688c8a4ce Add the default directores used by the Qt Online Installer for Qt 5.3.
Change-Id: Ia81ce10318b34f6af68862622a63c64e2883a937
Reviewed-on: https://code.wireshark.org/review/3191
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-25 00:28:47 +00:00
Joerg Mayer 075ac2e7f5 Obsolete tools/winXX-setup.sh:
- Move DOWNLOAD_TAG into config.nmake
- Call win-setup.sh directly instead of winXX-setup.sh
- TODO: Remove tools/winXX-setup.sh files

Change-Id: Ie02b6b468b4f3007f5e2b6a8282e2e6cdf7d1a70
Reviewed-on: https://code.wireshark.org/review/3144
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-21 01:04:03 +00:00
Guy Harris e696d0f93d Fix the checks for the Cygwin path.
I.e., do

	if we have 32-bit Cygwin
		CYGWIN_PATH=path to it
	else if we have 64-bit Cygwin
		CYGWIN_PATH=path to it
	else
		fail
	endif

rather than

	CYGWIN_PATH=standard path for 32-bit Cygwin
	if we don't have 32-bit cygwin and we do have 64-bit Cygwin
		CYGWIN_PATH=path to 64-bit cygwin
	else
		fail
	endif

as the latter will fail if we *do* have 32-bit Cygwin.

Change-Id: I42d607a1319263edcc1d6e546b813862b7d33ffa
Reviewed-on: https://code.wireshark.org/review/2756
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-01 20:19:03 +00:00
Tim Furlong 2211813e21 Add logic to config.nmake to find 64-bit cygwin, and a note warning
about forward slashes in the QT5_BASE_PATH if the recommended qmake
command is used; both of these issues will cause annoyingly non-
obvious errors.

Change-Id: I6f9a662969d1fc1887e75e8b0fde3520bbbea416
Reviewed-on: https://code.wireshark.org/review/2749
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01 19:18:29 +00:00
Graham Bloice e1e7dd0cfd Fix the QT build on Qt 5.3 or later to use the windeployqt tool
to copy the rquired Qt files into the runtime directory

Qt 5.2 is broken as windeployqt doesn't take the required --release flag

Also fix the passing of GCC_DLL and GPGERROR_DLL into config.pri so
that the Qt build copies the required files instead of the entire
gnutls bin dir twice (the variables expanded to nothing).

Add support for autodetection of Qt 5.3.0 with msvc2013

Change-Id: I1e9c70a5ff5d1fdfdce88ba15d324f1899c8129c
Reviewed-on: https://code.wireshark.org/review/2734
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01 19:16:52 +00:00
AndersBroman 18e14a4c6c Have the makefile run windepoyqt if it exists to copy the required dlls to the install dir.
Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b
Reviewed-on: https://code.wireshark.org/review/2644
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27 13:29:53 +00:00
Pascal Quantin cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Jeff Morriss f113306e0e More Python-bindings removal.
Change-Id: I4d82175781e65c73179f4c8e737a7900cb050bce
Reviewed-on: https://code.wireshark.org/review/2283
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-16 23:14:05 +00:00
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 15:33:01 +00:00
Pascal Quantin a4c306185b Use -O2 option when compiling with MSVC
Change-Id: Ia2c14b782b1a73ecab41c25ed21e4fcf356f5ee3
Reviewed-on: https://code.wireshark.org/review/1948
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04 14:55:40 +00:00
AndersBroman 1f17d0c6bb Use the -Ox compiler option.
Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02
Reviewed-on: https://code.wireshark.org/review/1937
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-04 04:26:53 +00:00
Gerald Combs 285405a0d7 1.11.4 → 1.99.0.
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-23 20:57:42 +00:00
Gerald Combs 0a249087c3 Build with GTK+ 2.24.23.
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-16 16:25:38 +00:00
Bill Meier aa5d91284b Add a comment indicating that 'PLATFORM' is apparently set only for X64.
Change-Id: I5248c421e53a4347789c076433af004697a1b682
Reviewed-on: https://code.wireshark.org/review/1637
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-14 15:45:49 +00:00
Gerald Combs 2981ae46ad Add default paths for the Qt online installer for Windows.
Change-Id: I55d1ad6e4cc14aa5f02597d2afc8512018181543
Reviewed-on: https://code.wireshark.org/review/1618
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-12 22:17:53 +00:00
Bill Meier b31381dd70 Add a comment re VS2013EE requiring that win32.mak needs to be separately obtained.
Change-Id: I53413f7bdde50149fd923bbe35c995145d5139f2
Reviewed-on: https://code.wireshark.org/review/1458
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-01 15:10:18 +00:00
Pascal Quantin 791dd4e128 Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f
Reviewed-on: https://code.wireshark.org/review/1176
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17 07:38:51 +00:00
Gerald Combs d73d1f14b3 1.11.3 → 1.11.4.
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-15 17:29:19 +00:00
Pascal Quantin dae96ca72b Switch back Windows 32 bits build to GTK2
GTK3 does not work great on Windows:
- the GUI is quite ugly
- features like background color in filter box does not work
- x64 builds are still using GTK2
- no one is putting efforts on this to fix those issues

As we are transitioning to Qt, I do not expect any improvement soon.
Let's switch back to a more user friendly GUI.

Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a
Reviewed-on: https://code.wireshark.org/review/1026
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09 12:53:01 +00:00
Pascal Quantin cc3c05ed5f Switch to Lua 5.2.3 built with MSVC2010 instead of the one built with MingW gcc 4.3
Fixes bug 9957

Change-Id: Ibe38ec25be5cfdad98c53c8257b0a858529897f6
Reviewed-on: https://code.wireshark.org/review/991
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-07 05:54:19 +00:00
Pascal Quantin 590fcbc66f Upgrade Windows builds to Lua 5.2.3
Change-Id: Ie7fffa9d57b1b861ab57cc55259c79cf0e8ee0e0
Reviewed-on: https://code.wireshark.org/review/974
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-05 22:41:06 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Pascal Quantin a1d4189c5e Upgrade Windows builds to Lua 5.2.1
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e
Reviewed-on: https://code.wireshark.org/review/863
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-29 16:30:53 +00:00
Bill Meier dec951ef88 (Trivial) Fix 2 typos; Reformat some long lines.
Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464
Reviewed-on: https://code.wireshark.org/review/491
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-04 03:13:42 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07 23:03:03 +00:00
Graham Bloice d9c018539c Improve windows build
Allows config.nmake to pick up settings from environment variables.
With the move to git I'm no longer happy with my permanently modified
copy of config.nmake, these changes allow the most often modified
values to be set from environment variables.

As a bonus, some of the variables are set by the vcvarsall.bat for
Visual Studio 2012 or later

Change-Id: I681aeaec9519f6b6c9fa2c33abc706ce335585f5
Reviewed-on: https://code.wireshark.org/review/70
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-02 15:31:42 +00:00
Anders Broman a40f824e0e Make it easier to try GTK 3.6
svn path=/trunk/; revision=54986
2014-01-27 19:22:10 +00:00
Alexis La Goutte c6022b3b85 Drop support of Visual Studio 2005
* Remove _MSC_VER < 1500 check
* Cleanup config.nmake

See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html

svn path=/trunk/; revision=54965
2014-01-26 12:56:32 +00:00
Gerald Combs 8db4bc2499 More Chocolatey lex/yacc updates.
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh

Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.

svn path=/trunk/; revision=54828
2014-01-16 18:57:29 +00:00
Gerald Combs d5b706be51 Allow the use of Win flex-bison and document how to do that.
svn path=/trunk/; revision=54824
2014-01-16 01:28:02 +00:00
Michael Mann bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607)
This is a VERY PRELIMINARY version of tfshark.  It's an attempt to jumpstart FileShark and its architecture.  Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)

This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture.  And those layers will slowly be added in time (patches always welcome!).

svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
Gerald Combs 2fa2f632ec Add a note and commented-out definitions for Win flex-bison.
Alex Zhondin was kind enough to create a Chocolatey package for Win
flex-bison.  Unfortunately a bug in Chocolatey's shell wrapper generator
keeps us from using it for the time being.

svn path=/trunk/; revision=54584
2014-01-04 01:00:19 +00:00
Bill Meier 9e8306c746 Back out inadvertant change introduced in SVN #54340
to use GTK2 when building Windows Wireshark.

svn path=/trunk/; revision=54390
2013-12-23 16:47:10 +00:00
Bill Meier 7d5a52f4c8 Add a comment as to a required change to CFLAGS
if Wireshark is ever to be built with Gtk >= 3.10.

svn path=/trunk/; revision=54340
2013-12-21 19:12:04 +00:00
Jörg Mayer acccbc79c5 nmake: Allow setting the wireshark base dir via env variable
svn path=/trunk/; revision=53718
2013-12-02 13:00:06 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
2013-12-01 10:05:16 +00:00
Gerald Combs 16e27047d0 1.11.2 → 1.11.3.
svn path=/trunk/; revision=53412
2013-11-18 17:41:00 +00:00
Gerald Combs f772a268db 1.11.1 → 1.11.2.
svn path=/trunk/; revision=53346
2013-11-15 22:34:31 +00:00
Alexis La Goutte 4bff9d32a0 Enable Packet Editor by default
svn path=/trunk/; revision=53132
2013-11-07 07:42:35 +00:00