Update to WpdPack 4.0.2 and NASM 2.02

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

diff --git a/Makefile.nmake b/Makefile.nmake
index f0d745026f0f2e6e83ae62d3427ce6c3beeb8fe3..5de3b97d52c3583531526585c1c1bb7eface25e7 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -672,7 +672,7 @@ process_libs:
 !ENDIF
 !IFDEF PCAP_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . WpdPack_3_1.zip
+               . WpdPack_4_0_2.zip
 !ENDIF
 !IFDEF AIRPCAP_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -776,7 +776,7 @@ process_libs:
 !ENDIF
 !IFDEF NASM
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . nasm-2.00-win32.zip
+               . nasm-2.02-win32.zip
 !ENDIF
        @echo.
        @echo Wireshark is ready to build.
@@ -801,6 +801,7 @@ clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.5
     rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.8
     rm -r -f $(WIRESHARK_LIBS)/nasm-2.00
+    rm -r -f $(WIRESHARK_LIBS)/nasm-2.02
     rm -r -f $(WIRESHARK_LIBS)/pcre-6.4
     rm -r -f $(WIRESHARK_LIBS)/pcre-7.0
     rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1

diff --git a/config.nmake b/config.nmake
index f9ed61c551ed62f28df58d213470bbbb85f0ddf2..dc30058991005fa8cbe050e1785ecca0bc0308f3 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -98,8 +98,7 @@ MSVC_VARIANT=MSVC6
 # If you don't have NASM, comment this line out, so that NASM
 # isn't defined.
 #
-#NASM=c:\progs\nasm\nasm.exe
-NASM=$(WIRESHARK_LIBS)\nasm-2.00\nasm.exe
+NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
 
 
 ##### Libraries #####

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index d9742b216f5e7ec7ea9340cad3fb32c78b9fa290..957e0a39da9403eb396eba07c329a74416f852d0 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -7,8 +7,8 @@
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
 # Save previous tag.
-#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-22/packages/"
-DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-24/packages/"
+#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-24/packages/"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-12/packages/"
 
 # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
 #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"