Commit graph

538 commits

Author SHA1 Message Date
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