Commit graph

538 commits

Author SHA1 Message Date
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
Tomas Kukosa
40cc6f9108 Update to the GnuTLS 2.8.1
svn path=/trunk/; revision=28689
2009-06-10 21:08:01 +00:00
Gerald Combs
fffb5f5043 Update the GTK+/GLib libraries.
svn path=/trunk/; revision=28688
2009-06-10 20:58:05 +00:00
Gerald Combs
8adf270b5e Update the GTK+/GLib libraries.
svn path=/trunk/; revision=28686
2009-06-10 18:06:33 +00:00
Gerald Combs
1d0ae8dadb Upgrade to KFW 3.2.2.
svn path=/trunk/; revision=28684
2009-06-10 01:30:49 +00:00
Gerald Combs
cdae660d2a Update KFW to 2.6.5.
svn path=/trunk/; revision=28683
2009-06-09 23:54:07 +00:00
Gerald Combs
bc469b1f79 Move the trunk to 1.3.
svn path=/trunk/; revision=28495
2009-05-26 20:53:28 +00:00
Tomas Kukosa
0a101aacf6 Make gtk/capture_if_details_dlg_win32.c compileable using MSVC6 with SDK
svn path=/trunk/; revision=28314
2009-05-08 19:53:41 +00:00
Anders Broman
b96b6756c9 Use GTK+ 2.16.1-1
svn path=/trunk/; revision=28180
2009-04-27 16:50:58 +00:00
Gerald Combs
2739bf8819 Use the CRT version appropriate for our target architecture.
svn path=/trunk/; revision=28079
2009-04-17 19:02:56 +00:00
Gerald Combs
7b3b6ed3f9 Check for the existence of a couple of directories and add variables for DLL
names.

svn path=/trunk/; revision=28070
2009-04-16 21:34:44 +00:00
Gerald Combs
c0ebf76780 Fix (and likely re-break) the Windows builds:
- Use the latest WinPcap Developer's Pack.
  - In file_dlg_win32.c, try to fix Visual C++ 6.0 compilation.
  - #if 0 out a bunch of definitions in capture_if_details_dlg_win32.c
    that already exist in Ntddndis.h.

svn path=/trunk/; revision=28067
2009-04-16 18:14:38 +00:00
Gerald Combs
1c3e3a4a53 Switch back to 1.1.4.
svn path=/trunk/; revision=27810
2009-03-20 23:15:15 +00:00
Gerald Combs
ecd732384c Temporarily switch back to building 1.1.3 final.
svn path=/trunk/; revision=27807
2009-03-20 16:17:02 +00:00
Anders Broman
db6795dc82 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27796
2009-03-19 06:42:46 +00:00
Gerald Combs
31ea1d7aac Fix the Lua path on Win64.
svn path=/trunk/; revision=27777
2009-03-18 17:05:41 +00:00
Gerald Combs
2d24475011 Move to 1.1.4.
svn path=/trunk/; revision=27767
2009-03-18 05:42:03 +00:00
Anders Broman
e7ccbd26d1 Revert the changes, it blows up when resizeing windows...
svn path=/trunk/; revision=27764
2009-03-17 21:33:15 +00:00
Anders Broman
2a6752e050 Use GTK 2.16 and glib 2.20.
svn path=/trunk/; revision=27762
2009-03-17 20:21:16 +00:00
Gerald Combs
0d446ae826 Use WIRESHARK_TARGET_PLATFORM instead of PLATFORM.
svn path=/trunk/; revision=27701
2009-03-11 16:13:17 +00:00
Bill Meier
a910aed306 gettext library setup: Fix a bug and adjust config slightly for win32 so
gettext setup works the way I think was intended.

svn path=/trunk/; revision=27644
2009-03-07 18:48:25 +00:00
Gerald Combs
2731028a0c Fix Win32 build breakage.
svn path=/trunk/; revision=27634
2009-03-07 03:25:01 +00:00
Gerald Combs
8f69ddeb00 Add preliminary support for Win64 compilation. Attempt to use the same
set of makefiles and scripts for each platform as much as possible.

svn path=/trunk/; revision=27633
2009-03-07 01:06:40 +00:00
Gerald Combs
57dadc4664 More Windows compiler flag cleanups. Fix a problem with my last commit
that would break compilation for older compilers. Create a "DLL_LDFLAGS"
variable and use it in DLLs and plugins. Use PLUGIN_LDFLAGS and
DLL_LDFLAGS where needed. Don't force i386 code in the TPG plugin.

