From f7f8804131160342fe6053a1ed8aa6efe2d5ee39 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 15 Nov 2023 14:12:55 -0500 Subject: [PATCH 1/3] [build] Remove mingw and mman-win23 dependencies Context: https://github.com/xamarin/xamarin-android/commit/6ba99924c96b81fde6a545869d67dfe3c2943e06 Updates xaprepare and other relevant build tools to remove installation of and reference to dependencies required to compile Host OS runtimes such as mingw and mman-win32. These runtime builds were disabled in commit 6ba9992, and the dependencies are no longer required. --- .github/dependabot.yml | 1 - .gitmodules | 4 - Configuration.Override.props.in | 14 -- Configuration.props | 32 --- Documentation/building/configuration.md | 19 -- Documentation/building/unix/instructions.md | 3 +- build-tools/scripts/generate-os-info | 201 ------------------ build-tools/scripts/mingw-32.cmake.in | 38 ---- build-tools/scripts/mingw-64.cmake.in | 38 ---- build-tools/xaprepare/global.json | 6 + .../xaprepare/Application/Context.cs | 133 ------------ .../Application/GeneratedMakeRulesFile.cs | 3 - .../xaprepare/Application/KnownProperties.cs | 7 - .../xaprepare/Application/MonoCrossRuntime.cs | 34 --- .../xaprepare/Application/MonoHostRuntime.cs | 56 ----- .../Application/MonoRuntimesHelpers.cs | 40 ---- .../Application/Properties.Defaults.cs.in | 7 - .../xaprepare/Application/Utilities.cs | 1 - .../ConfigAndData/Configurables.Unix.cs | 6 - .../xaprepare/ConfigAndData/Configurables.cs | 13 -- .../Dependencies/Linux.DebianCommon.cs | 3 - .../ConfigAndData/Dependencies/MacOS.cs | 6 - .../xaprepare/ConfigAndData/Runtimes.Code.cs | 18 +- .../xaprepare/ConfigAndData/Runtimes.cs | 90 -------- build-tools/xaprepare/xaprepare/Main.cs | 3 - .../xaprepare/OperatingSystems/NoOS.cs | 5 - .../xaprepare/OperatingSystems/OS.cs | 121 ----------- .../xaprepare/OperatingSystems/Unix.cs | 84 -------- .../Configuration.OperatingSystem.props.in | 9 - .../Scenarios/Scenario_Standard.MacOS.cs | 16 -- .../Scenarios/Scenario_Standard.Unix.cs | 22 -- .../xaprepare/Scenarios/Scenario_Standard.cs | 2 - .../Steps/Step_BuildMingwDependencies.cs | 143 ------------- .../Steps/Step_BuildMonoRuntimes.Unix.cs | 7 - .../Step_ChangeLibMonoSgenDylibID.MacOS.cs | 51 ----- .../xaprepare/Steps/Step_GenerateFiles.cs | 30 --- .../Steps/Step_InstallMonoRuntimes.cs | 5 - .../ThirdPartyNotices/witwall_mman.cs | 41 ---- .../xaprepare/xaprepare/xaprepare.targets | 7 - external/mman-win32 | 1 - 40 files changed, 8 insertions(+), 1312 deletions(-) delete mode 100755 build-tools/scripts/generate-os-info delete mode 100644 build-tools/scripts/mingw-32.cmake.in delete mode 100644 build-tools/scripts/mingw-64.cmake.in create mode 100644 build-tools/xaprepare/global.json delete mode 100644 build-tools/xaprepare/xaprepare/Application/MonoCrossRuntime.cs delete mode 100644 build-tools/xaprepare/xaprepare/Application/MonoHostRuntime.cs delete mode 100644 build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.MacOS.cs delete mode 100644 build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.Unix.cs delete mode 100644 build-tools/xaprepare/xaprepare/Steps/Step_BuildMingwDependencies.cs delete mode 100644 build-tools/xaprepare/xaprepare/Steps/Step_ChangeLibMonoSgenDylibID.MacOS.cs delete mode 100644 build-tools/xaprepare/xaprepare/ThirdPartyNotices/witwall_mman.cs delete mode 160000 external/mman-win32 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fa93c1e867c..9c3f02fab8f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,7 +17,6 @@ updates: - dependency-name: "external/apksig" - dependency-name: "external/debugger-libs" - dependency-name: "external/lz4" - - dependency-name: "external/mman-win32" - dependency-name: "external/nrefactory" - dependency-name: "external/opentk" - dependency-name: "external/robin-map" diff --git a/.gitmodules b/.gitmodules index ab79ccab656..a98c09ab928 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,10 +14,6 @@ path = external/lz4 url = https://github.com/lz4/lz4.git branch = release -[submodule "external/mman-win32"] - path = external/mman-win32 - url = https://github.com/alitrack/mman-win32.git - branch = master [submodule "external/nrefactory"] path = external/nrefactory url = https://github.com/xamarin/NRefactory.git diff --git a/Configuration.Override.props.in b/Configuration.Override.props.in index 722b508470d..e60799fc0c5 100644 --- a/Configuration.Override.props.in +++ b/Configuration.Override.props.in @@ -38,20 +38,6 @@ - win-x86_64 --> armeabi-v7a:win-armeabi-v7a:arm64:win-arm64:x86:win-x86:x86_64:win-x86_64 - - Darwin:mxe-Win64 - - - clang - clang++ $(HOME)\android-archives diff --git a/Configuration.props b/Configuration.props index 5c4a2f321fe..fcdce84495d 100644 --- a/Configuration.props +++ b/Configuration.props @@ -69,15 +69,6 @@ $(BuildOutputDirectory)lib\packs\Microsoft.Android.Runtime.$(AndroidApiLevel).android-x64\$(AndroidPackVersion)\runtimes\android-x64\ $(BuildOutputDirectory)lib\packs\$(MicrosoftAndroidSdkPackName)\$(AndroidPackVersion)\ $(MicrosoftAndroidSdkPackDir)\tools\ - $(MSBuildThisFileDirectory)\bin\Build$(Configuration)\mingw-deps - $(HostCc64) - $(HostCxx64) - $(HostCc32) - $(HostCxx32) - cc - c++ - cc - c++ -j$(HostCpuCount) mono --debug=casts @@ -102,7 +93,6 @@ $(MSBuildThisFileDirectory)build-tools\gradle $(GradleHome)\gradlew --stacktrace --no-daemon - $(HostOS) armeabi-v7a:arm64:x86:x86_64:win-armeabi-v7a:win-arm64:win-x86:win-x86_64 armeabi-v7a:arm64:x86:x86_64 armeabi-v7a:arm64-v8a:x86:x86_64 @@ -114,11 +104,6 @@ False True $(MSBuildThisFileDirectory)external\opentk - \usr - $(HostHomebrewPrefix)\opt\mingw-zlib\usr - $(MingwZlibRootDirectory)\i686-w64-mingw32 - $(MingwZlibRootDirectory)\x86_64-w64-mingw32 - libz.a $(MSBuildThisFileDirectory)external\sqlite $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)src-ThirdParty\ @@ -147,10 +132,6 @@ <_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled $(_TestsProfiledAotName)$(_TestsAotName) - - i686-w64-mingw32 - x86_64-w64-mingw32 - 1.8 1.8 @@ -192,19 +173,6 @@ $(MSBuildThisFileDirectory)bin/Build$(Configuration)/SourceLink.json - - - $(AndroidSupportedHostJitAbis) - $(AndroidSupportedHostJitAbisForConditionalChecks): - :$(AndroidSupportedHostJitAbisForConditionalChecks) - $(AndroidSupportedHostJitAbis.Split(':')) - - - -