mirror of
https://github.com/licsber/micropython.git
synced 2024-09-22 10:00:24 +08:00
47f634300c
This cleans up the parsing of MP_REGISTER_MODULE() and generation of genhdr/moduledefs.h so that it uses the same process as compressed error string messages, using the output of qstr extraction. This makes sure all MP_REGISTER_MODULE()'s that are part of the build are correctly picked up. Previously the extraction would miss some (eg if you had a mod.c file in the board directory for an stm32 board). Build speed is more or less unchanged. Thanks to @stinos for the ports/windows/msvc/genhdr.targets changes. Signed-off-by: Damien George <damien@micropython.org>
162 lines
9.1 KiB
XML
162 lines
9.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="GenerateHeaders">
|
|
|
|
<Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
|
|
|
|
<!--Generate qstrdefs.generated.h and mpversion.h similar to what is done in py/mkrules.mk and py/py.mk-->
|
|
<Target Name="GenerateHeaders" DependsOnTargets="MakeVersionHdr;MakeModuleDefs;MakeQstrData">
|
|
</Target>
|
|
|
|
<PropertyGroup>
|
|
<DestDir>$(PyBuildDir)genhdr\</DestDir>
|
|
<PySrcDir>$(PyBaseDir)py\</PySrcDir>
|
|
<QstrDefs>$(PyBaseDir)ports\unix\qstrdefsport.h</QstrDefs>
|
|
<PyQstrDefs>$(PySrcDir)qstrdefs.h</PyQstrDefs>
|
|
<QstrDefsCollected>$(DestDir)qstrdefscollected.h</QstrDefsCollected>
|
|
<QstrGen>$(DestDir)qstrdefs.generated.h</QstrGen>
|
|
<ModuleDefsCollected>$(DestDir)/moduledefs.collected</ModuleDefsCollected>
|
|
<PyPython Condition="'$(PyPython)' == ''">$(MICROPY_CPYTHON3)</PyPython>
|
|
<PyPython Condition="'$(PyPython)' == ''">python</PyPython>
|
|
<CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe>
|
|
<PyClTool>$([System.IO.Path]::Combine(`$(CLToolPath)`, `$(CLToolExe)`))</PyClTool>
|
|
<PyPlatformToolsetNum>120</PyPlatformToolsetNum> <!--Minimum we support is VS2013.-->
|
|
<PyPlatformToolsetNum Condition="$(PlatformToolset.StartsWith('v'))">$(PlatformToolset.Replace('v', ''))</PyPlatformToolsetNum>
|
|
<PyParallelPreProc Condition="'$(PyPlatformToolsetNum)' > '140'">True</PyParallelPreProc> <!--VS2017 and up.-->
|
|
</PropertyGroup>
|
|
|
|
<UsingTask Condition="'$(PyParallelPreProc)' == 'True'"
|
|
TaskName="ParallelCustomBuild" AssemblyFile="$(VCTargetsPath)\Microsoft.Build.CppTasks.Common.dll"/>
|
|
|
|
<Target Name="MakeDestDir">
|
|
<MakeDir Directories="$(DestDir)"/>
|
|
</Target>
|
|
|
|
<!-- Concatenate preprocessed files for use with makeqstrdefs.py.
|
|
Filters out any lines which aren't used by makeqstrdefs.py so the resulting file is
|
|
hundreds of times smaller and processing in python takes substantially less time-->
|
|
<UsingTask TaskName="ConcatPreProcFiles" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
|
|
<ParameterGroup>
|
|
<OutputFile Required="true" ParameterType="System.String"/>
|
|
<InputFiles Required="true" ParameterType="System.String[]"/>
|
|
</ParameterGroup>
|
|
<Task>
|
|
<Code Type="Fragment" Language="cs">
|
|
<![CDATA[
|
|
using(var outFile = System.IO.File.CreateText(OutputFile)) {
|
|
foreach(var inFile in InputFiles)
|
|
foreach(var line in System.IO.File.ReadAllLines(inFile))
|
|
if((line.Contains(".c") && line.StartsWith("#line")) || line.Contains("MP_QSTR"))
|
|
outFile.WriteLine( line );
|
|
}
|
|
]]>
|
|
</Code>
|
|
</Task>
|
|
</UsingTask>
|
|
|
|
<!-- If any of these changed we'll force all qstrs to be generated again-->
|
|
<ItemGroup>
|
|
<QstrDependencies Include="$(PyWinDir)mpconfigport.h;$(PySrcDir)mpconfig.h;$(PySrcDir)makeqstrdata.py"/>
|
|
</ItemGroup>
|
|
|
|
<!-- Preprocess changed files, concatenate and feed into makeqstrdefs.py split/cat-->
|
|
<Target Name="MakeQstrDefs" DependsOnTargets="MakeDestDir" Inputs="@(ClCompile);@(QstrDependencies)" Outputs="$(QstrDefsCollected)">
|
|
<ItemGroup>
|
|
<PyIncDirs Include="$(PyIncDirs)"/>
|
|
<PreProcDefs Include="%(ClCompile.PreProcessorDefinitions);NO_QSTR"/>
|
|
<PyQstrSourceFiles Include="@(ClCompile)" Exclude="$(PyBuildDir)\frozen_content.c">
|
|
<Changed>False</Changed>
|
|
<OutFile>$([System.String]::new('%(FullPath)').Replace('$(PyBaseDir)', '$(DestDir)qstr\'))</OutFile>
|
|
</PyQstrSourceFiles>
|
|
<PyQstrSourceFiles>
|
|
<OutFile>$([System.IO.Path]::ChangeExtension('%(OutFile)', '.pp'))</OutFile>
|
|
<OutDir>$([System.IO.Path]::GetDirectoryName('%(OutFile)'))</OutDir>
|
|
</PyQstrSourceFiles>
|
|
<PyQstrSourceFiles>
|
|
<Changed Condition="$([System.DateTime]::Compare($([System.IO.File]::GetLastWriteTime('%(FullPath)')), $([System.IO.File]::GetLastWriteTime('%(OutFile)')))) > 0">True</Changed>
|
|
</PyQstrSourceFiles>
|
|
<QstrDependencies>
|
|
<Changed Condition="$([System.DateTime]::Compare($([System.IO.File]::GetLastWriteTime('%(FullPath)')), $([System.IO.File]::GetLastWriteTime('$(DestDir)qstr.i.last')))) > 0">True</Changed>
|
|
</QstrDependencies>
|
|
</ItemGroup>
|
|
<PropertyGroup>
|
|
<PyPreProcCommand>$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D')</PyPreProcCommand>
|
|
<ForceQstrRebuild>@(QstrDependencies->AnyHaveMetadataValue('Changed', 'True'))</ForceQstrRebuild>
|
|
<RunPreProcConcat>@(PyQstrSourceFiles->AnyHaveMetadataValue('Changed', 'True'))</RunPreProcConcat>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<PyQstrSourceFilesToPreProc Include="@(PyQstrSourceFiles)" Condition="'%(Changed)' == 'True' Or '$(ForceQstrRebuild)' == 'True'">
|
|
<Command>$(PyPreProcCommand) /Fi%(OutFile) /P %(Identity)</Command>
|
|
<Outputs>%(OutFile)</Outputs>
|
|
</PyQstrSourceFilesToPreProc>
|
|
</ItemGroup>
|
|
|
|
<MakeDir Directories="@(PyQstrSourceFilesToPreProc->'%(OutDir)')"/>
|
|
<Exec Condition="'$(PyParallelPreProc)' != 'True'" Command="%(PyQstrSourceFilesToPreProc.Command)" />
|
|
<ParallelCustomBuild Condition="'$(PyParallelPreProc)' == 'True' And '@(PyQstrSourceFilesToPreProc)' != ''" Sources="@(PyQstrSourceFilesToPreProc)" />
|
|
|
|
<ConcatPreProcFiles InputFiles="@(PyQstrSourceFiles->'%(OutFile)')" OutputFile="$(DestDir)qstr.i.last"
|
|
Condition="'$(RunPreProcConcat)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/>
|
|
<Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split qstr $(DestDir)qstr.i.last $(DestDir)qstr _"/>
|
|
<Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat qstr _ $(DestDir)qstr $(QstrDefsCollected)"/>
|
|
</Target>
|
|
|
|
<Target Name="CollectModuleDefs" DependsOnTargets="MakeQstrDefs" Inputs="$(DestDir)qstr.i.last" Outputs="$(ModuleDefsCollected)">
|
|
<Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split module $(DestDir)qstr.i.last $(DestDir)module _"/>
|
|
<Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat module _ $(DestDir)module $(ModuleDefsCollected)"/>
|
|
</Target>
|
|
|
|
<Target Name="MakeModuleDefs" DependsOnTargets="CollectModuleDefs" Inputs="$(ModuleDefsCollected)" Outputs="$(DestDir)moduledefs.h">
|
|
<PropertyGroup>
|
|
<DestFile>$(DestDir)moduledefs.h</DestFile>
|
|
<TmpFile>$(DestFile).tmp</TmpFile>
|
|
</PropertyGroup>
|
|
<Exec Command="$(PyPython) $(PySrcDir)makemoduledefs.py $(ModuleDefsCollected) > $(TmpFile)"/>
|
|
<MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
|
|
</Target>
|
|
|
|
<Target Name="MakeQstrData" DependsOnTargets="MakeQstrDefs" Inputs="$(QstrDefsCollected);$(PyQstrDefs);$(QstrDefs)" Outputs="$(QstrGen)">
|
|
<PropertyGroup>
|
|
<TmpFile>$(QstrGen).tmp</TmpFile>
|
|
</PropertyGroup>
|
|
<Exec Command="$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /E $(PyQstrDefs) $(QstrDefs) > $(DestDir)qstrdefs.preprocessed.h"/>
|
|
<Exec Command="$(PyPython) $(PySrcDir)makeqstrdata.py $(DestDir)qstrdefs.preprocessed.h $(QstrDefsCollected) > $(TmpFile)"/>
|
|
<MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(QstrGen)"/>
|
|
</Target>
|
|
|
|
<Target Name="MakeVersionHdr" DependsOnTargets="MakeDestDir">
|
|
<PropertyGroup>
|
|
<DestFile>$(DestDir)mpversion.h</DestFile>
|
|
<TmpFile>$(DestFile).tmp</TmpFile>
|
|
</PropertyGroup>
|
|
<Exec Command="$(PyPython) $(PySrcDir)makeversionhdr.py $(TmpFile)"/>
|
|
<MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
|
|
</Target>
|
|
|
|
<Target Name="FreezeModules" Condition="'$(FrozenManifest)' != ''" DependsOnTargets="MakeQstrData" Inputs="$(FrozenManifest)" Outputs="$(PyBuildDir)frozen_content.c">
|
|
<ItemGroup>
|
|
<ClCompile Include="$(PyBuildDir)frozen_content.c"/>
|
|
<ClCompile>
|
|
<PreprocessorDefinitions>MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
</ClCompile>
|
|
</ItemGroup>
|
|
<Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)../micropython-lib -v PORT_DIR=$(PyWinDir) -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
|
|
<WriteLinesToFile File="$(TLogLocation)frozen.read.1.tlog" Lines="$(FrozenManifest)" Overwrite="True"/>
|
|
</Target>
|
|
|
|
<Target Name="RemoveGeneratedFiles" AfterTargets="Clean">
|
|
<RemoveDir Directories="$(DestDir)"/>
|
|
</Target>
|
|
|
|
<!--Copies SourceFile to DestFile only if SourceFile's content differs from DestFile's.
|
|
We use this to 'touch' the generated files only when they are really newer
|
|
so a build is only triggered if the generated content actually changed,
|
|
and not just because the file date changed since the last build-->
|
|
<Target Name="CopyFileIfDifferent">
|
|
<Exec Command="fc /B $(SourceFile) $(DestFile) > NUL 2>&1" IgnoreExitCode="true">
|
|
<Output TaskParameter="ExitCode" PropertyName="FilesDiffer" />
|
|
</Exec>
|
|
<Copy SourceFiles="$(SourceFile)" DestinationFiles="$(DestFile)" Condition="'$(FilesDiffer)'!='0'"/>
|
|
</Target>
|
|
|
|
</Project>
|