Commit graph

751 commits

Author SHA1 Message Date
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
Bill Meier
0ea6bce6af Escape ? in echo text the Windows way ....
svn path=/trunk/; revision=28616
2009-06-02 22:02:13 +00:00
Bill Meier
cb4f0a40c2 Prevent "echo ? ... " from expanding ? as a file name pattern;
(Trivial) Remove duplicate xcopy of libwireshark.dll;
(Trivial) xcopy $(MSVCR_DLL) ...  only if newer.

svn path=/trunk/; revision=28528
2009-05-29 20:11:17 +00:00
Gerald Combs
6e689b5adc Update the Windows library tags and documentation filename.
svn path=/trunk/; revision=28527
2009-05-29 18:45:24 +00:00
Bill Meier
96505bc99d Version 2: Fix bug: Makefile doesn't detect some out-of-date libraries.
The previous fix (SVN 28504) didn't quite work since
 nmake always errored out if the libraries were not up-to-date; this 
 prevented doing an nmake ... setup.

 This version of the fix:
 1. Gets the library status (checktag) at the beginning of the make.
 2. Effectively does the actual testing of the status whenever 
    a target with $(LIBS_CHECK) as a dependency is invoked.

 Result: nmake ... [all] will error-out while nmake .... setup will
  work properly.

 Note that nmake ... setup will now show an initial error message
  (from checktag) if the libraries are out of date; setup will still 
  proceed normally.
  This is a slight change from the current behavior wherein no
  error message occurs when nmake ... setup is invoked when the
  libraries are out of date.

svn path=/trunk/; revision=28516
2009-05-28 23:20:20 +00:00
Bill Meier
2223888b20 Add missing quote
svn path=/trunk/; revision=28505
2009-05-27 17:13:07 +00:00
Bill Meier
582e9cb3a4 Fix bug: Makefile doesn't detect some out-of-date libraries.
Reason:
 The makefile was coded to do the checktag and libverify checks
 only if makefile.nmake changed. It's now the case that some 
 library updates are reflected in config.nmake rather than in
 Makefile.nmake and thus were missed.

Solution:
 Do a checktag once at the beginning of the make.
 Do not do a libverify any more. I think that checking
  that the library 'tag' is correct is sufficient.
 (The libverify code has been effectively commented out for now. 
  It can be removed at a later date once we're comfortable
  with just using checktag).
 --This line, and those below, will be ignored--

M    Makefile.nmake

svn path=/trunk/; revision=28504
2009-05-27 17:07:51 +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
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
e648060f0f Fix the last(?) of the Win64 compilation problems.
svn path=/trunk/; revision=28065
2009-04-16 04:05:39 +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
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
Bill Meier
b3f428acb4 Do checkAPIs for wireshark_SOURCES
svn path=/trunk/; revision=27754
2009-03-17 15:39:07 +00:00
Gerald Combs
cf7fb3ea9c Port rdps from C to Python. This makes it easier to cross-compile
Wireshark on Windows. The GNU toolchain changes have not been tested.

svn path=/trunk/; revision=27704
2009-03-11 22:12:05 +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
0af6e6e23a Enable checkAPIs on gtk/...
(I believe all the errors for gtk/... have been fixed);
 Next up: Add the complete list of deprecated
   GTK APIs to checkAPIs.pl

svn path=/trunk/; revision=27681
2009-03-09 20:29:09 +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
db37f3cecf Try using the MSVCRT version of Lua (lua5_1_4_Win32_dll6_lib) for
all builds.

svn path=/trunk/; revision=27465
2009-02-16 17:27:12 +00:00
Ulf Lamping
f8e5b17dbd add support for a simple GeoIP based IP Location Map, more details will follow on the dev-list
svn path=/trunk/; revision=27433
2009-02-11 20:25:17 +00:00
Ulf Lamping
67efa1ca84 we don't need to copy rawshark.exe.manifest, as this manifest is integrated using mt.exe
svn path=/trunk/; revision=27403
2009-02-09 19:38:15 +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
Anders Broman
7c48128948 Revert previous checkin.
svn path=/trunk/; revision=27356
2009-02-02 22:16:46 +00:00
Anders Broman
d92ab193f5 Use Python to build tshark-tap-register.c
svn path=/trunk/; revision=27355
2009-02-02 21:22:01 +00:00
Ulf Lamping
7eae5480fb trying to "inject" commands into xcopy doesn't work on international windows version. You simply can't answer the question "Datei oder Verzeichnis" with the key 'f' ;-)
Replace this with the triple: "copy, if exist delete, rename" which isn't very nice but at least works on all machines

