diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-08-28 16:48:53 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-02 15:39:17 +0000 |
| commit | b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d (patch) | |
| tree | 4fe0e3ab63d6a6f4644daa82165ca035dd20cd30 /image/Makefile.nmake | |
| parent | b9e61becffc42f4b2d7981a0f468effbe9fa4b12 (diff) | |
Qt → wireshark. GTK+ → wireshark-gtk.
Make sure the Qt UI is named "Wireshark" and its executable is named
"wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
"Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
audience is likely to care about UI toolkits. Make sure the GTK+
executable is named "wireshark-gtk" or "wireshark-gtk.exe".
It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
package. It's likely even more broken now.
Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
1.11.3) at some point. The first attempt to compile in ui/qt returns
"error: source_file.cpp: No such file or directory". The second attempt
works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).
Tested:
- Nmake builds
- NSIS packaging
- CMake builds (Windows, OS X)
- Autotools build and distcheck
- RPM packaging
To do:
- Test Debian packaging
- Fix PortableApps
Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
Reviewed-on: https://code.wireshark.org/review/3919
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'image/Makefile.nmake')
| -rw-r--r-- | image/Makefile.nmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index 0cb78774f2..de5c615b16 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -7,6 +7,7 @@ include ..\config.nmake ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc wiretap.rc dumpcap.rc libwsutil.rc wireshark.exe.manifest all : $(ALL_RC) +# wireshark.exe.manifest and wireshark.rc are used for both Qt and GTK+ executables. wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake sed -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ |