aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2015-07-05Fix Windows CMake generated installer to include snmp mibsGraham Bloice1-0/+2
Wireshark.nsi requires SMI_DIR to point to the base of the SMI directory but FindSMI.cmake doesn't set it. Set it in the main CMakeLists.txt Change-Id: Id667341273d6abb0d2d64ef91cc62d1ce3f42a83 Reviewed-on: https://code.wireshark.org/review/9499 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-03Convert BOOTP/DHCP tap stats to new "generic stat API".Michael Mann1-1/+0
Change-Id: I0edc3909516452e6497a050b4617f9aafcea2688 Reviewed-on: https://code.wireshark.org/review/9112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Create very basic "generic" stat tap API to create a "GUI" independent table.Michael Mann1-1/+1
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there. Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt) Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab Reviewed-on: https://code.wireshark.org/review/9110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-23Use RTD functionality for H.225Michael Mann1-1/+0
This got missed in the initial refactoring. Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3 Reviewed-on: https://code.wireshark.org/review/9044 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22Refactor RTD stats.Michael Mann1-3/+1
Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces. Currently implemented for TShark and GTK. Affected dissectors: MEGACO, MGCP, Radius Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21 Reviewed-on: https://code.wireshark.org/review/8998 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21Further refactor SRT stats.Michael Mann1-9/+1
Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-15Fix the CMake windows installer to pickup the locally built zlib1.dllGraham Bloice1-0/+1
Change-Id: I8880a760d9817dd038694e96b4a3d9b8d2db3c2c Reviewed-on: https://code.wireshark.org/review/8931 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-06-15Separate Windows CMake compiler definitions and flagsGraham Bloice1-10/+15
Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238 Reviewed-on: https://code.wireshark.org/review/8926 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-06-12Fix some CMake compiler tests for Win64Graham Bloice1-1/+1
Change-Id: I03244b48e6593d1fe5f4d139fa5d171debeb9fd7 Reviewed-on: https://code.wireshark.org/review/8909 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-03Fix OSX CMake warningsGraham Bloice1-0/+5
Set the CMake policy for CMP0042 to old Change-Id: I2b71e1d8d9b9b90ede11df1a7874a2360c3032c5 Reviewed-on: https://code.wireshark.org/review/8740 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: Anders Broman <a.broman58@gmail.com>
2015-05-31Fix zlib cmakeGraham Bloice1-4/+2
Add support for the locally modified version of zlib to suppress a CMake warning and disable building of the zlib examples. Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23 Reviewed-on: https://code.wireshark.org/review/8706 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-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-19Fix CMake warningsGraham Bloice1-4/+4
Rename a local CMake variable to prevent CMP0054 warnings in CheckTypeSize and CheckStructHasMember modules. Change-Id: Ida0df954c81333ad37455db90e0d72ca9df8c6f1 Reviewed-on: https://code.wireshark.org/review/8522 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-05-05CMake: Try to fix version.h dependencies.Gerald Combs1-10/+10
Make the gitversion target depend on version.h instead of running make-version.pl separately. Make wsutil and qtui depend on gitversion. Change-Id: I32f25347c12c7f86b2439ed4bf517cc8f5fb106f Reviewed-on: https://code.wireshark.org/review/8299 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-05-01Add tshark -z "ncp,srt"Michael Mann1-0/+1
Change-Id: Iab2559c2bac5550987c108c6e917506fcec525e9 Reviewed-on: https://code.wireshark.org/review/8221 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-30CMake: Always set PROCESSOR_ARCHITECTURE on Windows.Gerald Combs1-2/+6
An undefined or invalid PROCESSOR_ARCHITECTURE will produce an invalid wireshark.exe.manifest. Make sure it's always set. Change-Id: I1b33f7bd5e964f05344919d1f11d88c14104c0ce Reviewed-on: https://code.wireshark.org/review/8253 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-30CMake for Windows improvementsGraham Bloice1-8/+15
Allow the wireshark libs directory to be defined by WIRESHARK_LIB_DIR. Ensure either WIRESHARK_LIB_DIR or WIRESHARK_BASE_DIR is defined. Ensure the compiler is a supported version (VS2010, 12 or 13). Change-Id: I0abd371c5773c08ca255abe308d1a59e2e290a02 Reviewed-on: https://code.wireshark.org/review/8247 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-04-29CMake Windows fixesGraham Bloice1-1/+7
Set the minimum version for Windows to 3.1.3 Set the policy for CMP0054 to squelch a few warnings. Change-Id: I7647a0e5dce83db2cd87d7b8048c808e10863c7e Reviewed-on: https://code.wireshark.org/review/8241 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-28Add service_response_time_table for TShark srt stats.Michael Mann1-0/+1
This is a "refactoring part 1" of the srt stats. This first step is using the service_response_time_table for all (possible) TShark srt stats. Next step will be combining the GTK and TShark service_response_time_table, so there is more code reuse and the "shared structure names" between GTK and TShark service_response_time_table won't seem as bad. Maybe it can even go one step farther and handle a dynamic number of columns so this refactoring can apply to all srt stats. Change-Id: Ief28e7e55f7dbbf4f2d9bb6f1a1592b87b866137 Reviewed-on: https://code.wireshark.org/review/8210 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-28Add tshark -z "smb2,srt"Michael Mann1-0/+1
Change-Id: I66247132f00c83f35cf78cb63ea00a5ce923fddb Reviewed-on: https://code.wireshark.org/review/8211 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27Add tshark -z "ldap,srt"Michael Mann1-0/+1
Bug: 9363 Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c Reviewed-on: https://code.wireshark.org/review/8196 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-23CMake fix windows setupGraham Bloice1-4/+4
Standardise the args to win-setup.ps1 Change-Id: Ibd9d7bb338edb1cef444abc37a7b103eec38fb09 Reviewed-on: https://code.wireshark.org/review/8173 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-04-21[Androiddump] Fix CMake install path for androiddumpmichal.orynicz1-5/+6
Changed path from "share" to one based on plugns path For example /usr/local/lib/wireshark/extcap Change-Id: I8f4a9f274b1cec897ed45de9e05679ac3f230301 Reviewed-on: https://code.wireshark.org/review/8161 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2015-04-20CMake minor updatesGraham Bloice1-4/+5
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-17Make androiddump loadable on OS X.Gerald Combs1-0/+12
Make sure the target location for extcap executables and extcap_dir match on OS X. Set the extcap directory to Contents/MacOS/extcap. The Mac Developer Library documentation doesn't explicitly define "Resources", but examples include data files and not executables. It does state that executables shouldn't go into PlugIns. Make sure we rpathify androiddump. Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94 Reviewed-on: https://code.wireshark.org/review/8093 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-17Fix CMake warningsGraham Bloice1-2/+7
Newer versions of CMake generate warnings about the use of @variable@ references, replace @CPACK_PACKAGE_NAME@ with ${CPACK_PACKAGE_NAME} Set the policy for CMP0026 to be old to squelch warnings about the use of target LOCATION Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec Reviewed-on: https://code.wireshark.org/review/7977 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-17androiddump: Fix build on onther than Win platformsMichal Labedzki1-1/+4
androiddump should be put in extcat directory. Change-Id: I360eef2d5a68178c73181949b0fe3346585f5190 Reviewed-on: https://code.wireshark.org/review/8083 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-17CMake: Set WIN32 for GUI executables.Gerald Combs1-6/+12
Pass WIN32 to add_executable where needed. Require CMake 2.8.11 on Windows. Change-Id: I6a119bbb0f16f9e21f2e7378bae7ed52b8abb2dc Reviewed-on: https://code.wireshark.org/review/8091 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-16Fix wireshark.pc when CMAKE_INSTALL_LIBDIR is absoluteBalint Reczey1-5/+6
Change-Id: I9667660329c0888f35e1ac332537eda995509a85 Reviewed-on: https://code.wireshark.org/review/8010 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-04-15CMake: Try not to clobber our gspawn exes.Gerald Combs1-3/+5
Try not to overwrite gspawn*.exe between signing them and packaging them. (Second try.) Change-Id: I717f5fca6dc6afbc146927d06e6f74ae6a0a87c8 Reviewed-on: https://code.wireshark.org/review/8082 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15Revert "CMake: Try not to clobber our gspawn exes."Gerald Combs1-14/+23
This accidentally reverted code from g40ce324. Will try again shortly. This reverts commit 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7. Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e Reviewed-on: https://code.wireshark.org/review/8081 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15CMake: Try not to clobber our gspawn exes.Gerald Combs1-23/+14
Try not to overwrite gspawn*.exe between signing them and packaging them. Change-Id: I9f224b64537c3b0dd6f7f8b94a8837bd427ad2ca Reviewed-on: https://code.wireshark.org/review/8080 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15Set the extcap working directory on Windows.Gerald Combs1-9/+20
On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14CMake: Initial PortableApps targets.Gerald Combs1-0/+10
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-9/+30
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-04-13Fix zlib DLL copy.Gerald Combs1-3/+9
Switch to "if exist ... xcopy". Change-Id: I255fd3e719645b247024583590b748104c5e15b9 Reviewed-on: https://code.wireshark.org/review/8056 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-13Add the OpenSUSE zlib1.dll when needed.Gerald Combs1-2/+5
The Visual Studio solution files created by CMake list "Debug" as the first configuration, which means that we end up with zlibd1.dll by default. Many of the OpenSUSE DLLs depend on zlib1.dll. Add the OBS version in that case. Change-Id: Ia98490f1a192802d1482e0749bbd2b550e916bc5 Reviewed-on: https://code.wireshark.org/review/8051 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-12Add missing androiddump stuffMichal Labedzki1-2/+14
Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-10CMake: Add a build environment == generator check.Gerald Combs1-2/+16
If we're building on Windows and %Platform% is "x64" or undefined, check it against our generator's target platform. Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake uses internally. Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c Reviewed-on: https://code.wireshark.org/review/7994 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-09Cleanup CMake VS solutionGraham Bloice1-0/+5
Move the zlib artefacts into Libs\zlib "folder" Change-Id: Iddf0121fad3885553d908a51e9e07a7f676403fe Reviewed-on: https://code.wireshark.org/review/7993 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> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-08Fix CMake build for WindowsGraham Bloice1-0/+1
The change to zlib 1.28 requires the variable BUILD_SHARED_LIBS to be set and true to build the correct zlib dll on Windows. Change-Id: I0f46b832726834a4e99d7d7d0637112da9c0c531 Reviewed-on: https://code.wireshark.org/review/7982 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-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-0/+36
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-07Add zlib compilation to CMake on WindowsGraham Bloice1-7/+14
Modify CMake to compile zlib, removing need for an nmake compilation of zlib before running CMake. Change-Id: I63cead55b14d6a2e22b1b6a8536eaf9260e21231 Reviewed-on: https://code.wireshark.org/review/7864 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> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-02Fixup our anonsvn URLs.Gerald Combs1-0/+1
Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a Reviewed-on: https://code.wireshark.org/review/7886 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-26CMake updates for Windows buildGraham Bloice1-6/+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-0/+2
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-25Always use html2text.py for FAQ, improve outputPeter Wu1-3/+2
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-201.99.5 → 1.99.6.Gerald Combs1-1/+1
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 02:48:37 +0000