osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Win flex-bison and Chocolatey updates. 

Chocolatey's latest winflexbison package is usable. Update
config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly.  Rename
CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're
finding.

Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb
Reviewed-on: https://code.wireshark.org/review/3479
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-08-07 14:07:16 -07:00
parent 1dc88edc2c
commit 714fa85d85
4 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/modules/FindChocolatey.cmake
View File

@ -1,7 +1,7 @@
# FindChocolatey
# ----------
#
# this module looks for Chocolatey
# This module looks for Chocolatey
# This code was copied from
# http://cmake.org/gitweb?p=cmake.git;a=blob_plain;f=Modules/FindCygwin.cmake;hb=HEAD
@ -22,15 +22,15 @@
# License text for the above reference.)
if (WIN32)
find_path(CHOCOLATEY_INSTALL_PATH
choco.bat
PATH "C:/Chocolatey" ENV ChocolateyInstall
find_path(CHOCOLATEY_BIN_PATH
choco.exe
PATHS "C:/ProgramData/chocolatey" "C:/Chocolatey" ENV ChocolateyInstall
PATH_SUFFIXES bin
DOC "Chocolatey installation path"
DOC "Chocolatey binary path"
NO_DEFAULT_PATH
)
mark_as_advanced(
CHOCOLATEY_INSTALL_PATH
CHOCOLATEY_BIN_PATH
)
endif ()

12
cmake/modules/FindLEX.cmake
View File

@ -1,14 +1,9 @@
#
# - Find lex executable
# - Find flex/lex executable
#
INCLUDE(FindCygwin)
#INCLUDE(FindChocolatey)
# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are
# currently unusable without some manual adjustments to the
# win_flex and win_bison wrapper scripts. Calling the executables
# directly should work.
INCLUDE(FindChocolatey)
FIND_PROGRAM(LEX_EXECUTABLE
NAMES
@ -16,9 +11,8 @@ FIND_PROGRAM(LEX_EXECUTABLE
win_flex
lex
PATHS
${CHOCOLATEY_BIN_PATH}/bin
${CYGWIN_INSTALL_PATH}/bin
# ${CHOCOLATEY_INSTALL_PATH}/bin
# ${CHOCOLATEY_INSTALL_PATH}/lib/winflexbison.2.4.1.20140103/tools
/bin
/usr/bin
/usr/local/bin

13
cmake/modules/FindYACC.cmake
View File

@ -1,15 +1,9 @@
#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
# - Find bison/yacc executable
#
INCLUDE(FindCygwin)
#INCLUDE(FindChocolatey)
# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are
# currently unusable without some manual adjustments to the
# win_flex and win_bison wrapper scripts. Calling the executables
# directly should work.
INCLUDE(FindChocolatey)
FIND_PROGRAM(YACC_EXECUTABLE
NAMES
@ -17,9 +11,8 @@ FIND_PROGRAM(YACC_EXECUTABLE
win_bison
yacc
PATHS
${CHOCOLATEY_BIN_PATH}/bin
${CYGWIN_INSTALL_PATH}/bin
# ${CHOCOLATEY_INSTALL_PATH}/bin
# ${CHOCOLATEY_INSTALL_PATH}/lib/winflexbison.2.4.1.20140103/tools
/bin
/usr/bin
/usr/local/bin

9
config.nmake
View File

@ -803,13 +803,8 @@ SED=sed
# recommended.
# Absolute or relative paths must be Windows-style
# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are
# currently unusable without some manual adjustments to the
# win_flex and win_bison wrapper scripts. Calling the executables
# directly should work.
#LEX=win_flex
#LEX=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_flex
#LEX=%ChocolateyInstall%\bin\win_flex
LEX=flex
# Command for yacc/bison. Cygwin's bison or Chocolatey's win_bison
@ -817,7 +812,7 @@ LEX=flex
# Absolute or relative paths must be Windows-style
#YACC=win_bison
#YACC=C:\Chocolatey\lib\winflexbison.2.4.1.20140103\tools\win_bison
#YACC=%ChocolateyInstall%\bin\win_bison
YACC=bison
# Commands to convert UNIX line endings to DOS/Windows