Update some of the "Details" properties in the installer. Remove the
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 1 Mar 2011 19:40:51 +0000 (19:40 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 1 Mar 2011 19:40:51 +0000 (19:40 +0000)
32-bit BMPs from the installer icon; they don't appear to render properly.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36113 f5534014-38df-0310-8fa8-9805f1628bb7

config.nmake
image/wiresharkinst.ico
packaging/nsis/Makefile.nmake
packaging/nsis/wireshark.nsi

index 70e49bdf8a2c39de952f9ed57b01a7e750087b29..009d692c9d34eb0eb412757f0a9fd9e2a2fdb854 100644 (file)
@@ -1018,6 +1018,7 @@ XMLLINT="xmllint"
 
 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
 RC_VERSION=$(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_BUILD)
+PRODUCT_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_BUILD)
 
 WTAP_VERSION=$(WTAP_VERSION_MAJOR).$(WTAP_VERSION_MINOR).$(WTAP_VERSION_MICRO)
 RC_WTAP_VERSION=$(WTAP_VERSION_MAJOR),$(WTAP_VERSION_MINOR),$(WTAP_VERSION_MICRO)
index 0f589a6091cc5e08dac7643523e95d9d13b55ae7..b43059377c8f48b570d386b5f50936f22e4e4343 100644 (file)
Binary files a/image/wiresharkinst.ico and b/image/wiresharkinst.ico differ
index e052766239065dbc22d85ac7f1c8f0f66a49edb3..8aeaf0025c398223f2476f803d88e5b81526c7b7 100644 (file)
@@ -139,6 +139,7 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
        /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
        /DINTL_DLL=$(INTL_DLL) \
        /DVERSION=$(VERSION) \
+       /DPRODUCT_VERSION=$(PRODUCT_VERSION) \
        /DWTAP_VERSION=$(WTAP_VERSION) \
 !IF "$(C_ARES_DIR)" != ""
        /DC_ARES_DIR=$(C_ARES_DIR) \
index a3e902b5d6b0335e4b3af5a071e2d3d1789bfbf2..cf9202d640d684366bd3fbc435fd59c3cd2783d4 100644 (file)
@@ -34,6 +34,20 @@ InstType "un.All (remove all)"
 
 Name "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)"
 
+; 
+VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
+VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
+VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
+; NSIS handles the copyright symbol correctly using CP-1252 but not UTF-8.
+VIAddVersionKey "LegalCopyright" "© Gerald Combs and many others"
+VIAddVersionKey "LegalTrademarks" "Wireshark and the 'fin' logo are registered trademarks of the Wireshark Foundation"
+VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for ${BITS}-bit Windows"
+VIAddVersionKey "Language" "English"
+VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
+VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
+VIProductVersion "${PRODUCT_VERSION}"
+
+
 ; The file to write
 OutFile "wireshark-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.exe"