Commit Graph

630 Commits

Author SHA1 Message Date
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
Pascal Quantin 1631f12389 From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9375 :
Avoid a 'GetVersionEx deprecated' warning when compiling with MSVC2013

svn path=/trunk/; revision=53095
2013-11-05 21:49:57 +00:00
Jörg Mayer 117a59d7a2 Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
2013-11-03 12:22:39 +00:00
Pascal Quantin cf9bbdecef From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9297 :
Add support for MSVC2013

svn path=/trunk/; revision=52716
2013-10-20 17:35:30 +00:00
Pascal Quantin 7c2219f301 1.11.0 -> 1.11.1
svn path=/trunk/; revision=52647
2013-10-16 17:32:45 +00:00
Gerald Combs fcff2c96e6 QT_DIR → QT5_BASE_DIR. This matches the CMake environment.
svn path=/trunk/; revision=52557
2013-10-12 00:12:24 +00:00
Gerald Combs 383ed6465a Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.
svn path=/trunk/; revision=52556
2013-10-11 23:52:19 +00:00
Gerald Combs 2f067f20dd Use the right package name.
svn path=/trunk/; revision=52521
2013-10-10 23:52:29 +00:00
Gerald Combs 06a3d1175c Try to discover Qt similar to the way we discover Python.
svn path=/trunk/; revision=52520
2013-10-10 23:45:16 +00:00
Gerald Combs b3c844fa64 Add an initial Qt configuration and makefile targets.
svn path=/trunk/; revision=52456
2013-10-08 23:03:56 +00:00
Anders Broman 1394b21b88 Try to fix Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 "Fix build for VS 2012 (MSVC_VARIANT==MSVC2012EE)"
svn path=/trunk/; revision=52433
2013-10-07 04:49:44 +00:00
Pascal Quantin 35f284caad Revert file committed by accident
svn path=/trunk/; revision=51565
2013-08-28 17:33:14 +00:00
Pascal Quantin 519a7778aa Fix copy/paste error introduced in r51541 and spotted by Joerg
svn path=/trunk/; revision=51564
2013-08-28 17:31:12 +00:00
Gerald Combs dc87fa2d68 Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
2013-08-23 22:18:49 +00:00
Martin Kaiser e8d6b0581b we have to make the manual change for *gtk2* now
svn path=/trunk/; revision=50873
2013-07-24 18:48:25 +00:00
Anders Broman 1c92cbf702 Don't enable GTK3 build on win32 - it's not working.
svn path=/trunk/; revision=50868
2013-07-24 17:29:52 +00:00
Anders Broman 61e0e4d88c Make it possible to use GetProcessMemoryInfo on Windows.
svn path=/trunk/; revision=50865
2013-07-24 15:54:55 +00:00
Jörg Mayer 18155bd148 Change default gtk build from version 2 to version 3 for
autotool, cmake and nmake.
No idea what it takes to change the visual project stuff

svn path=/trunk/; revision=50863
2013-07-24 11:51:10 +00:00
Gerald Combs a692824160 GeoIP 1.5.1.
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
Chris Maynard 59ef0c60d9 Change a forward-slash to a back-slash as the path separator..
svn path=/trunk/; revision=49677
2013-06-01 13:05:28 +00:00
Gerald Combs c0a41bb182 Add a link to the latest CRT redistributables.
svn path=/trunk/; revision=49000
2013-04-23 17:40:27 +00:00
Gerald Combs ea19c7f952 1.9.3 → 1.11.0.
svn path=/trunk/; revision=48972
2013-04-22 17:59:38 +00:00
Gerald Combs b60e41b984 1.9.2 → 1.9.3.
svn path=/trunk/; revision=48627
2013-03-28 18:13:22 +00:00
Gerald Combs 4c87778b7a 1.9.1 → 1.9.2.
svn path=/trunk/; revision=48406
2013-03-18 22:18:52 +00:00
Gerald Combs f609d943e5 Get release note conversion working on Windows.
svn path=/trunk/; revision=48321
2013-03-15 17:00:21 +00:00
Gerald Combs fc6e505dac Switch to Asciidoc for the release notes. The initial conversion from
Docbook was done using Pandoc and cleaned up by hand. Add an
asciidoc.conf which contains macros for linking to Wireshark bugs and
CVE IDs.

