Skip to content

Commit

Permalink
[build] Remove the mono bundle dependency (#8517)
Browse files Browse the repository at this point in the history
Context: b830f57
Context: 5daf102
Context: a831d62
Context: 8f33823

All of the dependencies we had on the contents of the mono archive from
commit mono/mono@6dd9def57ce have been removed from main.  We can now
remove all of the xaprepare sources that were used to download, prepare,
and install components from the mono bundle.
  • Loading branch information
pjcollins authored Nov 28, 2023
1 parent 65f15fd commit c0aefea
Show file tree
Hide file tree
Showing 67 changed files with 47 additions and 4,248 deletions.
1 change: 0 additions & 1 deletion .external
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
xamarin/monodroid:main@c5f1e77bc732dc660090a8d59048f07de846ccd7
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
1 change: 0 additions & 1 deletion Configuration.Override.props.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@
<!-- These must be FULL PATHS -->
<AndroidToolchainCacheDirectory>$(HOME)\android-archives</AndroidToolchainCacheDirectory>
<AndroidToolchainDirectory>$(HOME)\android-toolchain</AndroidToolchainDirectory>
<AndroidMxeInstallPrefix>$(AndroidToolchainDirectory)\mxe</AndroidMxeInstallPrefix>
</PropertyGroup>
</Project>
3 changes: 0 additions & 3 deletions Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
<AndroidPreviousFrameworkVersion Condition=" '$(AndroidPreviousFrameworkVersion)' == '' ">v1.0</AndroidPreviousFrameworkVersion>
<AndroidToolchainCacheDirectory Condition=" '$(AndroidToolchainCacheDirectory)' == '' ">$(HOME)\android-archives</AndroidToolchainCacheDirectory>
<AndroidToolchainDirectory Condition=" '$(AndroidToolchainDirectory)' == '' ">$(HOME)\android-toolchain</AndroidToolchainDirectory>
<AndroidMxeInstallPrefix Condition=" '$(HostOS)' == 'Linux' ">\usr</AndroidMxeInstallPrefix>
<AndroidMxeInstallPrefix Condition=" '$(HostOS)' == 'Darwin' ">$(HostHomebrewPrefix)</AndroidMxeInstallPrefix>
<AndroidSdkDirectory Condition=" '$(AndroidSdkDirectory)' == '' And Exists($(ANDROID_SDK_ROOT)) ">$(ANDROID_SDK_ROOT)</AndroidSdkDirectory>
<AndroidSdkDirectory Condition=" '$(AndroidSdkDirectory)' == '' ">$(AndroidToolchainDirectory)\sdk</AndroidSdkDirectory>
<AndroidNdkDirectory Condition=" '$(AndroidNdkDirectory)' == '' And Exists($(ANDROID_NDK_LATEST_HOME)) ">$(ANDROID_NDK_LATEST_HOME)</AndroidNdkDirectory>
Expand Down Expand Up @@ -140,7 +138,6 @@
<Java8SdkDirectory Condition=" '$(Java8SdkDirectory)' == '' ">$(JavaSdkDirectory)</Java8SdkDirectory>
</PropertyGroup>
<PropertyGroup>
<AndroidMxeFullPath Condition=" '$(AndroidMxeInstallPrefix)' != '' ">$([System.IO.Path]::GetFullPath ('$(AndroidMxeInstallPrefix)'))</AndroidMxeFullPath>
<AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>
<AndroidSdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidSdkDirectory)'))</AndroidSdkFullPath>
<JavaInteropFullPath>$([System.IO.Path]::GetFullPath ('$(JavaInteropSourceDirectory)'))</JavaInteropFullPath>
Expand Down
12 changes: 0 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,6 @@ ifneq ($(PREPARE_AUTOPROVISION),0)
_PREPARE_ARGS += --auto-provision=yes --auto-provision-uses-sudo=yes
endif

ifeq ($(OS_NAME),Darwin)
ifeq ($(HOMEBREW_PREFIX),)
HOMEBREW_PREFIX ?= $(shell brew --prefix)
endif
else
HOMEBREW_PREFIX := $prefix
endif