svn path=/trunk/; revision=27325
2009-01-29 01:31:11 +00:00
Anders Broman
2b3540be16 Use Glib 2.18-4 GTK+ 2.14.7 and Cairo 1.8.6.
svn path=/trunk/; revision=27226
2009-01-13 23:21:19 +00:00
Tomas Kukosa
e22d7c79eb display runtime versions of GnuTLS and Gcrypt libraries
svn path=/trunk/; revision=27194
2009-01-08 13:24:04 +00:00
Gerald Combs
8395f0ef02 As suggested by Joerg a while back, get rid of FAQ in the build directory.
Copy help/faq.txt to FAQ in the NSIS and zip packages.

Add "help" to the dependency list for "all". Fix a couple of minor bugs
in the top-level Makfile.nmake.

svn path=/trunk/; revision=27173
2009-01-06 21:47:19 +00:00
Anders Broman
57d4f179fd Use the install-plugins target.
svn path=/trunk/; revision=27125
2008-12-29 15:12:04 +00:00
Anders Broman
960cd2feee Use GTK+ 2.14.6
svn path=/trunk/; revision=27121
2008-12-27 16:24:16 +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
Bill Meier
9a411f5ddf Rework FAQ target & etc so it works; Is there a better way ?
svn path=/trunk/; revision=26984
2008-12-13 03:46:57 +00:00
Gerald Combs
9dcdec852b Try to get the FAQ targets working on Windows. Add lynx to the list of
required tools.

svn path=/trunk/; revision=26982
2008-12-13 02:59:42 +00:00
Bill Meier
4f170baf7e Delete the prior version of c-ares (1.5.3) in clean_setup
svn path=/trunk/; revision=26963
2008-12-11 00:49:17 +00:00
Gerald Combs
e137f6cb76 Use c-ares 1.6.0.
svn path=/trunk/; revision=26961
2008-12-10 22:16:09 +00:00
Anders Broman
8a1b0a0414 Use GTK 2.14.5 and glib 2.18.2
Overview of Changes from GLib 2.18.2 to GLib 2.18.3
===================================================

* Build with libtool 2.x

* Bugs fixed:
 557087 mem leak in g_content_types_get_registered
 558185 'parent' variable in g_local_file_get_child_for_display_name()
         hits g_object_unref(NULL) assertion
 557210 g_compute_checksum_for_* asserts with less than 2 bytes
 528320 Incorrect icons displayed for files with custom mimetype icons
 557592 Missing include in gwinhttpfile.c
 556415 Crash on Windows 2000 in g_winhttp_vfs_init()
 556910 Memory leak: sub
 561352 Leak of icon description
 561375 Leaks mountpoint description
 560569 gkeyfile doesn't use the set list_separator in some cases
 560568 gkeyfile docs buglet
 559413 g_option_group_set_error_hook docs buglet

Overview of Changes from GTK+ 2.14.4 to 2.14.5
==============================================

* Bugs fixed:
 556578 GIMP windows stay on top of other windows
 557059 crash when compositing emblems with icon
 557266 Window Management Problem
 528320 Incorrect icons displayed for files with custom mimetype icons
 557894 Wrong return value for gdk_pointer_grab_info_libgtk_only
 557316 GtkLinkButton should consider user-defined tooltip
 558323 glitches when popping up combos in treeviews
 558278 Crash when calling a callback set by
gdk_add_client_message_filter
 557212 Problem with which window gains focus and is visible
 541391 Unfocussable Treeview swallows focus
 552956 Should check composite extension version
 554567 warning fixes (missing format specifiers and NULL vs 0)

