Commit Graph

67 Commits (b044e48c7005ecb4233e7d6991876ebe3b673edc)

Author SHA1 Message Date
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
Petri-Dish: Alexis La Goutte <>
Reviewed-by: Peter Wu <>
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
Petri-Dish: Alexis La Goutte <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Anders Broman <>
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/ 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/

Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Petri-Dish: Anders Broman <>
Petri-Dish: Alexis La Goutte <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Anders Broman <>
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-by: Gerald Combs <>
2015-11-10 21:48:23 +00:00
Joerg Mayer 8e55f681fc Remove gitversion.h
Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6
Reviewed-by: Jörg Mayer <>
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-by: Evan Huus <>
2015-06-25 02:53:40 +00:00
Gerald Combs 3ac9921065 Retire git_version.xml.
Remove and its associated targets. We haven't used
git_version.xml since the AsciiDoc conversion.

Change-Id: I480f0094c4355d71201f2dd285198581bbbfc415
Petri-Dish: Gerald Combs <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Gerald Combs <>
2015-04-17 17:02:22 +00:00
Guy Harris 6c34e9a844 Ignore androiddump - it's another build target.
Change-Id: If0d4ca167fba528726537a7b65f0fbdba5aaa59d
Reviewed-by: Guy Harris <>
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-by: Gerald Combs <>
2015-04-10 17:16:21 +00:00
Graham Bloice ff16cfeabd Added nsis generated files to .gitignore
Change-Id: Id2f1ff7ca5094a785274c41eca0c1f878a427f90
Reviewed-by: Graham Bloice <>
2015-02-01 10:54:39 +00:00
Guy Harris 5a23a02ab8 Add .dirstamp - it's apparently some autotools thing.
Change-Id: I3303744858d807b1472c2e53ff6d886270664be2
Reviewed-by: Guy Harris <>
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-by: Gerald Combs <>
2015-01-06 20:41:09 +00:00
Bill Meier 6d6ba642b9 .gitignore: Add '*.nativecodeanalysis.xml'
Change-Id: I54133af8626125b51e4263d3c77358752bdcf339
Reviewed-by: Bill Meier <>
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
Petri-Dish: Stephen Fisher <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Stephen Fisher <>
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
Petri-Dish: Gerald Combs <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Gerald Combs <>
2014-11-10 05:30:10 +00:00
Stephen Fisher 8765fec578 Ignore additional generated files:

Change-Id: I7c9bb5c383f44800345540ec05a67175bd7267cc
Reviewed-by: Stephen Fisher <>
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-by: Stephen Fisher <>
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 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-by: Gerald Combs <>
2014-09-02 23:55:54 +00:00
Jeff Morriss dc9b44c5e2 Ignore RPM output directories.
Change-Id: I35cda66d512448317f3c7d6ed922f9dca2893690
Reviewed-by: Evan Huus <>
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-by: Gerald Combs <>
2014-07-30 18:07:29 +00:00
Pascal Quantin e21c429388 Add PortableApps temporary files to .gitignore
Change-Id: Ie76d2c5cc167a4d63f6c83b64cdf6d1ebb07afa9
Reviewed-by: Pascal Quantin <>
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-by: Guy Harris <>
2014-06-30 22:11:41 +00:00
Bill Meier 4c0d8fd9d7 Ignore 'docbook/ws?g_chm/'
Change-Id: If6529b7cfce199de2f3f54ab0ccf2aa26fe8ec19
Reviewed-by: Bill Meier <>
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

Remove the mtime check from 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-by: Evan Huus <>
Reviewed-by: Alexis La Goutte <>
Tested-by: Alexis La Goutte <>
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-by: Evan Huus <>
2014-04-15 02:38:36 +00:00
Bill Meier 4958cd7e50 Remove 3 dups from .gitignore
Change-Id: I81434f311568d42dd897461365a5c345dd9ff1bc
Reviewed-by: Bill Meier <>
Tested-by: Bill Meier <>
2014-03-31 19:30:30 +00:00
Gerald Combs b2689ab4e0 Add gitversion.h.
Change-Id: Ia1609a20b060cb535a366c96be5618dccb6e055f
Reviewed-by: Gerald Combs <>
2014-03-04 19:19:08 +00:00
Hadriel Kaplan b6aae8d5c4 Change libsmi url and Lua version in
The libsmi url in 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-by: Alexis La Goutte <>
2014-02-25 17:28:04 +00:00
Evan Huus 83fc346853 Documentation updates
Change-Id: I6bd7fa40726fe7ffd68b9341c640874f2a0f1c7c
Reviewed-by: Alexis La Goutte <>
Reviewed-by: Christopher Maynard <>
Reviewed-by: Evan Huus <>
2014-02-23 15:30:35 +00:00
Hadriel Kaplan 41fc5a53e9 Add note to .gitignore on how to ignore locally-specific files
Also, this removes a couple locally-specific files I had previously added.

