Commit Graph

91 Commits

Author SHA1 Message Date
Guy Harris 659d07f1e6 Ignore .moc.cpp files in ui/qt/widgets.
Change-Id: Ie709b9a13f1f2a76b355ffebeadbed0e47d90d2a
Reviewed-on: https://code.wireshark.org/review/22636
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-16 05:42:58 +00:00
Joerg Mayer 0b6b152694 Remove echld/.
It has been unsupported for some years and when talking about removing it
in the past I received some positive and no negative feedback.

There is one instance of echld left:
capchild/capture_sync.c:                 * echld might have already reaped the child.

Can that case be removed or should be comment be updated to something more
accurate? (left for a separate patch)

Change-Id: Idac397158dd86fd0728eb95379449ee4a463fc28
Reviewed-on: https://code.wireshark.org/review/20619
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-19 15:13:14 +00:00
Guy Harris 5fbcfd632a Clean up some UN*X-vs-Windows socket issues.
Have a wsutil/socket.h file, for inclusion by everything that uses
sockets, that contains the UN*X-vs-Windows #includes and #defines to
hide some UN*X-sockets vs. Winsock API differences.  That stuff mostly
comes from from extcap/extcap-base.h; have that file just include
wsutil/socket.h rather than defining that stuff itself.

Include it in sharkd_daemon.c.  Use socklen_t for the size of things to
pass to bind() as the last argument; wsutil/socket.h defines it as int
on Windows.

Ignore sharkd in Git.

Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6
Reviewed-on: https://code.wireshark.org/review/19796
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>
2017-01-26 07:00:06 +00:00
Dario Lombardo 47650d357e extcap: add udpdump.
Udpdump is a generic UDP receiver that exports datagram in PCAP format.

Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14
Reviewed-on: https://code.wireshark.org/review/17195
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-16 08:07:30 +00:00
João Valverde 21f5c53ae7 Rename PIDL Makefile
Otherwise it will get overwritten by the in-tree cmake build.

Issue reported by Rémy Léone.

Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f
Reviewed-on: https://code.wireshark.org/review/16305
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05 21:58:03 +00:00
João Valverde 5c03bda31a Qt: Generate .qm files during build
Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b
Reviewed-on: https://code.wireshark.org/review/14508
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-28 20:53:17 +00:00
Peter Wu 4add8b6b45 cmake: add idl2wrs-dissectors target for DCERPC
Add a callable target such that dissectors can be generated without the
AUTOGEN_dcerpc option.

Modelled after the pidl CMakeLists.txt file and target. This approach
has the advantage over the previous implementation such that the clean
target does not remove the packet-dcerpc-X.c files.

Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f
Reviewed-on: https://code.wireshark.org/review/15989
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-27 21:08:45 +00:00
Peter Wu deef1dc1ff cmake: add PIDL dissector generation support
The dissectors list is generated based on regex magic on pidl/Makefile.
A dssetup.cnf file is added because all other protocols already have
this file. The srvsvc and wkssvc protocols cannot be built for some
reason, so just disable it (this mirrors the original Makefile).

Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
compared to autotools.

Tested with an out-of-tree and in-tree build with cmake (make and ninja):

    cmake -GNinja && ninja -v pidl-dissectors
    touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
    cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs

Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
Reviewed-on: https://code.wireshark.org/review/15962
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-19 02:28:53 +00:00
Peter Wu 44e3212bce gitignore: updated cmake paths
* files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
* epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to
  libwireshark build")
* asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors")

Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa
Reviewed-on: https://code.wireshark.org/review/15961
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-16 05:29:19 +00:00
Pascal Quantin 6baa1b544c 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>
2016-06-15 19:21:57 +00:00
Gerald Combs f54ef6f8a0 Git: Add .vscode to .gitignore.
Change-Id: Ib4bb2d03eb493f83e18c507b1675feefd1f27384
Reviewed-on: https://code.wireshark.org/review/15271
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-05 17:46:58 +00:00
João Valverde 3db13a7fc9 Link version code statically again
This allows keeping the code-sharing with the static linking.

This "fixes" a hypothetical ABI mismatch with wsutil and avoids pulling more
external dependencies to wsutil than strictly necessary.

A nice side-effect is that libwsutil no longer depends on version.h.

Follow up to f95976eefc.

