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 /packaging/nsis/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 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 0e44a15ecb..0b158f28f7 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -14,7 +14,7 @@ STAGING_DIR=..\..\$(INSTALL_DIR) EXE=../../tshark.exe ../../editcap.exe \ !IFDEF GTK_DIR - ../../wireshark.exe \ + ../../wireshark-gtk.exe \ !ENDIF ../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll @@ -226,7 +226,7 @@ NSIS_FLAGS=\ !IFDEF HHC_DIR /DHHC_DIR="$(HHC_DIR)" \ !ENDIF -!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") /DQT_DIR="..\..\wireshark-qt-release" \ !ENDIF @@ -236,7 +236,7 @@ qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 Makefile.nmake set PATH=%PATH%;$(QT5_BASE_DIR)\bin !ENDIF $(POWERSHELL) windeployqt-to-nsis.ps1 \ - -Executable ..\..\wireshark-qt-release\qtshark.exe \ + -Executable ..\..\wireshark-qt-release\wireshark.exe \ -FilePath $@ $(STAGING_DIR)\uninstall.exe : $(NSI) |