Commit Graph

589 Commits

Author SHA1 Message Date
Ulf Lamping cd5aae8116 instead of putting the MSC_VER_REQUIRED test into the root Makefile (which would require to change ALL makefiles - the buildbot revealed it), simply put it in the wiretap generation. As wiretap is mandatory and one of the first things to be build this doesn't even sound like a bad idea anyway ...
svn path=/trunk/; revision=20646
2007-01-31 05:26:41 +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
Ulf Lamping e9cf850201 As discussed on the devlist:
A clean_setup is done first now to ensure that the target dirs don't contain old files -  probably remaining from a previous setup run.

explicit removing of the gtk2 dir is no longer required therefore

svn path=/trunk/; revision=20497
2007-01-19 02:41:25 +00:00
Ulf Lamping 020e10eabb add the user-guide as a component to the setup target
svn path=/trunk/; revision=20495
2007-01-19 01:10:59 +00:00
Anders Broman ceb60b0a6d Update to use the latest GTK packages.
Win32-setup.sh changed to overwrite existing folders.

svn path=/trunk/; revision=20463
2007-01-17 19:14:11 +00:00
Ulf Lamping 2b15cb0156 don't generate zlib1.dll over and over again
svn path=/trunk/; revision=20396
2007-01-11 22:05:59 +00:00
Ulf Lamping a7e01a7dc8 fix some zlib build issues
svn path=/trunk/; revision=20382
2007-01-10 21:42:34 +00:00
Ulf Lamping 15d125cefc add a missing dependency to the zlib1.dll, so it will be generated before wiretap
svn path=/trunk/; revision=20362
2007-01-10 00:35:01 +00:00
Ulf Lamping 550c897251 the makefile dependencies are just killing me ;-) Maybe this is the right way to go ...
svn path=/trunk/; revision=20342
2007-01-08 07:42:26 +00:00
Ulf Lamping 50750f6ecd fix general compilation:
- compile wiretap unconditionally

fix .NET1.1 + PSDK compilation:
- lib.exe tool not available, build dll only (that's just enough)
- copy zlib1.dll.manifest file only if it's available, MSVC2003 doesn't generate it

svn path=/trunk/; revision=20340
2007-01-08 05:03:17 +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 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
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 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 0eec920b42 fix epan\crypt\crypt-md5.obj
svn path=/trunk/; revision=20289
2007-01-03 05:08:20 +00:00
Ulf Lamping 83072738c7 if exist, the install targets should copy pdb and manifest files along with the exe and dll ones
svn path=/trunk/; revision=20280
2007-01-03 00:10:57 +00:00
Gerald Combs 53689800e6 Move epan/crypt-md5.[ch] to epan/crypt. Remove
epan/crypt/airpdcap_md5.[ch].  Fix up whitespace.

svn path=/trunk/; revision=20277
2007-01-02 22:49:57 +00:00
Guy Harris 04ca66dfb1 Ehtereal[sic] -> Wireshark. :-)
Give a little more detail in the comment in the H.248 dissector about
"MEGACO" vs. "H.248".

svn path=/trunk/; revision=20262
2007-01-02 09:20:27 +00:00
Gerald Combs bd282b4114 Move the contents of airpdcap to epan/crypt. Try to fix the current
distcheck failure.  Move the nmake build targets for airpdcap from 
epan/dissectors to epan.  This will probably break the Windows build.

svn path=/trunk/; revision=20231
2006-12-28 17:22:12 +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 0d43782ae7 convert line endings (using dos2unix) of the win32_setup.sh file before using it
svn path=/trunk/; revision=20215
2006-12-26 12:40:37 +00:00
Gerald Combs b90006ac6f Update to GNUTLS 1.6.0.
svn path=/trunk/; revision=20204
2006-12-23 00:06:16 +00:00
Bill Meier 42d5c2906f use 'rm -rf' so no error if directory already deleted (by 'clean_setup')
svn path=/trunk/; revision=20190
2006-12-22 00:38:53 +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
Gerald Combs a980d04783 From Davide Schiera and Giorgio Tino: Add initial WPA/WPA2 decryption
support.

