/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)
; 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
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
/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
#
print q{
+#
+# DO NOT EDIT - autogenerated from makenmake.pl and ../../wireshark.manifest
+#
+
include ../../../config.nmake
include <win32.mak>
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:
};