diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-10-23 21:38:38 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-10-23 21:38:38 +0000 |
| commit | b1a5c989ee31f4d81546f2555e047acadf2b5757 (patch) | |
| tree | bf84b9ffbcca7ab3c06d820518e14eb69496bb6c /packaging | |
| parent | 483711e3f5705fa6c47982b9920879111adf1b4f (diff) | |
| download | wireshark-b1a5c989ee31f4d81546f2555e047acadf2b5757.tar.gz wireshark-b1a5c989ee31f4d81546f2555e047acadf2b5757.tar.bz2 wireshark-b1a5c989ee31f4d81546f2555e047acadf2b5757.zip | |
Add updates from bug 4158.
svn path=/trunk/; revision=30681
Diffstat (limited to 'packaging')
| -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 | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/packaging/portableapps/win32/appinfo.tmpl b/packaging/portableapps/win32/appinfo.tmpl index b6a113268e..b0731bf4b2 100755 --- a/packaging/portableapps/win32/appinfo.tmpl +++ b/packaging/portableapps/win32/appinfo.tmpl @@ -1,17 +1,21 @@ [Format] Type=PortableApps.comFormat -Version=0.9.6 +Version=0.91 [Details] Name=Wireshark Portable +AppID=WiresharkPortable Publisher=Wireshark.org Homepage=www.wireshark.org Category=Internet Description=Wireshark is one of the world's foremost network protocol analysers. -InstallSize=TBD +Language=Multilingual [License] Shareable=true +OpenSource=true +Freeware=true +CommercialUse=true [Version] PackageVersion=$(PAPPS_VERSION) diff --git a/packaging/portableapps/win32/installer.ini b/packaging/portableapps/win32/installer.ini new file mode 100755 index 0000000000..41e5030ae0 --- /dev/null +++ b/packaging/portableapps/win32/installer.ini @@ -0,0 +1,2 @@ +[MainDirectories] +RemoveAppDirectory=false diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index e25f3e2798..3e2abe78a7 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -84,7 +84,10 @@ WiresharkPortable.ini: WiresharkPortable.tmpl $(TOPDIR)\config.nmake appinfo: appinfo.ini $(COPY) appinfo.ini $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) - $(COPY) $(TOPDIR)\image\wireshark.ico $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) + $(COPY) installer.ini $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) + copy $(TOPDIR)\image\wireshark.ico $(FILES)\$(APP)\$(APPINFO)\appicon.ico /y + copy $(TOPDIR)\image\wsicon16.png $(FILES)\$(APP)\$(APPINFO)\appicon_16.png /y + copy $(TOPDIR)\image\wsicon32.png $(FILES)\$(APP)\$(APPINFO)\appicon_32.png /y source: WiresharkPortable.ini $(COPY) WiresharkPortable.ini $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) |