Commit Graph

606 Commits

Author SHA1 Message Date
Gerald Combs 04fea80bf8 From Sho Amano via bug 7914:
If the source codes are checked out using TortoiseSVN on Windows,
"nmake -f Makefile.nmake packaging_papps" fails in the middle.

This is because the line end of packaging\nsis\wireshark.nsi is CRLF in
this case, and ws-manifest.pl cannot handle such case.

svn path=/trunk/; revision=45798
2012-10-26 15:51:28 +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 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 83092dca63 Use PROGRAM_NAME in more places.
svn path=/trunk/; revision=45575
2012-10-16 08:08:18 +00:00
Anders Broman 0a1bbd5526 Typos.
svn path=/trunk/; revision=45557
2012-10-15 12:50:20 +00:00
Anders Broman 58066cd222 See if we can build u3 pacakage with GTK3.
svn path=/trunk/; revision=45552
2012-10-15 08:03:44 +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
Martin Mathieson f1939f9442 Add 2 new file extension associations, and restore alphabetical order.
svn path=/trunk/; revision=45522
2012-10-13 19:39:05 +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
Anders Broman f0472792e2 - Add Nokai Siemens Networks AVP.
- Add a few enums to Event-Trigger
- Reformat the Nokia file a bit.

svn path=/trunk/; revision=45427
2012-10-09 14:10:31 +00:00
Anders Broman 9f38a46974 From GeorgiaK:
Add Nokia AVP:s

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

svn path=/trunk/; revision=45385
2012-10-08 14:20:34 +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
Martin Mathieson 05570017ba Include reordercap.exe.
svn path=/trunk/; revision=45096
2012-09-24 11:59:49 +00:00
Pascal Quantin 359335be9a Add AlcatelLucent.xml to NSIS installer
svn path=/trunk/; revision=45075
2012-09-23 20:12:46 +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 132febfbc4 Get the package version using configure.in, not grep+sed. Make sure we
exit with an error in a few places where it would be useful.

svn path=/trunk/; revision=44572
2012-08-19 00:49:55 +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 69b1c2dd84 Add a comment.
svn path=/trunk/; revision=43866
2012-07-20 18:04:00 +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
Anders Broman 78527f225d Make it possible to add custom/private MIBs to the Windows installer.
svn path=/trunk/; revision=43819
2012-07-19 08:02:50 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs 1785ed1ee0 Try to fix tarball compilation on Windows.
svn path=/trunk/; revision=43428
2012-06-21 17:35:59 +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
Anders Broman 2592e50101 Don't install main-menubar-ui.xml
svn path=/trunk/; revision=43368
2012-06-19 14:54:11 +00:00
Gerald Combs 089a048d4d Add back an absolute path prefix.
svn path=/trunk/; revision=43264
2012-06-14 19:49:57 +00:00
Gerald Combs 7931a2baf6 More NSIS cleanup.
svn path=/trunk/; revision=43261
2012-06-14 18:53:55 +00:00
Gerald Combs f6e2b64a8f Fix things to match what we're doing in our portableapps counterpart.
svn path=/trunk/; revision=43246
2012-06-13 23:04:57 +00:00
Gerald Combs b5e5d6ac35 Don't add uninstall.exe to the U3/PortableApps manifest. Define
STAGING_DIR. Update some makefile dependencies.

svn path=/trunk/; revision=43244
2012-06-13 22:28:28 +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 c548b1097f Use terminology that conforms better with the MSDN documentation and a
style that conforms better with the rest of the NSIS output.

svn path=/trunk/; revision=43237
2012-06-13 20:11:41 +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
Pascal Quantin 3be09ce941 Add TGPPS9.xml to makefile and NSIS installer
svn path=/trunk/; revision=43202
2012-06-11 13:48:11 +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
Guy Harris ed15123049 Add .ntar as a suffix (some pcap-ng files use it).
Sort the suffixes alphabetically.

svn path=/trunk/; revision=42329
2012-04-29 02:38:55 +00:00
Guy Harris c492f45a1e Make the extension lower case.
Say "Pcap" rather than "Libpcap" - pcap format is used by WinPcap as
well (and it's also read and written by this library called Wiretap
:-)).

Add an additional entry for pcap-NG.

svn path=/trunk/; revision=42328
2012-04-29 02:27:08 +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 0ef57966fc Update a couple of keys.
svn path=/trunk/; revision=41832
2012-03-29 20:22:50 +00:00
Guy Harris b7cfa1359d Now, isn't that swell! Leopard's dseditgroup doesn't return a failure
exit status if the group in question doesn't exist, so we can't use
dseditgroup on Leopard to check whether the access_bpf group exists.

Instead, as per Martin Williams' suggestion in bug 6526, use "dscl .
-read /groups/{group}" instead; the suggestion came from the addgroup.sh
script in

	https://developer.apple.com/library/mac/documentation/OpenSource/Conceptual/ShellScripting/ShellScripting.pdf

svn path=/trunk/; revision=41680
2012-03-20 04:06:36 +00:00
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names.
svn path=/trunk/; revision=41621
2012-03-16 17:36:40 +00:00