osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
63,169 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

678 Commits

Author SHA1 Message Date
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
Anders Broman 665aae16f6 Revert the change of MSVC_VARIANT made by misstake. 
svn path=/trunk/; revision=41238
 2012-02-29 14:50:02 +00:00
Anders Broman 90cf729795 Use GTK 2.24.10 for win32. 
svn path=/trunk/; revision=41237
 2012-02-29 14:44:08 +00:00
Anders Broman 1fb2e2b3e0 Add the package version of GTK 2.24.10(commented out). 
svn path=/trunk/; revision=41236
 2012-02-29 12:03:51 +00:00
Bill Meier a94a0e3b4e (Minor): Add -DG_DISABLE_SINGLE_INCLUDES to GLIB_CFLAGS 
svn path=/trunk/; revision=41076
 2012-02-19 23:26:29 +00:00
Bill Meier e61e93baae Rework optional generation of .sbr & .bsc files. 
svn path=/trunk/; revision=40779
 2012-01-30 22:57:09 +00:00
Bill Meier cd4e301f06 Fix QtShark compile error. 
(Quoting can be tricky ...)

svn path=/trunk/; revision=40766
 2012-01-30 00:44:11 +00:00
Anders Broman 087e6087f0 Part of "Build Browse Information File per default" from 
Kovarththanan Rajaratnam applied.

It's still not the default but easier to make it so.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480

svn path=/trunk/; revision=40765
 2012-01-29 21:56:35 +00:00
Chris Maynard 6d213e71bd Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown". 
svn path=/trunk/; revision=40740
 2012-01-27 03:41:20 +00:00
Bill Meier 0600db677f Remove support for MSVC < MSVC2005; Update Developer's Guide. 
svn path=/trunk/; revision=40395
 2012-01-06 15:45:46 +00:00
Gerald Combs 50594f1d71 Allow for, but don't yet use, GTK+ 2.24. 
svn path=/trunk/; revision=40032
 2011-11-29 00:07:54 +00:00
Gerald Combs 3f12c48ace Add an SVN_REVISION variable to config.nmake. This can be used to 
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.


svn path=/trunk/; revision=39891
 2011-11-17 00:19:03 +00:00
Gerald Combs 2798ad267a 1.7.0 → 1.7.1. 
svn path=/trunk/; revision=39769
 2011-11-08 22:35:56 +00:00
Gerald Combs d40223b6fb Add a HAVE_GEOIP_V6 configuration option and enable it by default. 
svn path=/trunk/; revision=39283
 2011-10-05 23:02:31 +00:00
Gerald Combs 996935a5de Add more entries to the Python CRT list. 
svn path=/trunk/; revision=39257
 2011-10-04 20:50:12 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER 
as it is the only option left.

svn path=/trunk/; revision=39138
 2011-09-25 21:27:19 +00:00
Anders Broman af6d7d7963 Make MAIN_MENU_USE_UIMANAGER the default. 
svn path=/trunk/; revision=38650
 2011-08-21 20:39:58 +00:00
Jörg Mayer b87f22700e Always build with -DGTK_DISABLE_DEPRECATED. The files that 
fail when built in specific configurations will disable this
option when required.

svn path=/trunk/; revision=38588
 2011-08-17 17:34:56 +00:00
Jörg Mayer e22f19f645 MAIN_MENU_USE_UIMANAGER is also used in some includes, not only 
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.

svn path=/trunk/; revision=38420
 2011-08-08 20:35:36 +00:00
Jörg Mayer a28af865bc Looks like the Windows code isn't as clean as the Unix path: 
Comment out GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38405
 2011-08-08 14:03:53 +00:00
Jörg Mayer 6ef6042641 GTK3 stuff: 
- Update Status file
- configure.in: start GSEALing with 2.20 and not 2.22
- configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE
    and GTK_DISABLE_DEPRECATED
- menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38404
 2011-08-08 13:39:21 +00:00
