summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-02-19 22:21:17 +0000
committerGerald Combs <gerald@wireshark.org>2013-02-19 22:21:17 +0000
commite48236a43635f9f0e695a25199bf3ab959774590 (patch)
treec6438499bad89c7f47eda54dc4e5c9bd2bcadb89 /packaging
parent9736ff7cb5f2ba971202a3472707aa96380d16de (diff)
downloadwireshark-e48236a43635f9f0e695a25199bf3ab959774590.tar.gz
Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update frequency, and set the update "channel" (stable vs development). Add a "Help" menu item to manually check for updates. svn path=/trunk/; revision=47748
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake3
-rw-r--r--packaging/nsis/wireshark.nsi3
2 files changed, 6 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 881f0bccaf..fa132703e1 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -208,6 +208,9 @@ NSIS_FLAGS=\
!IFDEF GEOIP_DIR
/DGEOIP_DIR=$(GEOIP_DIR) \
!ENDIF
+!IFDEF WINSPARKLE_DIR
+ /DWINSPARKLE_DIR=$(WINSPARKLE_DIR) \
+!ENDIF
!IFDEF HHC_DIR
/DHHC_DIR="$(HHC_DIR)" \
!ENDIF
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index e974bb9886..d432933e1b 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -342,6 +342,9 @@ File "${STAGING_DIR}\libsmi-2.dll"
!ifdef GEOIP_DIR
File "${STAGING_DIR}\libGeoIP-1.dll"
!endif
+!ifdef WINSPARKLE_DIR
+File "${STAGING_DIR}\WinSparkle.dll"
+!endif
File "${STAGING_DIR}\COPYING.txt"
File "${STAGING_DIR}\NEWS.txt"
File "${STAGING_DIR}\README.txt"