fix: do not overwrite exparse.h during MSBuild compilation

Commit 09973560cc67c5277df8732ebba75da784afbe51 altered exparse.h to be a static
checked-in file instead of generated by Bison. This passed CI testing, but
unfortunately it was not noticed that on Windows MSBuild this resulted in the
build process still generating exparse.h and overwriting the in-repo copy.

This change reverts the Bison command used during MSBuild to generate the
default y.tab.c/y.tab.h output, more closely aligning it with the other build
systems.

diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj
index d7f3e432f696f41e02a70159c50faa33434637ea..bd269d1ee0cc22e5add7666f84945fc0ec3a2629 100644 (file)
--- a/lib/expr/expr.vcxproj
+++ b/lib/expr/expr.vcxproj
@@ -64,7 +64,7 @@
     </ClCompile>
     <Lib />
     <PreBuildEvent>
-      <Command>win_bison -dy -Wno-yacc exparse.y -o exparse.c</Command>
+      <Command>win_bison -dy -Wno-yacc exparse.y -o y.tab.c</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -78,7 +78,7 @@
     </ClCompile>
     <Lib />
     <PreBuildEvent>
-      <Command>win_bison -dy -Wno-yacc exparse.y -o exparse.c</Command>
+      <Command>win_bison -dy -Wno-yacc exparse.y -o y.tab.c</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -89,7 +89,6 @@
     <ClInclude Include="expr.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="exparse.c" />
     <ClCompile Include="excc.c" />
     <ClCompile Include="excontext.c" />
     <ClCompile Include="exdata.c" />
@@ -102,6 +101,7 @@
     <ClCompile Include="extoken.c" />
     <ClCompile Include="extype.c" />
     <ClCompile Include="exzero.c" />
+    <ClCompile Include="y.tab.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/lib/expr/expr.vcxproj.filters b/lib/expr/expr.vcxproj.filters
index 7dace3a84804feba24690bc7940ca4c708b2ab4f..e8786ead389d396ca3f2c497eb103e8922f382de 100644 (file)
--- a/lib/expr/expr.vcxproj.filters
+++ b/lib/expr/expr.vcxproj.filters
@@ -68,7 +68,7 @@
     <ClCompile Include="exzero.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="exparse.c">
+    <ClCompile Include="y.tab.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>