aboutsummaryrefslogtreecommitdiffstats
path: root/.editorconfig
AgeCommit message (Collapse)AuthorFilesLines
2023-07-10manuf: Drop Cavebear OUI listJoão Valverde1-5/+0
The cavebear OUI list is hopelessly outdated (last updated 1999?) and our template file mostly contains obsolete or poorly formatted entries, compared to the official IEEE registry. We should rely on the official registry, which is the best and most up-to-date source, despite some minor inconsistencies and glitches. Remove the template file and use the IEEE registry exclusively.
2022-06-05Git+CMake: Add support for CMake presets.Gerald Combs1-0/+3
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-04-18macOS: Add support for Sparkle 2.Gerald Combs1-2/+2
Sparkle 2 deprecated the sharedUpdater singleton, so create our own which uses Sparkle 2's updated API. Ping #18035. Update our CMake version check.
2022-03-09EditorConfig: Add settings for FlexJoão Valverde1-0/+5
2022-02-20Remove editor modelines and .editorconfig exceptions from root filesDavid Perry1-48/+0
2022-01-25Docs: Update markup in the text2pcap man page.Gerald Combs1-0/+5
Add an EditorConfig entry as well.
2021-12-02dfilter: Convert grammar.lemon to 4-space indentationJoão Valverde1-0/+5
Add global EditorConfig settings for lemon files. Add exceptions for the two grammar files that use tab indentation.
2021-03-02Miscellaneous EditorConfig fixesGerald Combs1-0/+2
In the top-level .editorconfig, note that we don't use CMake's standard indentation. Remove ascendtext.[ch] from wiretap/.editorconfig since it's no longer needed.
2021-03-01Make ui/*.[ch] indentation consistent.Gerald Combs1-6/+0
Switch ui/clopts_common.c, ui/filter_files.[ch], and ui/summary.[ch] to 4 space indentation. This brings them in line with all of the other files in that directory and with ui/qt. Fix the modelines in ui/qt/models/filter_list_model.cpp.
2021-01-01Remove more duplicate manuf.tmpl entries.Gerald Combs1-0/+5
Make a manual pass through manuf.tmpl and remove entries that have either duplicate or more complete IEEE entries. Add an Editorconfig entry for manuf.tmpl.
2020-09-07GitLab CI: Restrict the Windows build to wireshark/wireshark.Gerald Combs1-1/+1
The Windows runners are constrained by the following: * We require quite a bit of software not present in the stanadard runner[1] which takes a long time to install, including Python, Perl, and Qt. * You can't specify an arbitrary Docker image like you can with Linux runners. As a result we have a project-specific runner for wireshark/wireshark that runs a custom Windows Docker image. Update the CI rules so that merge-request:windows only runs for gitlab.com/wireshark/wireshark. The GitLab documentation recommends rules over only/except, so switch to them. Fixup .editorconfig while we're here. [1]https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/blob/master/cookbooks/preinstalled-software/README.md
2020-08-23WSDG: Start updating for GitLab.Gerald Combs1-0/+6
Update the "Work with the Wireshark sources" chapter for GitLab. Change-Id: I58b2f0f5eeec85c891bd7fdbb6132eb8147baabf
2020-08-23Add merge request jobs to GitLab CI and migrate commit validation.Gerald Combs1-0/+5
Copy the Buildbot petri dish builder steps to corresponding GitLab CI jobs. Update validate-commit.py to look for old "Bug:" and "Ping-Bug:" references and have it call `git stripspace` directly. tools/commit-msg was specific to Gerrit, so remove it. Change-Id: Icbc54709052f44c941db9ad6a5dcf596292782a2
2019-09-25macOS: Use dmgbuild to build our .dmg.Gerald Combs1-1/+1
Scripting the Finder in order to lay out our disk image assumes that we have access to the Finder. This might not be the case on our builder, and it arguably shoudn't be. Switch from using a Bash script + AppleScript to build and lay out our .dmg to using dmgbuild, which creates our .DS_Store directly using Python's ds_store module. Change-Id: I2e4a9dd89bc8297c9cbd9df7aa8d3a44447bde85 Reviewed-on: https://code.wireshark.org/review/34623 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-27HTTPS In More Places, update some URLs.Guy Harris1-1/+1
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-24Fix EditorConfig keywordJoão Valverde1-2/+2
Change-Id: Ida0fbb4be701a777c4520ac9d3ae4e960b5db3e9 Reviewed-on: https://code.wireshark.org/review/29277 Reviewed-by: João Valverde <j@v6e.pt>
2018-08-24Add EditorConfig settings for CMakeJoão Valverde1-0/+4
Change-Id: Ia3451503dd356693cbf69b629bcfe7fd59097516 Reviewed-on: https://code.wireshark.org/review/29276 Reviewed-by: João Valverde <j@v6e.pt>
2018-05-11NSIS: Modernize the installer and remove GTK+ entries.Gerald Combs1-0/+5
Migrate the Additional Tasks page to nsDialog. Create it using NSIS Dialog Designer. Migrate the Modern UI code (WinPcapPage.ini and USBPcapPage.ini) to Modern UI2. Use LogicLib flow control instead of Gotos+labels in more places. Change-Id: I1a3733f0202ca372456074f43e5ae23b1da4e1b9 Reviewed-on: https://code.wireshark.org/review/27449 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-03WiX: Options dialog updates.Gerald Combs1-0/+5
Remove GTK+. Add links to Npcap, WinPcap, and USBPcap. Move the capture options to the top of the options dialog. Replace group boxes with simple titles. Add an EditorConfig entry for our WiX files. Change-Id: Ibd581fa09f333fa84228f0a6f723ab62df85ee8e Reviewed-on: https://code.wireshark.org/review/27292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-03Editorconfig: Add a filename match for Makefiles.Gerald Combs1-1/+2
The "Autotools, Make" section in .editorconfig didn't have an associated filepath glob pattern, which meant that it matched the preceding pattern, which was "*". This would appear to explain why VS Code mysteriously forced 8-character tabs for some files. Remove ui/qt/Makefile_custom.common while we're here. Change-Id: I5a84cc53c992bb2a95036cb98dc97cc7eb6b1299 Reviewed-on: https://code.wireshark.org/review/27281 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18Remove autotools build system.Dario Lombardo1-1/+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>
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-1/+1
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-03-19Remove echld/.Joerg Mayer1-1/+1
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-02-03sharkd: fix warning C4090: 'function' : different 'const' qualifiersPascal Quantin1-0/+11
According to https://msdn.microsoft.com/en-us/library/windows/desktop/ms682425(v=vs.85).aspx the lpCommandLine argument must not be const as is may cause an access violation. Change-Id: Iedd77663cd21ca8df542595890fbc7023f2c9c2b Reviewed-on: https://code.wireshark.org/review/19922 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-11remove unused mkcap.c.Dario Lombardo1-1/+1
mkcap.c is not used in any place. Change-Id: Ie29b2ed66bc304a5b6a19fc9128ead2958f8062a Reviewed-on: https://code.wireshark.org/review/17610 Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-15Remove Nmake build systemPascal Quantin1-2/+2
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-21Link version code statically againJoão Valverde1-0/+4
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 f95976eefcbeb5d24df383c29d29ef888b503945. 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-03-23EditorConfig: Add C++ to root fileJoão Valverde1-2/+2
Change-Id: I716bf59e401d7764692e524506756eb30ddb75f2 Reviewed-on: https://code.wireshark.org/review/14572 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-23Move extcap EditorConfig settings to source dirJoão Valverde1-4/+0
To comply with the procedure in README.developer. Change-Id: If68da7b5ff27c3b250200cd17c80a005d51c631d Reviewed-on: https://code.wireshark.org/review/14573 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-22Minor EditorConfig fixupsJoão Valverde1-5/+5
Change-Id: I16eb1ff8b71104300e88f4f307aaaaf6e276bc8e Reviewed-on: https://code.wireshark.org/review/14571 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-14Set EditorConfig hard tab width to 8 for CJoão Valverde1-0/+1
Our check scripts require 8 columns when using tab indentation with modelines so use the same setting for EditorConfig. Change-Id: I5a5a7c22a03866ee77c8fdc98d6582366950ce77 Reviewed-on: https://code.wireshark.org/review/14453 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Add EditorConfig settings for most C filesJoão Valverde1-2/+45
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Convert dissector modelines to EditorConfig fileJoão Valverde1-0/+6
Change-Id: I467b6ca940d2f89346fde46b7348b00eab40092e Reviewed-on: https://code.wireshark.org/review/14353 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08Start adding EditorConfig files.Gerald Combs1-0/+24
Add EditorConfig files where we currently have consistent indentation. This might let us get rid of our editor modeline footers at some point. Change-Id: I156f8d25cfa0050786eb2186c4b2e6d183c3a9ce Reviewed-on: https://code.wireshark.org/review/12383 Reviewed-by: João Valverde <j@v6e.pt>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 13:17:53 +0000