Wireshark-commits: [Wireshark-commits] master-2.4 c6c35d9: CMake: Try to avoid Strawberry Perl's xs
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 14 Feb 2018 20:34:05 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c6c35d9731f92f9143b65d70e4c1f672ad03825d
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.4
Repository: wireshark

Commits:

c6c35d9 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Try to avoid Strawberry Perl's xsltproc.
    
    Search for Chocolatey's and Cygwin's respective xsltprocs before searching
    %PATH%. Strawberry Perl doesn't include DocBook, which makes it useless
    as far as we're concerned.
    
    Another approach would be to look in various locations for an XML catalog
    files and set %XML_CATALOG_FILES%. However, Cygwin's /etc/xml/catalog
    contains Cygwin-specific URLs, e.g. file:///etc/xml/docbook and can't
    be used with a non-Cygwin xsltproc.
    
    (cherry picked from commit bfedd74e99a04fb4ef802fb8a663e3bf76721992)
    Conflicts:
    	cmake/modules/FindXSLTPROC.cmake
    
    Change-Id: Iaebfdff922a6574581b9bd207625f03598c166e0
    Reviewed-on: https://code.wireshark.org/review/25794
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-on: https://code.wireshark.org/review/25795
    

Actions performed:

    from  5173221   SIGCOMP: check operand offset when accessing UDVM memory
    adds  c6c35d9   CMake: Try to avoid Strawberry Perl's xsltproc.


Summary of changes:
 cmake/modules/FindXSLTPROC.cmake | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)