Commit Graph

542 Commits

Author SHA1 Message Date
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
Bill Meier d67f3341e5 Add stuff to config to build with VS2012. However: build currently fails.
svn path=/trunk/; revision=44982
2012-09-18 19:42:04 +00:00
Anders Broman 055736b655 Compile and install schemas if GTK3 is used, nsis needs update too
svn path=/trunk/; revision=44923
2012-09-16 09:55:44 +00:00
Anders Broman b3193ec862 Use the latet GTK3+ bundles when building with GTK3
svn path=/trunk/; revision=44890
2012-09-14 06:21:55 +00:00
Jakub Zawadzki 47cee41290 Revert part of r43579, MSVC_VARIANT should be not defined.
svn path=/trunk/; revision=43585
2012-07-06 07:49:36 +00:00
Anders Broman c19583b72c From Michael Mann:
Generic preferences implementation - Printing and Name Resolution.

svn path=/trunk/; revision=43579
2012-07-06 04:48:36 +00:00
Anders Broman e6e6d6217b From Tony Trinh:
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
Anders Broman 227eb36c83 Start to have an generic wireless toolbar. Sligtly modified patch from
Pontus Fuchs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=43354
2012-06-19 12:42:06 +00:00
Bill Meier 0ec00075ef Add a comment as to .bsc files seemingly not usable with VS2010.
svn path=/trunk/; revision=43234
2012-06-13 16:44:06 +00:00
Gerald Combs c592ceded1 Update the Lua configuration on Win64 to reflect the recent change to
Visual Studio 2010.

svn path=/trunk/; revision=43142
2012-06-06 20:42:47 +00:00
Gerald Combs f1cf70fc10 1.7.2 → 1.9.0.
svn path=/trunk/; revision=43120
2012-06-05 16:21:47 +00:00
Anders Broman 7b43b3de0f Make it possible to build with GTK3 on Windows
svn path=/trunk/; revision=43083
2012-06-04 20:42:09 +00:00
Anders Broman 94627901a9 Update GTK 3.0 package Id
svn path=/trunk/; revision=43071
2012-06-04 16:56:08 +00:00
Guy Harris 1dd90d3560 Default to the version recommended in the Developer's Guide, namely
MSVC++ 2010 Express Edition.

svn path=/trunk/; revision=43016
2012-06-03 07:07:35 +00:00
Pascal Quantin 5adc7cd8ef Use GeoIP package 1.4.8-2 for win64 also (I guess that's what was intended in r42933)
svn path=/trunk/; revision=42946
2012-05-31 18:56:02 +00:00
Gerald Combs ddcd6c5ce7 Use the updated GeoIP package (1.4.8-2).
svn path=/trunk/; revision=42933
2012-05-30 22:55:02 +00:00
Gerald Combs 77b9085de9 Revert GEOIP_CFLAGS back to r42905. It looks like the builders picked up
the wrong archive yesterday before I had a chance to upload the right one.

svn path=/trunk/; revision=42919
2012-05-30 15:36:48 +00:00
Chris Maynard b9e43af6e9 Ugh. Fix GEOIP_CFLAGS again. 3rd time's the charm?
svn path=/trunk/; revision=42918
2012-05-30 15:30:07 +00:00
Chris Maynard b15dc3a9af Try it with Windows style path separator instead.
svn path=/trunk/; revision=42917
2012-05-30 15:05:21 +00:00