Anders Broman c11c8b0ee0 svn path=/trunk/; revision=38396 2011-08-07 19:58:13 +00:00
Anders Broman 79501e9198 Revert previous commit. 
(Note to self read the description first)

"Returns :
 
a newly-allocated string, with all the upper case characters in str converted to lower case, with semantics that exactly match g_ascii_tolower(). (Note that this is unlike the old g_strdown(), which modified the string in place.)"

svn path=/trunk/; revision=38395
 2011-08-07 19:15:17 +00:00
Anders Broman e48dcbaf15 Replace deprecated glib functions. 
set DG_DISABLE_DEPRECATED for windows build.

svn path=/trunk/; revision=38394
 2011-08-07 19:08:41 +00:00
Anders Broman 7bcc6dd237 - Get rid of deprecated functions. 
- Include pangocairo.

svn path=/trunk/; revision=38317
 2011-08-03 14:54:03 +00:00
Anders Broman 8f54d76a77 - Always build with GSEAL_ENABLE 
svn path=/trunk/; revision=38252
 2011-07-29 10:12:48 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake 
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
 2011-07-19 18:22:46 +00:00
Gerald Combs e7fce8ccb8 Pull WIRESHARK_LIBS from the system environment if it's available. 
svn path=/trunk/; revision=38114
 2011-07-19 16:26:42 +00:00
Anders Broman 46bcd096a8 Include Cairo lib to be able to use caro functions. 
svn path=/trunk/; revision=38066
 2011-07-17 13:18:55 +00:00
Gerald Combs add36f416d Use the latest libsmi package. Note that we now support OID resolution 
on 64-bit Windows.

svn path=/trunk/; revision=37808
 2011-06-27 20:48:26 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not 
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
 2011-06-23 23:04:03 +00:00
Gerald Combs 8d88f3a790 Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or 
pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696
 2011-06-17 17:52:31 +00:00
Gerald Combs 6e040f6c0d Bump the wiretap version. 
svn path=/trunk/; revision=37571
 2011-06-06 16:29:23 +00:00
Anders Broman 4f525e3a78 Remove HAVE_AIRPDCAP 
svn path=/trunk/; revision=37495
 2011-05-31 21:38:39 +00:00
Gerald Combs 2c5e7ef953 FOP 0.95 → 1.0. 
svn path=/trunk/; revision=37300
 2011-05-19 19:03:22 +00:00
Gerald Combs 1c831b6343 1.5.2 → 1.7.0. 
svn path=/trunk/; revision=37148
 2011-05-14 20:17:37 +00:00
Anders Broman b699fa89ee Move MAIN_MENU_USE_UI_MANAGER outside of if win32. 
svn path=/trunk/; revision=37141
 2011-05-14 13:15:56 +00:00
Jakub Zawadzki b680407847 Conditional support for packet-editor [default=no]. 
svn path=/trunk/; revision=37084
 2011-05-12 17:14:59 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option. 
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
 2011-05-12 10:56:26 +00:00
Jeff Morriss 6ff4737f44 On Windows: don't (try but fail--the code did not work) to define 
HAVE_GZLCEARERR.  Define HAVE_INFLATEPRIME if we HAVE_LIBZ.

svn path=/trunk/; revision=36954
 2011-04-29 17:30:23 +00:00
Chris Maynard be832727cd Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The 
Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'

svn path=/trunk/; revision=36730
 2011-04-20 05:21:32 +00:00
Gerald Combs b971a0ef5d Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS. 
svn path=/trunk/; revision=36722
 2011-04-19 19:20:03 +00:00
Anders Broman 25ab8f9594 Ok let's try GTK 2.22 on Win64 too - fix a typo. 
svn path=/trunk/; revision=36623
 2011-04-13 15:46:39 +00:00
Anders Broman 81e330976e Ok let's try GTK 2.22 on Win64 too. 
svn path=/trunk/; revision=36620
 2011-04-13 14:38:58 +00:00
