Skip to content

Update mono to 2017-02 "monthly master" branch [do not merge yet] #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xmcclure wants to merge 2 commits into from
Closed

Update mono to 2017-02 "monthly master" branch [do not merge yet] #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
412d9b0
Update mono to 2017-02 "monthly master" branch and fix a build script…
xmcclure Feb 8, 2017
ae72e88
Correct "Exists" logic on monodoc debug files
xmcclure Feb 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions build-tools/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
</PropertyGroup>
<ItemGroup>
<MonoDocCopyItem Include="monodoc.dll" />
<MonoDocCopyItem Include="monodoc.dll.mdb" />
<MonoDocCopyItemOptional Include="monodoc.pdb" />
<MonoDocCopyItemOptional Include="monodoc.dll.mdb" />
<MonoDocCopyItem Include="monodoc.dll.config" />
</ItemGroup>
<ItemGroup>
Expand All @@ -25,13 +26,6 @@
<_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
<_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\net_4_x</_MonoOutputDir>
</PropertyGroup>
<ItemGroup>
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
</ItemGroup>
<ItemGroup>
<_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
<_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
</ItemGroup>
<PropertyGroup>
<ForceBuildDependsOn>
_BuildLlvm;
Expand Down Expand Up @@ -146,7 +140,7 @@
/>
</Target>
<Target Name="_ConfigureRuntimes"
DependsOnTargets="_BuildLlvm"
DependsOnTargets="_BuildLlvm;_Autogen"
Inputs="$(MonoSourceFullPath)\configure"
Outputs="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)\Makefile">
<MakeDir Directories="$(IntermediateOutputPath)\%(_MonoRuntime.Identity)" />
Expand Down Expand Up @@ -230,7 +224,7 @@
</ItemGroup>
</Target>
<Target Name="_BuildRuntimes"
DependsOnTargets="_GetRuntimesOutputItems"
DependsOnTargets="_GetRuntimesOutputItems;_ConfigureRuntimes"
Inputs="@(_RuntimeBuildStamp)"
Outputs="@(_RuntimeSource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_BclProfileItems);@(_MonoBtlsSource)">
<Exec
Expand Down Expand Up @@ -323,9 +317,27 @@
/>
<Touch Files="@(_InstallMonoPosixHelperOutput);@(_InstallUnstrippedMonoPosixHelperOutput)" />
</Target>
<Target Name="_GetMonodocItems" DependsOnTargets="_BuildRuntimes">
<ItemGroup>
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
<_MonoDocCopyItems
Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
Include="@(MonoDocCopyItemOptional->'$(_MonoOutputDir)\%(Identity)')"
/>
</ItemGroup>
<ItemGroup>
Copy link
Contributor

@dellis1972 dellis1972 Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can collapse these into one ItemGroup. there is not need to separate them. unless @jonpryor said to :P

Copy link
Contributor Author

@xmcclure xmcclure Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They're not the same, one contains "mdoc.exe" and the other doesn't

Copy link
Contributor

@dellis1972 dellis1972 Feb 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can mix different items within an ItemGroup so

<ItemGroup>
    <Foo Include="Somefile.dll" />
    <Bar Include="Someotherbarfile.dll" />
</ItemGroup>

MSbuild and xbuild will evaluate each "item" separately. But its sometimes useful to put items together in logical groups just to make it easier to maintain. This is probably one of those cases :)

<_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MandroidDir)\%(Identity)')" />
<_MonoDocInstalledItems
Condition=" Exists ('$(_MonoOutputDir)\%(Identity)') "
Include="@(MonoDocCopyItemOptional->'$(_MandroidDir)\%(Identity)')"
/>
<_MonoDocInstalledItems Include="$(_MandroidDir)\mdoc.exe" />
</ItemGroup>
</Target>
<Target Name="_InstallMonoDoc"
Inputs="@(_MonoDocCopyItems);$(_MonoOutputDir)\mdoc.exe"
Outputs="@(_MonoDocInstalledItems)">
Outputs="@(_MonoDocInstalledItems)"
DependsOnTargets="_GetMonodocItems">
<MakeDir Directories="$(_MandroidDir)" />
<Copy
SourceFiles="@(_MonoDocCopyItems)"
Expand Down Expand Up @@ -474,7 +486,7 @@
/>
</Target>
<Target Name="GetMonoBundleItems"
DependsOnTargets="_GetRuntimesOutputItems;_PrepareLlvmItems">
DependsOnTargets="_GetRuntimesOutputItems;_GetMonodocItems;_PrepareLlvmItems">
<ItemGroup>
<BundleItem Include="@(_BclInstalledItem)" />
<BundleItem Include="@(_MonoDocInstalledItems)" />
Expand Down
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 2919 files