Change-Id: I8f0d6a557ab3f7ce6f0e2c269124c89f29d6ad23
Reviewed-on: https://code.wireshark.org/review/15002
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-04-21 18:59:56 +00:00
João Valverde b9d5f59b24 Remove obsolete automake implicit rule
Change-Id: I75df2d5ede18b91b218748b8de224ad02257b449
Reviewed-on: https://code.wireshark.org/review/14817
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-05 04:17:18 +00:00
João Valverde 6bce7a0760 Remove .gitignore file in pidl folder
Otherwise it will end up in the source distribution tarball.

Change-Id: Ieeafd5dbaebe3930c3769bfcbce538da5d36b7d3
Reviewed-on: https://code.wireshark.org/review/14624
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-25 03:28:52 +00:00
Guy Harris a4aa8930bb Put pcapio.c into a writecap library, and use it.
Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e
Reviewed-on: https://code.wireshark.org/review/14615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 20:49:37 +00:00
João Valverde 7a1d3f67ac Remove ADNS support
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-03-21 19:32:00 +00:00
Gerald Combs a183726370 DocBook: Don't require xmllint.
Remove dependencies on xmllint. We don't write DocBook by hand any more
and we haven't used it in a long time in the CMake builds.

Change-Id: Ic07f03b00c4554c058eece0462b0925d565b6da1
Reviewed-on: https://code.wireshark.org/review/14506
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-18 23:26:51 +00:00
João Valverde 0ebb4912f9 autotools: Generate Qt Resource Compiler source in /ui/qt dir
Change-Id: I0acdc1ea4d2110111a5506104e5075962f580bd5
Reviewed-on: https://code.wireshark.org/review/14438
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-18 00:58:06 +00:00
Dario Lombardo 637aefd2b3 cmake: fix gen-authors target.
Also add AUTHORS.git to .gitignore.

Change-Id: I63365816fc32b33d064ebbcae0ddb607c2b37f38
Reviewed-on: https://code.wireshark.org/review/14339
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-04 15:30:24 +00:00
Gerald Combs 0a833f0dfc Git: Ignore vgcore files.
Change-Id: Iceb0d2778442d776320d6654cba25f7a43f63689
Reviewed-on: https://code.wireshark.org/review/14330
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-03-03 20:00:55 +00:00
Dario Lombardo ac0eb6043b extcap: add randpktdump, a random packet generator.
This new extcap is for testing and educational purpose.
It relies on rankpkt-core functions to generate random packets.

Change-Id: If6890f0673545682995a2079458108edc0913b30
Reviewed-on: https://code.wireshark.org/review/11764
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-22 12:24:16 +00:00
Peter Wu a198f47c06 cmake: add asn1 target, avoid unnecessary rebuilds
Add an "asn1" build target that rebuilds all ASN.1 dissectors.

Do not always generate the ASN.1 dissector when invoking the
"generate_dissector-PROTO" target. Use a special "packet-PROTO-stamp"
file to detect whether the dissector is out of date.

This indirection is needed because cmake removes output files from
add_custom_command in the clean target, but we would like to keep the
generated packet-PROTO.c files.

Make all EXTRA_CNF and EXPORT_DEPENDS point to absolute paths for
generated exported configs (PROTO-exp.cnf). This is done by automake too
and is needed for proper dependency tracking. Example: when h225.cnf is
updated, h225-exp.cnf needs to be generated. That is the purpose of the
"generate-h225-exp.cnf" target. Now h235 (and other) dissectors need to
be regenerated as well because the h225-exp.cnf is updated. This is why
there is a separate add_custom_command and add_custom_target.

Change-Id: I8cfc1f8f43cea595267b21eae30b4548f3407c0b
Reviewed-on: https://code.wireshark.org/review/12080
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-26 12:37:21 +00:00
João Valverde ac7982cf9b Remove 'filetap' residue from .gitignore
Change-Id: Ica5aff181e3b5031bd0be59c71a6bfa485e5c199
Reviewed-on: https://code.wireshark.org/review/12148
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-25 20:03:06 +00:00
Pascal Quantin 9e1128bfb6 Add Windows CMake auto generated files to .gitignore
This is useful in case of in tree build.

Change-Id: I91a4503221ad097fd15e32677190b36c2d483c1f
Reviewed-on: https://code.wireshark.org/review/12045
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-22 20:38:22 +00:00
Peter Wu 02fdea06de cmake: do not remove ws.css; ignore auto-generated files
Do not remove "ws.css" when doing a build in the source tree. Ignore
files that were automatically generated with cmake and the Ninja
generator (cmake -GNinja).

