diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-01-25 17:37:54 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-01-25 17:37:54 +0000 |
| commit | 1a9ea911936399f557877d61a3b1780750e010f2 (patch) | |
| tree | aec62be1c7fad47fd08d3aa0b902f846da0dc0ba /packaging | |
| parent | 8a543e99dff5f9d41cc05869d60d42905e8fc099 (diff) | |
Update manifest file (template) to:
a) remove schema reference
b) assign new GUID for 0.99.6
Update makefile.nmake to:
a) include user-guide.chm - user-guide.chm is copied from the nsis packaging directory
b) include the example_snmp_users_file
c) other tidy-ups
svn path=/trunk/; revision=20555
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 16 | ||||
| -rw-r--r-- | packaging/u3/win32/manifest.tmpl | 4 |
2 files changed, 16 insertions, 4 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index e269978267..a446c74a8a 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -54,7 +54,12 @@ data-dirs: manifest-dirs: if not exist $(MANIFEST) $(MKDIR) $(MANIFEST) -distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util.exe +user-guide.chm: + cd ../../nsis + nmake -f Makefile.nmake user-guide.chm + cd ../u3/win32 + +distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util.exe user-guide.chm # manifest $(COPY) manifest.u3i $(MANIFEST) $(COPY_FLAGS) $(COPY) $(TOPDIR)\image\wireshark.ico $(MANIFEST) $(COPY_FLAGS) @@ -90,6 +95,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\dtds\watcherinfo.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\dumpcap.html $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\editcap.html $(DEVICE) $(COPY_FLAGS) + $(COPY) $(TOPDIR)\example_snmp_users_file $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\help\toc $(DEVICE)\help $(COPY_FLAGS) $(COPY) $(TOPDIR)\help\overview.txt $(DEVICE)\help $(COPY_FLAGS) $(COPY) $(TOPDIR)\help\getting_started.txt $(DEVICE)\help $(COPY_FLAGS) @@ -98,6 +104,9 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\help\display_filters.txt $(DEVICE)\help $(COPY_FLAGS) $(COPY) $(TOPDIR)\help\faq.txt $(DEVICE)\help $(COPY_FLAGS) $(COPY) $(TOPDIR)\manuf $(DEVICE) $(COPY_FLAGS) +!IFDEF HHC_DIR + $(COPY) $(TOPDIR)\packaging\nsis\user-guide.chm $(DEVICE) $(COPY_FLAGS) +!ENDIF !IFDEF PCRE_DIR $(COPY) $(PCRE_DIR)\man\cat3\pcrepattern.3.txt $(DEVICE) $(COPY_FLAGS) !ENDIF @@ -190,7 +199,9 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(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) +!IFDEF NET_SNMP_DIR $(COPY) $(NET_SNMP_DIR)\mibs\*.txt $(DEVICE)\snmp\mibs $(COPY_FLAGS) +!ENDIF $(COPY) $(TOPDIR)\doc\text2pcap.html $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\tshark.html $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\wireshark.html $(DEVICE) $(COPY_FLAGS) @@ -203,9 +214,10 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\packaging\nsis\WinPcap_3_1.exe $(DEVICE) $(COPY_FLAGS) # host # -# these files are copy onto the U3 host and are required to make Wireshark stable +# these files are copied onto the U3 host and are required to make Wireshark stable # $(COPY) $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll $(HOST) $(COPY_FLAGS) + if exist $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll.manifest $(COPY) $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll.manifest $(HOST) $(COPY_FLAGS) !IFDEF ENABLE_LIBWIRESHARK $(COPY) $(TOPDIR)\epan\libwireshark.dll $(HOST) $(COPY_FLAGS) !ENDIF diff --git a/packaging/u3/win32/manifest.tmpl b/packaging/u3/win32/manifest.tmpl index c54d30f374..b6a53adc15 100644 --- a/packaging/u3/win32/manifest.tmpl +++ b/packaging/u3/win32/manifest.tmpl @@ -1,6 +1,6 @@ <?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="bb5e77c0-6bd8-11db-a4d9-0002a5d5c51b" version="$(VERSION)"> +<u3manifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"> + <application uuid="bded1f20-ac95-11db-a05b-0002a5d5c51b" version="$(VERSION)"> <icon>wireshark.ico</icon> <name>Wireshark $(VERSION)</name> <vendor url="http://www.wireshark.org/">The Wireshark Developer Community</vendor> |