From: Erwin Janssen Date: Fri, 28 Oct 2016 19:32:00 +0000 (+0200) Subject: Visual Studio: access bison, flex, sed from path X-Git-Tag: 2.42.0~229^2~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57fea682709577b480efbd4d24cc57e3864cf6e2;p=graphviz Visual Studio: access bison, flex, sed from path Instead of the environment variables %BISON%, %FLEX% and %SED%, access the commands by using the PATH. --- diff --git a/appveyor.yml b/appveyor.yml index 005346816..1d11d26c0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,9 +7,6 @@ environment: CHERE_INVOKING: 1 matrix: - compiler: msbuild - BISON: C:\projects\graphviz\windows\dependencies\graphviz-build-utilities\bison.exe - FLEX: C:\projects\graphviz\windows\dependencies\graphviz-build-utilities\flex.exe - SED: C:\projects\graphviz\windows\dependencies\graphviz-build-utilities\sed.exe #- compiler: msys2 #- compiler: cygwin @@ -62,6 +59,7 @@ build_script: cd $env:APPVEYOR_BUILD_FOLDER if($env:compiler -eq "msbuild") { + $env:Path += ";" + $env:APPVEYOR_BUILD_FOLDER + "\windows\dependencies\graphviz-build-utilities"; msbuild /p:Configuration=$env:configuration; if($env:configuration -eq "Release") { rm Release\Graphviz\bin\*.lastcodeanalysissucceeded; diff --git a/cmd/lefty/lefty.vcxproj b/cmd/lefty/lefty.vcxproj index e4a7e01d1..4e9dd6ca0 100644 --- a/cmd/lefty/lefty.vcxproj +++ b/cmd/lefty/lefty.vcxproj @@ -70,7 +70,7 @@ MachineX86 - "%BISON%" -dy dot2l\dotparse.y -o dot2l\dotparse.c + bison -dy dot2l\dotparse.y -o dot2l\dotparse.c @@ -93,7 +93,7 @@ MachineX86 - "%BISON%" -dy dot2l\dotparse.y -o dot2l\dotparse.c + bison -dy dot2l\dotparse.y -o dot2l\dotparse.c diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj index 3c6693936..741cc68f6 100644 --- a/cmd/tools/gml2gv.vcxproj +++ b/cmd/tools/gml2gv.vcxproj @@ -72,12 +72,12 @@ getopt.lib;%(AdditionalDependencies) - "%FLEX%" -o gmlscan-intermediate.c -i gmlscan.l -"%SED%" "s/yy/gml/g" < gmlscan-intermediate.c > gmlscan.c + flex -o gmlscan-intermediate.c -i gmlscan.l +sed "s/yy/gml/g" < gmlscan-intermediate.c > gmlscan.c del gmlscan-intermediate.c -"%BISON%" -dy gmlparse.y -o gmlparse-intermediate.c -"%SED%" "s/yy/gml/g" < gmlparse-intermediate.h > gmlparse.h -"%SED%" "s/yy/gml/g" < gmlparse-intermediate.c > gmlparse.c +bison -dy gmlparse.y -o gmlparse-intermediate.c +sed "s/yy/gml/g" < gmlparse-intermediate.h > gmlparse.h +sed "s/yy/gml/g" < gmlparse-intermediate.c > gmlparse.c del gmlparse-intermediate.h del gmlparse-intermediate.c @@ -102,12 +102,12 @@ del gmlparse-intermediate.c getopt.lib;%(AdditionalDependencies) - "%FLEX%" -o gmlscan-intermediate.c -i gmlscan.l -"%SED%" "s/yy/gml/g" < gmlscan-intermediate.c > gmlscan.c + flex -o gmlscan-intermediate.c -i gmlscan.l +sed "s/yy/gml/g" < gmlscan-intermediate.c > gmlscan.c del gmlscan-intermediate.c -"%BISON%" -dy gmlparse.y -o gmlparse-intermediate.c -"%SED%" "s/yy/gml/g" < gmlparse-intermediate.h > gmlparse.h -"%SED%" "s/yy/gml/g" < gmlparse-intermediate.c > gmlparse.c +bison -dy gmlparse.y -o gmlparse-intermediate.c +sed "s/yy/gml/g" < gmlparse-intermediate.h > gmlparse.h +sed "s/yy/gml/g" < gmlparse-intermediate.c > gmlparse.c del gmlparse-intermediate.h del gmlparse-intermediate.c diff --git a/lib/cgraph/cgraph.vcxproj b/lib/cgraph/cgraph.vcxproj index 0392d06a1..427fa7fff 100644 --- a/lib/cgraph/cgraph.vcxproj +++ b/lib/cgraph/cgraph.vcxproj @@ -71,8 +71,8 @@ cgraph.def - "%BISON%" -dy grammar.y -o grammar.c -"%FLEX%" -o scan.c scan.l + bison -dy grammar.y -o grammar.c +flex -o scan.c scan.l @@ -96,8 +96,8 @@ cgraph.def - "%BISON%" -dy grammar.y -o grammar.c -"%FLEX%" -o scan.c scan.l + bison -dy grammar.y -o grammar.c +flex -o scan.c scan.l diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj index c85198d77..4b17d282c 100644 --- a/lib/expr/expr.vcxproj +++ b/lib/expr/expr.vcxproj @@ -64,9 +64,9 @@ - "%BISON%" -dy exparse.y -o exparse-intermediate.c -"%SED%" "s/yy/ex/g" < exparse-intermediate.c | "%SED%" "s/YY/EX/g" > exparse.c -"%SED%" "s/yy/ex/g" < exparse-intermediate.h | "%SED%" "s/YY/EX/g" > exparse.h + bison -dy exparse.y -o exparse-intermediate.c +sed "s/yy/ex/g" < exparse-intermediate.c | sed "s/YY/EX/g" > exparse.c +sed "s/yy/ex/g" < exparse-intermediate.h | sed "s/YY/EX/g" > exparse.h del exparse-intermediate.c del exparse-intermediate.h @@ -83,9 +83,9 @@ del exparse-intermediate.h - "%BISON%" -dy exparse.y -o exparse-intermediate.c -"%SED%" "s/yy/ex/g" < exparse-intermediate.c | "%SED%" "s/YY/EX/g" > exparse.c -"%SED%" "s/yy/ex/g" < exparse-intermediate.h | "%SED%" "s/YY/EX/g" > exparse.h + bison -dy exparse.y -o exparse-intermediate.c +sed "s/yy/ex/g" < exparse-intermediate.c | sed "s/YY/EX/g" > exparse.c +sed "s/yy/ex/g" < exparse-intermediate.h | sed "s/YY/EX/g" > exparse.h del exparse-intermediate.c del exparse-intermediate.h diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj index 403542686..4f6ff891c 100644 --- a/lib/gvc.vcxproj +++ b/lib/gvc.vcxproj @@ -71,9 +71,9 @@ gvc.def - "%BISON%" -dy common\htmlparse.y -o common\htmlparse-intermediate.c -"%SED%" "s/yy/html/g" < common\htmlparse-intermediate.c > common\htmlparse.c -"%SED%" "s/yy/html/g" < common\htmlparse-intermediate.h > common\htmlparse.h + bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c +sed "s/yy/html/g" < common\htmlparse-intermediate.c > common\htmlparse.c +sed "s/yy/html/g" < common\htmlparse-intermediate.h > common\htmlparse.h del common\htmlparse-intermediate.c del common\htmlparse-intermediate.h @@ -105,9 +105,9 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\zlib1.dll $(OutDir)zlib1.dllgvc.def - "%BISON%" -dy common\htmlparse.y -o common\htmlparse-intermediate.c -"%SED%" "s/yy/html/g" < common\htmlparse-intermediate.c > common\htmlparse.c -"%SED%" "s/yy/html/g" < common\htmlparse-intermediate.h > common\htmlparse.h + bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c +sed "s/yy/html/g" < common\htmlparse-intermediate.c > common\htmlparse.c +sed "s/yy/html/g" < common\htmlparse-intermediate.h > common\htmlparse.h del common\htmlparse-intermediate.c del common\htmlparse-intermediate.h