Anders Broman 2d38d00656 Try out GTK 2.22 
svn path=/trunk/; revision=36619
 2011-04-13 13:42:41 +00:00
Anders Broman 8532a6f8af Restore defaults 
svn path=/trunk/; revision=36618
 2011-04-13 05:43:07 +00:00
Anders Broman 3db53e54ba Build win64 with a modified zlib (google is your friend). 
http://www.apachehaus.com/forum/index.php?action=printpage;topic=143.0

First problem: ZLIB build must be fixed for x64, otherwise there will be one unresolved external symbol later. Quick fix is to open build\win32\build_zlib.bat and insert this at line 51:
set ASM_OPTS=AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
(info found in zlib\win32\Makefile.msc) and then open zlib\contrib\masmx64\inffas8664.c and prepend "../../" to four includes at the beginning.

svn path=/trunk/; revision=36616
 2011-04-13 04:47:38 +00:00
Bill Meier 8587721abb Fix nasm pathname: nasm-2.09-08\nasm.exe ==> nasm-2.09.08\nasm.exe 
svn path=/trunk/; revision=36596
 2011-04-12 17:53:23 +00:00
Anders Broman b5125be726 Build with zlib-1.2.5 for win32 
zlib for GTK hasd this comment:
/* LFS conventions have no meaning on Windows. Looking for feature
 * macros like _LARGEFILE64_SOURCE or _FILE_OFFSET_BITS on Windows is
 * wrong. So make sure any such macros misguidedly defined by the
 * user have no effect. Windows has large file support, but the
 * official zlib DLL has not been built to provide the 64-bit offset
 * APIs, sigh.  So we have just patched out the 64-bit offset API
 * from this header file.
 */

svn path=/trunk/; revision=36586
 2011-04-12 15:44:05 +00:00
Gerald Combs d7d45f8072 1.5.1 → 1.5.2. Reenable Babel. 
svn path=/trunk/; revision=36540
 2011-04-10 17:03:43 +00:00
Gerald Combs 92c8f32ff7 Use the latest library tag, which updates GNUTLS. Add code to check for 
libintl-8.dll and add the GNUTLS version if needed.

svn path=/trunk/; revision=36483
 2011-04-05 22:38:12 +00:00
Bill Meier dbc7c80782 Remove the 'NEW_PACKET_LIST' defines & etc (since the code no longer supports the old packet list) 
svn path=/trunk/; revision=36165
 2011-03-08 14:55:07 +00:00
Gerald Combs 2009cc6f17 Update some of the "Details" properties in the installer. Remove the 
32-bit BMPs from the installer icon; they don't appear to render properly.

svn path=/trunk/; revision=36113
 2011-03-01 19:40:51 +00:00
Gerald Combs 6095647db2 Fix a typo. 
svn path=/trunk/; revision=36021
 2011-02-21 18:42:19 +00:00
Bill Meier 4099dfa603 Update a few comments about the use of LOCAL_CFLAGS, STANDARD_CFLAGS and WARNING_ARE_ERRORS 
svn path=/trunk/; revision=35952
 2011-02-15 16:56:31 +00:00
Bill Meier dcb5dfe207 Enable /analyze:WX- only if ENABLE_CODE_ANALYSIS is defined ... 
svn path=/trunk/; revision=35951
 2011-02-15 16:40:09 +00:00
Gerald Combs 7bd9a9c607 Enable Enterprise Code Analysis via the ENABLE_CODE_ANALYSIS environment 
variable.

svn path=/trunk/; revision=35946
 2011-02-14 18:58:37 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup: 
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
 2011-02-02 01:19:53 +00:00
