Added Support for Building libzip for Mac and Windows #89
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ItemType>GenericProject</ItemType> | ||
| <ProjectGuid>{900A0F71-BAAD-417A-8D1A-8D330297CDD0}</ProjectGuid> | ||
| </PropertyGroup> | ||
| <Import Project="..\..\Configuration.props" /> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <OutputPath>..\..\bin\$(Configuration)</OutputPath> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <OutputPath>..\..\bin\$(Configuration)</OutputPath> | ||
| </PropertyGroup> | ||
| <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
| <PropertyGroup> | ||
| <BuildDependsOn> | ||
| ResolveReferences; | ||
| _Configure; | ||
| _Make | ||
| </BuildDependsOn> | ||
| </PropertyGroup> | ||
| <Import Project="libzip.targets" /> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\android-toolchain\android-toolchain.mdproj"> | ||
| <Project>{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA}</Project> | ||
| <Name>android-toolchain</Name> | ||
| <ReferenceOutputAssembly>False</ReferenceOutputAssembly> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup> | ||
| <_LibZipTarget Include="host-mxe-Win64" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':mxe-Win64:'))"> | ||
| <CMake>$(AndroidMxeFullPath)\bin\x86_64-w64-mingw32.static-cmake</CMake> | ||
| <CMakeFlags></CMakeFlags> | ||
| <OutputLibrary>libzip.dll</OutputLibrary> | ||
| <OutputLibraryPath>lib/libzip.dll</OutputLibraryPath> | ||
| </_LibZipTarget> | ||
| <_LibZipTarget Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))"> | ||
| <CMake>cmake</CMake> | ||
| <CMakeFlags>-DCMAKE_OSX_ARCHITECTURES="i386;x86_64"</CMakeFlags> | ||
| <OutputLibrary>libzip.3.0.dylib</OutputLibrary> | ||
| <OutputLibraryPath>lib/libzip.3.0.dylib</OutputLibraryPath> | ||
| </_LibZipTarget> | ||
| <_LibZipTarget Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))"> | ||
| <CMake>cmake</CMake> | ||
| <CMakeFlags></CMakeFlags> | ||
| <OutputLibrary>libzip.so</OutputLibrary> | ||
| <OutputLibraryPath>libzip.so</OutputLibraryPath> | ||
| </_LibZipTarget> | ||
| </ItemGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <_SourceTopDir>..\..</_SourceTopDir> | ||
| </PropertyGroup> | ||
| <UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.GetNugetPackageBasePath" /> | ||
| <Import Project="libzip.props" /> | ||
| <Import Project="libzip.projitems" /> | ||
| <Target Name="_SetCMakeListsTxtTimeToLastCommitTimestamp"> | ||
| <Exec | ||
| Command="touch -m -t `git log -1 --format=%25cd --date=format-local:%25Y%25m%25d%25H%25M.%25S` CMakeLists.txt" | ||
| WorkingDirectory="$(LibZipSourceFullPath)" | ||
| /> | ||
| </Target> | ||
| <Target Name="_Configure" | ||
| DependsOnTargets="_SetCMakeListsTxtTimeToLastCommitTimestamp" | ||
| Inputs="$(LibZipSourceFullPath\CMakeLists.txt" | ||
| Outputs="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\Makefile"> | ||
| <MakeDir Directories="@(_LibZipTarget->'$(IntermediateOutputPath)\%(Identity)')" /> | ||
| <Exec | ||
| Command="%(_LibZipTarget.CMake) %(_LibZipTarget.CMakeFlags) $(LibZipSourceFullPath)" | ||
| WorkingDirectory="@(_LibZipTarget->'$(IntermediateOutputPath)\%(Identity)')" | ||
| /> | ||
| </Target> | ||
| <Target Name="_Make" | ||
| Inputs="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\Makefile" | ||
| Outputs="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)\%(_LibZipTarget.OutputLibraryPath)"> | ||
| <Exec | ||
| Command="make" | ||
| WorkingDirectory="$(IntermediateOutputPath)\%(_LibZipTarget.Identity)" | ||
| /> | ||
| <Copy SourceFiles="@(_LibZipTarget->'$(IntermediateOutputPath)\%(Identity)\%(_LibZipTarget.OutputLibraryPath)')" | ||
| DestinationFiles="@(_LibZipTarget->'$(OutputPath)\lib\xbuild\Xamarin\Android\%(_LibZipTarget.OutputLibrary)')"/> | ||
| </Target> | ||
| </Project> |
Submodule LibZipSharp
added at
16c468
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the update to
Outputs? Themake MXE_TARGETSvalue is unchanged, so it won't actually buildi686-w64-mingw32.static-cmake, will it?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we added cmake and zlib to the command
https://github.com/xamarin/xamarin-android/pull/89/files#diff-84fb09c4b62dc7398bf9a0683da5e15fR127