svn path=/trunk/; revision=27582
2009-03-02 21:33:11 +00:00
Gerald Combs
07e5df616e Disable manifest building for our DLLs. This attempts to fix bug 3272.
svn path=/trunk/; revision=27579
2009-03-02 18:57:35 +00:00
Tomas Kukosa
fe53605ff9 Update GnuTls to gnutls-2.6.4-1
svn path=/trunk/; revision=27398
2009-02-09 09:38:58 +00:00
Gerald Combs
414d042d2e Change the version to 1.1.3. SVN-stamp the version again.
svn path=/trunk/; revision=27252
2009-01-16 22:35:14 +00:00
Gerald Combs
9b852da8a5 Enable GeoIP if INETSDK is defined (which should mean we have IPv6
definitions even if we're running Visual C++ 6.0).

svn path=/trunk/; revision=27137
2008-12-30 20:05:58 +00:00
Gerald Combs
08364de20d Try to fix a compilation error with Visual C++ 6.0.
svn path=/trunk/; revision=27135
2008-12-30 18:27:34 +00:00
Gerald Combs
c30c410fa5 Add GeoIP to the Windows build. Fix a remaining geoip_ -> geoip_db_
conversion.

svn path=/trunk/; revision=27098
2008-12-23 18:56:31 +00:00
Gerald Combs
c9c32db187 Remove lynx as a dependency on Windows. By default, create the FAQ using
html2text.py. You can override this by adjusting config.nmake or by setting
HTML2TXT.

svn path=/trunk/; revision=27041
2008-12-17 21:11:20 +00:00
Tomas Kukosa
408d562a5c Update GnuTls to gnutls-2.6.3-1
svn path=/trunk/; revision=26998
2008-12-15 11:52:06 +00:00
Gerald Combs
e137f6cb76 Use c-ares 1.6.0.
svn path=/trunk/; revision=26961
2008-12-10 22:16:09 +00:00
Bill Meier
94c73a47c9 Compile flags: Use /DWIN32_LEAN_AND_MEAN; Add note re using /MP for faster build
(/MP means "compile multiple source files by using multiple processes")

svn path=/trunk/; revision=26553
2008-10-25 14:33:34 +00:00
Gerald Combs
f5b461c34f If PYTHON hasn't been defined, look for Python 2.6, 2.5, and 2.4 (in
that order). If found, set up Python automatically.

svn path=/trunk/; revision=26452
2008-10-14 16:37:47 +00:00
Gerald Combs
193ad40a59 Switch back to 1.1.2.
svn path=/trunk/; revision=26392
2008-10-09 05:07:24 +00:00
Gerald Combs
57a1c7be61 Try for another 1.1.1 development release.
svn path=/trunk/; revision=26374
2008-10-07 21:29:25 +00:00
Anders Broman
bc7779c4c4 Use LUA 5.1.4
svn path=/trunk/; revision=26329
2008-10-01 19:38:27 +00:00
Anders Broman
b8140ea604 Yet another GTK+ update...
Overview of Changes from GTK+ 2.14.2 to 2.14.3
==============================================

* Revert problematic GtkAdjustment changes

* Bugs fixed: 
 552837 mem leak in gtkimmulticontext
 553000 incorrect i18n header in gtkfilesystem.c
 553135 eog crash: assertion failed
 552545 leaks GpImage

svn path=/trunk/; revision=26273
2008-09-25 20:32:00 +00:00
Gerald Combs
2ed9fdf00e Switch back to normal versioning. Bump the development version to 1.1.2.
svn path=/trunk/; revision=26259
2008-09-24 03:29:21 +00:00
Gerald Combs
ba485a4163 Add /D_BIND_TO_CURRENT_CRT_VERSION=1 to LOCAL_CFLAGS in modern versions
of Visual C++. (How did this "feature" ever see the light of day?) Make
sure we use LOCAL_CFLAGS *everywhere*. This should fix problems with
building a usable installer under Visual Studio 2008 SP1.

Add comments with links to Visual C++'s idiotic handling of assemblies
and deployment using xcopy. Move to c-ares 1.5.3. Make sure we remove
all of our manifests in epan and packaging/u3/tools.