svn path=/trunk/; revision=26960
2008-12-10 20:30:34 +00:00
Ulf Lamping
152ba2075c add mt.exe to the REQUIRED_TOOLS (if we're not using MSVC6)
svn path=/trunk/; revision=26932
2008-12-08 18:28:40 +00:00
Balint Reczey
d343f41bcf Remove old lua5.1 dir when performing clean_setup.
From Christopher Maynard.
This fixes bug 3072 (with commit 26810).

svn path=/trunk/; revision=26811
2008-11-19 13:49:31 +00:00
Balint Reczey
aaee3d38eb delete lua5.1.4 dir when performing clean_setup
svn path=/trunk/; revision=26810
2008-11-19 13:44:04 +00:00
Anders Broman
f9f80c330e Update GTK packages.
svn path=/trunk/; revision=26786
2008-11-15 16:36:27 +00:00
Gerald Combs
b55a53fe02 Create a manifest for rawshark.exe.
svn path=/trunk/; revision=26437
2008-10-13 18:32:49 +00:00
Anders Broman
bc7779c4c4 Use LUA 5.1.4
svn path=/trunk/; revision=26329
2008-10-01 19:38:27 +00:00
Bill Meier
f5ef397375 Windows Vista: Fix so 'touch --reference ...' file mod time is always gt Makefile.nmake time
svn path=/trunk/; revision=26292
2008-09-29 17:05:46 +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
Anders Broman
04b710049c Use the latest GTK packages, changes:
Overview of Changes from GLib 2.18.0 to GLib 2.18.1
===================================================

* Bugs fixed:
 550433 g_test_init doesn't recognize --help
 523463 Core dump in gmain.c:2482:IA__g_main_context_check
 551228 G_STRFUNC on recent Sun compiler should be expanded...
 551410 gtestutils.c: using printf without prototype
 551731 g_date_set_time[_t] docs should mention what timezone
 548321 <string.h> is not included in gi18n-lib.h
 551149 xdgmime mem leak
 550647 synchronous pipe I/O when reading mount reply
 551887 Docs for g_desktop_app_info_new_from_filename aren't...
 551681 g_content_type_guess() too naive with filenames
 552352 g_app_info_launch doesn't work if "Path" key...
 551408 gmodule.def generated to builddir...
 552359 g_file_info_get_icon should return GThemedIcon, and...

Overview of Changes from GTK+ 2.14.1 to 2.14.2
==============================================

* Don't use XRRGetScreenResources, since it doesn't work well

* Bugs fixed:
 551063 deprecated marking without a link to what new code should use
 319849 gtkcalendar look in RTL locales
 550989 gdk_display_put_event should call g_main_context_wakeup
 550062 Small update in gdk/gdkkeysyms.h
 551325 Reference to wrong parameter in gtk_editable_insert_text
 551386 gtk_printer_set_is_default() always sets TRUE
 550676 Memory leak, update keyboard layout data structure
 551699 gtk_scrolled_window_destroy() is broken
 551567 DND mark broken
 551378 Print dialog: should try UDS when fetching PPD for localhost
 536542 gtk_list_store_set() documentation doesn't say whether...
 552153 GtkModules loading with XSettings doesn't work...
 552001 gtkimcontextsimple.c: variable is declared at middle...
 551987 GtkPaned redrawing problem
 551722 gtk_widget_set_scroll_adjustments() should check...
 552107 Small libtool fixes
 552500 GtkPrintSettings API doc not precise enough
 408154 Change GtkEntryCompletion max-items to style property
 329593 Entering characters on a line very cpu intensive and slow
 552667 gtkimage containing gicon leaks memory
 552668 format not a string literal and no format arguments...
 346903 gtk_enumerate_printers needs events to complete
 550969 fix a typo which breaks the static build
 517233 Calling gdk_pixbuf_loader_close causes "GError set over...
 551063 deprecated marking without a link to what new code should use
 540967 docs build slowly because of entities

svn path=/trunk/; revision=26255
2008-09-23 20:32:40 +00:00