Commit Graph

561 Commits

Author SHA1 Message Date
Pascal Quantin 35f284caad Revert file committed by accident
svn path=/trunk/; revision=51565
2013-08-28 17:33:14 +00:00
Pascal Quantin 519a7778aa Fix copy/paste error introduced in r51541 and spotted by Joerg
svn path=/trunk/; revision=51564
2013-08-28 17:31:12 +00:00
Gerald Combs dc87fa2d68 Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497
2013-08-23 22:18:49 +00:00
Martin Kaiser e8d6b0581b we have to make the manual change for *gtk2* now
svn path=/trunk/; revision=50873
2013-07-24 18:48:25 +00:00
Anders Broman 1c92cbf702 Don't enable GTK3 build on win32 - it's not working.
svn path=/trunk/; revision=50868
2013-07-24 17:29:52 +00:00
Anders Broman 61e0e4d88c Make it possible to use GetProcessMemoryInfo on Windows.
svn path=/trunk/; revision=50865
2013-07-24 15:54:55 +00:00
Jörg Mayer 18155bd148 Change default gtk build from version 2 to version 3 for
autotool, cmake and nmake.
No idea what it takes to change the visual project stuff

svn path=/trunk/; revision=50863
2013-07-24 11:51:10 +00:00
Gerald Combs a692824160 GeoIP 1.5.1.
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
Chris Maynard 59ef0c60d9 Change a forward-slash to a back-slash as the path separator..
svn path=/trunk/; revision=49677
2013-06-01 13:05:28 +00:00
Gerald Combs c0a41bb182 Add a link to the latest CRT redistributables.
svn path=/trunk/; revision=49000
2013-04-23 17:40:27 +00:00
Gerald Combs ea19c7f952 1.9.3 → 1.11.0.
svn path=/trunk/; revision=48972
2013-04-22 17:59:38 +00:00
Gerald Combs b60e41b984 1.9.2 → 1.9.3.
svn path=/trunk/; revision=48627
2013-03-28 18:13:22 +00:00
Gerald Combs 4c87778b7a 1.9.1 → 1.9.2.
svn path=/trunk/; revision=48406
2013-03-18 22:18:52 +00:00
Gerald Combs f609d943e5 Get release note conversion working on Windows.
svn path=/trunk/; revision=48321
2013-03-15 17:00:21 +00:00
Gerald Combs fc6e505dac Switch to Asciidoc for the release notes. The initial conversion from
Docbook was done using Pandoc and cleaned up by hand. Add an
asciidoc.conf which contains macros for linking to Wireshark bugs and
CVE IDs.

Remove the release-notes.chm target. I don't think we ever used it and
we're probably better off generating PDF or HTML if we need something
fancier than plain text.

In configure.ac, consolidate program path discovery a bit and add a2x
discovery.

svn path=/trunk/; revision=48307
2013-03-15 00:08:18 +00:00
Gerald Combs 7613251d1c Switch to WinPcap 4.1.3.
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
Gerald Combs ac364779f7 Switch to c-ares 1.9.1.
svn path=/trunk/; revision=48191
2013-03-08 16:51:21 +00:00
Bill Meier af4a5770c2 Always build with GDK_DISABLE_DEPRECATED, GDK_PIXBUF_DISABLE_DEPRECATED, GTK_DISABLE_DEPRECATED
Also: remove "experimental" comment from Win32 GTK3 build config;

(I'm not able to try the WIN64 GTK3 build so I've left that marked as experimental).

svn path=/trunk/; revision=48145
2013-03-06 20:56:04 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Gerald Combs f14ad04d4d More 1.9.0 → 1.9.1 changes. Release note updates.
svn path=/trunk/; revision=47777
2013-02-20 21:17:30 +00:00
Gerald Combs 81a5be5813 Enable automatic updates for Win64. Fix a copy/paste error.
svn path=/trunk/; revision=47749
2013-02-19 22:57:40 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Bill Meier fea2576612 Add note re 'no problems to date' with VS2012 (VC11).
svn path=/trunk/; revision=47539
2013-02-07 21:59:27 +00:00
Bill Meier b6bd189390 Fixes & comments for building Wireshark with VS2012 (VC11)
1. Define 'APPVER' appropriately;
   Prevents warning message:
   LINK : warning LNK4010: invalid subsystem version number 5.0; default subsystem version assumed.
2. Add comment (& ToDo) re using VS2012 to build .exe which will also run on WIndows XP.

svn path=/trunk/; revision=46830
2012-12-28 21:18:19 +00:00
Anders Broman 70f6c44703 Define GTK_SCHEMAS_DIR
svn path=/trunk/; revision=46704
2012-12-22 22:18:29 +00:00
Anders Broman 03282e6244 Put back the 'right' GTK3 bundles
svn path=/trunk/; revision=46703
2012-12-22 21:46:59 +00:00
Bill Meier bcec004e47 Remove redundant (commented out) definition for GTK_PKG
(introduced by me in SVN #46612).

svn path=/trunk/; revision=46677
2012-12-21 15:43:51 +00:00
Anders Broman c3040a0489 Don't yse the new GTK3 bundle, it lacks the tools
svn path=/trunk/; revision=46614
2012-12-19 06:55:11 +00:00
Anders Broman acab4fe903 Use the new bundle
svn path=/trunk/; revision=46613
2012-12-19 06:52:56 +00:00
Bill Meier 919c192780 Let's try using the new Win32 GTK2 bundle 2.24.14 (as suggested by Anders).
svn path=/trunk/; revision=46612
2012-12-19 04:44:01 +00:00
Anders Broman 2977bde9f1 - Make dumpcap build with the new bundle.
- Use the correct bundle id for GTK3

svn path=/trunk/; revision=46586
2012-12-18 11:58:22 +00:00
Anders Broman 4e254a907c Prepare to ubdate the GTK bundles
svn path=/trunk/; revision=46585
2012-12-18 07:42:17 +00:00
Jeff Morriss 83845c0048 vcredist_*.exe is, AFAICT, still optional yet config.nmake always defines the
variable for it.  Since it's always defined but it's optional, don't check
for its existence.

svn path=/trunk/; revision=46022
2012-11-13 15:01:49 +00:00
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