UPX compression corrupts the WinPcap installer - so don't UPX it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24014 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake
index bcf5fde3d99b7b44dfcce5cc3fc8f21efe43107a..220403138db3c28f349deb23450d438a0084014f 100644 (file)
--- a/packaging/portableapps/win32/makefile.nmake
+++ b/packaging/portableapps/win32/makefile.nmake
@@ -61,7 +61,7 @@ distribution: distribution.nmake
 
 pack:  distribution
 !IFDEF UPX
-       -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.exe 
+       -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe    
        -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll
        -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll
        -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll

diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index c0ab764393143d52077bcd42ed31d92c8dbed7dd..85ba5e14b63f1e4eef66763d7d4105d614d11157 100644 (file)
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -88,7 +88,7 @@ pack: distribution
        -$(UPX) $(UPX_FLAGS) $(HOST)\*.dll
        -$(UPX) $(UPX_FLAGS) $(HOST)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\*.dll
        -$(UPX) $(UPX_FLAGS) $(HOST)\$(GTK_WIMP_DLLDST_DIR)\*.dll
-       -$(UPX) $(UPX_FLAGS) $(HOST)\*.exe      
+       -$(UPX) $(UPX_FLAGS) $(HOST)\[a-z]*.exe 
 !ENDIF
 
 test:          pack