aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
AgeCommit message (Collapse)AuthorFilesLines
2016-06-15Remove Nmake build systemPascal Quantin1-466/+0
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>
2016-04-25Fix nmake build after statically linking version codeMichael Mann1-1/+1
Change-Id: I86a01bdd778f2242aa534a687275a85a2f329c02 Reviewed-on: https://code.wireshark.org/review/15071 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-21Remove ADNS supportJoão Valverde1-5/+1
Relevant mailing list message: https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2 Reviewed-on: https://code.wireshark.org/review/14519 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+1
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05Revert "Build Flex-generated files with "warnings are errors"."Guy Harris1-9/+20
This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6. Sadly, we *do* get warnings at this point with older versions of Flex, such as the one on the 32-bit OS X buildbot. Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3 Reviewed-on: https://code.wireshark.org/review/12443 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05Build Flex-generated files with "warnings are errors".Guy Harris1-20/+9
We shouldn't be getting warnings at this point. Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29 Reviewed-on: https://code.wireshark.org/review/12436 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-02Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Update from SQLite trunk (19 April 2015) Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-13Add a test-programs target everywhere.Gerald Combs1-8/+12
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17Added JSON native file support.Dario Lombardo1-18/+6
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c Bug: 10878 Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-19JSON dissector changed into heuristic dissector.Dario Lombardo1-6/+18
To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT). TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part. HPFEEDS dissector has also been changed in order to leverage the new json dissector. Bug: 10834 Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978 Reviewed-on: https://code.wireshark.org/review/6350 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-11Revert "Lemon: Update lemon tools"Pascal Quantin1-1/+1
This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. This Lemon update fails to compile on OSX and triggers asserts on other platforms Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 Reviewed-on: https://code.wireshark.org/review/6496 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Fix warning: declaration shadows a variable in the global scope [-Wshadow] Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d Reviewed-on: https://code.wireshark.org/review/3976 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier1-1/+1
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-30Create the compress module for compression functions.Matthieu Patou1-7/+22
For the moment there is only the lzxpress compression used by DRS Bug: 10546 Change-Id: Ifc7e1767934224c0198f0b09caa3efbad979ca1f Reviewed-on: https://code.wireshark.org/review/4600 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-16Fix the patch-bzip2 target.Gerald Combs1-1/+1
The main site URI scheme is now https. Update the URL in some other places while we're here. Change-Id: Ib03d4fd1c58dabd3cf5050dc4f79216e0b94d525 Reviewed-on: https://code.wireshark.org/review/4133 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-20Use forward slashes in paths to runlex.shРоман Донченко1-1/+1
This gets rid of "MS-DOS style path detected" warnings from Cygwin. Change-Id: Id10429669704aa371dbf56a9398947c8002260ad Reviewed-on: https://code.wireshark.org/review/3024 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-10Revert "More needed to get rid of "lib" in "libwsutil" on Windows."Guy Harris1-4/+4
This reverts commit 28719a4e4e01b478889dab9611fed517e506360e. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a Reviewed-on: https://code.wireshark.org/review/2972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09More needed to get rid of "lib" in "libwsutil" on Windows.Guy Harris1-4/+4
Change-Id: Iffc12ce67a8245e96eac3cf253641a15385001a9 Reviewed-on: https://code.wireshark.org/review/2969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09Moved nghttp2 to epanGraham Bloice1-6/+18
Cleaned up nghttp2 build Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d Reviewed-on: https://code.wireshark.org/review/2937 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-18Get rid of obsolete references to nettlePascal Quantin1-1/+0
Bug: 2089 Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83 Reviewed-on: https://code.wireshark.org/review/2388 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-16kill unmaintained python bindingsEvan Huus1-31/+7
Change-Id: I1fa4f0d76b6b29d2935723b83b5ea7165039c807 Reviewed-on: https://code.wireshark.org/review/2258 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-28Add Modelines and use tabs and fix typoAlexis La Goutte1-5/+18
Change-Id: Ie3f60f66f0f4a572098d1d7425c53aaf51bdb747 Reviewed-on: https://code.wireshark.org/review/1846 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-09Be less aggressive about rebuilding sminmpec.c.Gerald Combs1-3/+3
Instead of forcing developers to generate sminmpec.c (which will have different results depending on the presence or absence of a working Internet connection) add sminmpec.c back to the repository. I'll add it to the weekly update-numbers script so that it will be updated at the same time as manuf, services, enterprise-numbers, and usb.c. Change the Autotools, CMake, and Nmake sminmpec.c target name to "update-sminmpec". Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers and sminmpec.c while we're here. Tested with an in-tree Autotools build and an out-of-tree CMake build. Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 Reviewed-on: https://code.wireshark.org/review/1516 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-1/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-10-20Take a blind stab at adding oids_test to nmakeEvan Huus1-1/+39
svn path=/trunk/; revision=52699
2013-07-30Add a routine to get application memory usage to epan.Anders Broman1-1/+1
svn path=/trunk/; revision=51023
2013-07-28Added more build artefacts to the clean targetGraham Bloice1-1/+1
svn path=/trunk/; revision=50977
2013-07-14Build tvbtest the same way we build reassemble_test; see whether thatGuy Harris1-8/+20
fixes the build errors we're seeing, with complaints about tvbtest.obj : warning LNK4217: locally defined symbol tvb_XX imported in function test tvbtest.obj : error LNK2019: unresolved external symbol __imp_tvb_XXX referenced in function run_tests tvbuff.obj : error LNK2019: unresolved external symbol tvb_XXX referenced in function tvb_new_YYY svn path=/trunk/; revision=50573
2013-07-12Move the print modules into epan.Jeff Morriss1-0/+3
svn path=/trunk/; revision=50526
2013-06-25makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.Chris Maynard1-3/+3
svn path=/trunk/; revision=50140
2013-03-23Add exntest.c and tvbtest.c to the set of test program source files.Guy Harris1-0/+6
svn path=/trunk/; revision=48515
2013-03-23Build reassembly_test.c *without* -DWS_BUILD_DLL, as it's not part ofGuy Harris1-5/+36
the library, it's a test program that links with the library and imports stuff from the library. svn path=/trunk/; revision=48514
2013-03-02Fix copy-paste error introduced in r48021Pascal Quantin1-1/+1
svn path=/trunk/; revision=48027
2013-03-02Try to fix LNK4217 (locally defined symbol imported in function) and C4273 ↵Pascal Quantin1-3/+4
(inconsistent DLL linkage) warnings when compiling for Windows svn path=/trunk/; revision=48021
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-3/+3
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-09Pull in a comment from the MATE plugin Makefile.nmake.Guy Harris1-1/+13
Pull in a change from that Makefile.nmake to keep us from trying to hand a header file to the compiler as if it were a C source file. svn path=/trunk/; revision=47600
2013-02-09Put NODIST_ at the beginning of macro names, as was done for the pluginsGuy Harris1-2/+2
directory. svn path=/trunk/; revision=47599
2013-02-05dtd_parse.obj depends on dtd_grammar.h, but you can't buildGuy Harris1-1/+2
dtd_parse.obj by handing dtd_parse.c *and* dtd_grammar.h to the C compiler - dtd_grammar.h gets included by dtd_parse.c. svn path=/trunk/; revision=47488
2013-02-05dtd_parse.c includes dtd_grammar.h; make sure we build dtd_grammar.hGuy Harris1-1/+1
before trying to compile dtd_parse.c svn path=/trunk/; revision=47487
2013-02-05Don't distribute the results of running Lemon, as we distribute LemonGuy Harris1-4/+4
ourselves. Clean up various bits of "distribute" vs. "don't distribute" stuff in the process - use similar names, and make the "distribute vs. don't distribute" distinction the same as the "don't clean with "make distclean" vs. clean with "make distclean"" distinction. svn path=/trunk/; revision=47485
2012-10-24Basic skeleton for wmem.Evan Huus1-6/+18
https://www.wireshark.org/lists/wireshark-dev/201210/msg00178.html svn path=/trunk/; revision=45746
2012-05-16Fix the *test_install targets so they put the test tools in the right ↵Jeff Morriss1-3/+3
directory (wireshark-gtk2 is one dir up from here). svn path=/trunk/; revision=42659
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss1-1/+1
from makefiles (and thus from the buildbot). The intention is to be able to tell when a human is running the tool so we can provide more code-review guidance. As a starter, enable the "too many proto_tree_add_text() calls" check when a human is running the tool. svn path=/trunk/; revision=41943
2012-02-28Another try: we're in epan here so getting to libwsutil and wiretap requires ↵Jeff Morriss1-8/+8
going up a directory; getting to epan things does not require 'epan' in the path. svn path=/trunk/; revision=41225
2012-02-28Remove an extraneous backslashJeff Morriss1-1/+1
svn path=/trunk/; revision=41224
2012-02-28OK, to heck with it - link reassemble_test with libwireshark. Trying toGuy Harris1-9/+19
selectively pick up particular object files is just too much of a mess. Alas, this requires that we add some additional symbols to the list exported by libwireshark; the DCE RPC ones shouldn't be global, but reassemble_test uses them, so.... Get rid of stubs in reassemble_test.c - they just stub out routines from libwireshark, but that's not necessary any more. svn path=/trunk/; revision=41223
2012-02-28reassemble_test now requires mark_frame_as_depended_upon(), so itGuy Harris1-0/+1
requires packet.c. (If it requires any more, we should just make it link with libwireshark in its entirety.) svn path=/trunk/; revision=41219
2012-02-24CVARSDLL hasn't been used (is undefined) for a while....Bill Meier1-6/+6
svn path=/trunk/; revision=41180
2012-01-29Add *.sbr files to the clean target.Anders Broman1-1/+1
svn path=/trunk/; revision=40762
2011-08-31And fix distclean and maintainer-clean.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=38813
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 00:35:27 +0000