forked from osmocom/wireshark
Remove old PCRE references from the Windows build environment. We're not
likely to add it back to wireshark-win32-libs and it was never available in wireshark-win64-libs. svn path=/trunk/; revision=37778
This commit is contained in:
parent
f1bb0e1735
commit
0501a48552
|
@ -44,7 +44,7 @@ GENERATED_CFLAGS=\
|
|||
-D_NEED_VAR_IMPORT_ \
|
||||
/I. /Iwiretap $(GLIB_CFLAGS) \
|
||||
$(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \
|
||||
$(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) \
|
||||
$(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \
|
||||
$(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS)
|
||||
|
||||
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
|
||||
|
@ -88,7 +88,6 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
|||
epan\ftypes\ftypes.lib \
|
||||
$(C_ARES_LIBS) \
|
||||
$(ADNS_LIBS) \
|
||||
$(PCRE_LIBS) \
|
||||
$(ZLIB_LIBS)
|
||||
!ENDIF
|
||||
|
||||
|
@ -108,7 +107,6 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
|||
epan\ftypes\ftypes.lib \
|
||||
$(C_ARES_LIBS) \
|
||||
$(ADNS_LIBS) \
|
||||
$(PCRE_LIBS) \
|
||||
$(ZLIB_LIBS)
|
||||
!ENDIF
|
||||
|
||||
|
@ -128,7 +126,6 @@ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
|||
epan\ftypes\ftypes.lib \
|
||||
$(C_ARES_LIBS) \
|
||||
$(ADNS_LIBS) \
|
||||
$(PCRE_LIBS) \
|
||||
$(ZLIB_LIBS)
|
||||
!ENDIF
|
||||
|
||||
|
@ -172,7 +169,6 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
|||
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
||||
$(C_ARES_LIBS) \
|
||||
$(ADNS_LIBS) \
|
||||
$(PCRE_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(SMI_LIBS)
|
||||
!ENDIF
|
||||
|
@ -355,7 +351,6 @@ config.h : config.h.win32 config.nmake
|
|||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \
|
||||
-e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
|
||||
-e "s/@HAVE_PCRE@/$(PCRE_CONFIG)/" \
|
||||
-e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
|
||||
-e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
|
||||
-e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
|
||||
|
@ -624,10 +619,10 @@ $(ZLIB_DLL):
|
|||
xcopy $(ZLIB_DIR) zlib.tmp /D /I /E /Y
|
||||
cd zlib.tmp
|
||||
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
|
||||
$(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
|
||||
$(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
|
||||
!else
|
||||
$(MAKE) /$(MAKEFLAGS) -f win32/Makefile.msc zlib1.dll AS=ml64 LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"
|
||||
!endif
|
||||
!endif
|
||||
if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR)
|
||||
if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib
|
||||
if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include
|
||||
|
@ -805,12 +800,6 @@ process_libs:
|
|||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. adns-1.0-win32-05ws.zip
|
||||
!ENDIF
|
||||
!IFDEF PCRE_DIR
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
pcre-7.0 pcre-7.0-bin.zip
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
pcre-7.0 pcre-7.0-lib.zip
|
||||
!ENDIF
|
||||
!IFDEF ZLIB_DIR
|
||||
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
|
||||
|
@ -1073,10 +1062,6 @@ install-all: install-generated-files
|
|||
!IFDEF ADNS_DIR
|
||||
xcopy $(ADNS_DLL) $(INSTALL_DIR) /d
|
||||
!ENDIF
|
||||
!IFDEF PCRE_DIR
|
||||
xcopy $(PCRE_DIR)\bin\pcre3.dll $(INSTALL_DIR) /d
|
||||
xcopy $(PCRE_DIR)\man\cat3\pcrepattern.3.txt $(INSTALL_DIR) /d
|
||||
!ENDIF
|
||||
!IFDEF KFW_DIR
|
||||
xcopy $(KFW_PATH)\comerr32.dll $(INSTALL_DIR) /d
|
||||
xcopy $(KFW_PATH)\krb5_32.dll $(INSTALL_DIR) /d
|
||||
|
@ -1138,4 +1123,3 @@ checkapi: checkapi_local
|
|||
|
||||
####
|
||||
_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory
|
||||
|
||||
|
|
|
@ -186,9 +186,6 @@
|
|||
#define ADNS_JGAA_WIN32 1
|
||||
#endif
|
||||
|
||||
/* Define to use the PCRE library */
|
||||
@HAVE_PCRE@
|
||||
|
||||
/* Define to use the Nettle library */
|
||||
@HAVE_NETTLE@
|
||||
|
||||
|
|
36
config.nmake
36
config.nmake
|
@ -314,18 +314,6 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
|
|||
#
|
||||
C_ARES_PKG=1.7.1
|
||||
|
||||
#
|
||||
# Optional: the PCRE (Perl Compatible Regular Expressions) library
|
||||
# enables regular expressions for display filters.
|
||||
#
|
||||
# If you have the PCRE library, set this to the directory in which
|
||||
# the GNUWIN32 pcre-lib package is stored.
|
||||
#
|
||||
# If you don't have PCRE, comment this line out, so that PCRE_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
|
||||
|
||||
#
|
||||
# Optional: the GNUTLS library enables ssl decryption.
|
||||
#
|
||||
|
@ -521,18 +509,6 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
|
|||
#
|
||||
C_ARES_PKG=1.7.1
|
||||
|
||||
#
|
||||
# Optional: the PCRE (Perl Compatible Regular Expressions) library
|
||||
# enables regular expressions for display filters.
|
||||
#
|
||||
# If you have the PCRE library, set this to the directory in which
|
||||
# the GNUWIN32 pcre-lib package is stored.
|
||||
#
|
||||
# If you don't have PCRE, comment this line out, so that PCRE_DIR
|
||||
# isn't defined.
|
||||
#
|
||||
#PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
|
||||
|
||||
#
|
||||
# Optional: the GNUTLS library enables ssl decryption.
|
||||
#
|
||||
|
@ -1191,18 +1167,6 @@ KFW_LIBS=
|
|||
KFW_CONFIG=
|
||||
!ENDIF
|
||||
|
||||
!IFDEF PCRE_DIR
|
||||
PCRE_PATH=$(PCRE_DIR)\bin
|
||||
PCRE_CFLAGS=/I$(PCRE_DIR)\include
|
||||
PCRE_LIBS=$(PCRE_DIR)\lib\pcre.lib
|
||||
# Nmake uses carets to escape special characters
|
||||
PCRE_CONFIG=^#define HAVE_LIBPCRE 1
|
||||
!else
|
||||
PCRE_CFLAGS=
|
||||
PCRE_LIBS=
|
||||
PCRE_CONFIG=
|
||||
!ENDIF
|
||||
|
||||
!IFDEF NETTLE_DIR
|
||||
NETTLE_CFLAGS=/I$(NETTLE_DIR)
|
||||
NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib
|
||||
|
|
|
@ -152,9 +152,6 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
|
|||
!IF "$(GNUTLS_DIR)" != ""
|
||||
/DGNUTLS_DIR=$(GNUTLS_DIR) \
|
||||
!ENDIF
|
||||
!IF "$(PCRE_DIR)" != ""
|
||||
/DPCRE_DIR=$(PCRE_DIR) \
|
||||
!ENDIF
|
||||
!IF "$(ZLIB_DIR)" != ""
|
||||
/DZLIB_DIR=$(ZLIB_DIR) \
|
||||
!ENDIF
|
||||
|
@ -191,4 +188,3 @@ $(EXE) $(DLL):
|
|||
|
||||
####
|
||||
_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ InstType "un.All (remove all)"
|
|||
|
||||
Name "${PROGRAM_NAME} ${VERSION} (${BITS}-bit)"
|
||||
|
||||
;
|
||||
;
|
||||
VIAddVersionKey "ProductName" "${PROGRAM_NAME}"
|
||||
VIAddVersionKey "Comments" "It's a great product with a great story to tell. I'm pumped!"
|
||||
VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
|
||||
|
@ -312,7 +312,7 @@ Function .onInit
|
|||
IDYES prep_uninstaller \
|
||||
IDNO done
|
||||
Abort
|
||||
|
||||
|
||||
; Copy the uninstaller to $TEMP and run it.
|
||||
; The uninstaller normally does this by itself, but doesn't wait around
|
||||
; for the executable to finish, which means ExecWait won't work correctly.
|
||||
|
@ -333,7 +333,7 @@ silent_uninstall:
|
|||
|
||||
cleanup:
|
||||
Delete "$TMP_UNINSTALLER"
|
||||
|
||||
|
||||
done:
|
||||
;Extract InstallOptions INI files
|
||||
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "AdditionalTasksPage.ini"
|
||||
|
@ -391,10 +391,6 @@ File "${C_ARES_DIR}\bin\libcares-2.dll"
|
|||
!ifdef ADNS_DIR
|
||||
File "${ADNS_DIR}\..\${MSVC_VARIANT}\adns\adns_dll.dll"
|
||||
!endif
|
||||
!ifdef PCRE_DIR
|
||||
File "${PCRE_DIR}\bin\pcre3.dll"
|
||||
File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt"
|
||||
!endif
|
||||
!ifdef KFW_DIR
|
||||
File "${KFW_PATH}\comerr32.dll"
|
||||
File "${KFW_PATH}\krb5_32.dll"
|
||||
|
|
Loading…
Reference in New Issue