Tidyups:

* clean up more things
* better directory creation
* README update


svn path=/trunk/; revision=20419

2 files changed, 33 insertions, 34 deletions

diff --git a/packaging/u3/win32/README.txt b/packaging/u3/win32/README.txt
index 1be6586446..2d931f0843 100644
--- a/packaging/u3/win32/README.txt
+++ b/packaging/u3/win32/README.txt
@@ -12,15 +12,14 @@ You will need the cygwin zip archive package to build the package itself. Once y
 A few minor changes have been made to Wireshark itself:
 1) Wireshark will write a <pid>.pid file while running. This allows the utility to close down Wireshark when the device is removed.
 2) filesystem.c has been changed to take advantage of the U3 "datafile_dir" and "persconffile_dir". Personal settings are then stored on the device.
+3) The files in the 'recent' file are written in a form that allows the U3 device path to change.
 
 There is a [self-]certification process for U3 packages which could be undertaken if there is sufficient interest for this package format. Wireshark could then be placed on Software Central - http://software.u3.com/SoftwareCentral.aspx?skip=1.
 
-
 Known Issues:
 =============
 
-1) The U3 package does not include WinPcap - so that must be installed separately on the machine into which the U3 device is plugged into.
+1) The U3 package tries to install WinPcap if it is not already installed when it is first run. It will be automatically removed when the device is removed. But this is not the best approach.
 2) The distribution of the files across the U3 host and U3 device needs to be verified for all protocols.
 3) The list of files should be derived from a common source (e.g. nsis/wireshark.nsi)
-4) Should there be a Wiki page? Yes - but where?
-5) Wireshark does not close down cleanly when a dialog is up.
+4) Wireshark does not close down cleanly when a dialog is up.
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 98458add67..e269978267 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -25,36 +25,36 @@ all:	package
 manifest.u3i:	manifest.tmpl $(TOPDIR)\config.nmake
 	sed -e 's/$$(VERSION)/$(VERSION)/g' < manifest.tmpl > manifest.u3i
 
-$(HOST):
-	$(MKDIR) $(HOST)
-	$(MKDIR) $(HOST)\etc
-	$(MKDIR) $(HOST)\etc\gtk-2.0
-	$(MKDIR) $(HOST)\etc\pango
-	$(MKDIR) $(HOST)\lib
-	$(MKDIR) $(HOST)\lib\gtk-2.0
-	$(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)
+host-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):
-	$(MKDIR) $(DEVICE)
-	$(MKDIR) $(DEVICE)\plugins
-	$(MKDIR) $(DEVICE)\plugins\$(VERSION)
-	$(MKDIR) $(DEVICE)\help
-	$(MKDIR) $(DEVICE)\snmp
-	$(MKDIR) $(DEVICE)\snmp\mibs
-	$(MKDIR) $(DEVICE)\diameter
-	$(MKDIR) $(DEVICE)\dtds
-	$(MKDIR) $(DEVICE)\radius
+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
 
-$(DATA):
-	$(MKDIR) $(DATA)
+data-dirs:
+	if not exist $(DATA) $(MKDIR) $(DATA)
 
-$(MANIFEST):
-	$(MKDIR) $(MANIFEST)
+manifest-dirs:
+	if not exist $(MANIFEST) $(MKDIR) $(MANIFEST)
 
-distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe
+distribution: host-dirs device-dirs data-dirs manifest-dirs  manifest.u3i u3util.exe
 # manifest
 	$(COPY) manifest.u3i $(MANIFEST) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\image\wireshark.ico $(MANIFEST) $(COPY_FLAGS)
@@ -258,8 +258,8 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe
 !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) $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
+	$(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)
@@ -295,8 +295,8 @@ clean:
 	rm -rf $(DATA)	
 	rm -rf $(MANIFEST)	
 	rm -rf u3util.{exe,obj}
-	rm -rf wireshark-*.u3p
-   	rm -rf *~
+	rm -rf wireshark*.u3p
+   	rm -rf *~ *.*~
 
 distclean:	clean