diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-03-01 19:40:51 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-03-01 19:40:51 +0000 |
| commit | 2009cc6f1794054e4a9cd8f9dbfacc73ef833157 (patch) | |
| tree | c72951ece6b235d8f3363fbd3fde4dd3c737deeb | |
| parent | 5da016099ad3475ad6773b726f321118ab449892 (diff) | |
| download | wireshark-2009cc6f1794054e4a9cd8f9dbfacc73ef833157.tar.gz wireshark-2009cc6f1794054e4a9cd8f9dbfacc73ef833157.tar.bz2 wireshark-2009cc6f1794054e4a9cd8f9dbfacc73ef833157.zip | |
Update some of the "Details" properties in the installer. Remove the
32-bit BMPs from the installer icon; they don't appear to render properly.
svn path=/trunk/; revision=36113
| -rw-r--r-- | config.nmake | 1 | ||||
| -rw-r--r-- | image/wiresharkinst.ico | bin | 49334 -> 14846 bytes | |||
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 14 |
4 files changed, 16 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index 70e49bdf8a..009d692c9d 100644 --- a/config.nmake +++ b/config.nmake @@ -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) diff --git a/image/wiresharkinst.ico b/image/wiresharkinst.ico Binary files differindex 0f589a6091..b43059377c 100644 --- a/image/wiresharkinst.ico +++ b/image/wiresharkinst.ico diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index e052766239..8aeaf0025c 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -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) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index a3e902b5d6..cf9202d640 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -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" |