diff options
| author | Evan Huus <eapache@gmail.com> | 2014-08-04 07:22:59 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-08-04 14:31:37 +0000 |
| commit | 37b5b095b90ea714478049408084f39707882a06 (patch) | |
| tree | 626067a89976a18ce078c093a3609aa1de25e173 /image | |
| parent | 76e4698b6d5bf1c8a2aac419093d5cd52508a003 (diff) | |
| download | wireshark-37b5b095b90ea714478049408084f39707882a06.tar.gz | |
Rip out the filetap code
We decided at sharkfest that this wasn't the right design for file dissection;
we have more-or-less settled on way forward, but nobody's shown interest in
implementing it. Whether or not that ever happens, this code is effectively
dead and should be removed.
Change-Id: I14d6086df3204fffb6485228db39d9f407661417
Reviewed-on: https://code.wireshark.org/review/3400
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'image')
| -rw-r--r-- | image/Makefile.nmake | 7 | ||||
| -rw-r--r-- | image/filetap.rc.in | 34 |
2 files changed, 1 insertions, 40 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index 96d832e2fd..0cb78774f2 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -4,7 +4,7 @@ include ..\config.nmake # Nmake uses an implicit rule to build a .res from a .rc file! -ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc filetap.rc wiretap.rc dumpcap.rc libwsutil.rc wireshark.exe.manifest +ALL_RC=wireshark.rc libwireshark.rc tshark.rc tfshark.rc rawshark.rc capinfos.rc captype.rc editcap.rc text2pcap.rc mergecap.rc reordercap.rc wiretap.rc dumpcap.rc libwsutil.rc wireshark.exe.manifest all : $(ALL_RC) wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake @@ -69,11 +69,6 @@ text2pcap.rc : text2pcap.rc.in ..\config.nmake -e s/@RC_VERSION@/$(RC_VERSION)/ \ < text2pcap.rc.in > $@ -filetap.rc : filetap.rc.in ..\config.nmake - sed -e s/@VERSION@/$(FTAP_VERSION)/ \ - -e s/@RC_VERSION@/$(RC_FTAP_VERSION)/ \ - < filetap.rc.in > $@ - wiretap.rc : wiretap.rc.in ..\config.nmake sed -e s/@VERSION@/$(WTAP_VERSION)/ \ -e s/@RC_VERSION@/$(RC_WTAP_VERSION)/ \ diff --git a/image/filetap.rc.in b/image/filetap.rc.in deleted file mode 100644 index 189dc30aa6..0000000000 --- a/image/filetap.rc.in +++ /dev/null @@ -1,34 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @RC_VERSION@ - PRODUCTVERSION @RC_VERSION@ - FILEFLAGSMASK 0x0L -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" - VALUE "FileDescription", "Wireshark filetap library\0" - VALUE "FileVersion", "@VERSION@\0" - VALUE "InternalName", "filetap @VERSION@\0" - VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0" - VALUE "OriginalFilename", "filetap-@VERSION@.dll\0" - VALUE "ProductName", "Wireshark\0" - VALUE "ProductVersion", "@VERSION@\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END |