aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
AgeCommit message (Collapse)AuthorFilesLines
2023-11-03gitignore: Fix our Vim swap file patternGerald Combs1-1/+1
As https://vimdoc.sourceforge.net/htmldoc/recover.html#swap-file says, "If the ".swp" file name already exists, the last character is decremented until there is no file with that name or ".saa" is reached. In the last case, no swap file is created."
2023-08-25Fix Debian packaging and remove stale references to "init.lua"João Valverde1-1/+0
2023-08-16Lua: Remove console.luaJoão Valverde1-1/+0
Add Lua 5.1 support for the new IO Console Dialog. Remove the obsolete console.lua file.
2023-05-23Add python cache to gitignoreJoão Valverde1-0/+1
[skip ci]
2023-01-20GUI: Ship authors as a Qt resource fileJoão Valverde1-1/+0
2022-07-28gitignore: Add Qt creator autosaveJoão Valverde1-0/+1
2022-06-05Git+CMake: Add support for CMake presets.Gerald Combs1-1/+1
CMake 3.19 added support for CMakePresets.json and CMakeUserPresets.json, which let you prepopulate various configure, build, and test options. Add CMakeUserPresets.json to .gitignore as recommended by the documentation and add an example to the Developer's Guide. CMake uses 2-space indentation; specify that for CMake*.json in .editorconfig.
2022-05-23Git+docs: Ignore and document CMakeListsCustom.txt.Gerald Combs1-0/+1
2022-04-08Git: Fix our debian ignore.Gerald Combs1-1/+1
We create a top-level symlink to packaging/debian in GitLab CI, so only ignore that.
2022-02-13Packaging+GitLab CI: Move debian to the packaging directory.Gerald Combs1-0/+3
We keep our various packaging assets in the "packaging" directory. Move the Debian assets there. dpkg-buildpackage doesn't seem appear to have a "debian directory path" option, but symlinking worked in my test container.
2022-02-05Git: Ignore Visual Studio Code workspace definitionRoland Knall1-0/+1
2022-01-23Clean up .gitignore.Gerald Combs1-30/+19
Remove entries that were generated by HTML Help and NMake or are otherwise no longer relevant. Organize some other entries a little better.
2022-01-22gitignore: Add ignores for clangdDirk Ziegelmeier1-0/+5
2020-09-27Add /*build*/ to .gitignoreJeff Widman1-1/+1
A common pattern is to build the source artifacts within a *build* dir. For example, the wiki instructions for [building `wireshark` on `macOS` specify to create a `./build` directory](https://gitlab.com/wireshark/wireshark/-/wikis/BuildingAndInstalling#macos): ``` mkdir build && cd build && cmake ../ && make ``` So this commit adds this directory to `.gitignore` to prevent accidentally committing build artifacts. The specific format `/*build*/` protects against the following: 1. The leading slash makes sure only top-level directories that match this pattern are ignored. 2. The trailing slash makes sure that only directories (and not files) are ignored. 3. The wildcards catch all the various variations on `build` folder name that are used...
2020-02-25Remove some entries from .gitignore.Gerald Combs1-7/+4
Remove "Wireshark.*", since that makes tools like ag and rg skip packaging/wix/Wireshark.wxs. Add a note about this. Remove other no-longer-relevant entries. Change-Id: Ib3841249aef2018ca2ef0285a5d0ea799c54d310 Reviewed-on: https://code.wireshark.org/review/36145 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-20gitignore: Remove leftover cruft.João Valverde1-9/+0
Change-Id: Iac6d726533f9ea1d43287cd5a63f7dff47d27b2d Reviewed-on: https://code.wireshark.org/review/34581 Reviewed-by: João Valverde <j@v6e.pt>
2019-01-12CMake: use object libraries to avoid redundant buildsPeter Wu1-2/+0
Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-01Add .idea/ and cmake-build-*/ to gitignore (for jetbrains IDEs)Émilio Gonzalez1-0/+2
Change-Id: I70d8203cfa0a0c14f4df65d3a4bc9d5a1fbf12ae Reviewed-on: https://code.wireshark.org/review/29959 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-05.gitignore: Remove version.h.Gerald Combs1-1/+0
Remove version.h from .gitignore. This appears to be a leftover artifact from Autotools. Change-Id: I7b278c36444673bd50d936585cfdc5562d9ea825 Reviewed-on: https://code.wireshark.org/review/29418 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-08-16Replaced "wireshark-win32-libs/" and "wireshark-win64-libs/" by ↵Ralf Nasilowski1-0/+1
"wireshark-win??-libs*/" in ".gitignore" Change-Id: I154163847f54f2bce35ac5fa681d323290d6d7bf Reviewed-on: https://code.wireshark.org/review/29147 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-11Rewrite make-{dissectors,taps} in PythonJoão Valverde1-2/+0
Having these build tools in machine code poses problems when cross-compiling. The most significant being that we need to find the host and build GLiB dependencies at compile-time. There is no noticeable speed difference between the Python and C implementation. Ping-Bug: 14622 Change-Id: Id13f823c7f4abf51edfa291e703028873748989f Reviewed-on: https://code.wireshark.org/review/28130 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-31Move make-taps and make-dissectors to tools/João Valverde1-2/+2
make-taps and make dissectors are build tools so that is the natural location for them. See also 99ec2b58eb68ab8530245dd13485612695ba064a and bug 14622. Change-Id: I754848ea1c614bfa7121c44d89136ac3cba8a734 Reviewed-on: https://code.wireshark.org/review/27928 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-05-25Remove some unused .gitignore entries.Gerald Combs1-11/+0
Remove unused documentation extensions (.dbk or .fo) and what appear to be files generated or used by QMake. Change-Id: I8635436e6e7e7117ef9d0aadf97f925751d8df18 Reviewed-on: https://code.wireshark.org/review/27795 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10gitignore: add test log files.Dario Lombardo1-0/+1
They are generated by 'test' target and should be ignored. Change-Id: Ie378c356ba586e826946abfcfcd8faf2c3ad3c2d Reviewed-on: https://code.wireshark.org/review/27382 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo1-62/+0
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17More GTK+ removal.Gerald Combs1-4/+0
Remove GTK+ entries from .gitignore and start removing it from packaging. Change-Id: I70391000906e983eab250c8158b486c3dc6d4a16 Reviewed-on: https://code.wireshark.org/review/26988 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17Switch the Doxygen API reference build to CMake.Gerald Combs1-2/+0
Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15dfilter-test.py: document parallelization supportPeter Wu1-0/+1
Tests are independent and can be run in parallel using pytest-xdist (https://github.com/pytest-dev/pytest-xdist), document it. While at it, allow running the tests from other directories. Change-Id: I3e55c549669f7d59d35cd64eca53680cea6dec2d Reviewed-on: https://code.wireshark.org/review/26943 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-26mmdbresolve is an executable; git should ignore it.Guy Harris1-0/+1
Change-Id: I025c7c482182fdfa0849306f50d118d389670c83 Reviewed-on: https://code.wireshark.org/review/26646 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-16Update paths after dissector plugin move.Jaap Keuter1-2/+4
With the change in paths of the dissector plugins in the repository some other paths require adjustment. These are the obvious changes remaining. Change-Id: Id49ac6aaf1a29d9eb37f4c32226a4597d5e32edd Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25343 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-24Rename dissectors.c.in and fix CMake on removalsPeter Wu1-1/+1
"dissectors.c.in" is an input file for "make-dissectors" which outputs "dissectors.c", but does not contain C code. Rename it to "dissectors.in.txt" instead. When a dissector is removed from the list, the dissectors.c file was not properly generated even if CMake was re-run. Fix this by adding an additional dependency on the input file. autotools likely suffers from the same problem with removed files, I have not tried to fix that. Restore's João's original approach using file(GENERATE) to avoid using configure_file, this requires CMake 2.8.12. Change-Id: Id07cd8ef502186a90d41b3bb77ed0d9c94845af9 Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite make-dissector-reg.py in C") Reviewed-on: https://code.wireshark.org/review/24659 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-12-14Qt: Add QtCreator generated files to gitignoreRoland Knall1-0/+1
Change-Id: Id3ba4eede12de954bdc34d906abf2a84dc3e1cdd Reviewed-on: https://code.wireshark.org/review/24822 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-12-11Rewrite make-tap-reg.py in CJoão Valverde1-5/+1
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-07Add fuzzshark to cmake/autotools.Jakub Zawadzki1-0/+1
Add fuzzshark target to make sure that oss-fuzzshark always build. Change-Id: I802b679c18023daa1475a54bae722b5e90c72a59 Reviewed-on: https://code.wireshark.org/review/24716 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-29Update .gitignoreJoão Valverde1-6/+2
Change-Id: I3b5f343f241a7d0571ddd7a0647c45c2bef28c73 Reviewed-on: https://code.wireshark.org/review/24648 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-28gitignore: Add packaging/macosx/PkgInfoStig Bjørlykke1-0/+1
Change-Id: I630fa8ae0c3d5f078922b4d6cb2ee064c31bd35e Reviewed-on: https://code.wireshark.org/review/24616 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-20Rewrite make-dissector-reg.py in CJoão Valverde1-1/+1
The output compares equal to make-dissector-reg.py and the regex should be more robust (multiline, complete start of function definition). The primary motivation is to clean up the python script. This small binary results in much cleaner code. The python script is used only to generate plugin code, therefore it is renamed. Also in my casual measurements the C code is much faster (without cache) than the python script with the cache. Change-Id: Id4e8cac3c836d56775aba4819357a95ef19bcb85 Reviewed-on: https://code.wireshark.org/review/24497 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18Update .gitignoreJoão Valverde1-4/+2
Change-Id: Ia066511bc27618ee8e0a55e046a6d9437a4c3175 Reviewed-on: https://code.wireshark.org/review/24477 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17autotools: Remove setuid-root.plJoão Valverde1-1/+0
It seems to be some sort of development helper, and since CMake doesn't use it presumably it is not useful anymore. Change-Id: I23e4ab24199f21310ebd09064c3ae53e48673e4d Reviewed-on: https://code.wireshark.org/review/23945 Petri-Dish: Gerald Combs <gerald@wireshark.org> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-02Remove the SVR4 packaging assets.Gerald Combs1-2/+0
Remove the svr4-package and solaris-package targets along with their associated files and directories. We used to use this to build Solaris packages but we haven't shipped those in years. Given that the last substantive change to packaging/svr4 was in 2008 it's likely that this has been unused for a while. Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f Reviewed-on: https://code.wireshark.org/review/23808 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-2/+2
It's not installed so like most other files it doesn't need or benefit from the prefix. Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c Reviewed-on: https://code.wireshark.org/review/23751 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>
2017-07-20.gitignore: move ui/qt/gitignore to root gitignoreAlexis La Goutte1-0/+1
Change-Id: I303c6998b7b825ebb89aa1a81296b1ad69786ec1 Reviewed-on: https://code.wireshark.org/review/22538 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-07-17.gitignore: Add ignore to moc file on new qt subfolderAlexis La Goutte1-6/+5
See https://www.wireshark.org/lists/wireshark-dev/201706/msg00157.html and https://code.wireshark.org/review/#/c/22422/ for new folder Change-Id: If1ed71b844164fdf7a438d47244a0ad0e18b432b Reviewed-on: https://code.wireshark.org/review/22528 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-16Ignore .moc.cpp files in ui/qt/widgets.Guy Harris1-0/+1
Change-Id: Ie709b9a13f1f2a76b355ffebeadbed0e47d90d2a Reviewed-on: https://code.wireshark.org/review/22636 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-19Remove echld/.Joerg Mayer1-1/+0
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-01-26Clean up some UN*X-vs-Windows socket issues.Guy Harris1-0/+1
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>
2016-09-16extcap: add udpdump.Dario Lombardo1-0/+1
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-07-05Rename PIDL MakefileJoão Valverde1-1/+0
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-06-28Qt: Generate .qm files during buildJoão Valverde1-1/+1
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-27cmake: add idl2wrs-dissectors target for DCERPCPeter Wu1-0/+2
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>