Remove the release-notes.chm target. I don't think we ever used it and
we're probably better off generating PDF or HTML if we need something
fancier than plain text.

In configure.ac, consolidate program path discovery a bit and add a2x
discovery.

svn path=/trunk/; revision=48307
2013-03-15 00:08:18 +00:00
Gerald Combs 7613251d1c Switch to WinPcap 4.1.3.
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
Gerald Combs ac364779f7 Switch to c-ares 1.9.1.
svn path=/trunk/; revision=48191
2013-03-08 16:51:21 +00:00
Bill Meier af4a5770c2 Always build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED
Also: remove "experimental" comment from Win32 GTK3 build config;

(I'm not able to try the WIN64 GTK3 build so I've left that marked as experimental).

svn path=/trunk/; revision=48145
2013-03-06 20:56:04 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Gerald Combs f14ad04d4d More 1.9.0 → 1.9.1 changes. Release note updates.
svn path=/trunk/; revision=47777
2013-02-20 21:17:30 +00:00
Gerald Combs 81a5be5813 Enable automatic updates for Win64. Fix a copy/paste error.
svn path=/trunk/; revision=47749
2013-02-19 22:57:40 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Bill Meier fea2576612 Add note re 'no problems to date' with VS2012 (VC11).
svn path=/trunk/; revision=47539
2013-02-07 21:59:27 +00:00
Bill Meier b6bd189390 Fixes & comments for building Wireshark with VS2012 (VC11)
1. Define 'APPVER' appropriately;
   Prevents warning message:
   LINK : warning LNK4010: invalid subsystem version number 5.0; default subsystem version assumed.
2. Add comment (& ToDo) re using VS2012 to build .exe which will also run on WIndows XP.

