Fix benign typo in Scanner/Parser msbuild targets

The output path referenced a non-existant msbuild metadata prop "RelativeOutputDir"
(the actual prop is called "RelativeDir"). Also, the OutputFile path is relative to the
project dir (the 'MSBuildProjectDir' prop), not the file being included.
This commit is contained in:
John Colvin committed 2024-10-30 19:31:09 +00:00
1 parent ec88ffdbf3
commit ebc39f203d
1 file changed
+6 -7
+6 -7
View File
@@ -93,13 +93,13 @@
Name="GenerateScanners"
BeforeTargets="BeforeBuild"
Condition="'@(Scanner)'!=''"
Outputs="%(Scanner.RelativeOutputDir)\%(Scanner.FileName).Scanner.g.cs">
Outputs="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ScannerOutputPath)\%(Scanner.RelativeDir)))\%(Scanner.FileName).Scanner.g.cs">
<Message Text="Generating Scanner %(Scanner.Identity)" Importance="High" />
<ItemGroup>
<LexFile Include="%(Scanner.Identity)">
<OutputFile>$([MSBuild]::MakeRelative(%(Scanner.RootDir)%(Scanner.Directory), $(ScannerOutputPath)))\%(Scanner.FileName).Scanner.g.cs</OutputFile>
<OutputFile>$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ScannerOutputPath)\%(Scanner.RelativeDir)))\%(Scanner.FileName).Scanner.g.cs</OutputFile>
</LexFile>
<Compile Include="$([MSBuild]::MakeRelative(%(Scanner.RootDir)%(Scanner.Directory), $(ScannerOutputPath)))\%(Scanner.FileName).Scanner.g.cs">
<Compile Include="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ScannerOutputPath)\%(Scanner.RelativeDir)))\%(Scanner.FileName).Scanner.g.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>%(Scanner.Identity)</DependentUpon>
@@ -112,17 +112,16 @@
BeforeTargets="BeforeBuild"
AfterTargets="GenerateScanners"
Condition="'@(Parser)'!=''"
Outputs="%(Parser.RelativeOutputDir)\%(Parser.FileName).Parser.g.cs">
Outputs="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ParserOutputPath)\%(Parser.RelativeDir)))\%(Parser.FileName).Parser.g.cs">
<Message
Text="Generating Parser %(Parser.Identity)"
Importance="High" />
<ItemGroup>
<YaccFile Include="%(Parser.Identity)">
<OutputFile>$([MSBuild]::MakeRelative(%(Parser.RootDir)%(Parser.Directory),
$(ParserOutputPath)))\%(Parser.FileName).Parser.g.cs</OutputFile>
<OutputFile>$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ParserOutputPath)\%(Parser.RelativeDir)))\%(Parser.FileName).Parser.g.cs</OutputFile>
<Arguments>/gplex /nolines</Arguments>
</YaccFile>
<Compile Include="$([MSBuild]::MakeRelative(%(Parser.RootDir)%(Parser.Directory), $(ParserOutputPath)))\%(Parser.FileName).Parser.g.cs">
<Compile Include="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), $(ParserOutputPath)\%(Parser.RelativeDir)))\%(Parser.FileName).Parser.g.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>%(Parser.Identity)</DependentUpon>