Skip to content

[mono-sdks] Try to download Mono runtimes and BCL before building them. #2265

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
Oct 12, 2018
Merged

[mono-sdks] Try to download Mono runtimes and BCL before building them. #2265

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
ca195c5
[mono-sdks] Package BCL from dedicated SDKs target.
luhenry Oct 4, 2018
f1d7f6e
[mono-sdks] Consolidate the build of LLVM and the Runtimes in a singl…
luhenry Oct 5, 2018
f4f056a
[mono-sdks] Try to download the Mono SDKs before building them
luhenry Oct 5, 2018
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
10 changes: 7 additions & 3 deletions build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitHash.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ public sealed class GitCommitHash : Git
[Output]
public string AbbreviatedCommitHash { get; set; }

[Output]
public string CommitHash { get; set; }

protected override bool LogTaskMessages {
get { return false; }
}
Expand All @@ -38,17 +41,18 @@ public override bool Execute ()

protected override string GenerateCommandLineCommands ()
{
return "log --no-color --first-parent -n1 --pretty=format:%h";
return "rev-parse HEAD";
}

protected override void LogEventsFromTextOutput (string singleLine, MessageImportance messageImportance)
{
if (string.IsNullOrEmpty (singleLine))
return;
if (singleLine.Length < RequiredHashLength) {
Log.LogError ("Abbreviated commit hash `{0}` is shorter than required length of {1} characters", singleLine, RequiredHashLength);
if (singleLine.Length < 40) {
Log.LogError ("Commit hash `{0}` is shorter than required length of {1} characters", singleLine, 40);
return;
}
CommitHash = singleLine;
AbbreviatedCommitHash = singleLine.Substring (0, RequiredHashLength);
}
}
Expand Down
2 changes: 1 addition & 1 deletion external/mono
Open in desktop
Submodule mono updated 23 files
+1 −1 external/xunit-binaries
+3 −3 mcs/build/config-default.make
+28 −19 mcs/build/tests.make
+6 −5 mcs/class/Mono.Profiler.Log/Makefile
+7 −2 mcs/class/Mono.Profiler.Log/Test/ProfilerTestRun.cs
+11 −0 ...System.ComponentModel.Composition.4.5/monodroid_System.ComponentModel.Composition_xtest.dll.exclude.sources
+15 −0 mcs/class/System/monodroid_System_xtest.dll.exclude.sources
+25 −9 runtime/Makefile.am
+18 −16 scripts/ci/run-jenkins.sh
+2 −0 sdks/builds/.gitignore
+40 −5 sdks/builds/Makefile
+18 −10 sdks/builds/android.mk
+49 −31 sdks/builds/bcl.mk
+11 −0 sdks/builds/desktop.mk
+21 −20 sdks/builds/ios.mk
+39 −76 sdks/builds/llvm.mk
+20 −0 sdks/builds/mxe-Win32.cmake.in
+20 −0 sdks/builds/mxe-Win64.cmake.in
+3 −10 sdks/builds/runtime.mk
+3 −1 sdks/builds/wasm.mk
+2 −2 sdks/desktop/Makefile
+1 −1 sdks/paths.mk
+2 −2 sdks/wasm/Makefile
23 changes: 7 additions & 16 deletions src/mono-runtimes/mono-runtimes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<_MonoBcl Include="bcl" />
</ItemGroup>

<ItemGroup>
<_MonoRuntime Include="armeabi-v7a" Condition=" $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains (':armeabi-v7a:')) ">
<Strip>$(AndroidToolchainDirectory)\toolchains\armeabi-v7a-clang\bin\arm-linux-androideabi-strip</Strip>
Expand Down Expand Up @@ -60,27 +64,16 @@
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
</_MonoRuntime>
<_MonoRuntime Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
<Strip>strip</Strip>
<StripFlags>-S</StripFlags>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>dylib</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
<BuildTests>True</BuildTests>
</_MonoRuntime>
<_MonoRuntime Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">
<_MonoRuntime Include="host-$(HostOS)" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':$(HostOS):')) And ( '$(HostOS)' == 'Darwin' Or '$(HostOS)' == 'Linux' )">
<Strip>strip</Strip>
<StripFlags>-S</StripFlags>
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
<NativeLibraryExtension>so</NativeLibraryExtension>
<NativeLibraryExtension Condition=" '$(HostOS)' == 'Darwin' ">dylib</NativeLibraryExtension>
<NativeLibraryExtension Condition=" '$(HostOS)' == 'Linux' ">so</NativeLibraryExtension>
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
<BuildTests>True</BuildTests>
</_MonoRuntime>
</ItemGroup>

Expand All @@ -91,15 +84,13 @@
<InstallBinaries>true</InstallBinaries>
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">Linux/</InstallPath>
<PackageOptions>llvm-llvm32_CC="$(HostCc32)" llvm-llvm32_CXX="$(HostCxx32)"</PackageOptions>
</_LlvmRuntime>

<_LlvmRuntime Include="llvm64" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':arm64:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':x86_64:'))) And '$(HostBits)' == '64' ">
<ExeSuffix></ExeSuffix>
<InstallBinaries>true</InstallBinaries>
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">Darwin/</InstallPath>
<InstallPath Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">Linux/</InstallPath>
<PackageOptions>llvm-llvm64_CC="$(HostCc64)" llvm-llvm64_CXX="$(HostCxx64)"</PackageOptions>
</_LlvmRuntime>

<_LlvmRuntime Include="llvmwin32" Condition=" ($(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))) ">
Expand Down
Loading