diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-03-18 16:32:54 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2019-03-18 23:47:38 +0000 |
| commit | a6da14982b2df222af81f89fa2db95b07fdf0388 (patch) | |
| tree | 66323388056a639bbc29da01d5a2e41f9b49ba5c /packaging | |
| parent | 36ba6b87c1545b5c93c498556ac0db74c5965a9c (diff) | |
NSIS: Fix our extra installer location.
We know the native Windows library path early on in the configure
process. Use it to set the location of the Npcap and USBPcap installers
instead of trying to derive it from the GLib DLL path.
Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
Reviewed-on: https://code.wireshark.org/review/32475
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | packaging/nsis/config.nsh.in | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index d7fb923ba9..062e54c33f 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -45,12 +45,7 @@ else() endif() set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND}) -# Path to the Npcap installer. -# XXX Come up with a better variable, e.g. cache WIRESHARK_LIB_DIR in FindWSWinLibs. -file(TO_NATIVE_PATH "${GLIB2_DLL_DIR}/../.." _wireshark_lib_dir) -set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}") - -# Must match ${WIRESHARK_LIB_DIR}/Npcap-X.Y.Z.exe +# Must match ${EXTRA_INSTALLER_DIR}/Npcap-X.Y.Z.exe set(NPCAP_PACKAGE_VERSION "0.991") set(USBPCAP_PACKAGE_VERSION "1.2.0.4") diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 78ae18092e..c20ff93471 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -9,7 +9,7 @@ #define TOP_SRC_DIR "@TOP_SRC_DIR@" #define WIRESHARK_TARGET_PLATFORM @WIRESHARK_TARGET_PLATFORM@ #define TARGET_MACHINE @TARGET_MACHINE@ -#define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@" +#define EXTRA_INSTALLER_DIR "@EXTRA_INSTALLER_DIR@" #define NPCAP_PACKAGE_VERSION @NPCAP_PACKAGE_VERSION@ #define USBPCAP_PACKAGE_VERSION @USBPCAP_PACKAGE_VERSION@ #define VERSION @VERSION@ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 754e2bccc6..5768a60119 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -888,7 +888,7 @@ IfSilent SecRequired_skip_Npcap ReadINIStr $0 "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State" StrCmp $0 "0" SecRequired_skip_Npcap SetOutPath $INSTDIR -File "${WIRESHARK_LIB_DIR}\npcap-${NPCAP_PACKAGE_VERSION}.exe" +File "${EXTRA_INSTALLER_DIR}\npcap-${NPCAP_PACKAGE_VERSION}.exe" ExecWait '"$INSTDIR\npcap-${NPCAP_PACKAGE_VERSION}.exe" /winpcap_mode=no' $0 DetailPrint "Npcap installer returned $0" SecRequired_skip_Npcap: @@ -899,7 +899,7 @@ IfSilent SecRequired_skip_USBPcap ReadINIStr $0 "$PLUGINSDIR\USBPcapPage.ini" "Field 4" "State" StrCmp $0 "0" SecRequired_skip_USBPcap SetOutPath $INSTDIR -File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_PACKAGE_VERSION}.exe" +File "${EXTRA_INSTALLER_DIR}\USBPcapSetup-${USBPCAP_PACKAGE_VERSION}.exe" ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_PACKAGE_VERSION}.exe"' $0 DetailPrint "USBPcap installer returned $0" ${If} $0 == "0" |