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 0053468165c71c4a10f3ae9323c10b1aba6eaee2..1d11d26c096c96a492f8e4f0c62c2c1a5273a186 100644 (file)
--- 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 e4a7e01d179cc25a8231476676c987e274ed2aa6..4e9dd6ca0cf48ceaa2e58ccd2ea1c890eb5b8711 100644 (file)
--- a/cmd/lefty/lefty.vcxproj
+++ b/cmd/lefty/lefty.vcxproj
@@ -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>

diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj
index 3c669393681265c43167c59df650a2a88b69d3a6..741cc68f6c2b4e5b458cb185d63434e35cc98b2d 100644 (file)
--- a/cmd/tools/gml2gv.vcxproj
+++ b/cmd/tools/gml2gv.vcxproj
@@ -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>

diff --git a/lib/cgraph/cgraph.vcxproj b/lib/cgraph/cgraph.vcxproj
index 0392d06a19db772543ede4524f27c4db074bc495..427fa7fff9bce937bce117133d2d78417ea67d15 100644 (file)
--- a/lib/cgraph/cgraph.vcxproj
+++ b/lib/cgraph/cgraph.vcxproj
@@ -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>

diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj
index c85198d778c5b336aa78c8f8b699e597c86caff2..4b17d282cbba78681d15e63d3469264aa7e54823 100644 (file)
--- a/lib/expr/expr.vcxproj
+++ b/lib/expr/expr.vcxproj
@@ -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>

diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index 40354268666e8c42f0261978c01a8fc56f5c560d..4f6ff891caec696d9f024118fa47508dc7f95d1c 100644 (file)
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -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>