Gerald Combs 2b3eddb842 Add an option to enable Code Analysis for C/C++ (MSVC's static analyzer). 
svn path=/trunk/; revision=35688
 2011-01-28 18:42:49 +00:00
Gerald Combs 5d46856320 Use the correct processor architecture in our manifest. This lets us 
create a usable wireshark.exe for x64 using Visual C++ 10.  Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.

svn path=/trunk/; revision=35687
 2011-01-28 00:21:05 +00:00
Gerald Combs 1635ef0ddf 1.5.0 → 1.5.1. 
svn path=/trunk/; revision=35639
 2011-01-24 19:27:38 +00:00
Chris Maynard 252861e6af Updates for Wireshark portable installer. Using nsis unicode now. 
svn path=/trunk/; revision=35300
 2010-12-29 20:41:53 +00:00
Stephen Fisher 52b99dc191 Remove "not tested" note on MSVC 2010's vcredist instructions 
svn path=/trunk/; revision=35040
 2010-11-27 18:52:02 +00:00
Stephen Fisher d1108eebab Remove comment stating that Microsoft Visual Studio 2010 doesn't work since the express edition does (and presumably the full edition does also) 
svn path=/trunk/; revision=35031
 2010-11-26 17:54:45 +00:00
Bill Meier a6c0c9738f From Michael Wells: Fix "missing path seperator in config.nmake" 
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5378

svn path=/trunk/; revision=34829
 2010-11-09 23:03:47 +00:00
Gerald Combs cfe3d49619 From g.khueny via bug 5346: 
If PYTHON_DIR is specificed in config.nmake the variable will be overritten by
PYTHON_DIR=C:\Python$(PYTHON_VER). 
It looks like the problem was created by revision 34246.

svn path=/trunk/; revision=34673
 2010-10-28 16:29:39 +00:00
Anders Broman b7d293bdc0 Target system changed by mistake. 
svn path=/trunk/; revision=34594
 2010-10-20 20:49:30 +00:00
Anders Broman 2f9403ab15 Prepartaions to use GTK 2.22 
svn path=/trunk/; revision=34593
 2010-10-20 20:41:39 +00:00
Anders Broman dd551b6585 Use the new GTK bundles. 
svn path=/trunk/; revision=34382
 2010-10-05 15:46:13 +00:00
Sake Blok 6c97a708c9 Make "bpf_image" available on Windows. This enables the "Compile BPF" button and "dumpcap -d" on Windows. 
svn path=/trunk/; revision=34357
 2010-10-03 22:42:27 +00:00
Sake Blok f3e94f6753 Retry of SVN 34338, now tested on my WinXP dev VM: 
Use pcap_open_dead instead of pcap_create for the compile BPF button. 



svn path=/trunk/; revision=34340
 2010-10-03 12:04:18 +00:00
Stephen Fisher d0244ffa9a Allow up to Python 2.7 now (was 2.6) and move Python build statements into same part of nmake file for ease of use. 
svn path=/trunk/; revision=34246
 2010-09-24 23:50:38 +00:00
Jeff Morriss d8310ff499 Assume we HAVE_GZCLEARERR on Windows and when using cmake 
svn path=/trunk/; revision=34192
 2010-09-23 05:50:10 +00:00
Gerald Combs a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy(). 
svn path=/trunk/; revision=34137
 2010-09-16 19:20:06 +00:00
Bill Meier 03b7c7b8fa I suspect the changes to config.nmake committed in SVN #33942 were not intended. 
Revert the changes (for now ?) so the Buildbot will run again.

svn path=/trunk/; revision=33945
 2010-08-26 23:40:27 +00:00
Anders Broman d4e0b348cf Doxygen fixes. 
svn path=/trunk/; revision=33942
 2010-08-26 20:31:09 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call 
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
 2010-08-25 20:30:59 +00:00
Jeff Morriss 43af5f6344 Update the WinPcap developer's pack to 4.1.2. Update PCAP_VERSION to 4.1.2 on Win64 too (for consistency more than anything I think). 
svn path=/trunk/; revision=33923
 2010-08-25 18:20:56 +00:00
Jeff Morriss 44f8a8824e Change PCAP_VERSION to 4.1.2. Hopefully this will cause the U3/PortableApps builds to pick up WinPcap again. 
svn path=/trunk/; revision=33921
 2010-08-25 15:27:14 +00:00
Jaap Keuter 93497759a3 Remove experimental marker from NEW_PACKET_LIST. 
svn path=/trunk/; revision=33719
 2010-08-05 19:11:35 +00:00
Gerald Combs 349fac664b 1.3.6 -> 1.5.0 
svn path=/trunk/; revision=33138
 2010-06-07 16:43:09 +00:00
Gerald Combs fe79af8f42 From Kovarththanan Rajaratnam via bug 3500: 
Sébastien's initial commit [1] didn't contain support for embedding Python on
Windows.

[1] http://anonsvn.wireshark.org/viewvc?view=rev&revision=28529


From me:

Comment out PYTHON_EMBED for now.

Start a list of known Python+CRT versions.

Add get_wspython_dir to libwireshark.def.

svn path=/trunk/; revision=33036
 2010-06-01 22:20:15 +00:00
Gerald Combs 55c48a28ed Our default target platform is still win32. 
svn path=/trunk/; revision=32698
 2010-05-06 23:58:18 +00:00
Anders Broman f9981411f1 Checking in Stigs changes from 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=475
BUT not activating the check for 
pcap_create()
pcap_set_buffer_size()
This should make it possible to build with support for setting the buffersize if not capturing 802.11 traffic.

The code for handling the 'B' option should be OK in any case.

svn path=/trunk/; revision=32688
 2010-05-06 18:34:30 +00:00
Gerald Combs e535271512 1.3.5 -> 1.3.6. 
svn path=/trunk/; revision=32667
 2010-05-05 00:28:24 +00:00
Bill Meier 0303dfbf9f Manifests are not needed when building with VC10. 
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx

svn path=/trunk/; revision=32540
 2010-04-22 19:35:47 +00:00
Anders Broman f739b285c9 Add settings for "Microsoft Visual Studio 2010" note that 
Wireshark does not build with Visual studio 10 yet.

svn path=/trunk/; revision=32529
 2010-04-21 05:23:29 +00:00
Gerald Combs 6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link. 
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
 2010-04-09 21:42:51 +00:00
Bill Meier a5b180a3a8 Add coment about why 'links' fails if it is used to generate release-notes.txt 
svn path=/trunk/; revision=32387
 2010-04-05 19:42:07 +00:00
Gerald Combs ab71d9d92b 1.3.4 -> 1.3.5. 
svn path=/trunk/; revision=32345
 2010-03-31 22:54:07 +00:00
Gerald Combs 12e2df52e1 Update c-ares to 1.7.1. 
svn path=/trunk/; revision=32293
 2010-03-26 18:36:27 +00:00
Guy Harris 1e0bcd0740 Define HAVE_PCAP_LIST_DATALINKS, HAVE_PCAP_FREE_DATALINKS, and 
HAVE_PCAP_SET_DATALINK only if we have the WinPcap development package;
otherwise, don't define them - if you don't have the WinPcap development
package when building on Windows, we don't define HAVE_LIBPCAP, so we
won't include any of the code controlled by those ifdefs in any case,
and, if you do have the WinPcap development package, you'll need to have
the 4.1 version (you won't need WinPcap 4.1 at run time, but you will
need the 4.1 development package at build time).

svn path=/trunk/; revision=32230
 2010-03-17 22:09:19 +00:00
Guy Harris 42a9ea8eaa Use the right #define value to check whether WinPcap has 
pcap_free_datalinks().

*Set* that #define, while we're at it.

svn path=/trunk/; revision=32220
 2010-03-17 18:04:21 +00:00
Gerald Combs a5b39ae47a Use the latest GTK+ 2.16 bundle. For the Win32 build this means downgrading 
from GTK+ 2.18. According to https://bugzilla.gnome.org/show_bug.cgi?id=598299
we should probably hold off on using 2.18 for a while.

svn path=/trunk/; revision=31992
 2010-02-24 21:08:09 +00:00
Guy Harris 2b2879b098 Correct GTK+ package for Win64. 
svn path=/trunk/; revision=31890
 2010-02-15 23:46:39 +00:00
Anders Broman 72cfbf1e01 Use the latest GTK bundle (2.18.7) 
svn path=/trunk/; revision=31882
 2010-02-15 20:57:50 +00:00
Gerald Combs 7e9faae9d9 1.3.3 -> 1.3.4. 
svn path=/trunk/; revision=31865
 2010-02-11 16:38:42 +00:00
Stephen Fisher 490be8cf45 Remove comment stating that GTK 2.12 is being used since Wireshark 0.99.7. 
Gerald just changed it from 2.16 to 2.18.


svn path=/trunk/; revision=31603
 2010-01-21 16:53:41 +00:00
Gerald Combs 16c2a0b4b0 Use the correct GTK_INST_VERSION. 
svn path=/trunk/; revision=31602
 2010-01-21 16:41:20 +00:00
Gerald Combs f1958a48f9 Drop our requirement for MSVCR71.DLL. 
svn path=/trunk/; revision=31578
 2010-01-19 22:58:12 +00:00
Gerald Combs 7b42cf5135 Use the official kfw packages. 
svn path=/trunk/; revision=31355
 2009-12-23 00:22:12 +00:00
Gerald Combs 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages 
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
 2009-12-21 21:06:01 +00:00
Gerald Combs 7046509b99 Use the WinPcap version of pcap_datalink_val_to_description if it's 
present.  Add an entry for DLT_PPI in case it's not.

svn path=/trunk/; revision=31316
 2009-12-18 20:36:36 +00:00
Gerald Combs a9e185a062 Disable PCRE in the Win32 build. GRegex uses a newer version than we do 
and this matches the Win64 configuration.

svn path=/trunk/; revision=31304
 2009-12-18 01:29:56 +00:00
Gerald Combs 7524c0b963 Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer 
build.

svn path=/trunk/; revision=31301
 2009-12-17 22:01:13 +00:00
Anders Broman e1b992ef3b Use gtk+-bundle_2.18.5-20091215_win32 
svn path=/trunk/; revision=31288
 2009-12-17 06:36:37 +00:00
Anders Broman 65a85f0fba Use gtk+-bundle_2.16.6-20091215_win32 
svn path=/trunk/; revision=31285
 2009-12-16 20:54:40 +00:00
Gerald Combs e5be652056 Fix compilation under Windows. Allocate our hash buffer dynamically so 
that _chkstk doesn't throw a hissy fit. When hashing, open the file in
binary mode.

svn path=/trunk/; revision=31192
 2009-12-08 00:13:57 +00:00
Gerald Combs f08e18e9a5 Switch back to normal versioning. Bump the version to 1.3.3. 
svn path=/trunk/; revision=31064
 2009-11-24 05:57:05 +00:00
Gerald Combs 907bf4e36b Switch from individual GLib, GTK+, and related packages to the all-in-one 
versions.

svn path=/trunk/; revision=31023
 2009-11-19 20:27:08 +00:00
Gerald Combs 23df4e7f01 Update the AirPcap code for Win64 and enable AirPcap for the 64-bit build. 
svn path=/trunk/; revision=30945
 2009-11-12 23:48:11 +00:00
Tomas Kukosa 7f38b7b889 Update to the GnuTLS 2.8.5 
svn path=/trunk/; revision=30930
 2009-11-11 09:58:29 +00:00
Gerald Combs cc036df5ea Updates for FOP 0.95. 
svn path=/trunk/; revision=30913
 2009-11-10 01:32:59 +00:00
Gerald Combs 0ead6b73ff Switch the default Fop version to 0.95 and adjust custom_layer_pdf.xsl 
accordinglty. Tweak the print resolution on all of the images again. Add
a MIME type for one of the images.

svn path=/trunk/; revision=30909
 2009-11-09 18:41:21 +00:00
Anders Broman a9c313a864 Bump development version. 
svn path=/trunk/; revision=30750
 2009-10-29 06:15:52 +00:00
Anders Broman c5ce562d60 Use pango 1.26 
svn path=/trunk/; revision=30687
 2009-10-25 09:59:40 +00:00
Gerald Combs 0bbe1cb546 Make the new packet list the default on Win64. 
svn path=/trunk/; revision=30668
 2009-10-23 00:16:34 +00:00
Gerald Combs 839977fd7d Fix the WpdPack version on Win64. 
svn path=/trunk/; revision=30665
 2009-10-22 17:00:26 +00:00
Anders Broman 89e9745ed5 Use 2.22.2-1 
svn path=/trunk/; revision=30653
 2009-10-21 06:01:36 +00:00
Gerald Combs 09a0650607 Update WinPcap and the developer's pack to 4.1.1. 
svn path=/trunk/; revision=30652
 2009-10-21 03:13:42 +00:00
Kovarththanan Rajaratnam 0c75135ffd Cleanup comments wrt. /MP 
svn path=/trunk/; revision=30337
 2009-10-05 17:43:27 +00:00
Ulf Lamping ab99aaf732 be more verbose how to get VCREDIST_EXE 
svn path=/trunk/; revision=30247
 2009-10-02 09:26:52 +00:00
Jaap Keuter a8a62d3e8b Bump version number after release of first development snapshot. 
svn path=/trunk/; revision=30007
 2009-09-20 09:19:59 +00:00
Gerald Combs 76a108ab01 Install the CRT DLLs using the Visual C++ Redistributable Package 
(vcredist_x64.exe) on Win64. This should fix bug 4024.

svn path=/trunk/; revision=29977
 2009-09-17 21:54:52 +00:00
Gerald Combs f6bab49051 Fix the Freetype DLL name on Win64. 
svn path=/trunk/; revision=29972
 2009-09-17 15:33:34 +00:00
Anders Broman 35a62e44f9 Try to get the win64 build going. 
svn path=/trunk/; revision=29967
 2009-09-17 13:49:34 +00:00
Anders Broman 5564468d40 Make the new packet list the default build choice. 
svn path=/trunk/; revision=29964
 2009-09-17 08:29:10 +00:00
Anders Broman a601aeed88 Use latest GTK suport libs. 
svn path=/trunk/; revision=29962
 2009-09-17 06:16:24 +00:00
Gerald Combs fcaa314c61 Try to fix the build. 
svn path=/trunk/; revision=29952
 2009-09-17 01:18:51 +00:00
Anders Broman ef2d9da167 Use the latest GTK packages. 
svn path=/trunk/; revision=29943
 2009-09-16 13:34:37 +00:00
Kovarththanan Rajaratnam 499695595e Remove superfluous config parameters 
svn path=/trunk/; revision=29633
 2009-08-30 18:30:14 +00:00
Kovarththanan Rajaratnam 42c0ca3ca7 We require WinPcap > 3.0 so get rid of WPCAP_CONSTIFIED_CONFIG 
svn path=/trunk/; revision=29616
 2009-08-29 08:19:16 +00:00
Kovarththanan Rajaratnam cfcf299dfe Simplify logic wrt. PANGO_INST_VERSION 
svn path=/trunk/; revision=29613
 2009-08-29 05:46:45 +00:00
Kovarththanan Rajaratnam f3de3a12a7 Simplify logic wrt. GTK_INST_VERSION 
svn path=/trunk/; revision=29612
 2009-08-29 05:39:33 +00:00
Kovarththanan Rajaratnam 52183baedd Remove GCC_GLIB_CFLAGS. It isn't being used 
svn path=/trunk/; revision=29611
 2009-08-29 05:35:50 +00:00
Kovarththanan Rajaratnam 41778c459f Indicate where the some of the macros are used 
svn path=/trunk/; revision=29596
 2009-08-28 15:59:20 +00:00
Anders Broman e392e77382 Use GTK+ 2.16.5 and Glib 2.20.4. 
svn path=/trunk/; revision=29593
 2009-08-28 06:21:16 +00:00
Kovarththanan Rajaratnam 5417edcfdc Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead 
svn path=/trunk/; revision=29580
 2009-08-27 05:04:29 +00:00
Gerald Combs 4c7f40f3f5 Add a compile-time option to use a separate thread for reading from 
pipes. Enable this by default on Windows. Remove code that tried to
use WaitForSingleObject on a pipe (which Windows doesn't support). Use
native file handles and system calls on Windows (which fixes a problem
with partial reads I ran into during testing).

This should fix bug 1759.

svn path=/trunk/; revision=29574
 2009-08-26 23:16:37 +00:00
Kovarththanan Rajaratnam 10ce541917 Reorder so that mandatory requirements appear in succession 
svn path=/trunk/; revision=29560
 2009-08-26 07:05:50 +00:00
Kovarththanan Rajaratnam 0dead996a2 win-iconv is statically linked as part of Glib >= 2.14.5, so remove it from config.nmake 
svn path=/trunk/; revision=29559
 2009-08-26 06:54:48 +00:00
Kovarththanan Rajaratnam 8bc2261d24 Back out r29323. The non fully qualified path seems to work for everyone else so don't mess with it. 
svn path=/trunk/; revision=29324
 2009-08-07 14:01:44 +00:00
Kovarththanan Rajaratnam cdf7fda658 Use fully qualified path to bash 
svn path=/trunk/; revision=29323
 2009-08-07 13:18:02 +00:00
Anders Broman e040dac13f Revert change by mistake. 
svn path=/trunk/; revision=29201
 2009-07-26 22:18:11 +00:00
Anders Broman 3bbe2106c5 From Kovarththanan Rajaratnam: 
- Don't issue a row_inserted signal. Rely on our caller to have  
disconnected the model from the view.

-  Removing col_fmt from row_data. It wasn't being used. If we need to store
the column format in the future that should probably be placed in the
PacketList instead of the PacketListRecord
2) Remove double allocation of col_text. Now we allocate it in
new_packet_list_append() and pass it on to packet_list_append_record()
3) Use se_alloc instead of se_alloc0 because we explictly set all the
parameters we use.

