Commit Graph

177 Commits

Author SHA1 Message Date
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte 94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Joerg Mayer fa7288702a Fix GTK3 detection (or more specific: the include paths) on Windows
Change-Id: Ia0aef096849d1935ca4a6d1d31aabd099087cf29
Reviewed-on: https://code.wireshark.org/review/694
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16 11:42:32 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Michal Labedzki 5e27a39fc6 Add Bluetooth SBC Codec support in cmake
SBC Codec can be optionally linked with Wireshark to provide
ability to playing RTP/SBC stream by RTP Player.

Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5
Reviewed-on: https://code.wireshark.org/review/223
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-17 21:44:17 +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-on: https://code.wireshark.org/review/155
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-02-11 18:04:45 +00:00
Gerald Combs c57ac03e65 Try to get CMake to build the Developer Guide again. I don't have
dblatex installed so the release notes fail to build but the WSDG
targets appear to work.

svn path=/trunk/; revision=54952
2014-01-25 00:17:19 +00:00
Gerald Combs a9ddc06adc Prepare for conversion of Guide chapters to AsciiDoc.
svn path=/trunk/; revision=54936
2014-01-24 01:10:10 +00:00
Jörg Mayer 2a21b01fbb Add option to specify special permissions for dumpcap during cmake phase:
set(DUMPCAP_INSTALL_OPTION   <val>)
where val is one of "normal" "suid" "capabilities"

Some things left to do:
- Error out in cmake if setcap isn't found or libcap isn't found.
- Move multivalue option handling into it's own macro (-file) with
  value checking


svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
Gerald Combs fae3157f04 Look for win_flex and win_bison.
svn path=/trunk/; revision=54830
2014-01-16 20:15:20 +00:00
Gerald Combs 8db4bc2499 More Chocolatey lex/yacc updates.
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh

Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.

svn path=/trunk/; revision=54828
2014-01-16 18:57:29 +00:00
Jörg Mayer 6d17d3c4d6 Beginnings of doxygen support.
Currently the doxygen.cfg files are not designed for
out-of-tree builds - that needs to be fixed first.

svn path=/trunk/; revision=54348
2013-12-22 01:21:56 +00:00
Jörg Mayer b2be51c76d Only try to fix absolute Unix paths.
svn path=/trunk/; revision=53801
2013-12-05 22:50:42 +00:00
Jörg Mayer 70f4223c2a The changes to work around the msbuild deficiencies broke
dependeny tracking (replaced the list of dissectors by the file
containing the dissectors). Fix that.

svn path=/trunk/; revision=53703
2013-12-01 22:24:59 +00:00
Jörg Mayer c0f974f9d1 Too litte modify in copy - modify - paste cycle
svn path=/trunk/; revision=53693
2013-12-01 10:58:17 +00:00
Jörg Mayer 38b8e4ecb9 Graham Bloice
- Using gtk[23] is a hack. Implement a clean solution.

Me
- In the current setup, building Qt ONLY is not supported as
  lots of required support libraries are only found in gtk2 and
  gtk3. Print an error in that case.
- Small style changes (lowercasing, whitespace)

svn path=/trunk/; revision=53692
2013-12-01 10:34:01 +00:00
Jörg Mayer fb22ecce8d Graham Bloice
I've now got tshark to build from a VS solution file, had to do some hacks
to get there though, patch files attached for others to peruse, as I'm not
sure if they are the optimal solutions:

   3. As mentioned in my previous message, the VS solution chops out every
   8192nd byte from the command line passed to make-dissector-reg.py.  My
   patch (make-reg.patch) gets CMake to write out the required source file
   list to a file and modifies the python script to read in the file.  The
   python changes *should* be backwards compatible.

Me: Small fix to UseMakeDissectorReg.cmake (elseif() -> else())

svn path=/trunk/; revision=53654
2013-11-29 19:57:00 +00:00
Jörg Mayer d2fc0179cc - Avoid copying of the graphics, specify the graphics source
dir instead.
- (Finally!) fix the problem of missing admon graphics in out of
  tree builds - specify the admin directory as an absolute path
  This may need porting to Makefile.am

svn path=/trunk/; revision=53618
2013-11-27 23:07:25 +00:00
Graham Bloice e36f3b0526 Ensure the WIRESHARK_BASE_DIR env var is in cmake format. Required for the regex in FindGTK3.cmake.
svn path=/trunk/; revision=53550
2013-11-24 19:12:07 +00:00
Jörg Mayer 2276ff07d2 Beginnings of CheckAPI support. More diligence needed
(need to seperate generated files into their own variables).

svn path=/trunk/; revision=53407
2013-11-18 07:42:23 +00:00
Jörg Mayer 086e73cf7d On Windows find the standard html viewer by using bigger and bigger
hammers only to realize that this really needs to be done at runtime.
Commit it anyway.

svn path=/trunk/; revision=53226
2013-11-10 14:42:49 +00:00
Jörg Mayer da01960a24 Make FindGTK3 work on windows
svn path=/trunk/; revision=53218
2013-11-10 11:00:54 +00:00
Jörg Mayer ee0d4f698d Try to get findhtmlviewer working on windows. Doesn't work but
at least remember the registry keys for the next time someone
works on this.

svn path=/trunk/; revision=53215
2013-11-10 10:38:49 +00:00
Jörg Mayer fa3332e8ed Remove extraction of cmake parameters from autotools files.
While it was an interesting exercise it just doesn't
work good enough to stay, i.e. it doesn't automatically
pick up changes but requires rerunning cmake instead.

