osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
50,929 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

165 Commits

Author SHA1 Message Date
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
Jörg Mayer 2e59bc7c89 Use the correct syntax for the shell 
svn path=/trunk/; revision=52425
 2013-10-06 22:14:37 +00:00
Jörg Mayer f016e8c0a4 Libwireshark now links on windows with cmake 
svn path=/trunk/; revision=52424
 2013-10-06 21:25:44 +00:00
Jörg Mayer 88eb04035c Fix a typo 
svn path=/trunk/; revision=52418
 2013-10-06 20:32:56 +00:00
Jörg Mayer c73bbc6150 Make FindGTK3 work again 
svn path=/trunk/; revision=52416
 2013-10-06 19:58:18 +00:00
Jörg Mayer 7888bec0bc Missed this part of Grahams patch. 
svn path=/trunk/; revision=52411
 2013-10-06 18:19:58 +00:00
Jörg Mayer 59cca5016b Finding GTK3 works now, but the list of libs is incomplete 
svn path=/trunk/; revision=52408
 2013-10-06 18:11:05 +00:00
Jörg Mayer efb42cf8dc Rewrite FindPCAP.cmake to current practices 
svn path=/trunk/; revision=52405
 2013-10-06 15:56:30 +00:00
Jörg Mayer f303dfdd05 Fix a typo (letover from autotools times) which accidentally 
worked with cmake on unix but not on windows

svn path=/trunk/; revision=52384
 2013-10-05 21:23:57 +00:00
Jörg Mayer eb1ee413e3 editcap and capinfos compile now with cmake 
svn path=/trunk/; revision=52382
 2013-10-05 20:49:44 +00:00
Jörg Mayer 7b3ac2ae6b Attempt to get linking working with cmake - without success so far. 
svn path=/trunk/; revision=52377
 2013-10-05 10:17:21 +00:00
Jörg Mayer 150fb747a6 Make runlex.sh work on Windows 
svn path=/trunk/; revision=52373
 2013-10-04 23:23:16 +00:00
Jörg Mayer 21bfea7309 Looks like we have problems invoking shell scripts from 
cmake on windows - so explicitely run the shell with the
script as argument

svn path=/trunk/; revision=52372
 2013-10-04 22:18:57 +00:00