svn path=/trunk/; revision=26219
2008-09-16 21:08:18 +00:00
Gerald Combs
11171da80f Move to 1.1.1.
svn path=/trunk/; revision=26199
2008-09-15 18:30:51 +00:00
Anders Broman
ad54e4ed0e Use GTK+ 2.14.1
What's new in GTK+ 2.14
=======================

GTK+ 2.14 adds new functionality while maintaining source and binary 
compatibility with GTK+ 2.12. Highlights of new features and
improvements in GTK+ 2.14 are:

New widgets and objects

 * GdkAppLaunchContext, provides startup notification with 
   g_app_info_launch()
 * GtkMountOperation, can ask for passwords when mounting 
   volumes with g_volume_mount()
 * GtkToolShell, an interface for containers of GtkToolItems

Noteworthy new APIs
 
 * gtk_show_uri(), a replacement for gnome_vfs_url_show() and
   gnome_url_show()
 * gtk_widget_get_snapshot(), using pixmap redirection to render 
   snapshots of widgets

Changes in the file chooser

 The file chooser uses GIO directly, loadable backends are no longer 
 supported. Autocompletion in the file chooser entry has been improved.

Changes in printing support
 
 The print dialog displays printer status information. Support for
 rearranging pages when printing multiple pages per sheet has been
 added to the cups backend. 

Accessibility support
 
 The gail module is shipped with GTK+, GtkBuilder supports
 accessibility attributes and GtkStatusIcon supports keyboard
 navigation.

Internationalization support

 The compose sequences understood by GTK+'s builtin input method
 have been synchronized with recent X.org compose sequences, adding
 a large number of new sequences. GTK+ no longer uses translations
 when an application is not translated to the current locale.

gdk-pixbuf changes

 * Support loading OS X icns format
 * Support loading JPEG 2000 images
 * Support loading and saving to GIO streams
 * Use GIO for mime information
 
GDK changes

 GDK uses Xrandr instead of Xinerama to provide more (and dynamic)
 monitor information. Font configuration changes are now picked up
 at runtime, without an application restart.

For more details and lists of fixed bugs, see the
announcements for the 2.13.x development releases:

http://mail.gnome.org/archives/gtk-devel-list/2008-February/msg00079.html
http://mail.gnome.org/archives/gtk-devel-list/2008-May/msg00112.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00033.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00158.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00044.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00182.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00023.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00153.html

svn path=/trunk/; revision=26148
2008-09-06 15:25:23 +00:00
Gerald Combs
56c7f5b643 Move the trunk to 1.1.0. Temporarily build a non-SVN-stamped package, so
that we can build 1.1.0 packages.

svn path=/trunk/; revision=26136
2008-09-04 19:37:16 +00:00
Gerald Combs
1930d5cad3 More updates to allow for a win64 target build.
svn path=/trunk/; revision=26029
2008-08-14 23:56:57 +00:00
Gerald Combs
837f0d9d53 SecFileExtensions was removed in 2005. Don't reference it. Fixes bug 2793.
Replicate the old SecFileExtensions behavior by disabling and unchecking
the file extensions option when Wireshark is unselected.

While we're at it, add a "PLATFORM" variable to config.nmake, and use
it to set the library directory and installer filename and title.

Add a couple of minor fixes.

svn path=/trunk/; revision=26019
2008-08-14 17:54:35 +00:00
Gerald Combs
5906f69b88 On Windows, if we're running anything but plain Visual C++ 6 (including
VC6 plus a platform SDK), set INET6. Use that to figure out if we need
to define socklen_t for c-ares. This should fix bug 2797.

svn path=/trunk/; revision=25985
2008-08-11 21:59:59 +00:00
Gerald Combs
ce6607a9dd Add a note about c-ares and MSVC6.
svn path=/trunk/; revision=25982
2008-08-11 17:20:18 +00:00
Gerald Combs
021a926793 Add support for the c-ares asynchronous DNS resolution library to the
Windows build. Add support for async IPv6 lookups. Update the ADNS
code slightly.

This is not supported (yet) on the UNIX side.

svn path=/trunk/; revision=25953
2008-08-07 21:41:48 +00:00
Gerald Combs
10260fb76b Switch the default MSVC_VARIANT from MSVC6 to MSVC2008.
svn path=/trunk/; revision=25932
2008-08-05 17:02:30 +00:00
Gerald Combs
7d8e29f501 From Pascal Quantin via bug 2719: Fix support for Microsoft Visual C++ 2008.
From me:

Instead of adding adns_config.h, place it a custom adns package in
wireshark-win32-libs. Update tools/win32-setup.sh accordingly.

Split the MSVC2008EE variant into MSVC2008 and MSVC2008EE, similar to
MSVC2005 and MSVC2005EE. We have to worry about vcredist_x86.exe in
both cases.

Add Pascal to AUTHORS.

Update the Developer's Guide.

svn path=/trunk/; revision=25921
2008-08-04 23:05:32 +00:00
Gerald Combs
72965329b0 Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS
Windows-Engine."

Simplify the Windows installer by removing the GTK-Wimp option (which
means the "Wireshark" item can be an entry instead of a group). Move
Rawshark to the "Tools" group.

(If anyone wants to disable the MS Windows Engine they can still do so
after installation by disabling or removing libwimp.dll.)

svn path=/trunk/; revision=25611
2008-06-26 16:42:07 +00:00
Gerald Combs
48c21706f2 Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
  - packet-ppi.c: Add aggregation and 802.3 extended information.
  - capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.

Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.

svn path=/trunk/; revision=25593
2008-06-24 21:16:22 +00:00
Tomas Kukosa
b202c984e3 Update GnuTls to gnutls-2.3.8-1
svn path=/trunk/; revision=25309
2008-05-16 06:53:15 +00:00
Tomas Kukosa
a1d164a5da Update to Portaudio pa_stable_v19_20071207
svn path=/trunk/; revision=25285
2008-05-13 07:39:23 +00:00
Tomas Kukosa
27ccd63ce7 Update to WpdPack 4.0.2 and NASM 2.02
svn path=/trunk/; revision=25278
2008-05-12 19:13:55 +00:00
Tomas Kukosa
73ae498dd0 Enable PCAP_REMOTE by default
svn path=/trunk/; revision=25252
2008-05-07 13:15:24 +00:00
Anders Broman
a0866910ef Use Libsmi 0.4.8
svn path=/trunk/; revision=25147
2008-04-22 19:28:44 +00:00
Ulf Lamping
2e505267a8 as we can't easily (re)build adns on msvc6, create and use compiler specific dirs (e.g. MSVC2005EE/adns) to place the compiler specific dll/lib files into
svn path=/trunk/; revision=25000
2008-04-13 21:21:25 +00:00
Ulf Lamping
f2012542c0 attempt to build ADNS on none MSVC6 systems - with the same mechanism as done with ZLIB
Unfortunately, both dep and rc files need to be patched, so I added the patched files

It's an ugly solution but it seems to work ...

svn path=/trunk/; revision=24996
2008-04-13 17:58:04 +00:00
Ulf Lamping
22045b4a54 lot's of GTK1 related code cleanup in the Win32 build process
svn path=/trunk/; revision=24854
2008-04-09 03:48:16 +00:00
Anders Broman
533063e063 Use the latest GTK libraries.
svn path=/trunk/; revision=24711
2008-03-21 16:15:21 +00:00
Gerald Combs
d4ba88b677 Use libgmodule-2.0-0.dll 2.14.5 for the GTK+1 version of Wireshark.
svn path=/trunk/; revision=24703
2008-03-20 00:30:47 +00:00
Gerald Combs
55b798b353 Bump the version in the trunk to 1.0.99 (which will become 1.1.0 at some
point).

svn path=/trunk/; revision=24676
2008-03-17 23:01:20 +00:00
Gerald Combs
b14bd744d3 The trunk is now 0.99.9.
svn path=/trunk/; revision=24379
2008-02-18 19:58:46 +00:00
Gerald Combs
7abeb02747 If we have an SVN revision number, use it as the build number under Windows
instead of "0".

svn path=/trunk/; revision=24376
2008-02-18 18:08:14 +00:00
Bill Meier
69a44d1cb8 Clean-up: remove obsolete references to GTK libraries, ETHEREAL_EUG_DIR, etc
svn path=/trunk/; revision=24365
2008-02-16 21:07:19 +00:00
Anders Broman
363524d728 Use gtk+ 2.12.8 glib 2.12.6-2 and pcre 7.0.
( Problem seemed to be with pxbuffloaders).

