Changes to use a generic manifest to determine package contents, and also U3 self-certification fixes e.g.

* package size (dependent on use of UPX)
* upgrade 
* shortDescription
* vendor


svn path=/trunk/; revision=24012

4 files changed, 130 insertions, 283 deletions

diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 251159f3f8..c0ab764393 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -15,6 +15,8 @@ HOST 	= host
 MANIFEST= manifest
 DATA	= data
 
+WSMANIFEST	= ../../wireshark.manifest
+
 TOPDIR	= ..\..\..
 TOOLSDIR= ..\tools
 COPY	= xcopy
@@ -37,297 +39,39 @@ uuid.sed: $(TOPDIR)\config.nmake
 manifest.u3i:	manifest.tmpl uuid.sed
 	sed -e 's/$$(U3_VERSION)/$(U3_VERSION)/g' \
             -e 's/$$(VERSION)/$(VERSION)/g' \
+#ifdef UPX
+	    -e 's/$$(SIZE)/50/g' \
+#else
+	    -e 's/$$(SIZE)/65/g' \
+#endif
             -f  uuid.sed < manifest.tmpl > manifest.u3i
 
-host-dirs:
+u3-dirs:
 	if not exist $(HOST) $(MKDIR) $(HOST)
-	if not exist $(HOST)\etc $(MKDIR) $(HOST)\etc
-	if not exist $(HOST)\etc\gtk-2.0 $(MKDIR) $(HOST)\etc\gtk-2.0
-	if not exist $(HOST)\etc\pango $(MKDIR) $(HOST)\etc\pango
-	if not exist $(HOST)\lib $(MKDIR) $(HOST)\lib
-	if not exist $(HOST)\lib\gtk-2.0 $(MKDIR) $(HOST)\lib\gtk-2.0
-	if not exist $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR) $(MKDIR) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)
-	if not exist $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders $(MKDIR) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders
-	if not exist $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules $(MKDIR) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
-	if not exist $(HOST)\$(GTK_WIMP_DLLDST_DIR) $(MKDIR) $(HOST)\$(GTK_WIMP_DLLDST_DIR)
-
-device-dirs:
 	if not exist $(DEVICE) $(MKDIR) $(DEVICE)
-	if not exist $(DEVICE)\plugins $(MKDIR) $(DEVICE)\plugins
-	if not exist $(DEVICE)\plugins\$(VERSION) $(MKDIR) $(DEVICE)\plugins\$(VERSION)
-	if not exist $(DEVICE)\help $(MKDIR) $(DEVICE)\help
-	if not exist $(DEVICE)\snmp $(MKDIR) $(DEVICE)\snmp
-	if not exist $(DEVICE)\snmp\mibs $(MKDIR) $(DEVICE)\snmp\mibs
-	if not exist $(DEVICE)\diameter $(MKDIR) $(DEVICE)\diameter
-	if not exist $(DEVICE)\dtds $(MKDIR) $(DEVICE)\dtds
-	if not exist $(DEVICE)\radius $(MKDIR) $(DEVICE)\radius
-	if not exist $(DEVICE)\wimaxasncp $(MKDIR) $(DEVICE)\wimaxasncp
-
-data-dirs:
 	if not exist $(DATA) $(MKDIR) $(DATA)
 	if not exist $(DATA)\"My Captures" $(MKDIR) $(DATA)\"My Captures"
-
-manifest-dirs:
 	if not exist $(MANIFEST) $(MKDIR) $(MANIFEST)
 
-user-guide.chm:
+nsis-bits:
 	cd ../../nsis
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm NEWS.txt
 	cd ../u3/win32
 
-distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util.exe user-guide.chm wireshark.bat
+$(WSMANIFEST):
+	cd ../..
+	$(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest
+	cd u3/win32
+
+distribution.nmake:	$(WSMANIFEST)  makenmake.pl
+	$(PERL) makenmake.pl $(WSMANIFEST) > $@	
+
+distribution: u3-dirs manifest.u3i u3util.exe nsis-bits wireshark.bat distribution.nmake
 # manifest
 	$(COPY) manifest.u3i $(MANIFEST) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\image\wireshark.ico $(MANIFEST) $(COPY_FLAGS)
-# device
-#
-# these files stay on the U3 device and should not cause Wireshark to become unstable
-# if they are missing (e.g. U3 device removed)
-#
-	$(COPY) $(TOPDIR)\AUTHORS-SHORT $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\COPYING $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\FAQ $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\README $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\README.win32 $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\doc\capinfos.html $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\chargecontrol.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\dictionary.dtd $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\dictionary.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\etsie2e4.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\gqpolicy.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\imscxdx.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\mobileipv4.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\nasreq.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\sip.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\sunping.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\TGPPSh.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\diameter\Ericsson.xml $(DEVICE)\diameter $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\dtds\dc.dtd $(DEVICE)\dtds $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\dtds\itunes.dtd $(DEVICE)\dtds $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\dtds\mscml.dtd $(DEVICE)\dtds $(COPY_FLAGS)
-	$(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)
-	$(COPY) $(TOPDIR)\dtds\xcap-error.dtd $(DEVICE)\dtds $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\dtds\watcherinfo.dtd $(DEVICE)\dtds $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\wimaxasncp\dictionary.xml $(DEVICE)\wimaxasncp $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\wimaxasncp\dictionary.dtd $(DEVICE)\wimaxasncp $(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)
-	$(COPY) $(TOPDIR)\help\capturing.txt $(DEVICE)\help $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\help\capture_filters.txt $(DEVICE)\help $(COPY_FLAGS)
-	$(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)
-	$(COPY) $(TOPDIR)\services $(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
-	$(COPY) $(TOPDIR)\doc\mergecap.html $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\agentx\agentx.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\artnet\artnet.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\asn1\asn1.dll $(DEVICE)\plugins\$(VERSION)$(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\ciscosm\ciscosm.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\docsis\docsis.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\enttec\enttec.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\ethercat\ethercat.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\giop\coseventcomm.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\giop\cosnaming.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\giop\parlay.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\giop\tango.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\gryphon\gryphon.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\irda\irda.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\lwres\lwres.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\m2m\m2m.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\mate\mate.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\opsi\opsi.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\pcli\pcli.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\profinet\profinet.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\rlm\rlm.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\rtnet\rtnet.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\rudp\rudp.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\sbus\sbus.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\stats_tree\stats_tree.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\unistim\unistim.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\v5ua\v5ua.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\wimax\wimax.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.3com $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.3gpp $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.3gpp2 $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.acc $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.alcatel $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.alteon $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.altiga $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.aptis $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.ascend $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.bay $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.bintec $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.bristol $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cablelabs $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cabletron $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cisco $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cisco.bbsm $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cisco.vpn3000 $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cisco.vpn5000 $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.colubris $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.columbia_university $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.compat $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.cosine $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.ericsson $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.erx $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.extreme $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.foundry $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.freeradius $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.gandalf $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.garderos $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.gemtek $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.itk $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.juniper $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.karlnet $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.livingston $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.localweb $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.merit $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.microsoft $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.mikrotik $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.navini $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.netscreen $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.nokia $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.nomadix $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.propel $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.quintum $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.redback $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.redcreek $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.shasta $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.shiva $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.sonicwall $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.springtide $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.t_systems_nova $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.telebit $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.trapeze $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.tunnel $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.unisphere $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.unix $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.usr $(DEVICE)\radius $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\radius\dictionary.valemount $(DEVICE)\radius $(COPY_FLAGS)
-	$(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)
-	$(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
-	$(COPY) $(TOPDIR)\packaging\nsis\WinPcap_4_0_2.exe $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\cfilters $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\colorfilters $(DEVICE) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\dfilters $(DEVICE) $(COPY_FLAGS)
-# host
-#
-# 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)
-!IFDEF ENABLE_LIBWIRESHARK
-	$(COPY) $(TOPDIR)\epan\libwireshark.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-	$(COPY) $(GLIB_DIR)\bin\libglib-2.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(ICONV_DIR)\bin\iconv.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GETTEXT_DIR)\bin\intl.dll $(HOST) $(COPY_FLAGS)
-!ifdef ZLIB_DIR
-	$(COPY) $(ZLIB_DIR)\zlib1.dll $(HOST) $(COPY_FLAGS)
-!endif
-!IFDEF ADNS_DIR
-	$(COPY) $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-!IFDEF PCRE_DIR
-	$(COPY) $(PCRE_DIR)\bin\pcre.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-!ifdef KFW_DIR
-	$(COPY) $(KFW_DIR)\bin\comerr32.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(KFW_DIR)\bin\krb5_32.dll $(HOST) $(COPY_FLAGS)
-!endif
-!ifdef GNUTLS_DIR
-	$(COPY) $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GNUTLS_DIR)\bin\libgnutls-13.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GNUTLS_DIR)\bin\libgnutls-extra-13.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GNUTLS_DIR)\bin\libgnutls-openssl-13.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GNUTLS_DIR)\bin\libtasn1-3.dll $(HOST) $(COPY_FLAGS)
-!endif
-!ifdef LUA_DIR
-	$(COPY) $(LUA_DIR)\lib\dll\lua5.1.dll $(HOST) $(COPY_FLAGS)
-!endif
-!ifdef SMI_DIR
-	$(COPY) $(SMI_DIR)\lib\smi.dll $(HOST) $(COPY_FLAGS)
-!endif
-
-!IFDEF GTK2_DIR
-	$(COPY) $(TOPDIR)\wireshark-gtk2.exe $(HOST) $(COPY_FLAGS)
-# can't get /i to work with $(COPY) above to do the rename there
-	mv $(HOST)\wireshark-gtk2.exe $(HOST)\wireshark.exe
-# can't get /i to work with $(COPY) above to do the rename there
-	$(COPY) $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\bin\libatk-1.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\bin\libpango-1.0-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\bin\libpangowin32-1.0-0.dll $(HOST) $(COPY_FLAGS)
-!IFDEF NEED_CAIRO_DLL
-	$(COPY) $(GTK2_DIR)\bin\libcairo-2.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\bin\libpangocairo-1.0-0.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-!IFDEF NEED_LIBPNG_DLL
-	$(COPY) $(GTK2_DIR)\bin\libpng13.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-!IFDEF NEED_LIBTIFF_DLL
-	$(COPY) $(GTK2_DIR)\bin\libtiff3.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-!IFDEF NEED_LIBJPEG_DLL
-	$(COPY) $(GTK2_DIR)\bin\jpeg62.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-
-	$(COPY) $(GTK2_DIR)\etc\gtk-2.0\*.* $(HOST)\etc\gtk-2.0 $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\etc\pango\pango.* $(HOST)\etc\pango $(COPY_FLAGS)
-#	$(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders $(COPY_FLAGS)
-	$(COPY) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules $(COPY_FLAGS)
-!IFDEF GTK_WIMP_DIR
-	$(COPY) $(GTK_WIMP_DLLSRC_DIR)\libwimp.dll $(HOST)\$(GTK_WIMP_DLLDST_DIR) $(COPY_FLAGS)
-	$(COPY) $(GTK_WIMP_RCSRC_DIR)\gtkrc $(HOST)\$(GTK_WIMP_RCDST_DIR) $(COPY_FLAGS)
-!ENDIF
-!ELSE
-!IFDEF GTK1_DIR
-	$(COPY) $(TOPDIR)\wireshark.exe $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK1_DIR)\lib\libgtk-0.dll $(HOST) $(COPY_FLAGS)
-	$(COPY) $(GTK1_DIR)\lib\libgdk-0.dll $(HOST) $(COPY_FLAGS)
-!ENDIF
-!ENDIF
-	$(COPY) $(TOPDIR)\capinfos.exe $(HOST) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\dumpcap.exe $(HOST) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\editcap.exe $(HOST) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\mergecap.exe $(HOST) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\text2pcap.exe $(HOST) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\tshark.exe $(HOST) $(COPY_FLAGS)
 	$(COPY) u3util.exe $(HOST) $(COPY_FLAGS)
