Commit 57fea682 authored by Erwin Janssen's avatar Erwin Janssen

Visual Studio: access bison, flex, sed from path

Instead of the environment variables %BISON%, %FLEX% and %SED%, access the
commands by using the PATH.
parent d928a75f
......@@ -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;
......
......@@ -70,7 +70,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PreBuildEvent>
<Command>"%BISON%" -dy dot2l\dotparse.y -o dot2l\dotparse.c</Command>
<Command>bison -dy dot2l\dotparse.y -o dot2l\dotparse.c</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -93,7 +93,7 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PreBuildEvent>
<Command>"%BISON%" -dy dot2l\dotparse.y -o dot2l\dotparse.c</Command>
<Command>bison -dy dot2l\dotparse.y -o dot2l\dotparse.c</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -72,12 +72,12 @@
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>"%FLEX%" -o gmlscan-intermediate.c -i gmlscan.l
"%SED%" "s/yy/gml/g" &lt; gmlscan-intermediate.c &gt; gmlscan.c
<Command>flex -o gmlscan-intermediate.c -i gmlscan.l
sed "s/yy/gml/g" &lt; gmlscan-intermediate.c &gt; gmlscan.c
del gmlscan-intermediate.c
"%BISON%" -dy gmlparse.y -o gmlparse-intermediate.c
"%SED%" "s/yy/gml/g" &lt; gmlparse-intermediate.h &gt; gmlparse.h
"%SED%" "s/yy/gml/g" &lt; gmlparse-intermediate.c &gt; gmlparse.c
bison -dy gmlparse.y -o gmlparse-intermediate.c
sed "s/yy/gml/g" &lt; gmlparse-intermediate.h &gt; gmlparse.h
sed "s/yy/gml/g" &lt; gmlparse-intermediate.c &gt; gmlparse.c
del gmlparse-intermediate.h
del gmlparse-intermediate.c</Command>
</PreBuildEvent>
......@@ -102,12 +102,12 @@ del gmlparse-intermediate.c</Command>
<AdditionalDependencies>getopt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>"%FLEX%" -o gmlscan-intermediate.c -i gmlscan.l
"%SED%" "s/yy/gml/g" &lt; gmlscan-intermediate.c &gt; gmlscan.c
<Command>flex -o gmlscan-intermediate.c -i gmlscan.l
sed "s/yy/gml/g" &lt; gmlscan-intermediate.c &gt; gmlscan.c
del gmlscan-intermediate.c
"%BISON%" -dy gmlparse.y -o gmlparse-intermediate.c
"%SED%" "s/yy/gml/g" &lt; gmlparse-intermediate.h &gt; gmlparse.h
"%SED%" "s/yy/gml/g" &lt; gmlparse-intermediate.c &gt; gmlparse.c
bison -dy gmlparse.y -o gmlparse-intermediate.c
sed "s/yy/gml/g" &lt; gmlparse-intermediate.h &gt; gmlparse.h
sed "s/yy/gml/g" &lt; gmlparse-intermediate.c &gt; gmlparse.c
del gmlparse-intermediate.h
del gmlparse-intermediate.c</Command>
</PreBuildEvent>
......
......@@ -71,8 +71,8 @@
<ModuleDefinitionFile>cgraph.def</ModuleDefinitionFile>
</Link>
<PreBuildEvent>
<Command>"%BISON%" -dy grammar.y -o grammar.c
"%FLEX%" -o scan.c scan.l</Command>
<Command>bison -dy grammar.y -o grammar.c
flex -o scan.c scan.l</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -96,8 +96,8 @@
<ModuleDefinitionFile>cgraph.def</ModuleDefinitionFile>
</Link>
<PreBuildEvent>
<Command>"%BISON%" -dy grammar.y -o grammar.c
"%FLEX%" -o scan.c scan.l</Command>
<Command>bison -dy grammar.y -o grammar.c
flex -o scan.c scan.l</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
......
......@@ -64,9 +64,9 @@
</ClCompile>
<Lib />
<PreBuildEvent>
<Command>"%BISON%" -dy exparse.y -o exparse-intermediate.c
"%SED%" "s/yy/ex/g" &lt; exparse-intermediate.c | "%SED%" "s/YY/EX/g" &gt; exparse.c
"%SED%" "s/yy/ex/g" &lt; exparse-intermediate.h | "%SED%" "s/YY/EX/g" &gt; exparse.h
<Command>bison -dy exparse.y -o exparse-intermediate.c
sed "s/yy/ex/g" &lt; exparse-intermediate.c | sed "s/YY/EX/g" &gt; exparse.c
sed "s/yy/ex/g" &lt; exparse-intermediate.h | sed "s/YY/EX/g" &gt; exparse.h
del exparse-intermediate.c
del exparse-intermediate.h</Command>
</PreBuildEvent>
......@@ -83,9 +83,9 @@ del exparse-intermediate.h</Command>
</ClCompile>
<Lib />
<PreBuildEvent>
<Command>"%BISON%" -dy exparse.y -o exparse-intermediate.c
"%SED%" "s/yy/ex/g" &lt; exparse-intermediate.c | "%SED%" "s/YY/EX/g" &gt; exparse.c
"%SED%" "s/yy/ex/g" &lt; exparse-intermediate.h | "%SED%" "s/YY/EX/g" &gt; exparse.h
<Command>bison -dy exparse.y -o exparse-intermediate.c
sed "s/yy/ex/g" &lt; exparse-intermediate.c | sed "s/YY/EX/g" &gt; exparse.c
sed "s/yy/ex/g" &lt; exparse-intermediate.h | sed "s/YY/EX/g" &gt; exparse.h
del exparse-intermediate.c
del exparse-intermediate.h</Command>
</PreBuildEvent>
......
......@@ -71,9 +71,9 @@
<ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
</Link>
<PreBuildEvent>
<Command>"%BISON%" -dy common\htmlparse.y -o common\htmlparse-intermediate.c
"%SED%" "s/yy/html/g" &lt; common\htmlparse-intermediate.c &gt; common\htmlparse.c
"%SED%" "s/yy/html/g" &lt; common\htmlparse-intermediate.h &gt; common\htmlparse.h
<Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
sed "s/yy/html/g" &lt; common\htmlparse-intermediate.c &gt; common\htmlparse.c
sed "s/yy/html/g" &lt; common\htmlparse-intermediate.h &gt; common\htmlparse.h
del common\htmlparse-intermediate.c
del common\htmlparse-intermediate.h</Command>
</PreBuildEvent>
......@@ -105,9 +105,9 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\zlib1.dll $(OutDir)zlib1.dll</C
<ModuleDefinitionFile>gvc.def</ModuleDefinitionFile>
</Link>
<PreBuildEvent>
<Command>"%BISON%" -dy common\htmlparse.y -o common\htmlparse-intermediate.c
"%SED%" "s/yy/html/g" &lt; common\htmlparse-intermediate.c &gt; common\htmlparse.c
"%SED%" "s/yy/html/g" &lt; common\htmlparse-intermediate.h &gt; common\htmlparse.h
<Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
sed "s/yy/html/g" &lt; common\htmlparse-intermediate.c &gt; common\htmlparse.c
sed "s/yy/html/g" &lt; common\htmlparse-intermediate.h &gt; common\htmlparse.h
del common\htmlparse-intermediate.c
del common\htmlparse-intermediate.h</Command>
</PreBuildEvent>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment