From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Tue, 25 Aug 2020 18:25:33 +0000 (+0200)
Subject: Adapt MSBuild project files to renamed win_flex and win_bison
X-Git-Tag: 2.46.0~20^2^2~109^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee1c3aa73797e4074cbcf60d2ea1d65f1222e3fc;p=graphviz

Adapt MSBuild project files to renamed win_flex and win_bison
---

diff --git a/cmd/lefty/lefty.vcxproj b/cmd/lefty/lefty.vcxproj
index a9588ae08..c392394dd 100644
--- 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>win_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>win_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 a946f57bf..46b3d0c59 100644
--- a/cmd/tools/gml2gv.vcxproj
+++ b/cmd/tools/gml2gv.vcxproj
@@ -72,10 +72,10 @@
       <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>flex  -o gmlscan-intermediate.c -i gmlscan.l
+      <Command>win_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
+win_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
@@ -101,10 +101,10 @@ del gmlparse-intermediate.c</Command>
       <AdditionalDependencies>getopt.lib;cdt.lib;cgraph.lib;ingraphs.lib;gvc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>flex  -o gmlscan-intermediate.c -i gmlscan.l
+      <Command>win_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
+win_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
diff --git a/lib/cgraph/cgraph.vcxproj b/lib/cgraph/cgraph.vcxproj
index b8f1d5871..faf248b2c 100644
--- a/lib/cgraph/cgraph.vcxproj
+++ b/lib/cgraph/cgraph.vcxproj
@@ -70,8 +70,8 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PreBuildEvent>
-      <Command>bison -dy grammar.y -o grammar.c
-flex -oscan.c scan.l</Command>
+      <Command>win_bison -dy grammar.y -o grammar.c
+win_flex -oscan.c scan.l</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -93,8 +93,8 @@ flex -oscan.c scan.l</Command>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PreBuildEvent>
-      <Command>bison -dy grammar.y -o grammar.c
-flex -oscan.c scan.l</Command>
+      <Command>win_bison -dy grammar.y -o grammar.c
+win_flex -oscan.c scan.l</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj
index a0c97dda4..a170a3df8 100644
--- a/lib/expr/expr.vcxproj
+++ b/lib/expr/expr.vcxproj
@@ -64,7 +64,7 @@
     </ClCompile>
     <Lib />
     <PreBuildEvent>
-      <Command>bison -dy exparse.y -o exparse-intermediate.c
+      <Command>win_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
@@ -82,7 +82,7 @@ del exparse-intermediate.h</Command>
     </ClCompile>
     <Lib />
     <PreBuildEvent>
-      <Command>bison -dy exparse.y -o exparse-intermediate.c
+      <Command>win_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
diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index ab8b9668b..64b88f898 100644
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -72,7 +72,7 @@
       <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
+      <Command>win_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
@@ -107,7 +107,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
       <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>bison -dy common\htmlparse.y -o common\htmlparse-intermediate.c
+      <Command>win_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