osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Updates for Wireshark portable installer. Using nsis unicode now. 

svn path=/trunk/; revision=35300
This commit is contained in:
Chris Maynard 2010-12-29 20:41:53 +00:00
parent c4d27bd873
commit 252861e6af
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.nmake
View File

@ -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.

2
packaging/portableapps/win32/WiresharkPortable.nsi
View File

@ -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 ""

8
packaging/portableapps/win32/appinfo.tmpl
View File

@ -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
Start=WiresharkPortable.exe

2
packaging/portableapps/win32/installer.ini
View File

@ -1,2 +0,0 @@
[MainDirectories]
RemoveAppDirectory=false

4
packaging/portableapps/win32/makefile.nmake
View File

@ -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)" \