WEP key preferences have been overloaded to allow WPA keys.  The
decryption code currently uses Windows-specific data types, but can be
converted to use glib equivalents.

Add a few text and whitespace fixups.

svn path=/trunk/; revision=20049
2006-12-05 19:24:25 +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
Ulf Lamping f5e8f21286 if the WIRESHARK_LIBS dir isn't already existing, create it
this fixes problems discussed earlier on the list with cygpath

svn path=/trunk/; revision=19934
2006-11-19 17:02:31 +00:00
Ulf Lamping 405813eb42 fix clean_setup target
svn path=/trunk/; revision=19933
2006-11-19 16:49:58 +00:00
Ulf Lamping 9fb143d508 add the /LARGEADDRESSAWARE to the link process of Wireshark(2) and Tshark. See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/memory/base/physical_address_extension.asp how to enable 3GB support on several Windows versions - I will update the OutOfMemory Wiki page accordingly
svn path=/trunk/; revision=19923
2006-11-17 22:48:21 +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
Ulf Lamping e13cec2560 don't copy mibs.txt files to mibs, but to snmp\mibs
svn path=/trunk/; revision=19856
2006-11-07 09:36:26 +00:00
Anders Broman 261a964be1 Remove the references to acn
svn path=/trunk/; revision=19835
2006-11-06 20:49:47 +00:00
Ulf Lamping 826b611290 fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO

svn path=/trunk/; revision=19715
2006-10-27 12:06:13 +00:00
Anders Broman c8ecc89dec Missed a change.
svn path=/trunk/; revision=19696
2006-10-26 07:34:10 +00:00
Anders Broman 0880bc54d0 Preparations for using the latest GTK 2.8 files for now only gettext is updated.
svn path=/trunk/; revision=19695
2006-10-26 07:25:07 +00:00
Bill Meier 658fbf4314 rdm now not a plugin - don't copy dll
svn path=/trunk/; revision=19600
2006-10-19 03:45:34 +00:00
Gerald Combs 3208402386 If .svn/entries exists, add it as a dependency to svnversion.h.
svn path=/trunk/; revision=19598
2006-10-18 20:30:15 +00:00
Ulf Lamping 9f62a052a4 distclean should remove wireshark-gtk1/2 dirs completely
svn path=/trunk/; revision=19509
2006-10-13 00:21:47 +00:00
Bill Meier cf20149616 If GTK1_DIR or GTK2_DIR not defined, then corresponding install-common-deps should not be invoked....
svn path=/trunk/; revision=19458
2006-10-09 02:07:44 +00:00
Graeme Lunt 012a218a51 Patch for clean, distclean and maintainer-clean targets for U3 packaging.
svn path=/trunk/; revision=19431
2006-10-04 18:08:51 +00:00
Ulf Lamping 0be3b04cb1 as noted by Anders Broman: the Win2000 version of copy don't like the /d switch
svn path=/trunk/; revision=19395
2006-10-02 19:07:01 +00:00
Ulf Lamping e3883affdd that wasn't a typo, xcopy can't rename files that way
svn path=/trunk/; revision=19372
2006-09-30 00:45:03 +00:00
Anders Broman fdd6b40b4b Fixa a typo copy -> xcopy
svn path=/trunk/; revision=19357
2006-09-29 05:53:47 +00:00
Gerald Combs 0678c4f7c4 Update GNUTLS to 1.5.1. This includes an updated libgcrypt, which should
fix bug 1096.

Switch back to fetching a date-stamped URL in win32-setup.sh.  This
ensures backward compatibility with previous releases and non-updated
SVN trees.

svn path=/trunk/; revision=19339
2006-09-27 18:02:40 +00:00
Luis Ontanon 354983d30d use luaforge's 5.1 dll to be able to link on windows. fix some mistakes
svn path=/trunk/; revision=19331
2006-09-27 00:45:55 +00:00
Luis Ontanon e13832cbe3 The forgotten files!
svn path=/trunk/; revision=19325
2006-09-26 03:36:31 +00:00
Ulf Lamping 4c6484334c fix a typo
svn path=/trunk/; revision=19303
2006-09-23 08:39:54 +00:00