Commit Graph

191 Commits

Author SHA1 Message Date
Alexis La Goutte d55e1b5675 NSIS: Fix multiple issues.
Restore the "!include qt-dll-manifest.nsh" clobbered by ga722f83 and
which resulted in missing DLL warnings (e.g. QT5PrintSupport.dll).

Fix overly aggressive search+replace in wireshark.nsi which broke the
WinPcap installation page and GTK+ selection. Try to finish the work on
promoting Qt started in ga722f83.

Bug: 10349
Change-Id: I7086be7c5272f4ae1b2cc26bbd5d5b725f013573
Reviewed-on: https://code.wireshark.org/review/3428
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-06 16:53:07 +00:00
Gerald Combs 304388a44f Install our Qt DLL directories recursively.
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a
PowerShell script to convert the output of windeployqt to its equivalent
NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure
we uninstall known Qt DLL directories. DLLs now load correctly according
to Dependency Walker.

Install and uninstall our .qm files while we're here.

Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21
Reviewed-on: https://code.wireshark.org/review/3267
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30 18:07:29 +00:00
Gerald Combs 1f08f87735 Dont force qt-dll-manifest.txt.
Change-Id: I06781f9b0b89561a96b00c27f938005ebf5b915f
Reviewed-on: https://code.wireshark.org/review/3254
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30 00:28:27 +00:00
Gerald Combs 9a897d55fc Use windeployqt with NSIS.
If we find windeployqt, use it to create a DLL manifest for NSIS.
Fall back to the previous manual lists if we don't. This assumes that
your copy of windeployqt works.

New bug: The Windows installer is huge when using the official Digia DLLs
(around 43 MB for the win 64 package).

Change-Id: I1f662381b7a2c5474595b05177dbdfd3138c7e60
Reviewed-on: https://code.wireshark.org/review/3253
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-29 23:24:21 +00:00
Guy Harris b1c9d0fafe Revert "A few more changes to remove "lib" from "libwsutil" on Windows."
This reverts commit 2fbedef5d1.

Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.

Change-Id: I88245c046b1cf1c76c73fc8e4bc13868e0df4e44
Reviewed-on: https://code.wireshark.org/review/2971
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-10 00:58:37 +00:00
Guy Harris 2fbedef5d1 A few more changes to remove "lib" from "libwsutil" on Windows.
Change-Id: I4c694bb44ebced3d7ae66c16ec3a3ec58825d451
Reviewed-on: https://code.wireshark.org/review/2970
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09 23:44:01 +00:00
Ben Burwell 830d1b1ce9 Add quotes around MAKEDIR.
Bug: 7870
Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352
Reviewed-on: https://code.wireshark.org/review/2620
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 19:35:27 +00:00
Pascal Quantin ad7b5381ac Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06 15:33:01 +00:00
Gerald Combs 0a249087c3 Build with GTK+ 2.24.23.
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460
Reviewed-on: https://code.wireshark.org/review/1665
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-16 16:25:38 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Jeff Morriss 24b377b51f Don't try to distribute asn1.dll since we no longer build it.
svn path=/trunk/; revision=54566
2014-01-02 19:47:03 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
2013-12-01 10:05:16 +00:00
Gerald Combs 36ff508507 Try to fix PortableApps packaging. Note that the Qt definitions should
be in config.nmake along with everything else.

svn path=/trunk/; revision=51598
2013-08-30 15:55:12 +00:00
Gerald Combs 2e857954a3 Fix NSIS packaging.
svn path=/trunk/; revision=51583
2013-08-30 00:43:51 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Gerald Combs a7cef5b7c8 Prettify the WinPcap version display.
svn path=/trunk/; revision=48250
2013-03-11 19:12:17 +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
Gerald Combs a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +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 688ffbb464 Use PROGRAM_NAME in more places.
Missing fro previous commit.

svn path=/trunk/; revision=45576
2012-10-16 08:16:40 +00:00
Anders Broman 091559e2ab Try a experimental gtk3 build
svn path=/trunk/; revision=45540
2012-10-14 18:42:02 +00:00
Alexis La Goutte ea4f518997 Add Qtshark to Windows Installer (NSIS)
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)

Now qtshark is (normally) available in automated build !

svn path=/trunk/; revision=45485
2012-10-11 20:45:35 +00:00
Gerald Combs 1b1a1e6a3e Remove our local copy of WinPcap and download it from
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.

svn path=/trunk/; revision=44888
2012-09-13 21:28:28 +00:00
Gerald Combs 4507b5ed3a Remove a hard-coded path.
svn path=/trunk/; revision=44085
2012-07-27 23:30:44 +00:00
Gerald Combs f25ae3613a Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.

svn path=/trunk/; revision=43976
2012-07-24 23:59:42 +00:00
Gerald Combs 8d050c2828 Remove uninstall_installer.exe when we're done with it so that we don't
have an extraneous executable in the staging directory.

svn path=/trunk/; revision=43965
2012-07-24 16:30:03 +00:00
Gerald Combs 6b04299ae4 According to
http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx

and bug 7507 the Visual C++ 2010 redistributable installer might want
to reboot the system. Tell it not to do that and request a reboot at
the end of the installation process if needed.

svn path=/trunk/; revision=43864
2012-07-20 17:56:16 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695)
svn path=/trunk/; revision=43844
2012-07-20 01:21:27 +00:00
Jeff Morriss aab480d191 Followup to r43370: don't install idl2wrs or its man page.
svn path=/trunk/; revision=43377
2012-06-19 17:32:49 +00:00
Gerald Combs bcb021c25f Define STAGING_DIR and use it in various places instead of hard-coding
"..\.." or "..\..\wireshark-gtk2".

svn path=/trunk/; revision=43239
2012-06-13 21:03:54 +00:00
Gerald Combs a9cb4061d4 Move the "uninstall" parts of wireshark.nsi to uninstall.nsi and the
common parts to common.nsh. Creating an installer now requires two
NSIS runs:

  - uninstaller.nsi, which creates an installer (uninstall_installer.exe)
    that only writes uninstall.exe to ../../wireshark-gtk2.

  - wireshark.nsi, which bundles uninstall.exe along with the rest of
    our installation files.

If we ever get around to signing our executables this will let us sign
all of them. It also cleans up the .nsi file contents a bit.

Instead of keeping separate list of file extensions, manage them from
a single macro. Print the extensions we register / deregister in the
detail pane.

svn path=/trunk/; revision=43236
2012-06-13 19:06:27 +00:00
Guy Harris b018e77f7b No more GIOP plugins, no more GIOP loadable DLL.
svn path=/trunk/; revision=42981
2012-06-01 17:11:00 +00:00
Anders Broman 9d6d0cf275 Replace IDL generated dissector with common dll
svn path=/trunk/; revision=42926
2012-05-30 19:03:56 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library.
svn path=/trunk/; revision=42905
2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try.
svn path=/trunk/; revision=42623
2012-05-14 17:54:47 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo
doesn't crash.

svn path=/trunk/; revision=42171
2012-04-20 23:41:36 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
2012-04-19 18:31:11 +00:00
Gerald Combs 16a4af2d67 Add and update a bunch of Programs and Features-related registry
keys. Sort the keys by name. Calculate the installation size after all
of the files have been installed and add that in the "EstimatedSize"
key. Fix the display icon. Add a hint about our target platform. Add
version information.

We now look like a grown-up application in the Programs and Features
control panel.

svn path=/trunk/; revision=41914
2012-04-04 00:47:21 +00:00
Gerald Combs 1f497af628 Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake
use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119
2011-07-19 18:22:46 +00:00
Gerald Combs 0501a48552 Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available
in wireshark-win64-libs.

svn path=/trunk/; revision=37778
2011-06-23 23:04:03 +00:00
Anders Broman afb0e8b434 From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

svn path=/trunk/; revision=37610
2011-06-08 05:20:43 +00:00
Anders Broman d8e1b0d3d5 Move packet-sercosiii.c to be a builtin dissector.
svn path=/trunk/; revision=37597
2011-06-07 20:33:26 +00:00
Gerald Combs 2009cc6f17 Update some of the "Details" properties in the installer. Remove the
32-bit BMPs from the installer icon; they don't appear to render properly.

svn path=/trunk/; revision=36113
2011-03-01 19:40:51 +00:00
Chris Maynard da1ae8731c Removed duplicate rawshark.html entry from DOC.
svn path=/trunk/; revision=35239
2010-12-21 19:45:16 +00:00
Jeff Morriss dd53f9a1bd Use PCAP_VERSION (from config.nmake) instead of hard coding the WinPcap version.
svn path=/trunk/; revision=33922
2010-08-25 15:28:26 +00:00
Gerald Combs df14866685 WinPcap 4.1.1 -> 4.1.2.
svn path=/trunk/; revision=33493
2010-07-12 23:52:35 +00:00
Gerald Combs 423669df7d Back out r33088 for now.
svn path=/trunk/; revision=33102
2010-06-05 00:29:31 +00:00
Gerald Combs f6b2458924 From Matt Poduska via bug 1957 (with minor changes):
New dissector (plugin) to support decode of the EPCglobal Low-Level Reader
protocol (see llrp.org for more information). This dissector has passed fuzz
testing.

svn path=/trunk/; revision=33088
2010-06-04 18:45:02 +00:00
Gerald Combs 64fce08dc7 Fix the U3 and PortableApps builds.
svn path=/trunk/; revision=32441
2010-04-09 23:51:22 +00:00
Gerald Combs 6cd62e9e65 Rename README.win32 to README.windows and add a 64-bit download link.
Add tools/textify.sh, which makes a Notepad-clickable copy of a text
file. Use it for COPYING, NEWS, README, README.windows, and help/*.txt.

Remove tools/unix2dos.pl and use Cygwin's u2d instead.

svn path=/trunk/; revision=32440
2010-04-09 21:42:51 +00:00