ifeq ($(wildcard Configuration.OperatingSystem.props),)
PREPARE_MSBUILD_FLAGS += "/p:HostHomebrewPrefix=$(HOMEBREW_PREFIX)"
endif

ifneq ($(PREPARE_SCENARIO),)
_PREPARE_ARGS += -s:"$(PREPARE_SCENARIO)"
endif
Expand Down
1 change: 0 additions & 1 deletion build-tools/scripts/XAVersionInfo.targets
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" />
<Import Project="..\..\bin\Build$(Configuration)\MonoGitHash.props" Condition="Exists('..\..\bin\Build$(Configuration)\MonoGitHash.props')" />
<Target Name="_GetSubmodulesVersionInfo">
<ItemGroup>
<!-- If anything changes in this list, make sure to update:
Expand Down
12 changes: 0 additions & 12 deletions build-tools/xaprepare/xaprepare/Application/Abi.Bitness.cs

This file was deleted.

12 changes: 0 additions & 12 deletions build-tools/xaprepare/xaprepare/Application/Abi.OS.cs

This file was deleted.

119 changes: 0 additions & 119 deletions build-tools/xaprepare/xaprepare/Application/Abi.cs

This file was deleted.

11 changes: 0 additions & 11 deletions build-tools/xaprepare/xaprepare/Application/AbiType.cs

This file was deleted.

65 changes: 0 additions & 65 deletions build-tools/xaprepare/xaprepare/Application/BclFile.cs

This file was deleted.

23 changes: 0 additions & 23 deletions build-tools/xaprepare/xaprepare/Application/BclFileTarget.cs

This file was deleted.

8 changes: 0 additions & 8 deletions build-tools/xaprepare/xaprepare/Application/BclFileType.cs

This file was deleted.

30 changes: 0 additions & 30 deletions build-tools/xaprepare/xaprepare/Application/BuildInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ partial class BuildInfo : AppObject
public string NDKMinimumApiAvailable { get; private set; } = String.Empty;

public string VersionHash { get; private set; } = String.Empty;
public string MonoHash { get; private set; } = String.Empty;
public string FullMonoHash { get; private set; } = String.Empty;

public string XACommitHash { get; private set; } = String.Empty;
public string XABranch { get; private set; } = String.Empty;

Expand All @@ -37,8 +34,6 @@ public async Task GatherGitInfo (Context context)
Log.StatusLine ("Determining basic build information", ConsoleColor.DarkGreen);
await DetermineLastVersionChangeCommit (context);
Log.StatusLine ();
DetermineMonoHash (context);
Log.StatusLine ();
DetermineXACommitInfo (context);
}

Expand Down Expand Up @@ -113,31 +108,6 @@ public bool GatherNDKInfo (Context context)
return true;
}

void DetermineMonoHash (Context context)
{
GitRunner git = CreateGitRunner (context);

Log.StatusLine ($" {context.Characters.Bullet} Mono commit hash", ConsoleColor.Gray);
List<ExternalGitDependency> externalDependencies = ExternalGitDependency.GetDependencies (context, Configurables.Paths.ExternalGitDepsFilePath, quiet: true);
ExternalGitDependency? mono = externalDependencies.Where (
eg => eg != null &&
String.Compare ("mono", eg.Owner, StringComparison.Ordinal) == 0 &&
String.Compare ("mono", eg.Name, StringComparison.Ordinal) == 0).FirstOrDefault ();

FullMonoHash = (mono?.Commit ?? String.Empty).Trim ();
MonoHash = EnsureHash ("Mono", Utilities.ShortenGitHash (FullMonoHash));

string EnsureHash (string name, string hash)
{
if (String.IsNullOrEmpty (hash))
throw new InvalidOperationException ($"Unable to determine {name} commit hash");
Log.StatusLine (" Commit: ", hash, tailColor: ConsoleColor.Cyan);
Log.StatusLine ();

return hash;
}
}

async Task DetermineLastVersionChangeCommit (Context context)
{
Log.StatusLine ($" {context.Characters.Bullet} Commit of last version change", ConsoleColor.Gray);
Expand Down
Loading

0 comments on commit c0aefea

Please sign in to comment.