iASL: remove unused parser file and fix msvc2017 build files

AslCompiler.y had been split into numerous .y files several years
ago. When this change happened, the actual file was never removed.
This commit removes this unecessary file, and adds the .y files to be
displayed in the solution explorer, and adds build rules for
AslParser.y.

Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
This commit is contained in:
Erik Kaneda 2020-01-15 16:16:20 -08:00
parent f78d50aacc
commit e683bc33c1
4 changed files with 53 additions and 4936 deletions

2
.gitignore vendored
View File

@ -85,6 +85,8 @@ generate/msvc2017/*.y.h
generate/msvc2017/*.y.c
generate/msvc2017/*.y.output
generate/msvc2017/.vs
generate/msvc2017/*.y
generate/msvc9/AcpiSrcLinuxDebug
generate/msvc9/AcpiSubsystemLinux

View File

@ -443,20 +443,10 @@
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\source\compiler\aslcompiler.y">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bison -d -l -pAslCompiler -v %(FullPath) -vd -o%(Filename).y.c</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Yaccing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).y.c;%(Filename).y.h</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bison -d -l -pAslCompiler -v %(FullPath) -vd -o%(Filename).y.c</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Yaccing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).y.c;%(Filename).y.h</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\source\compiler\aslparser.y">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">m4 -P -I%(RootDir)%(Directory) %(FullPath) &gt; %(RootDir)%(Directory)/aslcompiler.y</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">m4 -P -I%(RootDir)%(Directory) %(FullPath) &gt; aslcompiler.y</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Macro-processing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)/aslcompiler.y</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">aslcompiler.y</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">m4 -P -I%(RootDir)%(Directory) %(FullPath) &gt; %(RootDir)%(Directory)/aslcompiler.y</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Macro-processing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)/aslcompiler.y</Outputs>
@ -519,6 +509,23 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).y.c;%(Filename).y.h</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="..\..\source\compiler\aslcstyle.y" />
<None Include="..\..\source\compiler\aslhelpers.y" />
<None Include="..\..\source\compiler\aslkeywords.y" />
<None Include="..\..\source\compiler\aslprimaries.y" />
<None Include="..\..\source\compiler\aslresources.y" />
<None Include="..\..\source\compiler\aslrules.y" />
<None Include="..\..\source\compiler\aslsupport.y" />
<None Include="..\..\source\compiler\asltokens.y" />
<None Include="..\..\source\compiler\asltypes.y" />
<CustomBuild Include="aslcompiler.y">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bison -d -l -pAslCompiler -v %(FullPath) -vd -o%(Filename).y.c</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Yaccing %(FullPath)</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(Filename).y.c;%(Filename).y.h</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -719,9 +719,6 @@
<CustomBuild Include="..\..\source\compiler\aslcompiler.l">
<Filter>Source Files\Parsers</Filter>
</CustomBuild>
<CustomBuild Include="..\..\source\compiler\aslcompiler.y">
<Filter>Source Files\Parsers</Filter>
</CustomBuild>
<CustomBuild Include="..\..\source\compiler\aslparser.y">
<Filter>Source Files\Parsers</Filter>
</CustomBuild>
@ -743,5 +740,37 @@
<CustomBuild Include="..\..\source\compiler\prparser.y">
<Filter>Source Files\Parsers</Filter>
</CustomBuild>
<CustomBuild Include="aslcompiler.y">
<Filter>Source Files\Intermediate</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="..\..\source\compiler\aslcstyle.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\aslhelpers.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\aslkeywords.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\aslprimaries.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\aslresources.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\aslrules.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\aslsupport.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\asltokens.y">
<Filter>Source Files\Parsers</Filter>
</None>
<None Include="..\..\source\compiler\asltypes.y">
<Filter>Source Files\Parsers</Filter>
</None>
</ItemGroup>
</Project>

File diff suppressed because it is too large Load Diff