diff options
| -rw-r--r-- | config.nmake | 12 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 2 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/appinfo.tmpl | 8 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/installer.ini | 2 | ||||
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 4 |
5 files changed, 18 insertions, 10 deletions
diff --git a/config.nmake b/config.nmake index 5173732240..456fb32e0f 100644 --- a/config.nmake +++ b/config.nmake @@ -661,7 +661,17 @@ TEXTIFY=$(SH) $(TOOLS_DIR)/textify.sh # If you don't have NSIS, comment this line out, so that MAKENSIS # isn't defined. # -MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" +MAKENSIS="$(PROGRAM_FILES)\NSIS\makensis.exe" + +# +# Optional: To build the NSIS PortableApps installer. +# +# If you have the NSIS Unicode package, set this to the NSIS Unicode executable. +# +# If you don't have NSIS Unicode, comment this line out, so that +# MAKENSIS_UNICODE isn't defined. +# +MAKENSIS_UNICODE="$(PROGRAM_FILES)\NSIS\Unicode\makensis.exe" # # Optional: To build the developers API documentation with doxygen and dot. diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index ac0c5c45fb..50538ac646 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -46,7 +46,7 @@ VIAddVersionKey FileDescription "${FULLNAME}" VIAddVersionKey FileVersion "${VERSION}" VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey InternalName "${FULLNAME}" -VIAddVersionKey LegalTrademarks "Wireshark and the fin logo are trademarks of Gerald Combs" +VIAddVersionKey LegalTrademarks "Wireshark and the fin logo are registered trademarks of Gerald C. Combs" VIAddVersionKey OriginalFilename "${NAME}.exe" ;VIAddVersionKey PrivateBuild "" ;VIAddVersionKey SpecialBuild "" diff --git a/packaging/portableapps/win32/appinfo.tmpl b/packaging/portableapps/win32/appinfo.tmpl index b0731bf4b2..5d7f2e7b24 100755 --- a/packaging/portableapps/win32/appinfo.tmpl +++ b/packaging/portableapps/win32/appinfo.tmpl @@ -1,6 +1,6 @@ [Format] Type=PortableApps.comFormat -Version=0.91 +Version=2.0 [Details] Name=Wireshark Portable @@ -8,8 +8,9 @@ AppID=WiresharkPortable Publisher=Wireshark.org Homepage=www.wireshark.org Category=Internet -Description=Wireshark is one of the world's foremost network protocol analysers. +Description=Wireshark is one of the world's foremost network protocol analyzers. Language=Multilingual +Trademarks=Wireshark and the fin logo are registered trademarks of Gerald C. Combs [License] Shareable=true @@ -19,9 +20,8 @@ CommercialUse=true [Version] PackageVersion=$(PAPPS_VERSION) -PackageRevision=$(VERSION_MAJOR) DisplayVersion=$(VERSION_MAJOR).$(VERSION_MINOR) [Control] Icons=1 -Start=WiresharkPortable.exe
\ No newline at end of file +Start=WiresharkPortable.exe diff --git a/packaging/portableapps/win32/installer.ini b/packaging/portableapps/win32/installer.ini index 41e5030ae0..e69de29bb2 100755 --- a/packaging/portableapps/win32/installer.ini +++ b/packaging/portableapps/win32/installer.ini @@ -1,2 +0,0 @@ -[MainDirectories] -RemoveAppDirectory=false diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index ccecb499ba..9affb50c35 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -102,14 +102,14 @@ findprocdll: WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/WiresharkPortable.exe Installer.nsi - $(MAKENSIS) \ + $(MAKENSIS_UNICODE) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \ Installer.nsi Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll - $(MAKENSIS) \ + $(MAKENSIS_UNICODE) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \ |