osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Graeme Lunt 2007-11-18 10:20:26 +00:00
parent 7e98b70b3f
commit 04b798cbf4
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config.nmake
View File

@ -373,6 +373,19 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe"
#
HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
#
# Optional: To reduce the size of dlls and exes, which is especially useful for USB device distributions (U3, PortableApps)
#
# If you have the UPX package, set this to the upx.exe executable.
#
# UPX can be downloaded from:
# http://upx.sourceforge.net/
#
# If you don't have UPX, comment this line out, so that UPX
# isn't defined.
#
#UPX="c:\upx301w\upx.exe"
##### Flags, PATHs and Miscellaneous #####

1
packaging/portableapps/win32/makefile.nmake
View File

@ -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

5
packaging/u3/win32/README.txt
View File

@ -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:
=============

12
packaging/u3/win32/makefile.nmake
View File

@ -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