svn path=/trunk/; revision=24357
2008-02-16 16:35:49 +00:00
Bill Meier
57c4bec6c2 Clarify wording slightly ....
svn path=/trunk/; revision=24331
2008-02-14 17:24:14 +00:00
Bill Meier
718b14c7ce Glib >= 2.14.5 does not require iconv
svn path=/trunk/; revision=24330
2008-02-14 17:16:12 +00:00
Stig Bjørlykke
7715fe8c8c Use the new gettext-runtime.
svn path=/trunk/; revision=24217
2008-01-28 20:23:08 +00:00
Anders Broman
6fbf8be77d Build with assembler support (NASM).
svn path=/trunk/; revision=23947
2007-12-25 15:55:19 +00:00
Guy Harris
947e70b4b7 Delete the *right* config.h.win32.
Copy the MSVC++-version-checking stuff from it into the top-level
config.h.win32, and try to set up config.nmake so that MSC_VER_REQUIRED
is defined in all Makefiles that include config.nmake.

svn path=/trunk/; revision=23802
2007-12-07 23:58:46 +00:00
Tomas Kukosa
08bbd29c71 Support for RPCAP features in GUI (from Boris Misenov, see Bug 1366)
- retrieving the list of remote PCAP interfaces
  - password authentication support
  - UDP data fransfer
  - packet sampling (available in WinPcap 4.x)
  etc.

fix problem if non-default rpcap port is used

svn path=/trunk/; revision=23750
2007-12-04 11:19:29 +00:00
Ulf Lamping
99d60cce59 first steps to support MSVC 2008 Express Edition
svn path=/trunk/; revision=23691
2007-11-30 22:01:05 +00:00
Anders Broman
26c07ee766 Update to gtk+ 2.14.2 and glib glib-2.14.4
svn path=/trunk/; revision=23674
2007-11-29 21:34:38 +00:00
Anders Broman
aeb3263d8f Add a link to NASM
svn path=/trunk/; revision=23652
2007-11-28 21:33:01 +00:00
Bill Meier
7f9585782d Fixes for Windows build w/o ZLIB
svn path=/trunk/; revision=23651
2007-11-28 20:06:21 +00:00
Tomas Kukosa
ff7c20938e Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional)
proto.c
 - do not look up in filed tree and inserts in two steps but do it at once
 - next few small speedups
 - some often called elementary functions can be optionally implemented in assembler
 - dispart some functions to see more exact result from profiling
packet-tpnc.c
 - do not reallocate memory for each filed

svn path=/trunk/; revision=23643
2007-11-28 10:18:16 +00:00
Graeme Lunt
24f27a48ec Support for the automatic configuration of the UPX dll/exe packer.
config.nmake - default UPX to the downloaded version in $WIRESHARK_LIBS
win32-setup.sh - updated to also add executables bit to exes - and also use new tag
Makefile.nmake - to download UPX (and also use new version of user-guide)


svn path=/trunk/; revision=23562
2007-11-24 11:45:51 +00:00
Gerald Combs
7a4d6fbf36 Bump the trunk to 0.99.8.
svn path=/trunk/; revision=23525
2007-11-21 00:09:38 +00:00
Graeme Lunt
04b798cbf4 Update to optionally use the "Ultimate Packer for eXecutables" (UPX) to pack the exes and dlls prior to U3 and PortableApps packaging.
For the U3 package, this results in a 40% smaller package.
For the PortableApps version, the package size is not much different, but the install time is quicker. 