+	$(MAKE) /$(MAKEFLAGS) -f distribution.nmake 
 
 verify-tools:	
 !IFDEF UPX
@@ -363,16 +107,21 @@ u3util.exe:	u3util.obj
 
 clean:
 	cd ../tools
-	nmake -f makefile.nmake clean
+	$(MAKE) -f makefile.nmake $@
 	cd ../win32
+	cd ../../
+	$(MAKE) -f makefile.nmake $@
+	cd u3/win32
 	rm -rf manifest.u3i
 	rm -rf uuid.sed
+	rm -rf nodeid state
 	rm -rf $(HOST)
 	rm -rf $(DEVICE)
 	rm -rf $(DATA)
 	rm -rf $(MANIFEST)
 	rm -rf u3util.{exe,obj,pdb}
 	rm -rf wireshark*.u3p
+	rm -rf distribution.nmake
    	rm -rf *~ *.*~
 
 distclean:	clean
diff --git a/packaging/u3/win32/makenmake.pl b/packaging/u3/win32/makenmake.pl
new file mode 100644
index 0000000000..266f357489
--- /dev/null
+++ b/packaging/u3/win32/makenmake.pl
@@ -0,0 +1,97 @@
+#
+# makenmake.pl - create a nmake file from a generic manifest file that will create the appropriate U3 structure
+# $Id$
+#
+
+print "
+include ../../../config.nmake
+include <win32.mak>
+
+DEVICE 	= device
+HOST 	= host
+MANIFEST= manifest
+DATA	= data
+
+TOPDIR	= ..\\..\\..
+COPY	= xcopy
+MOVE    = mv
+MKDIR	= mkdir
+COPY_FLAGS	= /d /y 
+
+distribution:
+";
+
+while($line = <>) {
+    
+    if($line =~ /^\#/) { # comment
+	next;
+    } elsif($line =~ /^\[(\S+)/) { # new directory
+	$dir = $1;
+	undef $u3loc;
+
+	if($line =~ /u3loc=(\w+)/) {
+	    $u3loc = "\$(" . uc $1 . ")";
+	}
+
+	$dir =~ s/\$INSTDIR?//; # remove $INSTDIR
+	
+	$dir =~ s/\{/\(/g; $dir =~ s/\}/\)/g; # convert curlies to round brackets
+
+	if($dir ne '') { 
+	    print "\tif not exist $u3loc$dir \$(MKDIR) $u3loc$dir\n";
+	}
+	
+    } else { # this is a file
+
+	$line =~ /^\s+(\S+)/;
+	$file = $1;
+
+	$file =~ s/\{/\(/g; $file =~ s/\}/\)/g; # convert curlies to round brackets
+
+	if($file =~ /^[^\$]/) {
+	    $file = "\$(TOPDIR)\\" . $file;
+	}
+
+	if($line =~ /ifdef=(\w+)/) { # dependency
+	    if($define ne $1) {
+		if(defined $define) {
+		    print "!ENDIF\n";
+		}
+		$define = $1;
+		print "!IF DEFINED($define)";
+
+		if($define eq "GTK1_DIR") {
+		    # only include this if GTK2_DIR is not defined
+		    print "& !DEFINED(GTK2_DIR)";
+		}
+
+		print "\n";
+	    }
+	} else {
+	    
+	    if(defined $define) {
+		print "!ENDIF\n";
+	    }
+	    undef $define;
+	}
+
+	$u3fileloc = $u3loc; # default location
+	$oname = "";
+
+	if($line =~ /u3loc=(\S+)/) { # override this location
+	    $u3fileloc = "\$(" . uc $1 . ")";
+	}
+
+	print "\t\$(COPY) $file $u3fileloc$dir \$(COPY_FLAGS)\n";
+
+	if($line =~ /oname=(\S+)/) { # override this filename
+	    $oname = $1;
+	    $file =~ /\\(.*)$/;
+	    $name = $1;
+
+	    print "\t\$(MOVE) $u3fileloc$dir\\$name $u3fileloc$dir\\$oname\n";
+
+	}
+
+    }
+}
diff --git a/packaging/u3/win32/manifest.tmpl b/packaging/u3/win32/manifest.tmpl
index 0d51062dd9..b43d7dd5dd 100644
--- a/packaging/u3/win32/manifest.tmpl
+++ b/packaging/u3/win32/manifest.tmpl
@@ -3,10 +3,12 @@
 	<application uuid="$(UUID)" version="$(U3_VERSION)">
 		<icon>wireshark.ico</icon>
 		<name>Wireshark</name>
-		<vendor url="http://www.wireshark.org/">The Wireshark Developer Community</vendor>
+		<vendor url="http://www.wireshark.org/">The Wireshark Community</vendor>
 		<description>Wireshark $(VERSION) is one of the world's foremost network protocol analyzers, and is the standard in many parts of the industry.</description>
+		<shortDescription>Network protocol analyzer</shortDescription>
 		<options>
-			<minFreeSpace>40</minFreeSpace>
+			<minFreeSpace>$(SIZE)</minFreeSpace>
+			<upgrade appData="remove" deviceExec="remove"/>
 		</options>
 	</application>
 	<actions>
diff --git a/packaging/u3/win32/u3util.c b/packaging/u3/win32/u3util.c
index 6703cde7d9..07f5cc768b 100644
--- a/packaging/u3/win32/u3util.c
+++ b/packaging/u3/win32/u3util.c
@@ -760,10 +760,9 @@ main(int argc, char *argv[])
 
   u3_is_device_available = getenv("U3_IS_DEVICE_AVAILABLE");
 
-  if(u3_is_device_available && !strncmp(u3_is_device_available, "true", 5))
-    /* the device is available - wait 5 seconds for user to respond to
-       any dialogs */
-    time_out = 5000; /* 5 seconds */
+  if(u3_is_device_available && !strncmp(u3_is_device_available, "true", 4))
+    /* the device is available - wait for user to respond to any dialogs */
+    time_out = INFINITE;
 
   if(argc > 1) {