Change-Id: I24cae27eb8ae9664e3354ba646fd5503649349b1
Reviewed-on: https://code.wireshark.org/review/12007
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-21 16:47:59 +00:00
Dario Lombardo d6da95231e extcap: add sshdump.
sshdump is an extcap module that allows dumping from a remote host using an ssh connection.
It goes with the existing extcap plugin interface.

Change-Id: I8987614fdd817b8173a50130812bc643a4833bca
Reviewed-on: https://code.wireshark.org/review/11402
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19 15:29:18 +00:00
João Valverde 2d7b0fc7d0 [GTK] Replace deprecated gdk_pixbuf_new_from_inline()
Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).

Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.

Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).

Add missing 'expert_ok.png' file to distribution (GTK only).

Minor improvements to style/structure of ui/gtk/Makefile.am.

Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12 07:14:32 +00:00
Gerald Combs ec303c13b3 Add CMakeLists.txt.user* to .gitignore.
Qt Creator uses CMakeLists.txt.user to store CMake build settings.

Change-Id: I600289183dcfbc03cd9b555c4b646e6cfb799b0e
Reviewed-on: https://code.wireshark.org/review/11700
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-10 21:48:23 +00:00
Joerg Mayer 8e55f681fc Remove gitversion.h
Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6
Reviewed-on: https://code.wireshark.org/review/10256
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-08-25 17:30:02 +00:00
Evan Huus 5aaaa550fd Add basic Vagrant configuration
For non-linux developers this should somewhat simplify development with e.g.
valgrind and other useful tools.

Change-Id: I973ab7412ad9a61f0892c25c079ea3424208abd1
Reviewed-on: https://code.wireshark.org/review/9117
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-25 02:53:40 +00:00
Gerald Combs 3ac9921065 Retire git_version.xml.
Remove check_git_version.sh and its associated targets. We haven't used
git_version.xml since the AsciiDoc conversion.

Change-Id: I480f0094c4355d71201f2dd285198581bbbfc415
Reviewed-on: https://code.wireshark.org/review/8104
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-04-17 17:02:22 +00:00
Guy Harris 6c34e9a844 Ignore androiddump - it's another build target.
Change-Id: If0d4ca167fba528726537a7b65f0fbdba5aaa59d
Reviewed-on: https://code.wireshark.org/review/8024
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-11 21:38:29 +00:00
Gerald Combs fd72024bc2 Move the PortabaleApps packaging up one level.
Update the PA section of the Developer's Guide.

Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b
Reviewed-on: https://code.wireshark.org/review/8012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-10 17:16:21 +00:00
Graham Bloice ff16cfeabd Added nsis generated files to .gitignore
Change-Id: Id2f1ff7ca5094a785274c41eca0c1f878a427f90
Reviewed-on: https://code.wireshark.org/review/6885
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-02-01 10:54:39 +00:00
Guy Harris 5a23a02ab8 Add .dirstamp - it's apparently some autotools thing.
Change-Id: I3303744858d807b1472c2e53ff6d886270664be2
Reviewed-on: https://code.wireshark.org/review/6752
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-23 04:04:03 +00:00
Gerald Combs a6e6deea7f NSIS: Quote all paths in config.nsh.
Fix the MAKEDIR substitution. Add config.nsh to .gitignore.

Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788
Reviewed-on: https://code.wireshark.org/review/6351
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 20:41:09 +00:00
Bill Meier 6d6ba642b9 .gitignore: Add '*.nativecodeanalysis.xml'
Change-Id: I54133af8626125b51e4263d3c77358752bdcf339
Reviewed-on: https://code.wireshark.org/review/6209
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-01 20:05:29 +00:00
Stephen Fisher e2ef6c4cfc Add on to the dummy.cpp hack that forces wireshark to be linked with a
c++ compiler to automatically create a dummy.cpp file and remove it when
make clean is issued.  This allows make tags to work again since the
file isn't missing.

Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67
Reviewed-on: https://code.wireshark.org/review/5494
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-25 22:39:00 +00:00
Gerald Combs 62289300d6 Finish converting the User's Guide to AsciiDoc.
As with the Developer's Guide, add user-guide-docinfo.xml, which lets us
carry over DocBook front matter. Remove the meta_info chapter. Most of
its contents are now in user-guide-docinfo.xml. Add a DocBook revision
history based on hints from the Git/SVN/CVS revision history.

Remove the various makefile targets for converting AsciiDoc files to
DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version.

Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a
Reviewed-on: https://code.wireshark.org/review/5216
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-10 05:30:10 +00:00
Stephen Fisher 8765fec578 Ignore additional generated files:
aclocal-fallback/libtool.m4
        aclocal-fallback/ltoptions.m4
        aclocal-fallback/ltsugar.m4
        aclocal-fallback/ltversion.m4
        aclocal-fallback/lt~obsolete.m4

Change-Id: I7c9bb5c383f44800345540ec05a67175bd7267cc
Reviewed-on: https://code.wireshark.org/review/5114
Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-11-04 19:32:32 +00:00
Stephen Fisher e2f2e18e63 Also ignore TAGS files in addition to the already ignored tags in .gitignore
Change-Id: Id787cf8dfd3df5fac6d535422e00eff3788570b0
Reviewed-on: https://code.wireshark.org/review/5103
Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-11-04 00:08:40 +00:00
Gerald Combs 85eec7f603 Fix PortableApps packaging.
Our Windows portable packaging environment has a lot of cruft which is
no longer relevant. We removed support for U3 packages and the method
we use to generate PortableApps packages has been deprecated for a while.

Create PortableApps packages using current file formats (AppInfo v3.0)
and tools. Generate the PA launcher using the PortableApps.com Launcher
generator. Copy files and directories from the top level instead of using
a manifest derived from the NSIS installer.

The manifest is a good idea, but we should create a central manifest
and use that to generate the NSIS and PortableApps packages instead of
trying to parse wireshark.nsi.

The new package still needs a bit of work but it installs and runs in
the current version of the PA Platform.

Remove the define for MAKENSIS_UNICODE. It doesn't look like we were
using it.

Start tearing down makefiles and scripts that we no longer use.

Ping-Bug: 4191
Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4
Reviewed-on: https://code.wireshark.org/review/3962
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02 23:55:54 +00:00
Jeff Morriss dc9b44c5e2 Ignore RPM output directories.
Change-Id: I35cda66d512448317f3c7d6ed922f9dca2893690
Reviewed-on: https://code.wireshark.org/review/3304
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-01 01:55:40 +00:00
Gerald Combs 304388a44f Install our Qt DLL directories recursively.
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a
PowerShell script to convert the output of windeployqt to its equivalent
NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure
we uninstall known Qt DLL directories. DLLs now load correctly according
to Dependency Walker.

Install and uninstall our .qm files while we're here.

Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21
Reviewed-on: https://code.wireshark.org/review/3267
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-30 18:07:29 +00:00
Pascal Quantin e21c429388 Add PortableApps temporary files to .gitignore
Change-Id: Ie76d2c5cc167a4d63f6c83b64cdf6d1ebb07afa9
Reviewed-on: https://code.wireshark.org/review/3221
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-27 21:32:36 +00:00
Guy Harris a07dc8bfca Add echld_test to the list of files we ignore (built with --enable-echld).
Change-Id: Idca036db408e4caf6c84a67b4c36145568921ca5
Reviewed-on: https://code.wireshark.org/review/2729
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30 22:11:41 +00:00
Bill Meier 4c0d8fd9d7 Ignore 'docbook/ws?g_chm/'
Change-Id: If6529b7cfce199de2f3f54ab0ccf2aa26fe8ec19
Reviewed-on: https://code.wireshark.org/review/2265
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-16 19:31:47 +00:00
Gerald Combs 3f247a5cee Be less aggressive about rebuilding sminmpec.c.
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-05-09 09:03:24 +00:00
Alexis La Goutte 157fe98533 Update .gitignore to ignore doxygen generate file/directory (wsar_html...)
Change-Id: I3d45c03f923dcc1c9216b8b102235221e8e3d556
Reviewed-on: https://code.wireshark.org/review/1140
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-15 02:38:36 +00:00
Bill Meier 4958cd7e50 Remove 3 dups from .gitignore
Change-Id: I81434f311568d42dd897461365a5c345dd9ff1bc
Reviewed-on: https://code.wireshark.org/review/893
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-31 19:30:30 +00:00