svn path=/trunk/; revision=23484
2007-11-18 10:20:26 +00:00
Tomas Kukosa
6055995bf1 revert changes in config.nmake committed by mistake and commit configure.in
svn path=/trunk/; revision=22996
2007-09-27 08:33:53 +00:00
Tomas Kukosa
706e13b44d put next few simple ASN.1 dissectors into the new makefile structure
svn path=/trunk/; revision=22994
2007-09-27 06:03:45 +00:00
Anders Broman
6b4a7ba74d Use GTK+ 2.12
svn path=/trunk/; revision=22955
2007-09-25 16:09:58 +00:00
Jörg Mayer
094e2a9a5f Get rid of the remains of NET-SNMP in the build process.
svn path=/trunk/; revision=22934
2007-09-24 06:59:40 +00:00
Ulf Lamping
7f299f9bcf remove comment which compiler version works - they all work
svn path=/trunk/; revision=22798
2007-09-05 23:03:58 +00:00
Ulf Lamping
a8d0136ed8 always compile zlib.dll from source (even on MSVC6 now), this simplifies the makefiles a bit and (more important) removes an annoying behaviour if you switch between compiler versions - you'll need to run the setup target each time you switch
svn path=/trunk/; revision=22714
2007-08-28 20:31:48 +00:00
Anders Broman
c2c385fc9f Minor tweeks.
svn path=/trunk/; revision=22674
2007-08-26 21:01:13 +00:00
Anders Broman
ef9971610c Use config and makefile from Chris Maynard and Luis instead.
svn path=/trunk/; revision=22672
2007-08-26 20:03:23 +00:00
Anders Broman
d4e158db74 Download libsmi
svn path=/trunk/; revision=22671
2007-08-26 19:17:03 +00:00
Gerald Combs
ad56f2ee36 0.99.6 has been split off. Bump the trunk to 0.99.7.
svn path=/trunk/; revision=22111
2007-06-15 18:44:43 +00:00
Gerald Combs
b713a968bd Revert back to having a local copy of airpcap.h. This should fix building
with AirPcap.  Re-define AIRPCAP_DIR.

svn path=/trunk/; revision=21846
2007-05-20 22:32:14 +00:00
Anders Broman
001d89c183 Undefine AIRPCAP_DIR to get the Windows build going again.
svn path=/trunk/; revision=21841
2007-05-20 19:55:34 +00:00
Gerald Combs
55d2b928c2 From Dustin Johnson:
- Update the wireless/AirPcap GUI code to support 802.11n as well as
    some related upcoming code changes.
  - Remove airpcap.h from the repository, since it exists in the AirPcap
    devpack (and will be superseded Real Soon Now).
  - Show the individual channel flag bits in radiotap.
  
Fix the 802.11n MCS set display.

This is a partial checkin, so hopefully nothing is broken.

svn path=/trunk/; revision=21831
2007-05-18 21:06:20 +00:00
Anders Broman
4c92cbef0e Use the latest GTK stuff.
svn path=/trunk/; revision=21122
2007-03-22 22:26:59 +00:00
Ulf Lamping
90a418243c Python V2.5 is the latest stable version. Add a comment to config.nmake (but keep the 2.4 alive for now) and update version strings in the devel guide.
If the buildbot will be updated, we could also activate the new version in config.nmake.

svn path=/trunk/; revision=20750
2007-02-08 18:25:45 +00:00
Ulf Lamping
77dd618f96 some minor cleanup
svn path=/trunk/; revision=20702
2007-02-03 20:57:24 +00:00
Ulf Lamping
591611ff4e as discussed on the list:
- GTK 2.10 is mainline now
- WINPCAP_VERSION is just confusing without benefit, remove it

svn path=/trunk/; revision=20701
2007-02-03 20:40:11 +00:00
Ulf Lamping
6060578121 ... no it won't, that's why I removed them ...
Put the quotes around the places where HHC_DIR is used, that should work.

svn path=/trunk/; revision=20699
2007-02-03 19:37:59 +00:00
Bill Meier
07ab8a268b Quotes around HHC_DIR required so build doesn't fail;
Will the buildbot "build docs" step work ? Let's see

svn path=/trunk/; revision=20698
2007-02-03 19:33:32 +00:00
Ulf Lamping
acaa675c25 fix HHC_DIR to work
svn path=/trunk/; revision=20693
2007-02-03 07:54:18 +00:00
Ulf Lamping
f95f5a5437 cleanup docbook related comments
svn path=/trunk/; revision=20692
2007-02-03 05:13:39 +00:00
Ulf Lamping
34c0a4447c move docbook related settings from docbook/Makefile.nmake to config.nmake - having only one place to configure it all :-)
svn path=/trunk/; revision=20690
2007-02-03 04:06:43 +00:00
Ulf Lamping
b7eca1050c fix a cut-n-paste error, to fix buildbot problem
svn path=/trunk/; revision=20645
2007-01-31 04:34:58 +00:00
Ulf Lamping
5698c994ca C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
svn path=/trunk/; revision=20637
2007-01-31 02:23:06 +00:00
Gerald Combs
9f8fa9cfe2 Bump the trunk version to 0.99.6.
svn path=/trunk/; revision=20526
2007-01-22 22:57:32 +00:00
Ulf Lamping
852551cd86 user-guide final step:
enable HHC_DIR as default, hopefully the buildbot will "get it right" now :-)