Change-Id: Ib93e0dc5aeb062321e47f77a084b0581f87046c6
Reviewed-by: Alexis La Goutte <>
Reviewed-by: Evan Huus <>
2014-02-23 01:07:18 +00:00
Bill Meier 0fd67829e5 Add config.cache to .gitignore
Change-Id: Ic1a5d06f9a0bea4ea10cd009000d5074541bec2a
Reviewed-by: Bill Meier <>
Tested-by: Bill Meier <>
2014-02-16 18:24:12 +00:00
Gerald Combs 5e3113e7c9 Finish converting the Developer's Guide to AsciiDoc.
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-by: Gerald Combs <>
Tested-by: Gerald Combs <>
2014-02-11 18:04:45 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In, 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-by: Gerald Combs <>
2014-02-07 23:03:03 +00:00
Gerald Combs ec6fc7690b Convert the libraries chapter to AsciiDoc.
Add some docbook-related entries to .gitignore. Whoever maintains the
Windows libraries has done a terrible job of keeping this chapter up to

Change-Id: Ic6dcbd9e8369eae9f07403bd3f805a515886f542
Reviewed-by: Gerald Combs <>
Tested-by: Gerald Combs <>
2014-02-01 19:30:01 +00:00
Evan Huus 42af212cec Add experimental gitreview file
Change-Id: I8361e6c2c477eca51e53185527db19993b8ddb94
Reviewed-by: Gerald Combs <>
Tested-by: Evan Huus <>
2014-01-31 23:50:38 +00:00
Hadriel Kaplan 5c7d57a1e2 In .gitignore: added dylib and sublimetext file types to be ignored, plus init.lua from anywhere, and removed the dir-specific entries for it.
Change-Id: I4b1f9b1603dcbf1e895944a4ccf382ad6ee309b0
Reviewed-by: Evan Huus <>
Tested-by: Evan Huus <>
2014-01-30 22:47:51 +00:00
Evan Huus 45fea8e2d7 Add missing gitignore entries
Change-Id: Icfdde6bad4aed8dfd5c0b14a04c37395dfbf0395
2014-01-29 23:10:59 +00:00
Evan Huus 3f6502079a Add captype and tfshark binaries to .gitignore
svn path=/trunk/; revision=54819
2014-01-15 18:06:57 +00:00
Alexis La Goutte 4ed44704d2 Add filetap/abi* to .gitignore
svn path=/trunk/; revision=54803
2014-01-14 20:37:23 +00:00
Gerald Combs db59fd82a4 Add .gitreview
svn path=/trunk/; revision=54000
2013-12-13 00:02:46 +00:00
Alexis La Goutte 8617423f84 Update .gitignore
wireshark-tap-register* is used by gtk and Qt

svn path=/trunk/; revision=53936
2013-12-11 13:14:08 +00:00
Martin Kaiser 8883b7a045 add tags file to .gitignore
svn path=/trunk/; revision=52921
2013-10-28 17:07:14 +00:00
Alexis La Goutte 9e36ab45fe Add *.lai file to wireshark
svn path=/trunk/; revision=52146
2013-09-19 20:26:41 +00:00
Alexis La Goutte f12a5fb7ae Update .gitignore
Add :
and lib(wireshark/wiretap/wsutil).so.*

svn path=/trunk/; revision=51287
2013-08-10 21:32:40 +00:00
Pascal Quantin deee570058 From David Richards via :
Add Windows specific items to .gitignore

svn path=/trunk/; revision=50979
2013-07-28 16:26:29 +00:00
Jakub Zawadzki 6eafdc3610 Add test binaries to .gitignore
svn path=/trunk/; revision=50758
2013-07-21 17:36:35 +00:00
Jeff Morriss 2aff467857 Move the ignore entries for ps.c to epan.
svn path=/trunk/; revision=50533
2013-07-12 13:04:28 +00:00
Alexis La Goutte e66457472d Update .gitignore to add some Windows specific build stuff to ignore list.
svn path=/trunk/; revision=50231
2013-06-29 21:58:46 +00:00
Alexis La Goutte 8ad81a426f Add wmem_test to .git(bzr)ignore
svn path=/trunk/; revision=49275
2013-05-13 20:24:22 +00:00
Alexis La Goutte 441294d61a Add abi stuff to .git(bzr)ignore (files generated by CMake)
svn path=/trunk/; revision=49274
2013-05-13 20:24:14 +00:00