diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-02 13:47:23 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-02 13:47:23 +0000 |
| commit | cea89f8c128230ceac67e5085578e5ab6e0012ff (patch) | |
| tree | a316abbcac066e29b62d5f89246f8b28ad94ef3a /Makefile.nmake | |
| parent | 686ea4b77376b71de2db70bdf01b676aaa6d39b9 (diff) | |
Initial Portable Apps (www.portableapps.com) packaging to produce a "Wireshark Portable" (WSP) distribution.
This allows Wireshark to be run from any USB stick, unlike the U3 packaging which must be installed on a specific U3 device.
The packaging basically builds upon the U3 distribution so new libraries/config only need to be added to the U3 makefile to update both distributions.
It still takes a "dumb" approach to WinPcap - installing it if it is not already installed and removing it (if WSP installed it) when Wireshark quits. (This is worse than the U3 packaging which only uninstalls WinPcap when the device is removed.) Really must talk to the WinPcap guys to see how we can make this less intrusive.
I am talking to John Haller (the Portable Apps guy) about fine tuning the distribution.
svn path=/trunk/; revision=23340
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 2b6183133e..4a78998fa0 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -154,6 +154,15 @@ packaging_u3: all cd .. cd .. +packaging_papps: all + cd packaging + cd portableapps + cd win32 + $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + cd .. + cd .. + cd .. + # use (info-)zip from cygwin to pack things packaging_zip1: all !IFDEF MSVCR_DLL @@ -401,6 +410,8 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../u3/win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../../portableapps/win32 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../../.. # "distclean" removes all files not part of the distribution. @@ -434,6 +445,8 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../u3/win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../../portableapps/win32 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../../.. # Make "maintainer-clean" only if you would like to remove ALL generated @@ -465,6 +478,8 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../u3/win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../../portableapps/win32 + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../../.. tools:: |