Support for the automatic configuration of the UPX dll/exe packer.

config.nmake - default UPX to the downloaded version in $WIRESHARK_LIBS
win32-setup.sh - updated to also add executables bit to exes - and also use new tag
Makefile.nmake - to download UPX (and also use new version of user-guide)

svn path=/trunk/; revision=23562

diff --git a/Makefile.nmake b/Makefile.nmake
index fcebb5bb71dadcd8069bd446df74b26a7ddaf6d8..6983f5997dd3216d8087aa3cd8f4ddbb37ad9210 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -768,7 +768,11 @@ process_libs:
 !ENDIF
 !IFDEF HHC_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               user-guide user-guide-20494.zip
+               user-guide user-guide-23522.zip
+!ENDIF
+!IFDEF UPX
+       @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+               . upx301w.zip
 !ENDIF
        @echo.
        @echo Wireshark is ready to build.
@@ -797,6 +801,7 @@ clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/AirPcap_Devpack_1_0_0_594
     rm -r -f $(WIRESHARK_LIBS)/zlib123
     rm -r -f $(WIRESHARK_LIBS)/zlib123-dll
+    rm -r -f $(WIRESHARK_LIBS)/upx301w
 
 ################################################################################
 # Prepare the debug trees for running Wireshark/Tshark from there.

diff --git a/config.nmake b/config.nmake
index fc3a5e7e7dba7623f5d9ea276db2852a20857a7f..709500696d17016ef3589718156755ecb630d2ba 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -381,11 +381,11 @@ HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
 # 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.
+# If you don't have UPX, or don't want to pack exes and dlls,  
+# comment this line out, so that UPX isn't defined.
 #
 
-#UPX="c:\upx301w\upx.exe"
+UPX=$(WIRESHARK_LIBS)\upx301w\upx.exe
 
 ##### Flags, PATHs and Miscellaneous #####
 

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 63f4dac2957616dd30f361dbb415cbe91a304e67..de3234606588ff5104a7d2f9ced022b7dca0e2d2 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -6,7 +6,7 @@
 #   http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
-DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-11-13/packages/"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-11-24/packages/"
 
 # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
 # DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
@@ -96,8 +96,8 @@ case "$1" in
        echo "Extracting $DEST_PATH/$PACKAGE into $DEST_PATH/$DEST_SUBDIR"
        unzip -oq "$DEST_PATH/$PACKAGE" ||
                err_exit "Couldn't unpack $DEST_PATH/$PACKAGE"
-       echo "Verifying that the DLLs in $DEST_PATH/$DEST_SUBDIR are executable."
-       for i in `/usr/bin/find $DEST_PATH/$DEST_SUBDIR -name \*\.dll` ; do
+       echo "Verifying that the DLLs and EXEs in $DEST_PATH/$DEST_SUBDIR are executable."
+       for i in `/usr/bin/find $DEST_PATH/$DEST_SUBDIR \( -name *\.dll -o -name *\.exe \)` ; do
                if [ ! -x "$i" ] ; then
                        echo "Changing file permissions (add executable bit) to:"
                        echo "$i"