Bump to mono/mono/2018-06@cda3acc5 (#2301)
Bumps to mono/llvm/release_60@8415fd85.
$ git diff --shortstat ab3c897d..cda3acc5 # mono
23 files changed, 346 insertions(+), 213 deletions(-)
$ git diff --shortstat 117a508c..8415fd85 # llvm
2 files changed, 15 insertions(+), 1 deletion(-)
Reverts commit 84952df6, re-enabling Mono archive downloads; see also
commit f970cd50 for details.
Hopefully *this* time it'll actually build! ;-)
This commit is contained in:
Ludovic Henry
Jonathan Pryor
Родитель
ca4283248a
Коммит
b3a7bbab8d
|
|
@ -16,6 +16,9 @@ namespace Xamarin.Android.BuildTools.PrepTasks
|
|||
[Output]
|
||||
public string AbbreviatedCommitHash { get; set; }
|
||||
|
||||
[Output]
|
||||
public string CommitHash { get; set; }
|
||||
|
||||
protected override bool LogTaskMessages {
|
||||
get { return false; }
|
||||
}
|
||||
|
|
@ -38,17 +41,18 @@ namespace Xamarin.Android.BuildTools.PrepTasks
|
|||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 117a508c0ca65b754008e94e3eb97e77edfef04b
|
||||
Subproject commit 8415fd85ce1570d4ba0a735bc4e968735a67ca37
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit ab3c897d6851ccf75e840d8b767aafa0d0a32d53
|
||||
Subproject commit cda3acc57cd40c666b2fea8391cdd68c8d4eb10c
|
||||
|
|
@ -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>
|
||||
|
|
@ -60,27 +64,16 @@
|
|||
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
|
||||
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
|
||||
</_MonoRuntime>
|
||||
<_MonoRuntime Include="host-Darwin" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Darwin:'))">
|
||||
<_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>dylib</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>
|
||||
<_MonoRuntime Include="host-Linux" Condition="$(AndroidSupportedHostJitAbisForConditionalChecks.Contains (':Linux:'))">
|
||||
<Strip>strip</Strip>
|
||||
<StripFlags>-S</StripFlags>
|
||||
<OutputRuntimeFilename>libmonosgen-2.0</OutputRuntimeFilename>
|
||||
<NativeLibraryExtension>so</NativeLibraryExtension>
|
||||
<OutputProfilerFilename>libmono-profiler-log</OutputProfilerFilename>
|
||||
<OutputAotProfilerFilename>libmono-profiler-aot</OutputAotProfilerFilename>
|
||||
<OutputMonoBtlsFilename></OutputMonoBtlsFilename>
|
||||
<OutputMonoPosixHelperFilename>libMonoPosixHelper</OutputMonoPosixHelperFilename>
|
||||
<BuildTests>True</BuildTests>
|
||||
</_MonoRuntime>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
@ -91,7 +84,6 @@
|
|||
<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' ">
|
||||
|
|
@ -99,7 +91,6 @@
|
|||
<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:'))) ">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.DownloadUri" />
|
||||
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
|
||||
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\xa-prep-tasks.dll" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
|
||||
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
|
||||
<PropertyGroup>
|
||||
<_SourceTopDir>..\..</_SourceTopDir>
|
||||
|
|
@ -23,15 +25,15 @@
|
|||
</ItemGroup>
|
||||
<UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.GetNugetPackageBasePath" />
|
||||
<ItemGroup>
|
||||
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
|
||||
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoProfileToolsDir)\%(Identity)')" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<_MonoDocInstalledItems Include="@(MonoDocCopyItem->'$(_MSBuildDir)\%(Identity)')" />
|
||||
<_MonoDocInstalledItems Include="$(_MSBuildDir)\mdoc.exe" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<_MonoProfileDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid</_MonoProfileDir>
|
||||
<_MonoOutputDir>$(MonoSourceFullPath)\mcs\class\lib\monodroid_tools</_MonoOutputDir>
|
||||
<_MonoProfileDir>$(MonoSourceFullPath)\sdks\out\android-bcl\monodroid</_MonoProfileDir>
|
||||
<_MonoProfileToolsDir>$(MonoSourceFullPath)\sdks\out\android-bcl\monodroid_tools</_MonoProfileToolsDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<_MonoSdksConfiguration Condition=" '$(Configuration)' == 'Release' ">release</_MonoSdksConfiguration>
|
||||
|
|
@ -44,15 +46,15 @@
|
|||
<_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory)</_MonoSdksMxePrefixDir>
|
||||
<_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe</_MonoSdksMxeSrc>
|
||||
|
||||
<_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true IGNORE_PROVISION_LLVM=true ANDROID_TOOLCHAIN_DIR="$(_MonoSdksAndroidToolchainDir)" ANDROID_TOOLCHAIN_CACHE_DIR="$(_MonoSdksAndroidToolchainCacheDir)" ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX_DIR="$(_MonoSdksMxePrefixDir)" MXE_SRC="$(_MonoSdksMxeSrc)"</_MonoSdksParameters>
|
||||
<_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=true IGNORE_PROVISION_ANDROID=true ANDROID_TOOLCHAIN_DIR="$(_MonoSdksAndroidToolchainDir)" ANDROID_TOOLCHAIN_CACHE_DIR="$(_MonoSdksAndroidToolchainCacheDir)" ANDROID_TOOLCHAIN_PREFIX="$(_MonoSdksAndroidToolchainPrefix)" LLVM_SRC="$(_MonoSdksLlvmSrc)" MXE_PREFIX_DIR="$(_MonoSdksMxePrefixDir)" MXE_SRC="$(_MonoSdksMxeSrc)"</_MonoSdksParameters>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ForceBuildDependsOn>
|
||||
_BuildLlvm;
|
||||
_InstallLlvm;
|
||||
_DownloadArchive;
|
||||
_Autogen;
|
||||
_BuildRuntimes;
|
||||
_Build;
|
||||
_InstallRuntimes;
|
||||
_InstallLlvm;
|
||||
_InstallBcl;
|
||||
_InstallCilStrip;
|
||||
_InstallMonoDoc;
|
||||
|
|
@ -109,11 +111,11 @@
|
|||
<_MonoUtility Include="mkbundle.exe" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<_MonoUtilitySource Include="@(_MonoUtility->'$(_MonoOutputDir)\%(Identity)')" />
|
||||
<_MonoUtilitySource Include="@(_MonoUtility->'$(_MonoProfileToolsDir)\%(Identity)')" />
|
||||
<_MonoUtilityDest Include="@(_MonoUtility->'$(_MSBuildDir)\%(Identity)')" />
|
||||
<_MonoUtilitySource
|
||||
Condition=" '$(_DebugFileExt)' == '.mdb'"
|
||||
Include="@(_MonoUtility->'$(_MonoOutputDir)\%(Identity).mdb')"
|
||||
Include="@(_MonoUtility->'$(_MonoProfileToolsDir)\%(Identity).mdb')"
|
||||
/>
|
||||
<_MonoUtilityDest
|
||||
Condition=" '$(_DebugFileExt)' == '.mdb'"
|
||||
|
|
@ -121,7 +123,7 @@
|
|||
/>
|
||||
<_MonoUtilitySource
|
||||
Condition=" '$(_DebugFileExt)' == '.pdb'"
|
||||
Include="@(_MonoUtility->'$(_MonoOutputDir)\%(Filename).pdb')"
|
||||
Include="@(_MonoUtility->'$(_MonoProfileToolsDir)\%(Filename).pdb')"
|
||||
/>
|
||||
<_MonoUtilityDest
|
||||
Condition=" '$(_DebugFileExt)' == '.pdb'"
|
||||
|
|
@ -154,21 +156,9 @@
|
|||
<_LlvmTargetBinary Include="@(_LlvmRuntime->'$(_MSBuildDir)\%(InstallPath)llc%(ExeSuffix)')" Condition=" '%(_LlvmRuntime.InstallBinaries)' == 'true' " />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_BuildLlvm"
|
||||
Condition=" '@(_LlvmRuntime)' != '' "
|
||||
DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;_PrepareLlvmItems"
|
||||
Inputs="$(LlvmSourceFullPath)\CMakeLists.txt"
|
||||
Outputs="@(_LlvmSourceBinary)">
|
||||
<Exec
|
||||
Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_LlvmRuntime->'package-llvm-%(Identity)', ' ') $(_MonoSdksParameters) @(_LlvmRuntime->'%(PackageOptions)', ' ')"
|
||||
IgnoreStandardErrorWarningFormat="True"
|
||||
WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
<Target Name="_InstallLlvm"
|
||||
DependsOnTargets="_BuildLlvm"
|
||||
DependsOnTargets="_Build"
|
||||
Inputs="@(_LlvmSourceBinary)"
|
||||
Outputs="@(_LlvmTargetBinary)"
|
||||
Condition=" '@(_LlvmRuntime)' != '' ">
|
||||
|
|
@ -189,6 +179,18 @@
|
|||
/>
|
||||
</Target>
|
||||
|
||||
<Target Name="_GetMonoGitCommitHash">
|
||||
<GitCommitHash
|
||||
WorkingDirectory="$(MonoSourceFullPath)"
|
||||
ToolPath="$(GitToolPath)"
|
||||
ToolExe="$(GitToolExe)" >
|
||||
<Output TaskParameter="CommitHash" PropertyName="_MonoGitCommitHash" />
|
||||
</GitCommitHash>
|
||||
<PropertyGroup>
|
||||
<_MonoArchiveName>android-$(_MonoSdksConfiguration)-$(_MonoGitCommitHash)-$(HostOS)</_MonoArchiveName>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_GetRuntimesOutputItems">
|
||||
<ItemGroup>
|
||||
<_RuntimeSource
|
||||
|
|
@ -280,26 +282,41 @@
|
|||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_BuildRuntimes"
|
||||
Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' "
|
||||
DependsOnTargets="_GetRuntimesOutputItems"
|
||||
Outputs="@(_RuntimeSource);@(_RuntimeBinarySource);@(_CrossRuntimeBinarySource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_RuntimeEglibHeaderSource);@(_MonoBtlsSource);@(_BclTestOutput)">
|
||||
<Exec
|
||||
Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_MonoRuntime->'package-android-%(Identity)', ' ') @(_MonoCrossRuntime->'package-android-%(Identity)', ' ') $(_MonoSdksParameters)"
|
||||
IgnoreStandardErrorWarningFormat="True"
|
||||
WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
|
||||
<Target Name="_DownloadArchive"
|
||||
DependsOnTargets="_GetMonoGitCommitHash"
|
||||
Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') " >
|
||||
<MakeDir
|
||||
Directories="$(MonoSourceFullPath)\sdks\out"
|
||||
/>
|
||||
<DownloadUri
|
||||
SourceUris="https://xamjenkinsartifact.blob.core.windows.net/mono-sdks/$(_MonoArchiveName).tar.gz"
|
||||
DestinationFiles="$(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz"
|
||||
ContinueOnError="True"
|
||||
/>
|
||||
<Exec
|
||||
Condition=" '%(_MonoRuntime.BuildTests)' == 'True' "
|
||||
Command="make DISABLE_IOS=1 $(MakeConcurrency) -C android-%(_MonoRuntime.Identity)-$(_MonoSdksConfiguration) -C runtime test"
|
||||
Condition=" Exists('$(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz') "
|
||||
Command="tar -xvf $(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz"
|
||||
IgnoreStandardErrorWarningFormat="True"
|
||||
WorkingDirectory="$(MonoSourceFullPath)\sdks\out"
|
||||
/>
|
||||
<Touch
|
||||
Condition=" Exists('$(AndroidToolchainCacheDirectory)\$(_MonoArchiveName).tar.gz') "
|
||||
Files="$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download"
|
||||
AlwaysCreate="True"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
<Target Name="_Build"
|
||||
Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' Or '@(_MonoBcl)' != '' Or '@(_LlvmRuntime)' != '' "
|
||||
DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;_GetRuntimesOutputItems;_PrepareLlvmItems;_GetMonoGitCommitHash;_DownloadArchive"
|
||||
Inputs="$(LlvmSourceFullPath)\CMakeLists.txt;$(MonoSourceFullPath)\autogen.sh"
|
||||
Outputs="@(_RuntimeSource);@(_RuntimeBinarySource);@(_CrossRuntimeBinarySource);@(_ProfilerSource);@(_MonoPosixHelperSource);@(_RuntimeEglibHeaderSource);@(_MonoBtlsSource);@(_BclTestOutput);@(_BclProfileItems);@(_LlvmSourceBinary)">
|
||||
<Exec
|
||||
Condition=" !Exists('$(MonoSourceFullPath)\sdks\out\.stamp-$(_MonoArchiveName)-download') "
|
||||
Command="make DISABLE_IOS=1 $(MakeConcurrency) @(_MonoRuntime->'package-android-%(Identity)', ' ') @(_MonoCrossRuntime->'package-android-%(Identity)', ' ') @(_MonoBcl->'package-android-%(Identity)', ' ') @(_LlvmRuntime->'provision-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
|
||||
IgnoreStandardErrorWarningFormat="True"
|
||||
WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
|
||||
/>
|
||||
<Exec
|
||||
Condition=" '%(MonoTestAssembly.TestType)' == 'xunit' "
|
||||
Command="make DISABLE_IOS=1 -C $(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath) xunit-test-local"
|
||||
WorkingDirectory="$(MonoSourceFullPath)"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
<Target Name="_InstallRuntimes"
|
||||
|
|
@ -308,16 +325,13 @@
|
|||
Outputs="@(_InstallRuntimeOutput);@(_InstallRuntimeBinaryOutput);@(_InstallCrossRuntimeBinaryOutput);@(_InstallProfilerOutput);@(_InstallMonoPosixHelperOutput);@(_RuntimeEglibHeaderOutput)">
|
||||
<ItemGroup>
|
||||
<_BclTestAssemblyReference Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'reference'" />
|
||||
<_BclTestAssemblyXUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'xunit'" />
|
||||
<_BclTestAssemblyNUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == ''" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" Condition="Exists('@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Filename).pdb')" />
|
||||
<_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" />
|
||||
<_BclTestAssembly Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == '' Or '%(MonoTestAssembly.TestType)' == 'xunit' " />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(_MonoProfileDir)\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(_MonoProfileDir)\%(Filename).pdb')" Condition="Exists('@(_BclTestAssemblyReference->'$(_MonoProfileDir)\%(Filename).pdb')')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssembly->'$(_MonoProfileDir)\tests\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(_BclTestAssembly->'$(_MonoProfileDir)\tests\%(Filename).pdb')" />
|
||||
<_BclTestAssemblySource Include="@(MonoTestRunner->'$(_MonoProfileDir)\%(Identity)')" />
|
||||
<_BclTestAssemblySource Include="@(MonoTestRunner->'$(_MonoProfileDir)\%(Filename).pdb')" />
|
||||
</ItemGroup>
|
||||
<Copy
|
||||
SourceFiles="@(_BclTestAssemblySource)"
|
||||
|
|
@ -459,19 +473,19 @@
|
|||
<Touch Files="@(_InstallMonoPosixHelperOutput);@(_InstallUnstrippedMonoPosixHelperOutput)" />
|
||||
</Target>
|
||||
<ItemGroup>
|
||||
<_MonoCilStripSource Include="$(_MonoOutputDir)\mono-cil-strip.exe" />
|
||||
<_MonoCilStripSource Include="$(_MonoProfileToolsDir)\mono-cil-strip.exe" />
|
||||
<_MonoCilStripDest Include="$(_MSBuildDir)\cil-strip.exe" />
|
||||
<_MonoCilStripSource
|
||||
Condition=" '$(_DebugFileExt)' == '.mdb' "
|
||||
Include="$(_MonoOutputDir)\mono-cil-strip.exe.mdb"
|
||||
Include="$(_MonoProfileToolsDir)\mono-cil-strip.exe.mdb"
|
||||
/>
|
||||
<_MonoCilStripDest
|
||||
Condition=" '$(_DebugFileExt)' == '.mdb' "
|
||||
Include="$(_MonoOutputDir)\cil-strip.exe.mdb"
|
||||
Include="$(_MonoProfileToolsDir)\cil-strip.exe.mdb"
|
||||
/>
|
||||
<_MonoCilStripSource
|
||||
Condition=" '$(_DebugFileExt)' == '.pdb' "
|
||||
Include="$(_MonoOutputDir)\mono-cil-strip.pdb"
|
||||
Include="$(_MonoProfileToolsDir)\mono-cil-strip.pdb"
|
||||
/>
|
||||
<_MonoCilStripDest
|
||||
Condition=" '$(_DebugFileExt)' == '.pdb' "
|
||||
|
|
@ -488,7 +502,7 @@
|
|||
/>
|
||||
</Target>
|
||||
<Target Name="_InstallMonoDoc"
|
||||
Inputs="@(_MonoDocCopyItems);$(_MonoOutputDir)\mdoc.exe"
|
||||
Inputs="@(_MonoDocCopyItems);$(_MonoProfileToolsDir)\mdoc.exe"
|
||||
Outputs="@(_MonoDocInstalledItems)">
|
||||
<MakeDir Directories="$(_MSBuildDir)" />
|
||||
<Copy
|
||||
|
|
@ -496,7 +510,7 @@
|
|||
DestinationFolder="$(_MSBuildDir)"
|
||||
/>
|
||||
<Exec
|
||||
Command="$(RemapAssemblyRefTool) "$(_MonoOutputDir)\mdoc.exe" "$(_MSBuildDir)\mdoc.exe" Mono.Cecil "..\..\bin\Build$(Configuration)\Xamarin.Android.Cecil.dll""
|
||||
Command="$(RemapAssemblyRefTool) "$(_MonoProfileToolsDir)\mdoc.exe" "$(_MSBuildDir)\mdoc.exe" Mono.Cecil "..\..\bin\Build$(Configuration)\Xamarin.Android.Cecil.dll""
|
||||
/>
|
||||
<Touch
|
||||
Files="@(_MonoDocInstalledItems)"
|
||||
|
|
@ -512,7 +526,7 @@
|
|||
/>
|
||||
<ItemGroup>
|
||||
<_MonoUtilityExe Include="@(_MonoUtility)">
|
||||
<Source>$(_MonoOutputDir)\%(Identity)</Source>
|
||||
<Source>$(_MonoProfileToolsDir)\%(Identity)</Source>
|
||||
<Dest>$(_MSBuildDir)\%(Identity)</Dest>
|
||||
</_MonoUtilityExe>
|
||||
</ItemGroup>
|
||||
|
|
@ -606,13 +620,13 @@
|
|||
AfterTargets="Clean">
|
||||
<Exec
|
||||
Condition=" '@(_MonoRuntime)' != '' Or '@(_MonoCrossRuntime)' != '' Or '@(_LlvmRuntime)' != '' "
|
||||
Command="make $(MakeConcurrency) @(_MonoRuntime->'clean-android-%(Identity)', ' ') @(_MonoCrossRuntime->'clean-android-%(Identity)', ' ') @(_LlvmRuntime->'clean-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
|
||||
Command="make $(MakeConcurrency) @(_MonoRuntime->'clean-android-%(Identity)', ' ') @(_MonoCrossRuntime->'clean-android-%(Identity)', ' ') @(_MonoBcl->'clean-android-%(Identity)', ' ') @(_LlvmRuntime->'clean-llvm-%(Identity)', ' ') $(_MonoSdksParameters)"
|
||||
IgnoreStandardErrorWarningFormat="True"
|
||||
WorkingDirectory="$(MonoSourceFullPath)\sdks\builds"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
<Target Name="CoreCompile"
|
||||
DependsOnTargets="_BuildRuntimes">
|
||||
DependsOnTargets="_Build">
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче