aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
AgeCommit message (Collapse)AuthorFilesLines
2015-11-26cmake: add asn1 target, avoid unnecessary rebuildsPeter Wu1-0/+1
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-25Remove 'filetap' residue from .gitignoreJoão Valverde1-2/+0
Change-Id: Ica5aff181e3b5031bd0be59c71a6bfa485e5c199 Reviewed-on: https://code.wireshark.org/review/12148 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-22Add Windows CMake auto generated files to .gitignorePascal Quantin1-2/+21
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-21cmake: do not remove ws.css; ignore auto-generated filesPeter Wu1-0/+10
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-19extcap: add sshdump.Dario Lombardo1-0/+1
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-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-0/+2
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-10Add CMakeLists.txt.user* to .gitignore.Gerald Combs1-0/+1
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-08-25Remove gitversion.hJoerg Mayer1-1/+0
Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6 Reviewed-on: https://code.wireshark.org/review/10256 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-25Add basic Vagrant configurationEvan Huus1-0/+1
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-04-17Retire git_version.xml.Gerald Combs1-1/+0
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-11Ignore androiddump - it's another build target.Guy Harris1-0/+1
Change-Id: If0d4ca167fba528726537a7b65f0fbdba5aaa59d Reviewed-on: https://code.wireshark.org/review/8024 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-10Move the PortabaleApps packaging up one level.Gerald Combs1-3/+3
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-02-01Added nsis generated files to .gitignoreGraham Bloice1-0/+2
Change-Id: Id2f1ff7ca5094a785274c41eca0c1f878a427f90 Reviewed-on: https://code.wireshark.org/review/6885 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-23Add .dirstamp - it's apparently some autotools thing.Guy Harris1-0/+1
Change-Id: I3303744858d807b1472c2e53ff6d886270664be2 Reviewed-on: https://code.wireshark.org/review/6752 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-06NSIS: Quote all paths in config.nsh.Gerald Combs1-0/+1
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-01.gitignore: Add '*.nativecodeanalysis.xml'Bill Meier1-0/+1
Change-Id: I54133af8626125b51e4263d3c77358752bdcf339 Reviewed-on: https://code.wireshark.org/review/6209 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-25Add on to the dummy.cpp hack that forces wireshark to be linked with aStephen Fisher1-0/+1
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-10Finish converting the User's Guide to AsciiDoc.Gerald Combs1-0/+1
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-04Ignore additional generated files:Stephen Fisher1-0/+5
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-04Also ignore TAGS files in addition to the already ignored tags in .gitignoreStephen Fisher1-0/+1
Change-Id: Id787cf8dfd3df5fac6d535422e00eff3788570b0 Reviewed-on: https://code.wireshark.org/review/5103 Reviewed-by: Stephen Fisher <stephenfisher@centurylink.net>
2014-09-02Fix PortableApps packaging.Gerald Combs1-1/+0
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-08-01Ignore RPM output directories.Jeff Morriss1-0/+2
Change-Id: I35cda66d512448317f3c7d6ed922f9dca2893690 Reviewed-on: https://code.wireshark.org/review/3304 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-30Install our Qt DLL directories recursively.Gerald Combs1-0/+1
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-27Add PortableApps temporary files to .gitignorePascal Quantin1-0/+4
Change-Id: Ie76d2c5cc167a4d63f6c83b64cdf6d1ebb07afa9 Reviewed-on: https://code.wireshark.org/review/3221 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-30Add echld_test to the list of files we ignore (built with --enable-echld).Guy Harris1-0/+1
Change-Id: Idca036db408e4caf6c84a67b4c36145568921ca5 Reviewed-on: https://code.wireshark.org/review/2729 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-16Ignore 'docbook/ws?g_chm/'Bill Meier1-0/+1
Change-Id: If6529b7cfce199de2f3f54ab0ccf2aa26fe8ec19 Reviewed-on: https://code.wireshark.org/review/2265 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-09Be less aggressive about rebuilding sminmpec.c.Gerald Combs1-1/+0
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-04-15Update .gitignore to ignore doxygen generate file/directory (wsar_html...)Alexis La Goutte1-1/+3
Change-Id: I3d45c03f923dcc1c9216b8b102235221e8e3d556 Reviewed-on: https://code.wireshark.org/review/1140 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31Remove 3 dups from .gitignoreBill Meier1-3/+0
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-04Add gitversion.h.Gerald Combs1-0/+1
Change-Id: Ia1609a20b060cb535a366c96be5618dccb6e055f Reviewed-on: https://code.wireshark.org/review/507 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-25Change libsmi url and Lua version in macosx-setup.shHadriel Kaplan1-0/+1
The libsmi url in macosx-setup.sh was dead, it's now an https site not ftp. Also we were pulling down Lua 5.1.5 but should be pullsing down 5.2.3. Lastly, macosx-setup cerates macosx-support-libs directory, which needs to be ignored. Change-Id: I79dc833dbc54fda8b237c5ada64f3564ce4f4cde Reviewed-on: https://code.wireshark.org/review/360 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-23Documentation updatesEvan Huus1-0/+8
Change-Id: I6bd7fa40726fe7ffd68b9341c640874f2a0f1c7c Reviewed-on: https://code.wireshark.org/review/314 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-23Add note to .gitignore on how to ignore locally-specific filesHadriel Kaplan1-3/+11
Also, this removes a couple locally-specific files I had previously added. Change-Id: Ib93e0dc5aeb062321e47f77a084b0581f87046c6 Reviewed-on: https://code.wireshark.org/review/315 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Add config.cache to .gitignoreBill Meier1-0/+1
Change-Id: Ic1a5d06f9a0bea4ea10cd009000d5074541bec2a Reviewed-on: https://code.wireshark.org/review/236 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-11Finish converting the Developer's Guide to AsciiDoc.Gerald Combs1-0/+1
Add developer-guide-docinfo.xml, which lets us carry over DocBook front matter. Remove the meta_info chapter. Most of its contents are now in developer-guide-docinfo.xml. Add a DocBook revision history based on hints from the Git/SVN/CVS revision history. Comment out or note makefile content that's no longer necessary for converting the Developer's Guide but will be useful for converting the User's Guide. Fix building the release notes with CMake. Other minor changes. Tested with Autotools, nmake, and CMake. Change-Id: Ib6d50c821ca906fff50a84ad4d6af3212ebdff0a Reviewed-on: https://code.wireshark.org/review/155 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs1-1/+1
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-01Convert the libraries chapter to AsciiDoc.Gerald Combs1-0/+5
Add some docbook-related entries to .gitignore. Whoever maintains the Windows libraries has done a terrible job of keeping this chapter up to date. Change-Id: Ic6dcbd9e8369eae9f07403bd3f805a515886f542 Reviewed-on: https://code.wireshark.org/review/72 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-01-31Add experimental gitreview fileEvan Huus1-1/+0
Change-Id: I8361e6c2c477eca51e53185527db19993b8ddb94 Reviewed-on: https://code.wireshark.org/review/66 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-30In .gitignore: added dylib and sublimetext file types to be ignored, plus ↵Hadriel Kaplan1-2/+4
init.lua from anywhere, and removed the dir-specific entries for it. Change-Id: I4b1f9b1603dcbf1e895944a4ccf382ad6ee309b0 Reviewed-on: https://code.wireshark.org/review/49 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-29Add missing gitignore entriesEvan Huus1-0/+2
Change-Id: Icfdde6bad4aed8dfd5c0b14a04c37395dfbf0395
2014-01-15Add captype and tfshark binaries to .gitignoreEvan Huus1-0/+2
svn path=/trunk/; revision=54819
2014-01-14Add filetap/abi* to .gitignoreAlexis La Goutte1-0/+2
svn path=/trunk/; revision=54803
2013-12-13Add .gitreviewGerald Combs1-0/+1
svn path=/trunk/; revision=54000
2013-12-11Update .gitignoreAlexis La Goutte1-3/+2
wireshark-tap-register* is used by gtk and Qt svn path=/trunk/; revision=53936
2013-10-28add tags file to .gitignoreMartin Kaiser1-0/+1
svn path=/trunk/; revision=52921
2013-09-19Add *.lai file to wiresharkAlexis La Goutte1-0/+1
svn path=/trunk/; revision=52146
2013-08-10Update .gitignoreAlexis La Goutte1-1/+2
Add : packaging/macosx/Wireshark_package.pmdoc/index.xml and lib(wireshark/wiretap/wsutil).so.* svn path=/trunk/; revision=51287
2013-07-28From David Richards via ↵Pascal Quantin1-0/+5
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8870 : Add Windows specific items to .gitignore svn path=/trunk/; revision=50979
2013-07-21Add test binaries to .gitignoreJakub Zawadzki1-0/+2
svn path=/trunk/; revision=50758
2013-07-12Move the ignore entries for ps.c to epan.Jeff Morriss1-1/+1
svn path=/trunk/; revision=50533
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 14:52:44 +0000