svn path=/trunk/; revision=20496
2007-01-19 01:21:17 +00:00
Ulf Lamping
2d760bf075 in effect use the User's Guide as the online help system now (for GTK > V1)!
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)

svn path=/trunk/; revision=20446
2007-01-16 04:08:35 +00:00
Ulf Lamping
13a095e055 no, we're still not using MSVC2005 as default :-(
should fix the Win32 buildbot ...

svn path=/trunk/; revision=20413
2007-01-13 04:28:26 +00:00
Ulf Lamping
19bd3956a2 fix some remaining MSVC != V6 issues:
- add redistributables (msvcr*.dll) to the NSIS installer (depending on MSVC_VARIANT)
- split MSVC2006 and MSVC2006EE (Express Edition) settings in config.nmake, as redistributable settings for NSIS are different
- remove Platform SDK setting from config.nmake, it's not needed

svn path=/trunk/; revision=20411
2007-01-13 00:59:39 +00:00
Ulf Lamping
ab31b4fa4d add the ".NET Framework SDK V1.0" to the list of working MSVC_VARIANTS :-)
svn path=/trunk/; revision=20390
2007-01-11 07:53:01 +00:00
Ulf Lamping
dab6935453 various msvc / zlib config cleanup
svn path=/trunk/; revision=20383
2007-01-10 21:45:19 +00:00
Ulf Lamping
393537a7f8 fix the HHC_DIR settings for none MSVC6 variants
svn path=/trunk/; revision=20375
2007-01-10 09:56:39 +00:00
Ulf Lamping
49fd1e07c8 from Laurent Rabret:
use /MD switch instead of direct linker switches
(hopefully this will fix linker issues mentioned by Andrew and Stephen)

svn path=/trunk/; revision=20370
2007-01-10 03:11:13 +00:00
Ulf Lamping
e71b416608 fix compilation for:
- Visual Studio .NET (2002)
- Visual Studio .NET 2003

svn path=/trunk/; revision=20349
2007-01-08 22:29:18 +00:00
Ulf Lamping
7a7c7ea302 Oops, I did it again ;-)
C:\Programme -> C:\Program Files

svn path=/trunk/; revision=20339
2007-01-08 03:31:28 +00:00
Ulf Lamping
e456b4fcd6 if we don't have MSVC6, download (using the setup target) the zlib source package instead of the dll one, and compile it in a temp dir before continuing with wiretap
svn path=/trunk/; revision=20337
2007-01-08 02:40:06 +00:00
Ulf Lamping
8fb030d900 fix GNUTLS compiling issue on recent MSVC versions by switching off Wincrypt.h, see: http://www.mail-archive.com/openssl-dev@openssl.org/msg03802.html for details
svn path=/trunk/; revision=20336
2007-01-07 19:50:16 +00:00
Ulf Lamping
cc164653a0 add experimental support for some more of the MSVC_VARIANTs:
- Microsoft .Net Framework SDK Version 1.1
- Microsoft .Net Framework 2.0 SDK
... which seems to work fine now (except for the open problems like zlib) :-)

Some of the plugins need different linker flags depending on the MSVC. I've set a "define" in config.nmake (PLUGIN_LDFLAGS) and used it in the affected plugins/.../Makefile.nmake. Maybe we should generally change the plugins that way.

btw: The "Microsoft Visual C++ Toolkit 2003" (mentioned some time ago on the list) doesn't work as some important files are missing - and we have much easier alternatives now :-)

svn path=/trunk/; revision=20332
2007-01-06 01:05:59 +00:00
Ulf Lamping
1a25d263d6 don't spread the AirPcap DevPack files over the libs dir, unzip files into: AirPcap_Devpack_1_0_0_594
svn path=/trunk/; revision=20324
2007-01-05 05:23:02 +00:00
Ulf Lamping
3a1a07c46a compile error in openssl.h depends on the Platform SDK, not the MSVC variant used
change the !IFDEF around GNUTLS accordingly

svn path=/trunk/; revision=20323
2007-01-05 05:03:15 +00:00
Ulf Lamping
b6fd719414 move the directory settings more to the top, add an optional platform SDK setting
svn path=/trunk/; revision=20322
2007-01-05 04:58:52 +00:00
Gerald Combs
7d0118ff10 Update to the latest Win32 libs: Net-SNMP 5.4 and GNUTLS 1.6.1. Enable
AirPcap.

