diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-08-30 15:55:12 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-08-30 15:55:12 +0000 |
commit | 36ff508507eb52ae37e5015f52701bb1d26cafcf (patch) | |
tree | c95f62cab84c5234e7a26faddb6deb193319f202 | |
parent | 84bf0acc0035cb284e8afcfb51ac7171eafc25ef (diff) |
Try to fix PortableApps packaging. Note that the Qt definitions should
be in config.nmake along with everything else.
svn path=/trunk/; revision=51598
-rw-r--r-- | packaging/nsis/Makefile.nmake | 7 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 9 | ||||
-rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 16 | ||||
-rwxr-xr-x | packaging/portableapps/win32/makenmake.pl | 20 |
4 files changed, 33 insertions, 19 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index dc1c9cc339..64345dc755 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -219,9 +219,10 @@ NSIS_FLAGS=\ /DQT_DIR="..\..\wireshark-qt-release" \ !ENDIF !IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") - /DQT_VER=5 \ -!ELSE - /DQT_VER=4 \ + /DNEED_QT5_DLL=USE \ +!ENDIF +!IF EXIST("..\..\wireshark-qt-release\QtCore4.dll") + /DNEED_QT4_DLL=USE \ !ENDIF $(STAGING_DIR)\uninstall.exe : $(NSI) diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index ef753687fa..e9d8231958 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -840,15 +840,16 @@ Section "QtShark (Experimental)" SecQtshark ; by default, QtShark is not installed SetOutPath $INSTDIR File "${QT_DIR}\qtshark.exe" -!if ${QT_VER} == "4" -File "${QT_DIR}\QtCore4.dll" -File "${QT_DIR}\QtGui4.dll" -!else +!ifdef NEED_QT5_DLL File "${QT_DIR}\Qt5Core.dll" File "${QT_DIR}\Qt5Gui.dll" File "${QT_DIR}\Qt5Widgets.dll" File "${QT_DIR}\Qt5PrintSupport.dll" !endif +!ifdef NEED_QT4_DLL +File "${QT_DIR}\QtCore4.dll" +File "${QT_DIR}\QtGui4.dll" +!endif ; Disable Qtshark shortcut if Qtshark isn't selected Push $0 SectionGetFlags ${SecQtshark} $0 diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index f2b3681f93..aebe11f805 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -24,15 +24,18 @@ COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y !IFNDEF WIN32_SETUP_OPT -WIN32_SETUP_OPT=--download +WIN32_SETUP_OPT = --download !ENDIF + +# XXX This should be defined in config.nmake. !IF EXIST("..\..\wireshark-qt-release\qtshark.exe") -QT_DIR="..\..\wireshark-qt-release" +QT_DIR = "..\..\wireshark-qt-release" !ENDIF !IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") - /DQT_VER=5 \ -!ELSE - /DQT_VER=4 \ +NEED_QT5_DLL = USE +!ENDIF +!IF EXIST("..\..\wireshark-qt-release\QtCore4.dll") +NEED_QT4_DLL = USE !ENDIF UPX_FLAGS = -q @@ -114,7 +117,8 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ /DQT_DIR=$(QT_DIR) \ - /DQT_VER=$(QT_VER) \ + /DNEED_QT5_DLL=$(NEED_QT5_DLL) \ + /DNEED_QT4_DLL=$(NEED_QT4_DLL) \ /DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \ Installer.nsi diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl index 69766c70d6..9f624ce664 100755 --- a/packaging/portableapps/win32/makenmake.pl +++ b/packaging/portableapps/win32/makenmake.pl @@ -4,6 +4,10 @@ # print q{ +# +# DO NOT EDIT - autogenerated from makenmake.pl and ../../wireshark.manifest +# + include ../../../config.nmake include <win32.mak> @@ -16,15 +20,19 @@ STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR) COPY = xcopy MOVE = mv MKDIR = mkdir -COPY_FLAGS = /d /y +COPY_FLAGS = /d /y + +# XXX This should be defined in config.nmake. !IF EXIST("$(TOPDIR)\wireshark-qt-release\qtshark.exe") -QT_DIR="$(TOPDIR)\wireshark-qt-release" +QT_DIR = "$(TOPDIR)\wireshark-qt-release" +!ENDIF +!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll") +NEED_QT5_DLL = USE !ENDIF -!IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") - /DQT_VER=5 \ -!ELSE - /DQT_VER=4 \ +!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll") +NEED_QT4_DLL = USE !ENDIF + distribution: }; |