svn path=/trunk/; revision=46830
2012-12-28 21:18:19 +00:00
Anders Broman 70f6c44703 Define GTK_SCHEMAS_DIR
svn path=/trunk/; revision=46704
2012-12-22 22:18:29 +00:00
Anders Broman 03282e6244 Put back the 'right' GTK3 bundles
svn path=/trunk/; revision=46703
2012-12-22 21:46:59 +00:00
Bill Meier bcec004e47 Remove redundant (commented out) definition for GTK_PKG
(introduced by me in SVN #46612).

svn path=/trunk/; revision=46677
2012-12-21 15:43:51 +00:00
Anders Broman c3040a0489 Don't yse the new GTK3 bundle, it lacks the tools
svn path=/trunk/; revision=46614
2012-12-19 06:55:11 +00:00
Anders Broman acab4fe903 Use the new bundle
svn path=/trunk/; revision=46613
2012-12-19 06:52:56 +00:00
Bill Meier 919c192780 Let's try using the new Win32 GTK2 bundle 2.24.14 (as suggested by Anders).
svn path=/trunk/; revision=46612
2012-12-19 04:44:01 +00:00
Anders Broman 2977bde9f1 - Make dumpcap build with the new bundle.
- Use the correct bundle id for GTK3

svn path=/trunk/; revision=46586
2012-12-18 11:58:22 +00:00
Anders Broman 4e254a907c Prepare to ubdate the GTK bundles
svn path=/trunk/; revision=46585
2012-12-18 07:42:17 +00:00
Jeff Morriss 83845c0048 vcredist_*.exe is, AFAICT, still optional yet config.nmake always defines the
variable for it.  Since it's always defined but it's optional, don't check
for its existence.

svn path=/trunk/; revision=46022
2012-11-13 15:01:49 +00:00
Gerald Combs b924cfed2b The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
Anders Broman df44255d07 - Use PROGRAM_NAME in the unistaller too.
- Make it possible to set PROGRAM_NAME in environment.
- Update the comment about setting program name it *should* work now.

svn path=/trunk/; revision=45582
2012-10-16 14:03:42 +00:00
Anders Broman 46484ff0f7 Start making the program name "wireshark" configurable.
svn path=/trunk/; revision=45558
2012-10-15 15:31:20 +00:00
Anders Broman 0a1bbd5526 Typos.
svn path=/trunk/; revision=45557
2012-10-15 12:50:20 +00:00
Anders Broman e0c023859e Building with GTK3 works.
svn path=/trunk/; revision=45555
2012-10-15 08:32:38 +00:00
Anders Broman a85e8b73a8 Build GTK2 versions again.
svn path=/trunk/; revision=45554
2012-10-15 08:30:32 +00:00
Anders Broman a3f65d3680 Try a experimental gtk3 build
svn path=/trunk/; revision=45551
2012-10-15 06:12:51 +00:00
Anders Broman f8d36704a8 Revert back to GTK2
svn path=/trunk/; revision=45541
2012-10-14 19:16:34 +00:00
Anders Broman 091559e2ab Try a experimental gtk3 build
svn path=/trunk/; revision=45540
2012-10-14 18:42:02 +00:00
Guy Harris 97ec1b176d Expand comments about the "making the C runtime available to Wireshark"
stuff.

svn path=/trunk/; revision=45305
2012-10-04 04:54:58 +00:00
Jeff Morriss 2fbf659e28 Stop defining HAVE_CONFIG_H on Windows builds too.
svn path=/trunk/; revision=45231
2012-10-01 11:47:36 +00:00
Chris Maynard 005175c9c4 Revert 45116. Developer's probably don't want the user-guide.chm that they get from the setup step as it's not going to be up-to-date.
svn path=/trunk/; revision=45121
2012-09-25 03:23:23 +00:00
Chris Maynard 410fdcd065 We're downloading the user-guide as part of the setup, so we might as well copy it to the install directory. If someone has built a more up-to-date version of the user-guide in the docbook directory, then it will just overwrite this one, but for most developers, I don't think they're building their own, so at least this way they'll still have a local copy of the user-guide. If optional is the preferred default, then we can change config.nmake and just comment out UG_DIR and mark as "optional" instead of "recommended".
svn path=/trunk/; revision=45116
2012-09-25 01:03:21 +00:00
Gerald Combs 878f93804f Look in $(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT) for
the MSVC redistributable package, then look in the top-level
$(WIRESHARK_LIB_DIR). This lets us more easily use multiple compilers
with the same library directory.

svn path=/trunk/; revision=45113
2012-09-24 22:57:54 +00:00
Anders Broman 8594038ccd Add MCVC2012 Professional
svn path=/trunk/; revision=45036
2012-09-21 06:16:19 +00:00
Jeff Morriss abc482e578 Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.

Put _U_'s definition in config.h when building with autofoo and on Windows.

svn path=/trunk/; revision=45034
2012-09-21 01:42:03 +00:00
Bill Meier 383467b2b3 Add some info about building with Visual Studio 2012 (VC11):
Summary: It seems to work; win32.mak file must be obtained
         from <somewhere>; (See comment in file for details)

svn path=/trunk/; revision=45033
2012-09-20 21:24:33 +00:00
Bill Meier d67f3341e5 Add stuff to config to build with VS2012. However: build currently fails.
svn path=/trunk/; revision=44982
2012-09-18 19:42:04 +00:00
Anders Broman 055736b655 Compile and install schemas if GTK3 is used, nsis needs update too
svn path=/trunk/; revision=44923
2012-09-16 09:55:44 +00:00
Anders Broman b3193ec862 Use the latet GTK3+ bundles when building with GTK3
svn path=/trunk/; revision=44890
2012-09-14 06:21:55 +00:00
Jakub Zawadzki 47cee41290 Revert part of r43579, MSVC_VARIANT should be not defined.
svn path=/trunk/; revision=43585
2012-07-06 07:49:36 +00:00
Anders Broman c19583b72c From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.

svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
Anders Broman 227eb36c83 Start to have an generic wireless toolbar. Sligtly modified patch from
Pontus Fuchs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=43354
2012-06-19 12:42:06 +00:00
Bill Meier 0ec00075ef Add a comment as to .bsc files seemingly not usable with VS2010.
svn path=/trunk/; revision=43234
2012-06-13 16:44:06 +00:00
Gerald Combs c592ceded1 Update the Lua configuration on Win64 to reflect the recent change to
Visual Studio 2010.

svn path=/trunk/; revision=43142
2012-06-06 20:42:47 +00:00
Gerald Combs f1cf70fc10 1.7.2 → 1.9.0.
svn path=/trunk/; revision=43120
2012-06-05 16:21:47 +00:00
Anders Broman 7b43b3de0f Make it possible to build with GTK3 on Windows
svn path=/trunk/; revision=43083
2012-06-04 20:42:09 +00:00
Anders Broman 94627901a9 Update GTK 3.0 package Id
svn path=/trunk/; revision=43071
2012-06-04 16:56:08 +00:00
Guy Harris 1dd90d3560 Default to the version recommended in the Developer's Guide, namely
MSVC++ 2010 Express Edition.

svn path=/trunk/; revision=43016
2012-06-03 07:07:35 +00:00
Pascal Quantin 5adc7cd8ef Use GeoIP package 1.4.8-2 for win64 also (I guess that's what was intended in r42933)
svn path=/trunk/; revision=42946
2012-05-31 18:56:02 +00:00
Gerald Combs ddcd6c5ce7 Use the updated GeoIP package (1.4.8-2).
svn path=/trunk/; revision=42933
2012-05-30 22:55:02 +00:00
Gerald Combs 77b9085de9 Revert GEOIP_CFLAGS back to r42905. It looks like the builders picked up
the wrong archive yesterday before I had a chance to upload the right one.

svn path=/trunk/; revision=42919
2012-05-30 15:36:48 +00:00
Chris Maynard b9e43af6e9 Ugh. Fix GEOIP_CFLAGS again. 3rd time's the charm?
svn path=/trunk/; revision=42918
2012-05-30 15:30:07 +00:00
Chris Maynard b15dc3a9af Try it with Windows style path separator instead.
svn path=/trunk/; revision=42917
2012-05-30 15:05:21 +00:00
Chris Maynard a489998855 Fix GEOIP_CFLAGS so GeoIP.h can be found.
svn path=/trunk/; revision=42916
2012-05-30 14:33:00 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try.
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
Anders Broman 361454b6b8 Add PKG_SUFIX
svn path=/trunk/; revision=42202
2012-04-23 07:19:22 +00:00
Anders Broman 2c996e9c18 Make it possible to download the GTK3 package
svn path=/trunk/; revision=42174
2012-04-21 08:45:52 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo
doesn't crash.

svn path=/trunk/; revision=42171
2012-04-20 23:41:36 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
2012-04-19 18:31:11 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2.
svn path=/trunk/; revision=41971
2012-04-06 17:27:20 +00:00
Anders Broman 6c902761a8 Revert
svn path=/trunk/; revision=41928
2012-04-04 15:42:46 +00:00
Anders Broman 82913779e4 Update to a version which have getopt_long().
svn path=/trunk/; revision=41926
2012-04-04 15:23:47 +00:00
Gerald Combs 3ae3fcee5c Use the GnuTLS 2.12.18-1.2-1 bundle.
svn path=/trunk/; revision=41829
2012-03-29 20:18:10 +00:00
Gerald Combs 2a1e0baeac Use GnuTLS 2.12.18.
svn path=/trunk/; revision=41809
2012-03-27 22:57:42 +00:00