diff options
| -rw-r--r-- | Makefile.nmake | 17 | ||||
| -rw-r--r-- | config.nmake | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 6 |
4 files changed, 15 insertions, 14 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 2650459414..f265223d72 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -667,9 +667,9 @@ process_libs: if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS) !IF "$(GTK2_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-2.14.5.zip + glib gtk2.12/glib-2.14.6-2.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - glib gtk2.12/glib-dev-2.14.5.zip + glib gtk2.12/glib-dev-2.14.6-2.zip !ELSEIF "$(GTK2_INST_VERSION)" == "2.10" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ glib gtk2.10/glib-2.12.13.zip @@ -711,9 +711,9 @@ process_libs: !ENDIF !IFDEF PCRE_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - pcre-6.4 pcre-6.4-bin.zip + pcre-7.0 pcre-7.0-bin.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - pcre-6.4 pcre-6.4-lib.zip + pcre-7.0 pcre-7.0-lib.zip !ENDIF !IFDEF ZLIB_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -740,9 +740,9 @@ process_libs: !IFDEF GTK2_DIR !IF "$(GTK2_INST_VERSION)" == "2.12" @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-2.12.6.zip + gtk2 gtk2.12/gtk+-2.12.8.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - gtk2 gtk2.12/gtk+-dev-2.12.6.zip + gtk2 gtk2.12/gtk+-dev-2.12.8.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ gtk2 gtk2.12/cairo-1.4.14.zip @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -836,6 +836,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/lua5.1 rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.5 rm -r -f $(WIRESHARK_LIBS)/pcre-6.4 + rm -r -f $(WIRESHARK_LIBS)/pcre-7.0 rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1 rm -r -f $(WIRESHARK_LIBS)/portaudio_v19 rm -r -f $(WIRESHARK_LIBS)/user-guide @@ -1024,7 +1025,7 @@ install-deps2: install-common-deps2 # if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* $(INSTALL2_DIR)\etc\gtk-2.0 /d xcopy $(GTK2_DIR)\etc\pango\pango.* $(INSTALL2_DIR)\etc\pango /d -# xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d + xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d # xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d !IFDEF NEED_LIBPNG_DLL @@ -1077,7 +1078,7 @@ install-common-deps: xcopy $(ADNS_DIR)\adns_win32\LIB\adns_dll.dll $(INSTALL_DIR) /d !ENDIF !IFDEF PCRE_DIR - xcopy $(PCRE_DIR)\bin\pcre.dll $(INSTALL_DIR) /d + xcopy $(PCRE_DIR)\bin\pcre3.dll $(INSTALL_DIR) /d xcopy $(PCRE_DIR)\man\cat3\pcrepattern.3.txt $(INSTALL_DIR) /d !ENDIF !IFDEF KFW_DIR diff --git a/config.nmake b/config.nmake index 8501629511..6a6955b6aa 100644 --- a/config.nmake +++ b/config.nmake @@ -206,7 +206,7 @@ ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05 # If you don't have PCRE, comment this line out, so that PCRE_DIR # isn't defined. # -PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4 +PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 # # Optional: the GNUTLS library enables ssl decryption. diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 4d225e00d0..88e5addd07 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -718,8 +718,8 @@ SetOutPath $INSTDIR\etc\gtk-2.0 File "${GTK2_DIR}\etc\gtk-2.0\*.*" SetOutPath $INSTDIR\etc\pango File "${GTK2_DIR}\etc\pango\pango.*" -#SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders -#File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll" +SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders +File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll" SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll" # Not needed with pango 1.14.5 diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 0fc18e0e0a..f504ad5e13 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -7,11 +7,11 @@ # 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-01-27/packages/" -DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-01-29/packages/" +#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-01-29/packages/" +DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-02-16/packages/" # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag. -# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" +#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/" err_exit () { echo "" |