diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-08 15:57:00 +0200 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-06-15 19:21:57 +0000 |
commit | 6baa1b544c84a766d9f9d356e9940eccaf0a128f (patch) | |
tree | fc5431419180335703edcbf01e6b260d2c0dcbfd /doc | |
parent | 88bd50c592b0d24a12dd178ae2858444400a012f (diff) | |
download | wireshark-6baa1b544c84a766d9f9d356e9940eccaf0a128f.tar.gz wireshark-6baa1b544c84a766d9f9d356e9940eccaf0a128f.tar.bz2 wireshark-6baa1b544c84a766d9f9d356e9940eccaf0a128f.zip |
Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 1 | ||||
-rw-r--r-- | doc/Makefile.nmake | 337 | ||||
-rw-r--r-- | doc/README.plugins | 3 | ||||
-rw-r--r-- | doc/README.qt | 20 | ||||
-rw-r--r-- | doc/README.wslua | 9 |
5 files changed, 8 insertions, 362 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 6a2004b2d9..2c9cd5c34b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -290,7 +290,6 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - Makefile.nmake \ README.capture \ README.design \ README.developer \ diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake deleted file mode 100644 index f56d2c78a7..0000000000 --- a/doc/Makefile.nmake +++ /dev/null @@ -1,337 +0,0 @@ -# Makefile.nmake -# Nmake file for Wireshark documentation -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# We include dependencies on ../config.h in order to -# capture when $(VERSION) changes. - -include ../config.nmake - -doc: wireshark.html tshark.html wireshark-filter.html capinfos.html \ - ciscodump.html editcap.html idl2wrs.html mergecap.html reordercap.html \ - text2pcap.html dumpcap.html androiddump.html sshdump.html rawshark.html \ - dftest.html randpkt.html randpktdump.html \ - idl2deb.html asn2deb.html extcap.html - -man: wireshark.1 tshark.1 wireshark-filter.4 capinfos.1 \ - editcap.1 idl2wrs.1 mergecap.1 reordercap.1 \ - text2pcap.1 dumpcap.1 androiddump.1 sshdump.1 rawshark.1 dftest.1 randpkt.1 \ - idl2deb.1 asn2deb.1 extcap.4 randpktdump.1 ciscodump.1 - -wireshark.pod: wireshark.pod.template AUTHORS-SHORT-FORMAT - copy /B wireshark.pod.template + AUTHORS-SHORT-FORMAT wireshark.pod - -# -# Build the short version of the authors file for the about dialog -# -AUTHORS-SHORT: ../AUTHORS make-authors-short.pl - $(PERL) perlnoutf.pl make-authors-short.pl < ../AUTHORS > AUTHORS-SHORT - -# -# Build the short version of the authors file with formatting codes for -# the man page -# -AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl - $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT - -ws.css: ../docbook/ws.css - copy ..\docbook\ws.css . - -wireshark.1: wireshark.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - wireshark.pod > wireshark.1 - -wireshark.html: wireshark.pod ../config.h ws.css - $(POD2HTML) \ - --title="The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - wireshark.pod > wireshark.html - -tshark.1: tshark.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - tshark.pod > tshark.1 - -tshark.html: tshark.pod ../config.h ws.css - $(POD2HTML) \ - --title="tshark - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - tshark.pod > tshark.html - -wireshark-filter.4: wireshark-filter.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - wireshark-filter.pod > wireshark.4 - -wireshark-filter.html: wireshark-filter.pod ../config.h ws.css - $(POD2HTML) \ - --title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - wireshark-filter.pod > wireshark-filter.html - -capinfos.1: capinfos.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - capinfos.pod > capinfos.1 - -capinfos.html: capinfos.pod ../config.h ws.css - $(POD2HTML) \ - --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - capinfos.pod > capinfos.html - -editcap.1: editcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - editcap.pod > editcap.1 - -editcap.html: editcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="editcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - editcap.pod > editcap.html - -asn2deb.1: asn2deb.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - asn2deb.pod > asn2deb.1 - -asn2deb.html: asn2deb.pod ../config.h ws.css - $(POD2HTML) \ - --title="asn2deb - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - asn2deb.pod > asn2deb.html - -idl2deb.1: idl2deb.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - idl2deb.pod > idl2deb.1 - -idl2deb.html: idl2deb.pod ../config.h ws.css - $(POD2HTML) \ - --title="idl2deb - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - idl2deb.pod > idl2deb.html - -idl2wrs.1: idl2wrs.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - idl2wrs.pod > idl2wrs.1 - -idl2wrs.html: idl2wrs.pod ../config.h ws.css - $(POD2HTML) \ - --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - idl2wrs.pod > idl2wrs.html - -mergecap.1: mergecap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - mergecap.pod > mergecap.1 - -mergecap.html: mergecap.pod ../config.h ws.css - $(POD2HTML) \ - --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - mergecap.pod > mergecap.html - -reordercap.1: reordercap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - reordercap.pod > reordercap.1 - -reordercap.html: reordercap.pod ../config.h ws.css - $(POD2HTML) \ - --title="reordercap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - reordercap.pod > reordercap.html - -text2pcap.1: text2pcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - text2pcap.pod > text2pcap.1 - -text2pcap.html: text2pcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - text2pcap.pod > text2pcap.html - -dumpcap.1: dumpcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - dumpcap.pod > dumpcap.1 - -dumpcap.html: dumpcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - dumpcap.pod > dumpcap.html - -extcap.4: extcap.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - extcap.pod > extcap.1 - -extcap.html: extcap.pod ../config.h ws.css - $(POD2HTML) \ - --title="extcap - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - extcap.pod > extcap.html - -androiddump.1: androiddump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - androiddump.pod > androiddump.1 - -androiddump.html: androiddump.pod ../config.h ws.css - $(POD2HTML) \ - --title="androiddump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - androiddump.pod > androiddump.html - -sshdump.1: sshdump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - sshdump.pod > sshdump.1 - -sshdump.html: sshdump.pod ../config.h ws.css - $(POD2HTML) \ - --title="sshdump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - sshdump.pod > sshdump.html - -ciscodump.1: ciscodump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - ciscodump.pod > ciscodump.1 - -ciscodump.html: ciscodump.pod ../config.h ws.css - $(POD2HTML) \ - --title="ciscodump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - ciscodump.pod > ciscodump.html - -randpktdump.1: randpktdump.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - randpktdump.pod > randpktdump.1 - -randpktdump.html: randpktdump.pod ../config.h ws.css - $(POD2HTML) \ - --title="randpktdump - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - randpktdump.pod > randpktdump.html - -rawshark.1: rawshark.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - rawshark.pod > rawshark.1 - -rawshark.html: rawshark.pod ../config.h ws.css - $(POD2HTML) \ - --title="rawshark - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - rawshark.pod > rawshark.html - -dftest.1: dftest.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - dftest.pod > dftest.1 - -dftest.html: dftest.pod ../config.h ws.css - $(POD2HTML) \ - --title="dftest - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - dftest.pod > dftest.html - -randpkt.1: randpkt.pod ../config.h - $(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ - randpkt.pod > randpkt.1 - -randpkt.html: randpkt.pod ../config.h ws.css - $(POD2HTML) \ - --title="randpkt - The Wireshark Network Analyzer $(VERSION)" \ - --css=ws.css \ - --noindex \ - randpkt.pod > randpkt.html - -clean: - rm -f wireshark.html wireshark.1 wireshark.pod - rm -f tshark.html tshark.1 - rm -f wireshark-filter.html wireshark-filter.4 - rm -f capinfos.html capinfos.1 - rm -f editcap.html editcap.1 - rm -f idl2wrs.html idl2wrs.1 - rm -f mergecap.html mergecap.1 - rm -f reordercap.html reordercap.1 - rm -f text2pcap.html text2pcap.1 - rm -f dumpcap.html dumpcap.1 - rm -f rawshark.html rawshark.1 - rm -f randpkt.html randpkt.1 - rm -f dftest.html dftest.1 - rm -f pod2htm* - rm -f ws.css - rm -f AUTHORS-SHORT AUTHORS-SHORT-FORMAT - -distclean: clean - -maintainer-clean: distclean diff --git a/doc/README.plugins b/doc/README.plugins index 78744cc580..5302cef56c 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -291,8 +291,7 @@ is encouraged to update their plugins as outlined below: o Add a new Makefile.common file with the lists of source files and headers. - o Change the Makefile.am and Makefile.nmake files to match those of - the DOCSIS plugin. + o Change the Makefile.am file to match the one of the DOCSIS plugin. 6 How to plugin related interface options diff --git a/doc/README.qt b/doc/README.qt index b47ca6d96a..4ff412c3b5 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -49,11 +49,6 @@ There are several ways of building the Qt UI: Qt (--with-qt) is enabled by default. -4) Qt Creator + Wireshark.pro: - - Wireshark.pro (formerly QtShark.pro) was used to bootstrap the UI porting - effort. It is still used by Nmake but will likely be removed at some point. - 1.1 Prerequisites Before compiling you need the Qt SDK and Qt Creator. @@ -79,7 +74,7 @@ select "Build Settings" and do the following: - In "Edit build configuration" make sure the "Release" build is selected. (The "Debug" build won't work unless Wireshark is recompiled to link with a "debug" - the "debug" C runtime library (using /MDd). See ui\qt\Wireshark.pro for details). + the "debug" C runtime library (using /MDd)). - Make sure "Qt version" matches your version of Visual Studio. - Make sure "Tool chain" matches your Visual C++ version. @@ -96,19 +91,10 @@ XXX: (WMeier): I've not had too much satisfaction using the "native Windows debu 1.1.2.2 Command Line -- Setup environment: - c:\qt\4.8.0\bin\qtvars.bat [vsvars] ;;; optional 'vsvars' to also setup VC env vars - - [Create and] Switch to a working dir to be used for .obj files, etc for Wireshark-qt compilation -- Use qmake to create Windows Makefile (based upon info in ui\qt\Wireshark.pro and config.pri) - qmake -o Makefile.nmake ..\..\ui\qt\QtShark.pro - ;; (Only needs to be run once; - ;; nmake -f Makefile.nmake will redo qmake if any - ;; dependendencies (e.g., Wireshark.pro) change. +- Use CMake to create Windows Makefile and compile (see README.cmake) -- Compile & Build - nmake -f Makefile.nmake ;; wireshark.exe + all DLL's will be in <working-dir>\wireshark-qt-debug - Run: <working-dir>\wireshark-qt-debug @@ -116,7 +102,7 @@ XXX: (WMeier): I've not had too much satisfaction using the "native Windows debu Start Visual Studio; File ! Open ! Project/Solution ! .../<working-dir>/wireshark-qt-debug/wireshark.exe (Using Solution Explorer ! Properties ! Environment to - add PATH=C:\Qt\4.8.0\bin;%PATH% will pobably be required). + add PATH=C:\Qt\4.8.0\bin;%PATH% will probably be required). ... Debug in the usual manner diff --git a/doc/README.wslua b/doc/README.wslua index 74074904e3..e1a02b3f01 100644 --- a/doc/README.wslua +++ b/doc/README.wslua @@ -44,11 +44,10 @@ Lua tables. (you can do so, but it's not advisable) Both of the perl scripts above are given the C-source files to search through by the make process, generated from the lists in epan/wslua/CMakeLists.txt. Naturally if you add new source files, you need to add them to the list in -epan/wslua/CMakeLists.txt, as well as epan/wslua/Makefile.am and -epan/wslua/Makefile.nmake. You also have to add the module name into -docbook/user-guide.xml and docbook/wsluarm.xml, and the source files into -docbook/CMakeLists.txt and docbook/Makefile.common, to get it to be generated -in the user guide. +epan/wslua/CMakeLists.txt and epan/wslua/Makefile.am. You also have to add +the module name into docbook/user-guide.xml and docbook/wsluarm.xml, and the +source files into docbook/CMakeLists.txt and docbook/Makefile.common, to get +it to be generated in the user guide. Another Perl script is used as well, called 'make-init-lua.pl', which generates the init.lua script. A large part of it deals with exposing #define |