svn path=/trunk/; revision=20321
2007-01-05 01:35:23 +00:00
Ulf Lamping
ba961e3ba8 add the "Microsoft .Net Framework SDK Version 1.1" as a compiler option (this is the one described in the corresponding Wiki page)
mark "Visual Studio 2005" (without Express) as EXPERIMENTAL too, seems to be working just like the Express Edition :-)

svn path=/trunk/; revision=20313
2007-01-04 20:51:18 +00:00
Ulf Lamping
d736a37664 another attempt to fix the "Program Files" setting. Unfortunately, using the environment setting doesn't seem to work ...
svn path=/trunk/; revision=20297
2007-01-03 22:09:15 +00:00
Ulf Lamping
97df0c4a56 hmmm, maybe he don't like mixing slashes and backslashes ...
svn path=/trunk/; revision=20292
2007-01-03 06:41:17 +00:00
Ulf Lamping
59cebb950f remove the PDB_FILE setting from config.nmake - there's no real need for this info
add some missing files to the clean targets

svn path=/trunk/; revision=20290
2007-01-03 05:41:11 +00:00
Ulf Lamping
17d57d538c Instead of hard coding "C:/program files", use the corresponding environment variable %ProgramFiles% (hopefully this is available on all supported platforms). This makes it possible to use the same unchanged setting even for internationalised Windows versions (e.g. in the german version this is: "C:\Programme")
svn path=/trunk/; revision=20288
2007-01-03 04:28:28 +00:00
Ulf Lamping
15fd728985 move the MSVC "block" towards the top of the file
don't use GNUTLS and ZLIB when compiling with MSVC != Version 6 - it currently doesn't work

svn path=/trunk/; revision=20283
2007-01-03 02:53:30 +00:00
Ulf Lamping
578e62131e make MSVC6 the default for MSVC_VARIANT, not MSVC2005
svn path=/trunk/; revision=20265
2007-01-02 13:05:04 +00:00
Ulf Lamping
6bb21fbafd first MSVC 2005 changes:
- add some lines to set the desired MSVC_VARIANT
- set some defines (to prevent tons of "deprecated" warnings)
- set some linker flags (currently don't know if these are the right ones - still experimenting)

svn path=/trunk/; revision=20258
2007-01-02 01:19:40 +00:00
Anders Broman
0e063dc29c Use portaudio v19.
svn path=/trunk/; revision=20225
2006-12-27 22:21:46 +00:00
Bill Meier
81ab78cddb Uh Oh: Fix to properly set SH_FLAGS with 'igncr' if required as part of the nmake;
I violated Murphy's nth law: thou shalt test fixes in an 
'out of the box' configuration *not* in one's customized configuration.
:(


svn path=/trunk/; revision=20221
2006-12-26 22:40:49 +00:00
Ulf Lamping
a672d53330 cygwins python doesn't work on a lot of machines, make the native python the default (until we know what the cause of the problems are)
set VERSION_EXTRA back to empty - I guess this was checked in by mistake

svn path=/trunk/; revision=20218
2006-12-26 20:20:52 +00:00
Gerald Combs
b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Anders Broman
686b41801c Update to use gtk 2.10.6 and friends.
svn path=/trunk/; revision=20188
2006-12-21 22:15:34 +00:00
Jörg Mayer
e26860607d Get rid of UCD SNMP support (it's not longer supported and
superseeded by net-snmp). Replace some_snmp by net_snmp
where appropriate.


svn path=/trunk/; revision=20071
2006-12-08 15:05:41 +00:00
Gerald Combs
8e397a2617 Don't define HAVE_AIRPDCAP if HAVE_AIRPCAP isn't defined. Fix a compiler
warning in the 802.11 dissector.

svn path=/trunk/; revision=20053
2006-12-06 20:29:54 +00:00
Bill Meier
bf209eec73 Use 'igncr' as needed with Bash (workaround for bug report 1162);
Change usage of 'nmake' to $(MAKE) /$(MAKEFLAGS) in a few places;
Add one missing /$(MAKEFLAGS);


svn path=/trunk/; revision=20034
2006-12-04 05:41:53 +00:00
Anders Broman
09bd61c233 Update to use the latest gtk 2.8 glib and pango libraries.
Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
2006-11-12 22:18:50 +00:00