Skip to content

[libzip-windows] Fix building with msbuild #1491

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

Merged
merged 1 commit into from
Apr 1, 2018
Merged

[libzip-windows] Fix building with msbuild #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions build-tools/api-xml-adjuster/api-xml-adjuster.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@
AdditionalMetadata="ParameterDescription=$(_TopDir)\src\Mono.Android\Profiles\api-%(AndroidApiInfo.Level).params.txt;ClassParseXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.class-parse;ApiAdjustedXml=$(_OutputPath)api\api-%(AndroidApiInfo.Level).xml.in">
<Output TaskParameter="Include" ItemName="ApiFileDefinition"/>
</CreateItem>
<ItemGroup>
<_ApiParameterDescription Include="%(ApiFileDefinition.ParameterDescription)" />
<_ApiClassParseXml Include="%(ApiFileDefinition.ClassParseXml)" />
<_ApiAdjustedXml Include="%(ApiFileDefinition.ApiAdjustedXml)" />
</ItemGroup>
</Target>

<Target Name="_ClassParse"
BeforeTargets="_AdjustApiXml"
DependsOnTargets="_DefineApiFiles"
Inputs="%(ApiFileDefinition.ParameterDescription)"
Outputs="%(ApiFileDefinition.ClassParseXml)">
Inputs="@(_ApiParameterDescription)"
Outputs="@(_ApiClassParseXml)">
<PropertyGroup>
<ClassParse>$(_TopDir)\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\class-parse.exe</ClassParse>
</PropertyGroup>
Expand All @@ -31,8 +36,8 @@
<Target Name="_AdjustApiXml"
AfterTargets="Build"
DependsOnTargets="_DefineApiFiles"
Inputs="%(ApiFileDefinition.ClassParseXml)"
Outputs="%(ApiFileDefinition.ApiAdjustedXml)">
Inputs="@(_ApiClassParseXml)"
Outputs="@(_ApiAdjustedXml)">
<PropertyGroup>
<ApiXmlAdjuster>$(_TopDir)\bin\Build$(Configuration)\api-xml-adjuster.exe</ApiXmlAdjuster>
</PropertyGroup>
Expand Down
5 changes: 4 additions & 1 deletion src/libzip/libzip.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<_LibZipTargetMakefile Include="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\Makefile" />
</ItemGroup>
<Target Name="_Make"
Condition=" '@(_LibZipTarget)' != '' "
Inputs="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\Makefile"
Inputs="@(_LibZipTargetMakefile)"
Outputs="@(Content)">
<Exec
Command="make"
Expand Down
17 changes: 11 additions & 6 deletions src/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,14 +786,19 @@
/>
</Target>

<ItemGroup>
<_MonoCrossRuntimeStamp Include="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\.stamp" />
<_MonoCrossRuntimeIntermediateOutput Include="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)" />
<_MonoCrossRuntimeOutput Include="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)" />
</ItemGroup>

<!-- The condition below is to work around a bug in xbuild which attempts to batch
even if there are no _MonoCrossRuntime items and the Copy task fails
-->
<Target Name="_BuildCrossRuntimes"
DependsOnTargets="_GenerateCrossOffsetHeaderFiles"
Inputs="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\.stamp"
Outputs="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
Inputs="@(_MonoCrossRuntimeStamp)"
Outputs="@(_MonoCrossRuntimeIntermediateOutput)"
Condition=" '@(_MonoCrossRuntime)' != '' ">
<Message Text="Building %(_MonoCrossRuntime.Identity) in $(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)"/>
<Exec
Expand All @@ -802,16 +807,16 @@
WorkingDirectory="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)"
/>
<Touch
Files="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
Files="@(_MonoCrossRuntimeIntermediateOutput)"
/>
</Target>

<!-- The condition below is to work around a bug in xbuild which attempts to batch
even if there are no _MonoCrossRuntime items and the Copy task fails
-->
<Target Name="_InstallCrossRuntimes"
Inputs="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
Outputs="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
Inputs="@(_MonoCrossRuntimeIntermediateOutput)"
Outputs="@(_MonoCrossRuntimeOutput)"
Condition=" '@(_MonoCrossRuntime)' != '' ">
<Copy
SourceFiles="$(IntermediateOutputPath)\%(_MonoCrossRuntime.Identity)\mono\mini\mono-sgen%(_MonoCrossRuntime.ExeSuffix)"
Expand All @@ -826,7 +831,7 @@
Command="&quot;%(_MonoCrossRuntime.Strip)&quot; %(_MonoCrossRuntime.StripFlags) &quot;$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)&quot;"
/>
<Touch
Files="$(_MSBuildDir)\%(_MonoCrossRuntime.InstallPath)%(_MonoCrossRuntime.CrossMonoName)%(_MonoCrossRuntime.ExeSuffix)"
Files="@(_MonoCrossRuntimeOutput)"
/>
</Target>
<Target Name="GetMonoBundleItems"
Expand Down