svn path=/trunk/; revision=53149
2013-11-07 21:40:31 +00:00
Jörg Mayer 117a59d7a2 Pass the name of the sed executable as an explicit argurment to
runlex.sh (like it is done with LEX already). May fix a problem
on Windows with cmake.

svn path=/trunk/; revision=53059
2013-11-03 12:22:39 +00:00
Jörg Mayer ec34959796 Add generation of release notes.
Regenerate NEWS file

svn path=/trunk/; revision=53014
2013-11-01 09:55:26 +00:00
Jörg Mayer 9bdeb99606 Remove a comment about adding use of the sh version of the script.
svn path=/trunk/; revision=53013
2013-11-01 09:54:05 +00:00
Jörg Mayer 8a7198a711 Fix a typo that was never noticed
svn path=/trunk/; revision=53012
2013-11-01 09:53:17 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Jeff Morriss 0cc2c88c2e Fix more SVN properties.
svn path=/trunk/; revision=52834
2013-10-25 01:25:23 +00:00
Balint Reczey 2ec414c257 Minor refactoring in CMake ABI dump generation
svn path=/trunk/; revision=52689
2013-10-19 15:51:36 +00:00
Balint Reczey 70dce86ab3 Set and use TMPDIR for ABI dump generation when using CMake
svn path=/trunk/; revision=52688
2013-10-19 14:55:12 +00:00
Balint Reczey 8956ee2a56 Factor out common parts of ABI checks to UseABICheck.cmake
svn path=/trunk/; revision=52614
2013-10-15 07:30:05 +00:00
Jörg Mayer 3af074a3f6 Make pkgconfig work - sort of:
- fix a typo
- Add the library dirs and not just the libraries.
  This would help if the paths that are now returned
  were actually correct.

svn path=/trunk/; revision=52598
2013-10-14 14:53:36 +00:00
Gerald Combs 3118bd5198 Don't clobber PKG_CONFIG_PATH.
svn path=/trunk/; revision=52589
2013-10-13 18:59:23 +00:00
Graham Bloice 1299f24e7b Set CMake to use Python when building the tap register files.
svn path=/trunk/; revision=52581
2013-10-13 09:47:32 +00:00
Jörg Mayer 3ab8799526 Remove some things that I added while not understanding the real
problem/solution.
"Long" since solved by copying the solution from Makefile.nmake.

Small update to the status of cmake builds on windows

svn path=/trunk/; revision=52574
2013-10-12 22:08:03 +00:00
Jörg Mayer f5fd46fe6d qtshark and wireshark(gtk2) now actually find their libs.
svn path=/trunk/; revision=52539
2013-10-11 11:11:41 +00:00
Jörg Mayer 28282a991d Now the GUI programs (wireshark/gtk2 and qtshark) compile and link
svn path=/trunk/; revision=52538
2013-10-11 10:32:11 +00:00
Jörg Mayer 8719cebf38 Make airpcap detection work
svn path=/trunk/; revision=52535
2013-10-11 07:38:45 +00:00
Guy Harris 059423c27a Fix check for inflatePrime in zlib (ZLIB_LIBRARIES isn't set at that
point, you want ZLIB_LIBRARY).

svn path=/trunk/; revision=52532
2013-10-11 06:10:32 +00:00
Jörg Mayer 59e052e7c8 Fix a few things - untested until current build finishes.
svn path=/trunk/; revision=52516
2013-10-10 22:19:45 +00:00
Guy Harris baf34b0beb Don't check for pcap_version(); we don't use it.
Sort the #cmakedefines in cmakeconfig.h.in to more closely match the
order in config.h.in, to make it easier to make sure CMake and autofoo
are doing the same checks.  Remove some #cmakedefines that don't
correspond to check that are being done either by CMake or autofoo.

svn path=/trunk/; revision=52515
2013-10-10 21:02:50 +00:00
Guy Harris 260a3af9b7 Check for bpf_image(), just as the autoconf script does.
svn path=/trunk/; revision=52514
2013-10-10 20:36:11 +00:00
Jörg Mayer 2a59ee58b8 Add Airpcap detection, use it by default on win32
QT5 compile working - NOT. It's almost working, except
that I *still* need to get GTK detection working on Win :-(


svn path=/trunk/; revision=52513
2013-10-10 20:35:32 +00:00
Jörg Mayer 7c25a38963 lib is required for linking, the dlls are in bin
And with this change, I'm finally able to run the executables in the
top builddir.

svn path=/trunk/; revision=52498
2013-10-10 17:13:02 +00:00
Jörg Mayer 36e0adfcc1 Generate setpath.bat to set the paths necessary for running
the generated binaries inside the build dir.

svn path=/trunk/; revision=52492
2013-10-10 13:37:15 +00:00
Balint Reczey 7af36bb2db Revert "Fix using fop from CMake"
This reverts commit r52484

svn path=/trunk/; revision=52488
2013-10-10 08:41:14 +00:00
Balint Reczey 6602789a48 Fix using fop from CMake
svn path=/trunk/; revision=52484
2013-10-10 05:02:50 +00:00
Jörg Mayer 6013cbd4f5 Try to get gtk3 detection working via pkg-config
(not yet working).

svn path=/trunk/; revision=52432
2013-10-07 00:25:43 +00:00