aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/modules
AgeCommit message (Collapse)AuthorFilesLines
2015-12-04CMake+PortableApps: Include the VC runtime (second try).Gerald Combs2-3/+23
Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-11-26cmake: add asn1 target, avoid unnecessary rebuildsPeter Wu1-44/+74
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-23cmake: fix "multiple rules generate abi-descriptor.template" warningPeter Wu1-1/+1
Fixes warning with "cmake -GNinja && ninja": ninja: warning: multiple rules generate /tmp/wireshark/abi-descriptor.template. builds involving this target will not be correct; continuing anyway [-w dupbuild=warn] Change-Id: I82ed3aefd32852e6a98060c1a175df855062531d Reviewed-on: https://code.wireshark.org/review/12009 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-11-19extcap: add sshdump.Dario Lombardo1-0/+101
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-17CMake: Add "C:/tools/cygwin" to FindCygwin.cmake.Gerald Combs1-0/+1
Add C:\tools\cygwin to the list of search paths in FindCygwin.cmake. This matches the behavior of config.nmake and is where Chocolatey installs Cygwin. Change-Id: I87a3cd64aae410b9c9abdc87c56d29aa3c4d5946 Reviewed-on: https://code.wireshark.org/review/11885 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-11-15FindLUA.cmake: reject version 5.3Peter Wu1-14/+22
Lua 5.3 could still be used when located at /usr/include/lua.h. Detect and reject it in that case. Rename LUA_VERSION to LUA_VERSION_NUM to avoid a conflict with pkg-config (which uses a different version format). Ensure that the regex matches a number only. Bug: 11706 Change-Id: Idb7e3e1a8d9c6e4ab9ab1816c4dedea7de9dde8e Reviewed-on: https://code.wireshark.org/review/11836 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-11-13CMake: add our own FindCygwin modulePascal Quantin1-0/+65
The one from official CMake (3.3.2) does not look for the default 64bits installation path. Let's add it. Also add a WIRESHARK_CYGWIN_INSTALL_PATH environment variable allowing to force it. For reference, registry based detection fails to detect a 64bits installation because it gets redirected to the Wow6432 node. Change-Id: If3172494e3ab232e094389b493e6b67023662ae5 Reviewed-on: https://code.wireshark.org/review/11769 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-03Put a newline at the end of the file.Guy Harris1-1/+1
Change-Id: Ic04e9a4afdceb1e36ad8367dd0d7bf6bd0674844 Reviewed-on: https://code.wireshark.org/review/11514 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-03Revert the last two CMake changes.Gerald Combs1-28/+13
get_filename_component returns "/regstry" if the query is unsuccessful. We'll have to add a check for that if we query "Add Paths". Revert "CMake: Pass ABSOLUTE to get_filename_component." This reverts commit 4c03f4be000fd930a939b042e8d1b68c509ccebd. Revert "CMake: Look for Python using the "App Paths" key." This reverts commit 6d1b6cd39db80fe8dc77c250ae795d16ce08bf41. Change-Id: Ida17608467fa3652f4219e4eaf01edfa48120b1d Reviewed-on: https://code.wireshark.org/review/11512 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-03CMake: Pass ABSOLUTE to get_filename_component.Gerald Combs1-0/+2
Change-Id: Iecfc4aabe332cac930a7fa5bb6e342a55e7bc7b3 Reviewed-on: https://code.wireshark.org/review/11510 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-03CMake: Look for Python using the "App Paths" key.Gerald Combs1-13/+26
Query HKLM\Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe and HKCU\Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe first before trying other methods. Change-Id: I83f54f6833149c68f1626c3c17f25ffe54d8ea5d Reviewed-on: https://code.wireshark.org/review/11506 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-10-25Require GnuTLS 2.12.0, add cmake version detectionPeter Wu1-3/+16
Since v2.1.0rc0-17-g877fd03 and v2.0.0rc0-23-g263ff53 ("ssl-utils: load RSA keys based on their modulus+exponent"), GnuTLS 2.12.0 is needed. Add a version check to cmake as well, tested on CentOS6 (with pkg-config check disabled to verify the code path). Note that RHEL6 has GnuTLS 2.8.5 and thus SSL decryption with a RSA private key is no longer supported on that version. Change-Id: I99fdfe6790107f48629dd435794fe8880263063d Reviewed-on: https://code.wireshark.org/review/11044 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-20Require libgcrypt 1.4.2, add cmake version detectionPeter Wu1-2/+12
libgcrypt 1.4.2 is required since since v1.11.0-rc1-2787-g23f9100 ("Really add support for AEAD ciphers (GCM)") due to the use of gcry_cipher_setctr. Bump the version in configure.ac too. Add version check for gcrypt to cmake. Tested with CentOS 6 (cmake 2.8.12.2, libgcrypt 1.4.5). Change-Id: I93c3ed902a764d9d14675779e866230d073c96d5 Reviewed-on: https://code.wireshark.org/review/11043 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: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-16Keep CMake from finding Cygwin's Python.Gerald Combs1-0/+18
Try to find Python and set PYTHON_EXECUTABLE on Windows via the registry prior to calling FindPythonInterp. This works around a bug in CMake that prefers Cygwin's Python, which is a symlink, which by default is a text file that contains a Cygwin-specific cookie, which is therefore useless outside of Cygwin. This is avoids the need to pass -DPYTHON_EXECUTABLE=... to CMake. Change-Id: Ife37221b61d920682c20357b6d139a93067a5ad1 Reviewed-on: https://code.wireshark.org/review/11071 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-10-14Revert "Another message from Clang for unknown -f and -m flags."Peter Wu1-1/+0
This reverts commit 5e5e2019ee09fb0901f35948f570baff8a884adb. This change was proposed in https://cmake.org/Bug/view.php?id=13194 to catch some Clang warnings concerning invalid -m flags, but it is causing legitimate breakage when setting CMAKE_C_FLAGS=-gsplit-dwarf. CMakeFiles/CMakeError.log shows: /usr/bin/clang -gsplit-dwarf -DC__W_VALID CMakeFiles/cmTC_04cc8.dir/src.c.o -o cmTC_04cc8 -rdynamic clang-3.7: warning: argument unused during compilation: '-gsplit-dwarf' With the additional regex, basic checks (like -Wall but also -fPIE) are incorrectly reported as unsupported. Follow upstreams action here and remove it, it is still not present as of CMake 3.3.2. Change-Id: I8a1e97b16c2bb929436cca669fdb42f33612c490 Reviewed-on: https://code.wireshark.org/review/10880 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-13cmake: fix kerberos library lookup, support HeimdalPeter Wu1-40/+56
A build with the gold linker broke with: run/libwireshark.so.0.0.0: error: undefined reference to 'krb5_c_decrypt' Fix this my restructuring the FindKERBEROS module to use the libraries found by pkg-config. While at it, check for MIT and Heimdal instead of assuming MIT. Remove HAVE_KEYTYPE_ARCFOUR_56 as this macro is not used. Change-Id: Iab23d79bc3f25e9c0fd7203b6f050f875fb4a2b5 Reviewed-on: https://code.wireshark.org/review/10907 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-06CMake: Don't clobber ZLIB_*.Gerald Combs1-38/+41
On Windows we set a few (but not all) ZLIB_* variables, then depend on FindZLIB to fill in the rest. Make sure FindZLIB doesn't unset everything the first time we run CMake. Bug: 11569 Change-Id: I199c83570c29343466b9ff63080b6a964dfd8d73 Reviewed-on: https://code.wireshark.org/review/10843 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-10-06Report an error if we don't find fop and are going to try to use it.Guy Harris1-0/+3
Change-Id: Ide5c43b797a2fa07c7d3c7f986d306a158d68c6b Reviewed-on: https://code.wireshark.org/review/10840 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 6c45d217d9d4fbf2a4dbc17d0b92334e3bc93052) Reviewed-on: https://code.wireshark.org/review/10841
2015-09-28Cosmetic tidy up for the projects in the Visual Studio solutionGraham Bloice1-1/+1
Change-Id: Ie4ed28ee7e59def2e8a15433334988b4d0225d1d Reviewed-on: https://code.wireshark.org/review/10675 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-08-24Add FOP 2.0 to the search list.Gerald Combs1-0/+2
Change-Id: Ifc462a69e28b875f05770c453b06689c69008c52 Reviewed-on: https://code.wireshark.org/review/10235 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-20CMake: Fixup appending to WS_WIN_LIBSGerald Combs1-3/+1
In the world of CMake calling "set" with multiple values creates a semicolon-separated list. For WS_WIN_LIBS we want a single string so we need to call "set" with a single, quoted value. Change-Id: I96c5085af58adfb97ce16195eb27cc8ddb612d6a Reviewed-on: https://code.wireshark.org/review/10158 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-20Link setargv.obj for Windows in CMake so mergecap worksHadriel Kaplan1-1/+1
Try it again. Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc Reviewed-on: https://code.wireshark.org/review/10148 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-20Link setargv.obj for Windows in CMake so mergecap worksHadriel Kaplan1-3/+3
Mergecap needs setargv.obj in order to get wildcard support. This is linked in nmake but not cmake. Bug: 10354 Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d Reviewed-on: https://code.wireshark.org/review/10143 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-16Run abicheck commands at compile time.Gerald Combs1-3/+9
The CMake dumpbabi targets collectively copy over 800 files. Do that when when we build the actual targets instead of at configure time. Hopefully this will speed up initial CMake runs. Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38 Reviewed-on: https://code.wireshark.org/review/10052 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-09Switch the guides back to html output.Gerald Combs1-3/+3
DocBook's xhtml5 stylesheet output didn't render correctly in Firefox. This reverts commit dc09d18e8ecdc55de2361d8ff6d2b0bf36345a70. This reverts commit 62e56ad92a50c7dd58e83447207b8be0cc0bbb76. This reverts commit 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3. Change-Id: Iafcf18cfce25772146fc2e155728401fd105a44b Reviewed-on: https://code.wireshark.org/review/9944 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-08CMake: Try to fix generated docbook dependencies.Gerald Combs3-40/+46
Add custom {developer,user}_guide_docbook targets for docbook output. Make sure the HTML, PDF, and CHM outputs depend on their associated docbook target and not on the output .xml file. This keeps us from running a2x instances in parallel. Change-Id: I73b0db50ae92f62eb08ae284d498cdf2d697ac00 Reviewed-on: https://code.wireshark.org/review/9920 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-08-05Make sure we use "*.html" in our chunked output.Gerald Combs1-1/+1
Change-Id: Idb441084ec50ec336b7f514895aba799832e8f66 Reviewed-on: https://code.wireshark.org/review/9879 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-05Generate XHTML5 documentation.Gerald Combs1-2/+2
When converting from DocBook to HTML, use DocBook's xhtml5 XSL stylesheets. Change-Id: I7a49d60c46a17e1e639b78ee10c4b9fa832d4a77 Reviewed-on: https://code.wireshark.org/review/9878 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08Duplicate CheckCCompilerFlag for CXX.Joerg Mayer2-0/+60
Correctly detect that XCode7Beta1 does not support -fno-delete-null-pointer-checks by adding a new regex. Change-Id: I76e0b6bb72094e6e75dae9be97bc7ee8e7051792 Reviewed-on: https://code.wireshark.org/review/9552 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-02Lemon: Update lemon toolsAlexis La Goutte1-1/+1
Update from SQLite trunk (19 April 2015) Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value Add "new" version of lempar.c (3 November 2009). LEMPAR: fix trailing whitespace LEMPAR: fix -Wunused-parameter Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813 Reviewed-on: https://code.wireshark.org/review/6502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-25cmake/add_lemon_files: depend on lemon and lemparPeter Wu1-4/+10
Add a dependency on the lemon binary and lempar.c files because the output depends on these tools. This is already done for autotools and nmake. In addition, clean up the generated .h and .out files. Change-Id: Ic1fa2c23949abf05e976a67d226c90293b2ce834 Reviewed-on: https://code.wireshark.org/review/9139 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-25Revert commit cc8ed845ed53ed60fa776728f1d7f2659dd311a3Joerg Mayer1-4/+3
Author: Maarten Bezemer <maarten.bezemer@gmail.com> Date: Wed Nov 12 13:39:07 2014 +0100 Invoke asn2wrs.py using a custom command Fixes bugid 11304 Once there is a better solution feel free to revert the revert. Change-Id: Id64b621c5f3b8a934ce9ec5c3c127326efab46f2 Reviewed-on: https://code.wireshark.org/review/9122 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-06-09Add PortAudio to Windows CMake buildGraham Bloice1-15/+39
Change-Id: I774ff0bf858280f2a5aa551ae1a5e23eedf8dc20 Reviewed-on: https://code.wireshark.org/review/8848 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-08Update how we search for Lua with pkg-config.Jeff Morriss1-1/+4
First, search for packages with the version number without the period (bug 11219). Second, don't look for Lua 5.3 because we don't work with it. If what we find (without pkg-config's help) is Lua 5.3, disable Lua support (bug 10881). Cmake support by Peter Wu (originally Ie73e5b53640f10432881a9671c0a605f7f027ed8): Note the check for "lua<=5.2.99" instead of "lua<5.3" since cmake does not support the latter syntax. Tested with lua5.2, lua5.1 and lua (5.3) installed. Bug: 11219 Ping-Bug: 10881 Change-Id: I382d07ca00eafc6111cd4e9faa2b66f6b8f95b6e Reviewed-on: https://code.wireshark.org/review/8783 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-28Fix Windows asciidoc buildGraham Bloice2-12/+19
Replace some unixisms with CMake equivalents Change-Id: I8dc125e830cdf7c31b13539c0a86df736097afef Reviewed-on: https://code.wireshark.org/review/8208 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-20CMake minor updatesGraham Bloice2-4/+1
Fix up generation messages for Windows build Remove some superfluous Lua messages Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9 Reviewed-on: https://code.wireshark.org/review/8138 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-14CMake: Initial PortableApps targets.Gerald Combs1-0/+26
Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14Start moving win-setup to PowerShell.Gerald Combs1-1/+4
Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-26CMake updates for Windows buildGraham Bloice1-41/+0
Removed the redundant setpath batch file and associated macro and updated docs. Change-Id: I5ddab6bad2d14ed3443194d7269f1890e4aa608e Reviewed-on: https://code.wireshark.org/review/7826 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-26CMake cleanup for VS solutionGraham Bloice1-1/+1
Add FOLDER properties to targets to tidy up the VS solution Change-Id: Ia42e0e89fb490cd3dcd33b7c5f59eb0a27b74c7a Reviewed-on: https://code.wireshark.org/review/7822 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-25FindPOD: fix link to CSSPeter Wu1-1/+1
docbook/Makefile.am uses --stylesheet=ws.css too, without this change the generated HTML will point to the source directory... Change-Id: I351cb658c404a08655201933158f91765f8d9c35 Reviewed-on: https://code.wireshark.org/review/7503 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu1-19/+1
A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25Have a #define for whether the capture buffer size can be set.Guy Harris1-1/+12
It can be set if either 1) this is Windows (where we're assumed to be using WinPcap, which includes calls to set the buffer size) or 2) we have pcap_create() (in which case we also have pcap_set_buffer_size(), at least in a normal libpcap release). Use that rather than testing "defined(_WIN32) || defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's being tested. Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12 Reviewed-on: https://code.wireshark.org/review/7816 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-12CMake: Add a top-level nsis_package target.Gerald Combs2-0/+16
Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 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-03-07Fix the exec call and paths in the test wrapper.Gerald Combs1-4/+27
Change-Id: Ie36e9c7dc9a60715248aea300cffde8040cb0768 Reviewed-on: https://code.wireshark.org/review/7574 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07Try adding "set -o igncr".Gerald Combs1-0/+3
Maybe the test wrapper should be a Python script. Change-Id: I38a5089c83ef643fb6c7c76acd599cef6aba39f4 Reviewed-on: https://code.wireshark.org/review/7572 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07CMake: Generate a wrapper for test.sh.Gerald Combs1-0/+17
Create a wrapper script that cd's to the test directory and execs test.sh. We need to handle build configurations so the path is a bit roundabout. Change-Id: I4c2a48c041bce2479422830110b1251b3f2c5a94 Reviewed-on: https://code.wireshark.org/review/7570 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-20CMake: Set an output directory for plugins.Gerald Combs1-0/+61
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18CMake: Copy data files to the run directory.Gerald Combs1-0/+27
Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-14CMake: Look for FOP and HHC only when needed.Gerald Combs1-24/+30
FOP is only required for generating PDF output and HHC is only needed for CHM output. Don't look for them unconditionally. Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c Reviewed-on: https://code.wireshark.org/review/6539 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 01:31:56 +0000