diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-11-04 08:01:44 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-11-04 08:01:44 +0000 |
| commit | a213330a6184a5b39b798a93723dfc2c01c00c70 (patch) | |
| tree | 924fb1de3a6031cf211af8464b24b38b4cd02774 /packaging | |
| parent | 0cb19ab9097e4baf2b0e6085c76ee22a8286fa85 (diff) | |
Update to U3 packaging to:
*) Assign a new UUID for version 0.99.5 (so different versions of Wireshark can be installed on one U3 device)
*) Include version number in U3 program name to allow user to differentiate versions
*) Catch up with packaging changes
svn path=/trunk/; revision=19790
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 5 | ||||
| -rw-r--r-- | packaging/u3/win32/manifest.tmpl | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 4f5123f259..638be33042 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -35,6 +35,7 @@ $(HOST): $(MKDIR) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR) $(MKDIR) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders $(MKDIR) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules + $(MKDIR) $(HOST)\$(GTK_WIMP_DLLDST_DIR) $(MKDIR) $(HOST)\lib\pango $(MKDIR) $(HOST)\lib\pango\$(PANGO_LIB_DIR) $(MKDIR) $(HOST)\lib\pango\$(PANGO_LIB_DIR)\modules @@ -87,6 +88,7 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe $(COPY) $(TOPDIR)\dtds\pocsettings.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\presence.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\reginfo.dtd $(DEVICE)\dtds $(COPY_FLAGS) + $(COPY) $(TOPDIR)\dtds\rlmi.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\rss.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\smil.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\xcap-caps.dtd $(DEVICE)\dtds $(COPY_FLAGS) @@ -194,7 +196,6 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe $(COPY) $(TOPDIR)\radius\dictionary.versanet $(DEVICE)\radius $(COPY_FLAGS) $(COPY) $(TOPDIR)\radius\dictionary.wispr $(DEVICE)\radius $(COPY_FLAGS) $(COPY) $(TOPDIR)\radius\dictionary.xedia $(DEVICE)\radius $(COPY_FLAGS) - $(COPY) $(GTK_THEME_DIR)\gtkrc $(DEVICE)\share\themes\Default\gtk-2.0 $(COPY_FLAGS) $(COPY) $(NET_SNMP_DIR)\mibs\*.txt $(DEVICE)\snmp\mibs $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\text2pcap.html $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\tshark.html $(DEVICE) $(COPY_FLAGS) @@ -202,6 +203,8 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe $(COPY) $(TOPDIR)\doc\wireshark-filter.html $(DEVICE) $(COPY_FLAGS) !IFDEF LUA_DIR $(COPY) $(TOPDIR)\epan\wslua\init.lua $(DEVICE) $(COPY_FLAGS) + $(COPY) $(TOPDIR)\epan\wslua\console.lua $(DEVICE) $(COPY_FLAGS) + $(COPY) $(TOPDIR)\epan\wslua\dtd_gen.lua $(DEVICE) $(COPY_FLAGS) !ENDIF # host # diff --git a/packaging/u3/win32/manifest.tmpl b/packaging/u3/win32/manifest.tmpl index 3a7a45d78a..6c9dc87d21 100644 --- a/packaging/u3/win32/manifest.tmpl +++ b/packaging/u3/win32/manifest.tmpl @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <u3manifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="C:\ethereal\packaging\u3\U3_manifest_1003.xsd" version="1.0"> - <application uuid="11b47440-1fa7-11db-9ce2-0002a5d5c51b" version="$(VERSION)"> + <application uuid="bb5e77c0-6bd8-11db-a4d9-0002a5d5c51b" version="$(VERSION)"> <icon>wireshark.ico</icon> - <name>Wireshark</name> + <name>Wireshark $(VERSION)</name> <vendor url="http://www.wireshark.org/">The Wireshark Developer Community</vendor> <description>Wireshark is one of the world's foremost network protocol analyzers, and is the standard in many parts of the industry.</description> <options> |