Skip to content

Add Linux sdk items and fix toolchain downloader to really respect HostOS #2

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 3 commits into from
Apr 20, 2016
Merged

Add Linux sdk items and fix toolchain downloader to really respect HostOS #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb76539
Add Linux sdk items and fix toolchain downloader to really respect Ho…
atsushieno Apr 20, 2016
8573e6a
HttpClient default timeout is 100sec. You can't really download NDK i…
atsushieno Apr 20, 2016
a3036ce
We cannot implicitly reference build item when the expression uses -> .
atsushieno Apr 20, 2016
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CONFIGURATION = Debug
MSBUILD = xbuild /p:Configuration=$(CONFIGURATION)
MSBUILD = xbuild /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS)

all:
$(MSBUILD)
Expand Down
18 changes: 17 additions & 1 deletion build-tools/android-toolchain/android-toolchain.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@
<AndroidUri Condition=" '$(AndroidUri)' == '' ">https://dl-ssl.google.com/android/repository</AndroidUri>
</PropertyGroup>
<ItemGroup>
<AndroidNdkItem Include="android-ndk-r11c-linux-x86_64.zip">
<HostOS>Linux</HostOS>
</AndroidNdkItem>
<AndroidSdkItem Include="build-tools_r23-linux.zip">
<HostOS>Linux</HostOS>
<DestDir>build-tools\23.0.0</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-tools_r23-linux.zip">
<HostOS>Linux</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="tools_r24.4.1-linux.zip">
<HostOS>Linux</HostOS>
</AndroidSdkItem>
<AndroidNdkItem Include="android-ndk-r11c-darwin-x86_64.zip">
<HostOS>Darwin</HostOS>
</AndroidNdkItem>
Expand All @@ -15,13 +29,15 @@
<HostOS>Darwin</HostOS>
<DestDir>platform-tools</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="android-sdk_r24.4.1-macosx.zip">
<AndroidSdkItem Include="tools_r24.4.1-macosx.zip">
<HostOS>Darwin</HostOS>
</AndroidSdkItem>
<AndroidSdkItem Include="platform-N_r01.zip">
<HostOS></HostOS>
Copy link
Contributor

@jonpryor jonpryor Apr 20, 2016

Choose a reason for hiding this comment

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

Why is this required?

Copy link
Contributor Author

@atsushieno atsushieno Apr 20, 2016

Choose a reason for hiding this comment

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

check my commit comment.

<DestDir>platforms\android-N</DestDir>
</AndroidSdkItem>
<AndroidSdkItem Include="android-23_r01.zip">
<HostOS></HostOS>
<DestDir>platforms\android-23</DestDir>
</AndroidSdkItem>
</ItemGroup>
Expand Down
31 changes: 22 additions & 9 deletions build-tools/android-toolchain/android-toolchain.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,37 @@
<UsingTask AssemblyFile="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.CreateTemporaryDirectory" />
<UsingTask AssemblyFile="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.DownloadUri" />
<UsingTask AssemblyFile="$(OutputPath)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.UnzipDirectoryChildren" />
<Target Name="_DetermineItems">
<CreateItem
Include="@(AndroidSdkItem)"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_PlatformAndroidSdkItem"/>
</CreateItem>
<CreateItem
Include="@(AndroidNdkItem)"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_PlatformAndroidNdkItem"/>
</CreateItem>
</Target>
<Target Name="_DownloadItems"
Outputs="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(AndroidNdkItems->'$(AndroidToolchainCacheDirectory)\%(Identity)')">
DependsOnTargets="_DetermineItems"
Outputs="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')">
<DownloadUri
SourceUris="@(AndroidSdkItem->'$(AndroidUri)/%(Identity)');@(AndroidNdkItem->'$(AndroidUri)/%(Identity)')"
DestinationFiles="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(AndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
SourceUris="@(_PlatformAndroidSdkItem->'$(AndroidUri)/%(Identity)');@(_PlatformAndroidNdkItem->'$(AndroidUri)/%(Identity)')"
DestinationFiles="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)');@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
/>
</Target>
<Target Name="_UnzipFiles"
Inputs="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
DependsOnTargets="_DetermineItems"
Inputs="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)')"
Outputs="$(AndroidToolchainDirectory)\.stamp-sdk">
<CreateItem
Include="@(AndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)"
Condition=" '%(AndroidSdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidSdkItem.HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_AndroidSdkItems"/>
Include="@(_PlatformAndroidSdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidSdkItem.Identity)">
<Output TaskParameter="Include" ItemName="_AndroidSdkItems"/>
</CreateItem>
<CreateItem
Include="@(AndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(Identity)"
Condition=" '%(AndroidSdkItem.HostOS)' == '$(HostOS)' Or '%(AndroidSdkItem.HostOS)' == '' ">
Include="@(_PlatformAndroidNdkItem->'$(AndroidToolchainCacheDirectory)\%(_PlatformAndroidNdkItem.Identity)"
Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' ">
<Output TaskParameter="Include" ItemName="_AndroidNdkItems"/>
</CreateItem>

Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/DownloadUri.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public override bool Execute ()

var tasks = new TTask [SourceUris.Length];
using (var client = new HttpClient ()) {
client.Timeout = TimeSpan.FromHours (3);
for (int i = 0; i < SourceUris.Length; ++i) {
tasks [i] = DownloadFile (client, SourceUris [i], DestinationFiles [i].ItemSpec);
}
Expand All @@ -57,6 +58,7 @@ async TTask DownloadFile (HttpClient client, string uri, string destinationFile)
Log.LogMessage (MessageImportance.Normal, $"Skipping uri '{uri}' as destination file already exists '{destinationFile}'.");
return;
}
Log.LogMessage (MessageImportance.Low, $"Downloading '{uri}'.");
using (var r = await client.GetAsync (uri))
using (var o = File.OpenWrite (destinationFile)) {
await r.Content.CopyToAsync (o);
Expand Down