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/portableapps | |
| parent | b9e61becffc42f4b2d7981a0f468effbe9fa4b12 (diff) | |
| download | wireshark-b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d.tar.gz wireshark-b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d.tar.bz2 wireshark-b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d.zip | |
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/portableapps')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index a930d41a32..60dee968ba 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -16,7 +16,6 @@ NSIS_PLUGINS = nsis-plugins FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll TOPDIR = ..\..\.. -U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y @@ -25,7 +24,7 @@ WIN32_SETUP_OPT = --download !ENDIF # XXX This should be defined in config.nmake. -!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +!IF EXIST("..\..\wireshark-qt-release\wireshark.exe") QT_DIR = "..\..\wireshark-qt-release" !ENDIF !IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") |