Add updates from bug 4158.
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 23 Oct 2009 21:38:38 +0000 (21:38 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 23 Oct 2009 21:38:38 +0000 (21:38 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30681 f5534014-38df-0310-8fa8-9805f1628bb7

packaging/portableapps/win32/appinfo.tmpl
packaging/portableapps/win32/installer.ini [new file with mode: 0755]
packaging/portableapps/win32/makefile.nmake

index b6a113268e42de096284778e7454b1574f67c363..b0731bf4b2c446680c6b5769becf5bb2420541ce 100755 (executable)
@@ -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 (executable)
index 0000000..41e5030
--- /dev/null
@@ -0,0 +1,2 @@
+[MainDirectories]
+RemoveAppDirectory=false
index e25f3e2798cd6c27eae6805800d4af1d8d441108..3e2abe78a780e61037a95dfacef4bf1f04628503 100644 (file)
@@ -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)