diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-18 10:20:26 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-11-18 10:20:26 +0000 |
| commit | 04b798cbf4df9161e4cd1cf91bff887cf0dfc19f (patch) | |
| tree | 0251614aaca4fab9997a8b64ca3d4c2050ac4df5 /packaging | |
| parent | 7e98b70b3f7f532381d809f0087602a5815bec3c (diff) | |
| download | wireshark-04b798cbf4df9161e4cd1cf91bff887cf0dfc19f.tar.gz wireshark-04b798cbf4df9161e4cd1cf91bff887cf0dfc19f.tar.bz2 wireshark-04b798cbf4df9161e4cd1cf91bff887cf0dfc19f.zip | |
Update to optionally use the "Ultimate Packer for eXecutables" (UPX) to pack the exes and dlls prior to U3 and PortableApps packaging.
For the U3 package, this results in a 40% smaller package.
For the PortableApps version, the package size is not much different, but the install time is quicker.
svn path=/trunk/; revision=23484
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/u3/win32/README.txt | 5 | ||||
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 12 |
3 files changed, 16 insertions, 2 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index aa8d4addfe..467dbebc14 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -18,7 +18,6 @@ U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y -UPX = upx301w\upx.exe PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0 diff --git a/packaging/u3/win32/README.txt b/packaging/u3/win32/README.txt index 000321ba7b..5c1cd9720d 100644 --- a/packaging/u3/win32/README.txt +++ b/packaging/u3/win32/README.txt @@ -21,6 +21,11 @@ A few minor changes have been made to Wireshark itself: 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. +UPX +=== + +If the Ultimate Packer for eXecutables (UPX) (http://upx.sourceforge.net) is downloaded and configured in config.nmake, the packaging process will pack all of the dll and exes before putting them into the U3 pacakage. This can significantly reduce the size of the U3 package - by about 40%. + Known Issues: ============= diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 576cb3b946..041da15152 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -98,6 +98,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(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) @@ -329,7 +330,16 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\tshark.exe $(HOST) $(COPY_FLAGS) $(COPY) u3util.exe $(HOST) $(COPY_FLAGS) -test: distribution +pack: distribution +!IFDEF UPX + $(UPX) $(DEVICE)\plugins\$(VERSION)\*.dll + $(UPX) $(HOST)\*.dll + $(UPX) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll + $(UPX) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll + $(UPX) $(HOST)\*.exe +!ENDIF + +test: pack wireshark.bat -D package: test |