svn path=/trunk/; revision=29199
 2009-07-26 22:11:46 +00:00
Jeff Morriss bca2a16879 /MP also works with 2008EE 
svn path=/trunk/; revision=29116
 2009-07-16 12:39:50 +00:00
Anders Broman 67d6f5976e Move th /MP flag setting to LOCAL_CFLAGS set in configure.nmake 
for MSVC variant 2008 only. As suggested by Bill Meier.

svn path=/trunk/; revision=29114
 2009-07-16 08:27:18 +00:00
Anders Broman 907673a91c Revert checkin made by misstake(don't use new packet list). 
svn path=/trunk/; revision=28949
 2009-07-06 13:34:30 +00:00
Anders Broman 1415c62c68 Fix: 
packet-ndmp.c:562: warning: unused parameter 'pinfo'

svn path=/trunk/; revision=28936
 2009-07-03 13:05:45 +00:00
Anders Broman 39139dc75c Sligtly modify Stig's fix, I forgot the makefile change :-( 
svn path=/trunk/; revision=28906
 2009-07-01 11:40:24 +00:00
Stig Bjørlykke 8324323784 Try to fix HAVE_NEW_PACKET_LIST handling. 
svn path=/trunk/; revision=28905
 2009-07-01 11:12:58 +00:00
Anders Broman ddad90c3e3 Make it possible to configure use of NEW_PACKET_LIST and fix 
one compile error. It still fails in file.c trying to include gtk/gtk.h in new_packet_list.h

svn path=/trunk/; revision=28903
 2009-07-01 08:23:32 +00:00
Graeme Lunt 6b64331033 Update to you the latest UPX executable/dll compressor. 
svn path=/trunk/; revision=28718
 2009-06-13 08:26:11 +00:00