Skip to content

[build] setup a Prepare target for Xamarin.Android.sln #946

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
jonpryor merged 1 commit into from
Oct 18, 2017
Merged

[build] setup a Prepare target for Xamarin.Android.sln #946

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
4 changes: 4 additions & 0 deletions Before.Xamarin.Android.sln.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisFileDirectory)build-tools\scripts\PrepareWindows.targets" Condition=" '$(OS)' == 'Windows_NT' " />
</Project>
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Building Xamarin.Android requires:
* [Autotools (`autoconf`, `automake`, etc.)](#autotools)
* [The Android SDK and NDK](#ndk)

The `make prepare` build step (or `PrepareWindows.targets` on Windows) will
The `make prepare` build step (or `/t:Prepare` on Windows) will
check that all required dependencies are present.
If you would like `make prepare` to automatically install
required dependencies, set the `$(AutoProvision)` MSBuild property to True
Expand Down Expand Up @@ -246,7 +246,7 @@ Unit tests are built in a separate target:

To build Xamarin.Android, ensure you are using MSBuild version 15+ and run:

msbuild build-tools\scripts\PrepareWindows.targets
msbuild Xamarin.Android.sln /t:Prepare
msbuild Xamarin.Android.sln

These are roughly the same as how `make prepare` and `make` are used on other platforms.
Expand Down
4 changes: 2 additions & 2 deletions build-tools/scripts/PrepareWindows.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<Output TaskParameter="JavaSdkDirectory" PropertyName="_JavaSdkDirectory" />
</JdkInfo>
<Copy
SourceFiles="Configuration.Java.Interop.Override.props"
SourceFiles="$(MSBuildThisFileDirectory)Configuration.Java.Interop.Override.props"
DestinationFiles="$(_TopDir)\external\Java.Interop\Configuration.Override.props"
SkipUnchangedFiles="True"
/>
<ReplaceFileContents
SourceFile="Windows-Configuration.OperatingSystem.props.in"
SourceFile="$(MSBuildThisFileDirectory)Windows-Configuration.OperatingSystem.props.in"
DestinationFile="$(_TopDir)\Configuration.OperatingSystem.props"
Replacements="@JAVA_HOME@=$(_JavaSdkDirectory)"
/>
Expand Down