mirror of
https://github.com/godotengine/godot-mono-builds.git
synced 2026-01-03 01:48:53 +03:00
Compare commits
1 Commits
release-9f
...
release-95
| Author | SHA1 | Date | |
|---|---|---|---|
|
d6b37438d4 |
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
@@ -1,2 +0,0 @@
|
||||
patreon: godotengine
|
||||
custom: https://godotengine.org/donate
|
||||
30
.github/ISSUE_TEMPLATE/bug-report.md
vendored
30
.github/ISSUE_TEMPLATE/bug-report.md
vendored
@@ -1,30 +0,0 @@
|
||||
---
|
||||
name: Bug Report
|
||||
about: Report a bug with this repo.
|
||||
title: ''
|
||||
labels: bug
|
||||
assignees: neikeq
|
||||
|
||||
---
|
||||
|
||||
<!--
|
||||
Please search existing issues for potential duplicates before filing yours:
|
||||
https://github.com/godotengine/godot-csharp-visualstudio/issues?q=is%3Aissue
|
||||
|
||||
Only submit an issue if it is reproducible with the latest stable Godot version.
|
||||
-->
|
||||
|
||||
**OS/device including version:**
|
||||
<!-- Specify GPU model and drivers if graphics-related. -->
|
||||
|
||||
|
||||
**Issue description:**
|
||||
<!-- What happened, what was expected, and what went wrong. -->
|
||||
|
||||
|
||||
**Screenshots of issue:**
|
||||
<!--
|
||||
This section is optional.
|
||||
Drag in an image, or post an image with a link in the form of:
|
||||
|
||||
-->
|
||||
@@ -1,13 +0,0 @@
|
||||
---
|
||||
name: Feature / Enhancement Request
|
||||
about: Adding new features or improving existing ones.
|
||||
title: ''
|
||||
labels: enhancement
|
||||
assignees: neikeq
|
||||
|
||||
---
|
||||
|
||||
<!--
|
||||
Please search existing issues for potential duplicates before filing yours:
|
||||
https://github.com/godotengine/godot-csharp-visualstudio/issues?q=is%3Aissue
|
||||
-->
|
||||
6
.github/dependabot.yml
vendored
6
.github/dependabot.yml
vendored
@@ -1,6 +0,0 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
565
.github/workflows/build.yml
vendored
565
.github/workflows/build.yml
vendored
File diff suppressed because it is too large
Load Diff
15
.github/workflows/static_checks.yml
vendored
15
.github/workflows/static_checks.yml
vendored
@@ -1,15 +0,0 @@
|
||||
name: Continuous integration
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Lint repo
|
||||
run: |
|
||||
sudo apt-get update -qq
|
||||
sudo apt-get install -qq dos2unix recode
|
||||
bash ./format.sh
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,2 @@
|
||||
__pycache__/
|
||||
*.pyc
|
||||
.DS_Store
|
||||
|
||||
49
README.md
49
README.md
@@ -2,16 +2,7 @@
|
||||
|
||||
[](https://github.com/godotengine/godot-mono-builds/actions)
|
||||
|
||||
This repository contains scripts for building the Mono runtime to use with Godot Engine.
|
||||
|
||||
## Supported versions
|
||||
|
||||
The scripts are tested against specific versions of the toolchains used by Godot.
|
||||
While they may work with other versions, you might have issues applying patches or compiling, so we recommend using the versions below.
|
||||
|
||||
- Mono: 6.12.0.206.
|
||||
- Emscripten: 1.39.9.
|
||||
- Android NDK: 23.2.8568313
|
||||
This repository contains scripts for building the Mono runtime to use with Godot Engine
|
||||
|
||||
## Command-line options
|
||||
|
||||
@@ -19,9 +10,9 @@ While they may work with other versions, you might have issues applying patches
|
||||
|
||||
These scripts are based on the Mono [sdks](https://github.com/mono/mono/tree/master/sdks) makefiles, with some changes to work well with Godot. Some platforms or targets depend on files from the `sdks` directory in the Mono source repository. This directory may be missing from tarballs. If that's the case, cloning the git repository may be needed. [This table](https://www.mono-project.com/docs/about-mono/versioning/#mono-source-versioning) can be used to determine the branch for a specific version of Mono.
|
||||
|
||||
Some patches need to be applied to the Mono sources before building. This can be done by running `python3 ./patch_mono.py`.
|
||||
Some patches need to be applied to the Mono sources before building. This can be done by running `python ./patch_mono.py`.
|
||||
|
||||
Run `python3 SCRIPT.py --help` for the full list of command line options.
|
||||
Run `python SCRIPT.py --help` for the full list of command line options.
|
||||
|
||||
By default, the scripts will install the resulting files to `$HOME/mono-installs`.
|
||||
A custom output directory can be specified with the `--install-dir` option.
|
||||
@@ -36,22 +27,9 @@ export MONO_SOURCE_ROOT=$HOME/git/mono
|
||||
|
||||
### Notes
|
||||
- Python 3.7 or higher is required.
|
||||
- OSXCROSS is supported except for building the Mono cross-compilers.
|
||||
- OSXCROSS is supported expect for building the Mono cross-compilers.
|
||||
- Building on Windows is not supported. It's possible to use Cygwin or WSL (Windows Subsystem for Linux) but this hasn't been tested.
|
||||
|
||||
## Compiling Godot for Desktop with this Runtime
|
||||
|
||||
In order to compile mono into Godot for deskop you will need to first build for desktop (see 'Desktop' below), and then Base Class Libraries (see 'Base Class library' below).
|
||||
|
||||
Then run the 'copy-bcl' action of the same desktop script you ran configure and make on, specifying the same target platforms you used before. This will copy the bcl runtime into the runtime directories that the subsequent Godot build (using `copy_mono_root=yes`) expects to find them in.
|
||||
e.g.
|
||||
`./linux.py copy-bcl --target=x86 --target=x86_64`
|
||||
|
||||
Then you'll need to compile Godot using `copy_mono_root=yes`
|
||||
e.g.
|
||||
`scons -j6 target=release_debug tools=yes module_mono_enabled=yes copy_mono_root=yes mono_prefix="$HOME/mono-installs/desktop-linux-x86_64-release"`
|
||||
|
||||
|
||||
## Desktop
|
||||
|
||||
```bash
|
||||
@@ -72,18 +50,25 @@ _AOT cross-compilers for desktop platforms cannot be built with these scripts ye
|
||||
|
||||
## Android
|
||||
|
||||
Building for Android requires the Android SDK cmdline-tools to be installed in the Android SDK folder.
|
||||
|
||||
```bash
|
||||
# The default location for the Android SDK is $HOME/Android/Sdk. This step can be omitted if SDK is in this location.
|
||||
# These are the default values. This step can be omitted if SDK and NDK root are in this location.
|
||||
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
|
||||
export ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk-bundle
|
||||
|
||||
# Build the runtime for all supported Android ABIs.
|
||||
./android.py configure --target=all-targets
|
||||
./android.py make --target=all-targets
|
||||
./android.py configure --target=all-runtime
|
||||
./android.py make --target=all-runtime
|
||||
|
||||
# Build the AOT cross-compilers targeting all supported Android ABIs.
|
||||
./android.py configure --target=all-cross
|
||||
./android.py make --target=all-cross
|
||||
|
||||
# Build the AOT cross-compilers for Windows targeting all supported Android ABIs.
|
||||
./android.py configure --target=all-cross-win --mxe-prefix=/usr
|
||||
./android.py make --target=all-cross-win --mxe-prefix=/usr
|
||||
```
|
||||
|
||||
The option `--target=all-targets` is a shortcut for `--target=armv7 --target=arm64v8 --target=x86 --target=x86_64`.
|
||||
The option `--target=all-runtime` is a shortcut for `--target=armeabi-v7a --target=x86 --target=arm64-v8a --target=x86_64`. The equivalent applies for `all-cross` and `all-cross-win`.
|
||||
|
||||
# iOS
|
||||
|
||||
|
||||
455
android.py
455
android.py
@@ -1,72 +1,96 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
import os
|
||||
import os.path
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from os.path import join as path_join
|
||||
|
||||
from options import *
|
||||
from os_utils import *
|
||||
import runtime
|
||||
|
||||
|
||||
DEFAULT_NDK_VERSION = '23.2.8568313'
|
||||
DEFAULT_CMAKE_VERSION = '3.18.1'
|
||||
targets = ['armv7', 'arm64v8', 'x86', 'x86_64']
|
||||
runtime_targets = ['armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64']
|
||||
cross_targets = ['cross-arm', 'cross-arm64', 'cross-x86', 'cross-x86_64']
|
||||
cross_mxe_targets = ['cross-arm-win', 'cross-arm64-win', 'cross-x86-win', 'cross-x86_64-win']
|
||||
|
||||
|
||||
def get_min_api_version(target) -> str:
|
||||
# Minimum API version should be in sync with Godot's platform/android/detect.py.
|
||||
# Note: The minimum API version for arm64v8 and x86_64 is '21'
|
||||
min_versions = {
|
||||
'armv7': '19',
|
||||
'arm64v8': '21',
|
||||
'x86': '19',
|
||||
'x86_64': '21',
|
||||
}
|
||||
return min_versions[target]
|
||||
def is_cross(target) -> bool:
|
||||
return target in cross_targets or is_cross_mxe(target)
|
||||
|
||||
|
||||
def check_for_android_ndk(opts: AndroidOpts):
|
||||
if not os.path.exists(os.path.join(opts.android_sdk_root, 'ndk', opts.android_ndk_version)):
|
||||
print("Attempting to install Android NDK version %s" % (opts.android_ndk_version))
|
||||
sdkmanager = opts.android_sdk_root + "/cmdline-tools/latest/bin/sdkmanager"
|
||||
if os.path.exists(sdkmanager):
|
||||
sdk_args = "ndk;" + opts.android_ndk_version
|
||||
subprocess.check_call([sdkmanager, sdk_args])
|
||||
else:
|
||||
print("ERROR: Cannot find %s. Please ensure ANDROID_SDK_ROOT is correct and cmdline-tools are installed" % (sdkmanager))
|
||||
sys.exit(1)
|
||||
def is_cross_mxe(target) -> bool:
|
||||
return target in cross_mxe_targets
|
||||
|
||||
|
||||
def check_for_cmake(opts: AndroidOpts):
|
||||
if not os.path.exists(os.path.join(opts.android_sdk_root, 'cmake', opts.android_cmake_version)):
|
||||
print("Attempting to install CMake version %s" % (opts.android_cmake_version))
|
||||
sdkmanager = opts.android_sdk_root + "/cmdline-tools/latest/bin/sdkmanager"
|
||||
if os.path.exists(sdkmanager):
|
||||
sdk_args = "cmake;" + opts.android_cmake_version
|
||||
subprocess.check_call([sdkmanager, sdk_args])
|
||||
else:
|
||||
print("ERROR: Cannot find %s. Please ensure ANDROID_SDK_ROOT is correct and cmdline-tools are installed" % (sdkmanager))
|
||||
sys.exit(1)
|
||||
def android_autodetect_cmake(opts: AndroidOpts) -> str:
|
||||
from distutils.version import LooseVersion
|
||||
from os import listdir
|
||||
|
||||
sdk_cmake_basedir = path_join(opts.android_sdk_root, 'cmake')
|
||||
versions = []
|
||||
|
||||
for entry in listdir(sdk_cmake_basedir):
|
||||
if os.path.isdir(path_join(sdk_cmake_basedir, entry)):
|
||||
try:
|
||||
version = LooseVersion(entry)
|
||||
versions += [version]
|
||||
except ValueError:
|
||||
continue # Not a version folder
|
||||
|
||||
if len(versions) == 0:
|
||||
raise BuildError('Cannot auto-detect Android CMake version')
|
||||
|
||||
lattest_version = str(sorted(versions)[-1])
|
||||
print('Auto-detected Android CMake version: ' + lattest_version)
|
||||
|
||||
return lattest_version
|
||||
|
||||
|
||||
def get_api_version_or_min(opts: AndroidOpts, target: str) -> str:
|
||||
min_api_version = get_min_api_version(target)
|
||||
if int(opts.android_api_version) < int(min_api_version):
|
||||
print('WARNING: API version %s is less than the minimum for platform %s; using %s' % (opts.android_api_version, target, min_api_version))
|
||||
return min_api_version
|
||||
min_versions = { 'arm64-v8a': '21', 'x86_64': '21' }
|
||||
if target in min_versions and int(opts.android_api_version) < int(min_versions[target]):
|
||||
print('WARNING: %s is less than minimum platform for %s; using %s' % (opts.android_api_version, target, min_versions[target]))
|
||||
return min_versions[target]
|
||||
return opts.android_api_version
|
||||
|
||||
|
||||
def get_android_cmake_version(opts: AndroidOpts) -> str:
|
||||
return opts.android_cmake_version if opts.android_cmake_version != 'autodetect' else android_autodetect_cmake(opts)
|
||||
|
||||
|
||||
class AndroidTargetTable:
|
||||
archs = {
|
||||
'armeabi-v7a': 'arm',
|
||||
'arm64-v8a': 'arm64',
|
||||
'x86': 'x86',
|
||||
'x86_64': 'x86_64'
|
||||
}
|
||||
|
||||
abi_names = {
|
||||
'armeabi-v7a': 'arm-linux-androideabi',
|
||||
'arm64-v8a': 'aarch64-linux-android',
|
||||
'x86': 'i686-linux-android',
|
||||
'x86_64': 'x86_64-linux-android'
|
||||
}
|
||||
|
||||
host_triples = {
|
||||
'armeabi-v7a': 'armv5-linux-androideabi',
|
||||
'arm64-v8a': 'aarch64-linux-android',
|
||||
'x86': 'i686-linux-android',
|
||||
'x86_64': 'x86_64-linux-android'
|
||||
}
|
||||
|
||||
|
||||
def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
|
||||
extra_target_envs = {
|
||||
'armv7': {
|
||||
'armeabi-v7a': {
|
||||
'android-armeabi-v7a_CFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-march=armv7-a', '-mtune=cortex-a8', '-mfpu=vfp', '-mfloat-abi=softfp'],
|
||||
'android-armeabi-v7a_CXXFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-march=armv7-a', '-mtune=cortex-a8', '-mfpu=vfp', '-mfloat-abi=softfp'],
|
||||
'android-armeabi-v7a_LDFLAGS': ['-Wl,--fix-cortex-a8']
|
||||
},
|
||||
'arm64v8': {
|
||||
'arm64-v8a': {
|
||||
'android-arm64-v8a_CFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-DL_cuserid=9', '-DANDROID64'],
|
||||
'android-arm64-v8a_CXXFLAGS': ['-D__POSIX_VISIBLE=201002', '-DSK_RELEASE', '-DNDEBUG', '-UDEBUG', '-fpic', '-DL_cuserid=9', '-DANDROID64']
|
||||
},
|
||||
@@ -76,51 +100,55 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
|
||||
'android-x86_64_CXXFLAGS': ['-DL_cuserid=9']
|
||||
}
|
||||
}
|
||||
env.update(extra_target_envs[target])
|
||||
|
||||
if target == "armv7":
|
||||
target_triple = "armv7a-linux-androideabi"
|
||||
bin_utils = "arm-linux-androideabi"
|
||||
elif target == "arm64v8":
|
||||
target_triple = "aarch64-linux-android"
|
||||
bin_utils = target_triple
|
||||
elif target == "x86":
|
||||
target_triple = "i686-linux-android"
|
||||
bin_utils = target_triple
|
||||
elif target == "x86_64":
|
||||
target_triple = "x86_64-linux-android"
|
||||
bin_utils = target_triple
|
||||
if target in extra_target_envs:
|
||||
env.update(extra_target_envs[target])
|
||||
|
||||
if sys.platform.startswith("linux"):
|
||||
host_subpath = "linux-x86_64"
|
||||
elif sys.platform.startswith("darwin"):
|
||||
host_subpath = "darwin-x86_64"
|
||||
elif sys.platform.startswith("win"):
|
||||
if platform.machine().endswith("64"):
|
||||
host_subpath = "windows-x86_64"
|
||||
else:
|
||||
host_subpath = "windows"
|
||||
android_new_ndk = True
|
||||
|
||||
cmake_path = os.path.join(opts.android_sdk_root, 'cmake', opts.android_cmake_version, 'bin')
|
||||
ndk_path = os.path.join(opts.android_sdk_root, 'ndk', opts.android_ndk_version)
|
||||
toolchain_path = os.path.join(ndk_path, 'toolchains/llvm/prebuilt', host_subpath)
|
||||
compiler_path = os.path.join(toolchain_path, 'bin')
|
||||
compiler_wrapper = target_triple + env['ANDROID_API_VERSION'] + '-'
|
||||
bin_utils_path = os.path.join(toolchain_path, bin_utils, 'bin')
|
||||
android_api = env['ANDROID_API_VERSION']
|
||||
with open(path_join(opts.android_ndk_root, 'source.properties')) as file:
|
||||
for line in file:
|
||||
line = line.strip()
|
||||
if line.startswith('Pkg.Revision ') or line.startswith('Pkg.Revision='):
|
||||
pkg_revision = line.split('=')[1].strip()
|
||||
mayor = int(pkg_revision.split('.')[0])
|
||||
android_new_ndk = mayor >= 18
|
||||
break
|
||||
|
||||
AR = os.path.join(compiler_path, 'llvm-ar')
|
||||
AS = os.path.join(bin_utils_path, 'as')
|
||||
CC = os.path.join(compiler_path, compiler_wrapper + 'clang')
|
||||
CXX = os.path.join(compiler_path, compiler_wrapper + 'clang++')
|
||||
LD = os.path.join(compiler_path, 'ld')
|
||||
arch = AndroidTargetTable.archs[target]
|
||||
abi_name = AndroidTargetTable.abi_names[target]
|
||||
host_triple = AndroidTargetTable.host_triples[target]
|
||||
api = env['ANDROID_API_VERSION']
|
||||
|
||||
toolchain_path = path_join(opts.android_toolchains_prefix, opts.toolchain_name_fmt % (target, api))
|
||||
|
||||
tools_path = path_join(toolchain_path, 'bin')
|
||||
name_fmt = abi_name + '-%s'
|
||||
|
||||
sdk_cmake_dir = path_join(opts.android_sdk_root, 'cmake', get_android_cmake_version(opts))
|
||||
if not os.path.isdir(sdk_cmake_dir):
|
||||
print('Android CMake directory \'%s\' not found' % sdk_cmake_dir)
|
||||
|
||||
AR = path_join(tools_path, name_fmt % 'ar')
|
||||
AS = path_join(tools_path, name_fmt % 'as')
|
||||
CC = path_join(tools_path, name_fmt % 'clang')
|
||||
CXX = path_join(tools_path, name_fmt % 'clang++')
|
||||
DLLTOOL = ''
|
||||
OBJDUMP = os.path.join(compiler_path, 'llvm-objdump')
|
||||
RANLIB = os.path.join(compiler_path, 'llvm-ranlib')
|
||||
CMAKE = os.path.join(cmake_path, 'cmake')
|
||||
STRIP = os.path.join(compiler_path, 'llvm-strip')
|
||||
CPP = CC + ' -E'
|
||||
CXXCPP = CXX + ' -E'
|
||||
LD = path_join(tools_path, name_fmt % 'ld')
|
||||
OBJDUMP = path_join(tools_path, name_fmt % 'objdump')
|
||||
RANLIB = path_join(tools_path, name_fmt % 'ranlib')
|
||||
CMAKE = path_join(sdk_cmake_dir, 'bin', 'cmake')
|
||||
STRIP = path_join(tools_path, name_fmt % 'strip')
|
||||
|
||||
CPP = path_join(tools_path, name_fmt % 'cpp')
|
||||
if not os.path.isfile(CPP):
|
||||
CPP = path_join(tools_path, (name_fmt % 'clang'))
|
||||
CPP += ' -E'
|
||||
|
||||
CXXCPP = path_join(tools_path, name_fmt % 'cpp')
|
||||
if not os.path.isfile(CXXCPP):
|
||||
CXXCPP = path_join(tools_path, (name_fmt % 'clang++'))
|
||||
CXXCPP += ' -E'
|
||||
|
||||
ccache_path = os.environ.get('CCACHE', '')
|
||||
if ccache_path:
|
||||
@@ -148,18 +176,25 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
|
||||
CFLAGS += [
|
||||
'-fstack-protector',
|
||||
'-DMONODROID=1'
|
||||
'-D__ANDROID_API__=' + android_api
|
||||
]
|
||||
CFLAGS += ['-D__ANDROID_API__=' + api] if android_new_ndk else []
|
||||
|
||||
CXXFLAGS += [
|
||||
'-fstack-protector',
|
||||
'-DMONODROID=1'
|
||||
'-D__ANDROID_API__=' + android_api,
|
||||
]
|
||||
CXXFLAGS += ['-D__ANDROID_API__=' + api] if android_new_ndk else []
|
||||
|
||||
CPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path]
|
||||
CXXCPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path]
|
||||
|
||||
path_link = '%s/platforms/android-%s/arch-%s/usr/lib' % (opts.android_ndk_root, api, arch)
|
||||
|
||||
LDFLAGS += [
|
||||
'-z', 'now', '-z', 'relro', '-z', 'noexecstack',
|
||||
'-ldl', '-lm', '-llog', '-lc'
|
||||
'-ldl', '-lm', '-llog', '-lc', '-lgcc',
|
||||
'-Wl,-rpath-link=%s,-dynamic-linker=/system/bin/linker' % path_link,
|
||||
'-L' + path_link
|
||||
]
|
||||
|
||||
# Fixes this error: DllImport unable to load library 'dlopen failed: empty/missing DT_HASH in "libmono-native.so" (built with --hash-style=gnu?)'.
|
||||
@@ -176,15 +211,15 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
|
||||
'--enable-minimal=ssa,portability,attach,verifier,full_messages,sgen_remset'
|
||||
',sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par'
|
||||
',sgen_copying,logging,security,shared_handles,interpreter',
|
||||
'--with-btls-android-ndk=%s' % ndk_path,
|
||||
'--with-btls-android-api=%s' % android_api,
|
||||
'--with-btls-android-ndk=%s' % opts.android_ndk_root,
|
||||
'--with-btls-android-api=%s' % api,
|
||||
]
|
||||
|
||||
CONFIGURE_FLAGS += ['--enable-monodroid']
|
||||
CONFIGURE_FLAGS += ['--with-btls-android-ndk-asm-workaround']
|
||||
CONFIGURE_FLAGS += ['--with-btls-android-ndk-asm-workaround'] if android_new_ndk else []
|
||||
|
||||
CONFIGURE_FLAGS += [
|
||||
'--with-btls-android-cmake-toolchain=%s/build/cmake/android.toolchain.cmake' % ndk_path,
|
||||
'--with-btls-android-cmake-toolchain=%s/build/cmake/android.toolchain.cmake' % opts.android_ndk_root,
|
||||
'--with-sigaltstack=yes',
|
||||
'--with-tls=pthread',
|
||||
'--without-ikvm-native',
|
||||
@@ -215,16 +250,186 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
|
||||
env['_android-%s_CONFIGURE_FLAGS' % target] = CONFIGURE_FLAGS
|
||||
|
||||
# Runtime template
|
||||
runtime.setup_runtime_template(env, opts, 'android', target, target_triple)
|
||||
runtime.setup_runtime_template(env, opts, 'android', target, host_triple)
|
||||
|
||||
|
||||
def strip_libs(opts: AndroidOpts, product: str, target: str):
|
||||
ndk_path = os.path.join(opts.android_sdk_root, 'ndk', opts.android_ndk_version)
|
||||
toolchain_path = os.path.join(ndk_path, 'toolchains/llvm/prebuilt/linux-x86_64')
|
||||
strip = os.path.join(toolchain_path, 'bin', 'llvm-strip')
|
||||
class AndroidCrossTable:
|
||||
target_archs = {
|
||||
'cross-arm': 'armv7',
|
||||
'cross-arm64': 'aarch64-v8a',
|
||||
'cross-x86': 'i686',
|
||||
'cross-x86_64': 'x86_64'
|
||||
}
|
||||
|
||||
install_dir = os.path.join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
out_libs_dir = os.path.join(install_dir, 'lib')
|
||||
device_targets = {
|
||||
'cross-arm': 'armeabi-v7a',
|
||||
'cross-arm64': 'arm64-v8a',
|
||||
'cross-x86': 'x86',
|
||||
'cross-x86_64': 'x86_64'
|
||||
}
|
||||
|
||||
offsets_dumper_abis = {
|
||||
'cross-arm': 'armv7-none-linux-androideabi',
|
||||
'cross-arm64': 'aarch64-v8a-linux-android',
|
||||
'cross-x86': 'i686-none-linux-android',
|
||||
'cross-x86_64': 'x86_64-none-linux-android'
|
||||
}
|
||||
|
||||
|
||||
def get_android_libclang_path(opts):
|
||||
if sys.platform == 'darwin':
|
||||
return '%s/toolchains/llvm/prebuilt/darwin-x86_64/lib64/libclang.dylib' % opts.android_ndk_root
|
||||
elif sys.platform in ['linux', 'linux2']:
|
||||
loc = '%s/toolchains/llvm/prebuilt/linux-x86_64/lib64/libclang.so.9svn' % opts.android_ndk_root
|
||||
if os.path.isfile(loc):
|
||||
return loc
|
||||
return '%s/toolchains/llvm/prebuilt/linux-x86_64/lib64/libclang.so.8svn' % opts.android_ndk_root
|
||||
assert False
|
||||
|
||||
|
||||
def setup_android_cross_template(env: dict, opts: AndroidOpts, target: str, host_arch: str):
|
||||
def get_host_triple():
|
||||
if sys.platform == 'darwin':
|
||||
return '%s-apple-darwin11' % host_arch
|
||||
elif sys.platform in ['linux', 'linux2']:
|
||||
return '%s-linux-gnu' % host_arch
|
||||
assert False
|
||||
|
||||
target_arch = AndroidCrossTable.target_archs[target]
|
||||
device_target = AndroidCrossTable.device_targets[target]
|
||||
offsets_dumper_abi = AndroidCrossTable.offsets_dumper_abis[target]
|
||||
host_triple = get_host_triple()
|
||||
target_triple = '%s-linux-android' % target_arch
|
||||
|
||||
android_libclang = get_android_libclang_path(opts)
|
||||
|
||||
env['_android-%s_OFFSETS_DUMPER_ARGS' % target] = [
|
||||
'--libclang=%s' % android_libclang,
|
||||
'--sysroot=%s/sysroot' % opts.android_ndk_root
|
||||
]
|
||||
|
||||
env['_android-%s_AR' % target] = 'ar'
|
||||
env['_android-%s_AS' % target] = 'as'
|
||||
env['_android-%s_CC' % target] = 'cc'
|
||||
env['_android-%s_CXX' % target] = 'c++'
|
||||
env['_android-%s_CXXCPP' % target] = 'cpp'
|
||||
env['_android-%s_LD' % target] = 'ld'
|
||||
env['_android-%s_RANLIB' % target] = 'ranlib'
|
||||
env['_android-%s_STRIP' % target] = 'strip'
|
||||
|
||||
is_darwin = sys.platform == 'darwin'
|
||||
|
||||
CFLAGS = []
|
||||
CFLAGS += ['-DDEBUG_CROSS'] if not opts.release else []
|
||||
CFLAGS += ['-mmacosx-version-min=10.9'] if is_darwin else []
|
||||
|
||||
env['_android-%s_CFLAGS' % target] = CFLAGS
|
||||
|
||||
CXXFLAGS = []
|
||||
CXXFLAGS += ['-DDEBUG_CROSS'] if not opts.release else []
|
||||
CXXFLAGS += ['-mmacosx-version-min=10.9', '-stdlib=libc++'] if is_darwin else []
|
||||
|
||||
env['_android-%s_CXXFLAGS' % target] = CXXFLAGS
|
||||
|
||||
env['_android-%s_CONFIGURE_FLAGS' % target] = [
|
||||
'--disable-boehm',
|
||||
'--disable-mcs-build',
|
||||
'--disable-nls',
|
||||
'--enable-maintainer-mode',
|
||||
'--with-tls=pthread'
|
||||
]
|
||||
|
||||
# Runtime cross template
|
||||
runtime.setup_runtime_cross_template(env, opts, 'android', target, host_triple, target_triple, device_target, 'llvm64', offsets_dumper_abi)
|
||||
|
||||
|
||||
def setup_android_cross_mxe_template(env: dict, opts: AndroidOpts, target: str, host_arch: str):
|
||||
table_target = cross_targets[cross_mxe_targets.index(target)] # Re-use the non-mxe table
|
||||
|
||||
target_arch = AndroidCrossTable.target_archs[table_target]
|
||||
device_target = AndroidCrossTable.device_targets[table_target]
|
||||
offsets_dumper_abi = AndroidCrossTable.offsets_dumper_abis[table_target]
|
||||
host_triple = '%s-w64-mingw32' % host_arch
|
||||
target_triple = '%s-linux-android' % target_arch
|
||||
|
||||
android_libclang = get_android_libclang_path(opts)
|
||||
|
||||
env['_android-%s_OFFSETS_DUMPER_ARGS' % target] = [
|
||||
'--libclang=%s' % android_libclang,
|
||||
'--sysroot=%s/sysroot' % opts.android_ndk_root
|
||||
]
|
||||
|
||||
mxe_bin = path_join(opts.mxe_prefix, 'bin')
|
||||
|
||||
env['_android-%s_PATH' % target] = mxe_bin
|
||||
|
||||
name_fmt = host_arch + '-w64-mingw32-%s'
|
||||
|
||||
env['_android-%s_AR' % target] = path_join(mxe_bin, name_fmt % 'ar')
|
||||
env['_android-%s_AS' % target] = path_join(mxe_bin, name_fmt % 'as')
|
||||
env['_android-%s_CC' % target] = path_join(mxe_bin, name_fmt % 'gcc')
|
||||
env['_android-%s_CXX' % target] = path_join(mxe_bin, name_fmt % 'g++')
|
||||
env['_android-%s_DLLTOOL' % target] = path_join(mxe_bin, name_fmt % 'dlltool')
|
||||
env['_android-%s_LD' % target] = path_join(mxe_bin, name_fmt % 'ld')
|
||||
env['_android-%s_OBJDUMP' % target] = path_join(mxe_bin, name_fmt % 'objdump')
|
||||
env['_android-%s_RANLIB' % target] = path_join(mxe_bin, name_fmt % 'ranlib')
|
||||
env['_android-%s_STRIP' % target] = path_join(mxe_bin, name_fmt % 'strip')
|
||||
|
||||
mingw_zlib_prefix = '%s/opt/mingw-zlib/usr' % opts.mxe_prefix
|
||||
if not os.path.isdir(mingw_zlib_prefix):
|
||||
mingw_zlib_prefix = opts.mxe_prefix
|
||||
|
||||
CFLAGS = []
|
||||
CFLAGS += ['-DDEBUG_CROSS'] if not opts.release else []
|
||||
CFLAGS += ['-I%s/%s-w64-mingw32/include' % (mingw_zlib_prefix, host_arch)]
|
||||
|
||||
env['_android-%s_CFLAGS' % target] = CFLAGS
|
||||
|
||||
CXXFLAGS = []
|
||||
CXXFLAGS += ['-DDEBUG_CROSS'] if not opts.release else []
|
||||
CXXFLAGS += ['-I%s/%s-w64-mingw32/include' % (mingw_zlib_prefix, host_arch)]
|
||||
|
||||
env['_android-%s_CXXFLAGS' % target] = CXXFLAGS
|
||||
|
||||
env['_android-%s_LDFLAGS' % target] = []
|
||||
|
||||
CONFIGURE_FLAGS = [
|
||||
'--disable-boehm',
|
||||
'--disable-mcs-build',
|
||||
'--disable-nls',
|
||||
'--enable-static-gcc-libs',
|
||||
'--enable-maintainer-mode',
|
||||
'--with-tls=pthread'
|
||||
]
|
||||
|
||||
CONFIGURE_FLAGS += ['--with-static-zlib=%s/%s-w64-mingw32/lib/libz.a' % (mingw_zlib_prefix, host_arch)]
|
||||
|
||||
env['_android-%s_CONFIGURE_FLAGS' % target] = CONFIGURE_FLAGS
|
||||
|
||||
# Runtime cross template
|
||||
runtime.setup_runtime_cross_template(env, opts, 'android', target, host_triple, target_triple, device_target, 'llvmwin64', offsets_dumper_abi)
|
||||
|
||||
|
||||
def make_standalone_toolchain(opts: AndroidOpts, target: str, api: str):
|
||||
install_dir = path_join(opts.android_toolchains_prefix, opts.toolchain_name_fmt % (target, api))
|
||||
if os.path.isdir(path_join(install_dir, 'bin')):
|
||||
return # Looks like it's already there, so no need to re-create it
|
||||
command = path_join(opts.android_ndk_root, 'build', 'tools', 'make_standalone_toolchain.py')
|
||||
args = ['--verbose', '--force', '--api=' + api, '--arch=' + AndroidTargetTable.archs[target],
|
||||
'--install-dir=' + install_dir]
|
||||
run_command(command, args=args, name='make_standalone_toolchain')
|
||||
|
||||
|
||||
def strip_libs(opts: AndroidOpts, product: str, target: str, api: str):
|
||||
toolchain_path = path_join(opts.android_toolchains_prefix, opts.toolchain_name_fmt % (target, api))
|
||||
|
||||
tools_path = path_join(toolchain_path, 'bin')
|
||||
name_fmt = AndroidTargetTable.abi_names[target] + '-%s'
|
||||
|
||||
strip = path_join(tools_path, name_fmt % 'strip')
|
||||
|
||||
install_dir = path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
out_libs_dir = path_join(install_dir, 'lib')
|
||||
|
||||
lib_files = globs(('*.a', '*.so'), dirpath=out_libs_dir)
|
||||
if len(lib_files):
|
||||
@@ -234,9 +439,20 @@ def strip_libs(opts: AndroidOpts, product: str, target: str):
|
||||
def configure(opts: AndroidOpts, product: str, target: str):
|
||||
env = { 'ANDROID_API_VERSION': get_api_version_or_min(opts, target) }
|
||||
|
||||
setup_android_target_template(env, opts, target)
|
||||
if is_cross(target):
|
||||
import llvm
|
||||
|
||||
if not os.path.isfile(os.path.join(opts.mono_source_root, 'configure')):
|
||||
if is_cross_mxe(target):
|
||||
llvm.make(opts, 'llvmwin64')
|
||||
setup_android_cross_mxe_template(env, opts, target, host_arch='x86_64')
|
||||
else:
|
||||
llvm.make(opts, 'llvm64')
|
||||
setup_android_cross_template(env, opts, target, host_arch='x86_64')
|
||||
else:
|
||||
make_standalone_toolchain(opts, target, env['ANDROID_API_VERSION'])
|
||||
setup_android_target_template(env, opts, target)
|
||||
|
||||
if not os.path.isfile(path_join(opts.mono_source_root, 'configure')):
|
||||
runtime.run_autogen(opts)
|
||||
|
||||
runtime.run_configure(env, opts, product, target)
|
||||
@@ -245,7 +461,7 @@ def configure(opts: AndroidOpts, product: str, target: str):
|
||||
def make(opts: AndroidOpts, product: str, target: str):
|
||||
env = { 'ANDROID_API_VERSION': get_api_version_or_min(opts, target) }
|
||||
|
||||
build_dir = os.path.join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
|
||||
make_args = make_default_args(opts)
|
||||
make_args += ['-C', build_dir]
|
||||
@@ -255,15 +471,15 @@ def make(opts: AndroidOpts, product: str, target: str):
|
||||
run_command('make', args=['-C', '%s/support' % build_dir, 'install'], name='make install support')
|
||||
run_command('make', args=['-C', '%s/data' % build_dir, 'install'], name='make install data')
|
||||
|
||||
if opts.strip_libs:
|
||||
strip_libs(opts, product, target)
|
||||
if opts.strip_libs and not is_cross(target):
|
||||
strip_libs(opts, product, target, env['ANDROID_API_VERSION'])
|
||||
|
||||
|
||||
def clean(opts: AndroidOpts, product: str, target: str):
|
||||
rm_rf(
|
||||
os.path.join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration)),
|
||||
os.path.join(opts.configure_dir, '%s-%s-%s.config.cache' % (product, target, opts.configuration)),
|
||||
os.path.join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration)),
|
||||
path_join(opts.configure_dir, '%s-%s-%s.config.cache' % (product, target, opts.configuration)),
|
||||
path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
)
|
||||
|
||||
|
||||
@@ -273,7 +489,13 @@ def main(raw_args):
|
||||
from collections import OrderedDict
|
||||
from typing import Callable
|
||||
|
||||
target_choices = targets + ['all-targets']
|
||||
target_shortcuts = {
|
||||
'all-runtime': runtime_targets,
|
||||
'all-cross': cross_targets,
|
||||
'all-cross-win': cross_mxe_targets
|
||||
}
|
||||
|
||||
target_values = runtime_targets + cross_targets + cross_mxe_targets + list(target_shortcuts)
|
||||
|
||||
actions = OrderedDict()
|
||||
actions['configure'] = configure
|
||||
@@ -282,20 +504,26 @@ def main(raw_args):
|
||||
|
||||
parser = cmd_utils.build_arg_parser(
|
||||
description='Builds the Mono runtime for Android',
|
||||
env_vars={ 'ANDROID_SDK_ROOT': 'Overrides default value for --android-sdk' }
|
||||
env_vars={
|
||||
'ANDROID_SDK_ROOT': 'Overrides default value for --android-sdk',
|
||||
'ANDROID_NDK_ROOT': 'Overrides default value for --android-ndk',
|
||||
'ANDROID_HOME': 'Same as ANDROID_SDK_ROOT'
|
||||
}
|
||||
)
|
||||
|
||||
home = os.environ.get('HOME')
|
||||
android_sdk_default = os.environ.get('ANDROID_SDK_ROOT', os.path.join(home, 'Android/Sdk'))
|
||||
android_sdk_default = os.environ.get('ANDROID_HOME', os.environ.get('ANDROID_SDK_ROOT', path_join(home, 'Android/Sdk')))
|
||||
android_ndk_default = os.environ.get('ANDROID_NDK_ROOT', path_join(android_sdk_default, 'ndk-bundle'))
|
||||
|
||||
default_help = 'default: %(default)s'
|
||||
|
||||
parser.add_argument('action', choices=['configure', 'make', 'clean'])
|
||||
parser.add_argument('--target', choices=target_choices, action='append', required=True)
|
||||
parser.add_argument('--target', choices=target_values, action='append', required=True)
|
||||
parser.add_argument('--toolchains-prefix', default=path_join(home, 'android-toolchains'), help=default_help)
|
||||
parser.add_argument('--android-sdk', default=android_sdk_default, help=default_help)
|
||||
parser.add_argument('--android-ndk-version', default=DEFAULT_NDK_VERSION, help=default_help)
|
||||
parser.add_argument('--android-api-version', default=get_min_api_version(targets[0]), help=default_help)
|
||||
parser.add_argument('--android-cmake-version', default=DEFAULT_CMAKE_VERSION, help=default_help)
|
||||
parser.add_argument('--android-ndk', default=android_ndk_default, help=default_help)
|
||||
parser.add_argument('--android-api-version', default='21', help=default_help)
|
||||
parser.add_argument('--android-cmake-version', default='autodetect', help=default_help)
|
||||
|
||||
cmd_utils.add_runtime_arguments(parser, default_help)
|
||||
|
||||
@@ -310,14 +538,11 @@ def main(raw_args):
|
||||
print('Mono sources directory not found: ' + opts.mono_source_root)
|
||||
sys.exit(1)
|
||||
|
||||
check_for_android_ndk(opts)
|
||||
check_for_cmake(opts)
|
||||
|
||||
build_targets = cmd_utils.expand_input_targets(input_targets, { 'all-targets': targets })
|
||||
targets = cmd_utils.expand_input_targets(input_targets, target_shortcuts)
|
||||
action = actions[input_action]
|
||||
|
||||
try:
|
||||
for target in build_targets:
|
||||
for target in targets:
|
||||
action(opts, 'android', target)
|
||||
except BuildError as e:
|
||||
sys.exit(e.message)
|
||||
|
||||
81
bcl.py
81
bcl.py
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
#!/usr/bin/python
|
||||
|
||||
import os
|
||||
import os.path
|
||||
@@ -26,21 +27,8 @@ test_profiles_table = {
|
||||
'wasm': ['wasm']
|
||||
}
|
||||
|
||||
def get_install_dir(opts: BaseOpts, product: str):
|
||||
return path_join(opts.install_dir, '%s-bcl' % product)
|
||||
|
||||
def get_profile_dir(profile: str, product: str):
|
||||
if product == 'desktop-win32':
|
||||
return profile + '-win32'
|
||||
else:
|
||||
return profile
|
||||
|
||||
def get_profile_install_dirs(opts: BaseOpts, product: str):
|
||||
install_dir = get_install_dir(opts, product)
|
||||
profiles = profiles_table[product]
|
||||
return [path_join(install_dir, get_profile_dir(profile, product)) for profile in profiles]
|
||||
|
||||
def configure_bcl(opts: BclOpts, product: str):
|
||||
def configure_bcl(opts: BclOpts):
|
||||
stamp_file = path_join(opts.configure_dir, '.stamp-bcl-configure')
|
||||
|
||||
if os.path.isfile(stamp_file):
|
||||
@@ -54,21 +42,12 @@ def configure_bcl(opts: BclOpts, product: str):
|
||||
|
||||
CONFIGURE_FLAGS = [
|
||||
'--disable-boehm',
|
||||
'--disable-btls-lib',
|
||||
'--disable-nls',
|
||||
'--disable-support-build',
|
||||
'--with-mcs-docs=no'
|
||||
]
|
||||
|
||||
if product == 'desktop-win32':
|
||||
CONFIGURE_FLAGS += [
|
||||
'--enable-btls',
|
||||
'--enable-btls-lib'
|
||||
]
|
||||
else:
|
||||
CONFIGURE_FLAGS += [
|
||||
'--disable-btls-lib'
|
||||
]
|
||||
|
||||
configure = path_join(opts.mono_source_root, 'configure')
|
||||
configure_args = CONFIGURE_FLAGS
|
||||
|
||||
@@ -93,8 +72,8 @@ def make_bcl(opts: BclOpts):
|
||||
touch(stamp_file)
|
||||
|
||||
|
||||
def build_bcl(opts: BclOpts, product: str):
|
||||
configure_bcl(opts, product)
|
||||
def build_bcl(opts: BclOpts):
|
||||
configure_bcl(opts)
|
||||
make_bcl(opts)
|
||||
|
||||
|
||||
@@ -106,14 +85,14 @@ def clean_bcl(opts: BclOpts):
|
||||
|
||||
|
||||
def make_product(opts: BclOpts, product: str):
|
||||
build_bcl(opts, product)
|
||||
build_bcl(opts)
|
||||
|
||||
build_dir = path_join(opts.configure_dir, 'bcl')
|
||||
|
||||
profiles = profiles_table[product]
|
||||
test_profiles = test_profiles_table[product]
|
||||
|
||||
install_dir = get_install_dir(opts, product)
|
||||
install_dir = path_join(opts.install_dir, '%s-bcl' % product)
|
||||
|
||||
mkdir_p(install_dir)
|
||||
|
||||
@@ -134,7 +113,7 @@ def make_product(opts: BclOpts, product: str):
|
||||
# Copy the bcl profiles to the output directory
|
||||
from distutils.dir_util import copy_tree
|
||||
for profile in profiles:
|
||||
profile_dir = get_profile_dir(profile, product)
|
||||
profile_dir = profile + '-win32' if product == 'desktop-win32' else profile
|
||||
copy_tree('%s/mcs/class/lib/%s' % (opts.mono_source_root, profile_dir), '%s/%s' % (install_dir, profile_dir))
|
||||
|
||||
# Remove unneeded files
|
||||
@@ -148,27 +127,6 @@ def make_product(opts: BclOpts, product: str):
|
||||
file_pattern_recursive = '%s/**/%s' % (install_dir, file_pattern)
|
||||
[rm_rf(x) for x in glob.iglob(file_pattern_recursive, recursive=True)]
|
||||
|
||||
# WebAssembly.Framework.sln
|
||||
if product == 'wasm':
|
||||
wasm_fx_output_dir = '%s/sdks/wasm/framework/netstandard2.0' % opts.mono_source_root
|
||||
wasm_fx_sln_file = '%s/sdks/wasm/framework/src/WebAssembly.Framework.sln' % opts.mono_source_root
|
||||
output_dir = path_join(install_dir, 'wasm')
|
||||
|
||||
from msbuild_helper import build_solution
|
||||
build_solution(wasm_fx_sln_file, 'Release')
|
||||
|
||||
import shutil
|
||||
from glob import glob
|
||||
|
||||
fglob = glob(path_join(wasm_fx_output_dir, '*.dll'))
|
||||
|
||||
if not opts.remove_pdb:
|
||||
fglob.extend(glob(path_join(wasm_fx_output_dir, '*.pdb')))
|
||||
|
||||
for file in fglob:
|
||||
if os.path.isfile(file):
|
||||
shutil.copy(file, output_dir)
|
||||
|
||||
# godot_android_ext profile (custom 'Mono.Android.dll')
|
||||
if product == 'android':
|
||||
this_script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
@@ -187,30 +145,11 @@ def make_product(opts: BclOpts, product: str):
|
||||
|
||||
run_command('csc', android_env_csc_args)
|
||||
|
||||
# (custom 'Xamarin.iOS.dll')
|
||||
if product == 'ios':
|
||||
this_script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
monotouch_profile_dir = '%s/%s' % (install_dir, 'monotouch')
|
||||
refs = ['mscorlib.dll', 'System.Net.Http.dll']
|
||||
|
||||
mkdir_p(monotouch_profile_dir)
|
||||
|
||||
ios_env_csc_args = [
|
||||
path_join(this_script_dir, 'files', 'xi.cs'),
|
||||
'-keyfile:' + path_join(this_script_dir, 'files', 'xi.snk'),
|
||||
'-out:%s' % path_join(monotouch_profile_dir, 'Xamarin.iOS.dll'),
|
||||
'-optimize', '-deterministic', '-publicsign', '-target:library',
|
||||
'-nostdlib', '-noconfig', '-langversion:latest'
|
||||
]
|
||||
ios_env_csc_args += ['-r:%s' % path_join(monotouch_profile_dir, r) for r in refs]
|
||||
|
||||
run_command('csc', ios_env_csc_args)
|
||||
|
||||
|
||||
def clean_product(opts: BclOpts, product: str):
|
||||
clean_bcl(opts)
|
||||
|
||||
install_dir = get_install_dir(opts, product)
|
||||
install_dir = path_join(opts.install_dir, '%s-bcl' % product)
|
||||
rm_rf(install_dir)
|
||||
|
||||
|
||||
|
||||
61
desktop.py
61
desktop.py
@@ -15,7 +15,7 @@ import runtime
|
||||
targets = {
|
||||
'linux': ['x86', 'x86_64'],
|
||||
'windows': ['x86', 'x86_64'],
|
||||
'osx': ['arm64', 'x86_64']
|
||||
'osx': ['x86_64']
|
||||
}
|
||||
|
||||
target_arch = {
|
||||
@@ -28,24 +28,14 @@ target_arch = {
|
||||
'x86_64': 'x86_64'
|
||||
},
|
||||
'osx': {
|
||||
'arm64': 'arm64',
|
||||
'x86_64': 'x86_64'
|
||||
}
|
||||
}
|
||||
|
||||
host_triples = {
|
||||
'linux': {
|
||||
'x86': 'i686-linux-gnu',
|
||||
'x86_64': 'x86_64-linux-gnu'
|
||||
},
|
||||
'windows': {
|
||||
'x86': 'i686-w64-mingw32',
|
||||
'x86_64': 'x86_64-w64-mingw32'
|
||||
},
|
||||
'osx': {
|
||||
'arm64': 'aarch64-apple-darwin20',
|
||||
'x86_64': 'x86_64-apple-darwin'
|
||||
}
|
||||
'linux': '%s-linux-gnu',
|
||||
'windows': '%s-w64-mingw32',
|
||||
'osx': '%s-apple-darwin',
|
||||
}
|
||||
|
||||
llvm_table = {
|
||||
@@ -80,26 +70,25 @@ def get_osxcross_sdk(osxcross_bin, arch):
|
||||
|
||||
|
||||
def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_platform: str, target: str):
|
||||
host_triple = host_triples[target_platform][target]
|
||||
host_triple = host_triples[target_platform] % target_arch[target_platform][target]
|
||||
|
||||
CONFIGURE_FLAGS = [
|
||||
'--disable-boehm',
|
||||
'--disable-mcs-build',
|
||||
'--enable-maintainer-mode',
|
||||
'--with-tls=pthread',
|
||||
'--without-ikvm-native',
|
||||
'--enable-btls',
|
||||
'--without-ikvm-native'
|
||||
]
|
||||
|
||||
if target_platform == 'windows':
|
||||
CONFIGURE_FLAGS += [
|
||||
'--with-libgdiplus=%s' % opts.mxe_prefix,
|
||||
'--enable-btls-lib',
|
||||
'--with-libgdiplus=%s' % opts.mxe_prefix
|
||||
]
|
||||
else:
|
||||
CONFIGURE_FLAGS += [
|
||||
'--disable-iconv',
|
||||
'--disable-nls',
|
||||
'--enable-dynamic-btls',
|
||||
'--with-sigaltstack=yes',
|
||||
]
|
||||
|
||||
@@ -148,20 +137,7 @@ def setup_desktop_template(env: dict, opts: DesktopOpts, product: str, target_pl
|
||||
# DTrace is not available when building with OSXCROSS
|
||||
CONFIGURE_FLAGS += ['--enable-dtrace=no']
|
||||
else:
|
||||
osx_toolchain = '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'
|
||||
|
||||
env['_%s-%s_CC' % (product, target)] = '%s/usr/bin/clang' % osx_toolchain
|
||||
env['_%s-%s_CXX' % (product, target)] = '%s/usr/bin/clang++' % osx_toolchain
|
||||
|
||||
osx_sysroot = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'
|
||||
|
||||
CFLAGS = [
|
||||
'-isysroot', osx_sysroot,
|
||||
'-arch', target_arch[target_platform][target]
|
||||
]
|
||||
|
||||
env['_%s-%s_CFLAGS' % (product, target)] = CFLAGS
|
||||
env['_%s-%s_CXXFLAGS' % (product, target)] = CFLAGS
|
||||
env['_%s-%s_CC' % (product, target)] = 'cc'
|
||||
|
||||
env['_%s-%s_CONFIGURE_FLAGS' % (product, target)] = CONFIGURE_FLAGS
|
||||
|
||||
@@ -211,14 +187,6 @@ def configure(opts: DesktopOpts, product: str, target_platform: str, target: str
|
||||
def make(opts: DesktopOpts, product: str, target_platform: str, target: str):
|
||||
build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
|
||||
|
||||
if target_platform == 'windows':
|
||||
mxe = 'mxe-Win64' if target == 'x86_64' else 'mxe-Win32'
|
||||
replace_in_new_file(
|
||||
src_file='%s/sdks/builds/%s.cmake.in' % (opts.mono_source_root, mxe),
|
||||
search='@MXE_PATH@', replace=opts.mxe_prefix,
|
||||
dst_file='%s/mono/btls/%s.cmake' % (opts.mono_source_root, mxe)
|
||||
)
|
||||
|
||||
make_args = make_default_args(opts)
|
||||
make_args += ['-C', build_dir]
|
||||
|
||||
@@ -230,14 +198,6 @@ def make(opts: DesktopOpts, product: str, target_platform: str, target: str):
|
||||
if opts.strip_libs:
|
||||
strip_libs(opts, product, target_platform, target)
|
||||
|
||||
def copy_bcl(opts: DesktopOpts, product: str, target_platform: str, target: str):
|
||||
from distutils.dir_util import copy_tree
|
||||
from bcl import get_profile_install_dirs
|
||||
dest_dir = path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration), 'lib/mono/4.5')
|
||||
for src_dir in get_profile_install_dirs(opts, 'desktop-win32' if target_platform == 'windows' else 'desktop'):
|
||||
if not os.path.isdir(src_dir):
|
||||
raise BuildError('BCL source directory does not exist: %s. The BCL must be built prior to this.' % src_dir)
|
||||
copy_tree(src_dir, dest_dir)
|
||||
|
||||
def clean(opts: DesktopOpts, product: str, target_platform: str, target: str):
|
||||
rm_rf(
|
||||
@@ -255,14 +215,13 @@ def run_main(raw_args, target_platform):
|
||||
actions = OrderedDict()
|
||||
actions['configure'] = configure
|
||||
actions['make'] = make
|
||||
actions['copy-bcl'] = copy_bcl
|
||||
actions['clean'] = clean
|
||||
|
||||
parser = cmd_utils.build_arg_parser(description='Builds the Mono runtime for the Desktop')
|
||||
|
||||
default_help = 'default: %(default)s'
|
||||
|
||||
parser.add_argument('action', choices=['configure', 'make', 'copy-bcl', 'clean'])
|
||||
parser.add_argument('action', choices=['configure', 'make', 'clean'])
|
||||
parser.add_argument('--target', choices=targets[target_platform], action='append', required=True)
|
||||
parser.add_argument('--with-llvm', action='store_true', default=False, help=default_help)
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@ index e57a636ef4d..60c60a8fc17 100644
|
||||
--- a/mcs/build/rules.make
|
||||
+++ b/mcs/build/rules.make
|
||||
@@ -94,7 +94,7 @@ include $(topdir)/build/config-default.make
|
||||
|
||||
|
||||
include $(topdir)/build/platforms/$(BUILD_PLATFORM).make
|
||||
|
||||
|
||||
-PROFILE_PLATFORM = $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)")))
|
||||
+PROFILE_PLATFORM ?= $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)")))
|
||||
PROFILE_DIRECTORY = $(PROFILE)$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))
|
||||
|
||||
|
||||
# Useful
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 19b20127ca2..d07afde5e05 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -5924,6 +5924,8 @@ if test "x$enable_btls" = "xyes"; then
|
||||
if test "x$HAVE_YASM" != "xyes"; then
|
||||
BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
|
||||
fi
|
||||
+ mono_btls_dir_abs=`cd $srcdir && pwd`/mono/btls
|
||||
+ BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCYGWIN=TRUE -DCMAKE_TOOLCHAIN_FILE=\"$mono_btls_dir_abs/mxe-Win32.cmake\""
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -5935,6 +5937,8 @@ if test "x$enable_btls" = "xyes"; then
|
||||
if test "x$HAVE_YASM" != "xyes"; then
|
||||
BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
|
||||
fi
|
||||
+ mono_btls_dir_abs=`cd $srcdir && pwd`/mono/btls
|
||||
+ BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCYGWIN=TRUE -DCMAKE_TOOLCHAIN_FILE=\"$mono_btls_dir_abs/mxe-Win64.cmake\""
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
|
||||
index 992f41e4c7f..9946f5d21a4 100644
|
||||
--- a/mono/btls/CMakeLists.txt
|
||||
+++ b/mono/btls/CMakeLists.txt
|
||||
@@ -129,4 +129,5 @@ endif ()
|
||||
|
||||
if (CYGWIN)
|
||||
target_link_libraries (mono-btls-shared wsock32 ws2_32)
|
||||
+ target_link_options (mono-btls-shared PRIVATE -static-libgcc)
|
||||
endif ()
|
||||
\ No newline at end of file
|
||||
@@ -1,59 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d07afde5e05..2c052530f2c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4927,9 +4927,6 @@ if test "x$target_mach" = "xyes"; then
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_OSX"
|
||||
target_osx=yes
|
||||
- if test "x$TARGET" = "xARM64"; then
|
||||
- BTLS_SUPPORTED=no
|
||||
- fi
|
||||
], [
|
||||
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
@@ -5952,7 +5949,11 @@ if test "x$enable_btls" = "xyes"; then
|
||||
;;
|
||||
aarch64)
|
||||
btls_arch=aarch64
|
||||
- btls_cflags="-march=armv8-a+crypto"
|
||||
+ if test "x$target_mach" = "xyes"; then
|
||||
+ btls_cflags="-arch arm64"
|
||||
+ else
|
||||
+ btls_cflags="-march=armv8-a+crypto"
|
||||
+ fi
|
||||
;;
|
||||
s390x)
|
||||
btls_arch=s390x
|
||||
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
|
||||
index 9946f5d21a4..a8aa3d07b0e 100644
|
||||
--- a/mono/btls/CMakeLists.txt
|
||||
+++ b/mono/btls/CMakeLists.txt
|
||||
@@ -21,6 +21,15 @@ if (MSVC OR CYGWIN)
|
||||
set(BTLS_HOST_WIN32 1)
|
||||
endif ()
|
||||
|
||||
+if (NOT "${BTLS_ARCH}" STREQUAL "")
|
||||
+ message (STATUS "SET ARCH: ${BTLS_ARCH}")
|
||||
+ set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
|
||||
+endif ()
|
||||
+
|
||||
+if ((("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") OR ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")) AND APPLE AND NOT IOS)
|
||||
+ set(OPENSSL_NO_ASM 1)
|
||||
+endif ()
|
||||
+
|
||||
if (NOT OPENSSL_NO_ASM)
|
||||
if (BTLS_HOST_WIN32)
|
||||
if (CYGWIN AND "${BTLS_ARCH}" STREQUAL "i386")
|
||||
@@ -38,11 +47,6 @@ if (NOT OPENSSL_NO_ASM)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
-if (NOT "${BTLS_ARCH}" STREQUAL "")
|
||||
- message (STATUS "SET ARCH: ${BTLS_ARCH}")
|
||||
- set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
|
||||
-endif ()
|
||||
-
|
||||
if (NOT MSVC)
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "AIX" OR ${CMAKE_SYSTEM_NAME} MATCHES "OS400")
|
||||
# GCC+XCOFF doesn't support -fvisibility=hidden, and we would prefer XCOFF debugging info.
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
|
||||
index 8d6753f2e01..1c1bd460123 100644
|
||||
index ad9b8823f8f..3542b32b540 100644
|
||||
--- a/mono/metadata/threads.c
|
||||
+++ b/mono/metadata/threads.c
|
||||
@@ -78,8 +78,12 @@ mono_native_thread_join_handle (HANDLE thread_handle, gboolean close_handle);
|
||||
@@ -77,8 +77,12 @@ mono_native_thread_join_handle (HANDLE thread_handle, gboolean close_handle);
|
||||
#include <zircon/syscalls.h>
|
||||
#endif
|
||||
|
||||
@@ -18,10 +18,10 @@ index 8d6753f2e01..1c1bd460123 100644
|
||||
|
||||
#ifdef HOST_ANDROID
|
||||
diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c
|
||||
index cd32e6b042d..5e2fd4618b8 100644
|
||||
index 3e4bf93de5f..79c9f731fe7 100644
|
||||
--- a/mono/utils/mono-threads-posix.c
|
||||
+++ b/mono/utils/mono-threads-posix.c
|
||||
@@ -32,8 +32,12 @@
|
||||
@@ -31,8 +31,12 @@
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
diff --git a/mono/metadata/threadpool-io.c b/mono/metadata/threadpool-io.c
|
||||
index a8a947e7dea..b87b59ed5b6 100644
|
||||
--- a/mono/metadata/threadpool-io.c
|
||||
+++ b/mono/metadata/threadpool-io.c
|
||||
@@ -179,6 +179,7 @@ selector_thread_wakeup_drain_pipes (void)
|
||||
{
|
||||
gchar buffer [128];
|
||||
gint received;
|
||||
+ static gint warnings_issued = 0;
|
||||
|
||||
for (;;) {
|
||||
#if !defined(HOST_WIN32)
|
||||
@@ -191,11 +192,16 @@ selector_thread_wakeup_drain_pipes (void)
|
||||
* some unices (like AIX) send ERESTART, which doesn't
|
||||
* exist on some other OSes errno
|
||||
*/
|
||||
- if (errno != EINTR && errno != EAGAIN && errno != ERESTART)
|
||||
+ if (errno != EINTR && errno != EAGAIN && errno != ERESTART) {
|
||||
#else
|
||||
- if (errno != EINTR && errno != EAGAIN)
|
||||
+ if (errno != EINTR && errno != EAGAIN) {
|
||||
#endif
|
||||
- g_warning ("selector_thread_wakeup_drain_pipes: read () failed, error (%d) %s\n", errno, g_strerror (errno));
|
||||
+ // limit amount of spam we write
|
||||
+ if (warnings_issued < 100) {
|
||||
+ g_warning ("selector_thread_wakeup_drain_pipes: read () failed, error (%d) %s\n", errno, g_strerror (errno));
|
||||
+ warnings_issued++;
|
||||
+ }
|
||||
+ }
|
||||
break;
|
||||
}
|
||||
#else
|
||||
@@ -203,8 +209,13 @@ selector_thread_wakeup_drain_pipes (void)
|
||||
if (received == 0)
|
||||
break;
|
||||
if (received == SOCKET_ERROR) {
|
||||
- if (WSAGetLastError () != WSAEINTR && WSAGetLastError () != WSAEWOULDBLOCK)
|
||||
- g_warning ("selector_thread_wakeup_drain_pipes: recv () failed, error (%d)\n", WSAGetLastError ());
|
||||
+ if (WSAGetLastError () != WSAEINTR && WSAGetLastError () != WSAEWOULDBLOCK) {
|
||||
+ // limit amount of spam we write
|
||||
+ if (warnings_issued < 100) {
|
||||
+ g_warning ("selector_thread_wakeup_drain_pipes: recv () failed, error (%d)\n", WSAGetLastError ());
|
||||
+ warnings_issued++;
|
||||
+ }
|
||||
+ }
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@@ -1,21 +0,0 @@
|
||||
diff --git a/external/llvm-project/llvm/lib/Support/regex_impl.h b/external/llvm-project/llvm/lib/Support/regex_impl.h
|
||||
index f8296c9ff75e..45bdb469a0b3 100644
|
||||
--- a/external/llvm-project/llvm/lib/Support/regex_impl.h
|
||||
+++ b/external/llvm-project/llvm/lib/Support/regex_impl.h
|
||||
@@ -35,8 +35,8 @@
|
||||
* @(#)regex.h 8.1 (Berkeley) 6/2/93
|
||||
*/
|
||||
|
||||
-#ifndef _REGEX_H_
|
||||
-#define _REGEX_H_
|
||||
+#ifndef _REGEX_IMPL_H_
|
||||
+#define _REGEX_IMPL_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
typedef off_t llvm_regoff_t;
|
||||
@@ -105,4 +105,4 @@ size_t llvm_strlcpy(char *dst, const char *src, size_t siz);
|
||||
}
|
||||
#endif
|
||||
|
||||
-#endif /* !_REGEX_H_ */
|
||||
+#endif /* !_REGEX_IMPL_H_ */
|
||||
@@ -1,10 +1,10 @@
|
||||
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
|
||||
index 32bfc471ea2..5087405eed5 100644
|
||||
index df6329391df..05f30d5b4dc 100644
|
||||
--- a/mono/mini/debugger-agent.c
|
||||
+++ b/mono/mini/debugger-agent.c
|
||||
@@ -4172,8 +4172,12 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
|
||||
@@ -4088,8 +4088,12 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
|
||||
}
|
||||
|
||||
|
||||
tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
|
||||
- g_assert (!tls);
|
||||
- // FIXME: Free this somewhere
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
diff --git a/mono/utils/mono-log-darwin.c b/mono/utils/mono-log-darwin.c
|
||||
index 2cb41b1481e..4f566ddb90a 100644
|
||||
index 3cb127bad59..30ff5edc307 100644
|
||||
--- a/mono/utils/mono-log-darwin.c
|
||||
+++ b/mono/utils/mono-log-darwin.c
|
||||
@@ -5,7 +5,8 @@
|
||||
*/
|
||||
#include <config.h>
|
||||
|
||||
-#if (defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)) || defined(HOST_MACCAT)
|
||||
+#if (defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)) || defined(HOST_MACCAT) \
|
||||
-#if defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)
|
||||
+#if (defined(HOST_WATCHOS) && (__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_3_0)) \
|
||||
+ || (defined(HOST_IOS) && (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 100000))
|
||||
/* emitted by clang:
|
||||
* > /Users/lewurm/work/mono-watch4/mono/utils/mono-log-darwin.c:35:2: error: 'asl_log' is \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
Extracted from https://github.com/dotnet/runtime/commit/087651ee0c2e315f7fe1cbecab5f507af364ab5c
|
||||
--
|
||||
diff --git a/mono/tools/offsets-tool/offsets-tool.py b/mono/tools/offsets-tool/offsets-tool.py
|
||||
index adf7eb4b..46214429 100644
|
||||
--- a/mono/tools/offsets-tool/offsets-tool.py
|
||||
+++ b/mono/tools/offsets-tool/offsets-tool.py
|
||||
@@ -303,8 +303,11 @@ class OffsetsTool:
|
||||
if type.size == -1:
|
||||
continue
|
||||
f.write ("DECL_SIZE2(%s,%s)\n" % (type.name, type.size))
|
||||
+ done_fields = {}
|
||||
for field in type.fields:
|
||||
- f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset))
|
||||
+ if field.name not in done_fields:
|
||||
+ f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset))
|
||||
+ done_fields [field.name] = field.name
|
||||
f.write ("#endif //disable metadata check\n")
|
||||
|
||||
f.write ("#ifndef DISABLE_JIT_OFFSETS\n")
|
||||
@@ -314,8 +317,11 @@ class OffsetsTool:
|
||||
if type.size == -1:
|
||||
continue
|
||||
f.write ("DECL_SIZE2(%s,%s)\n" % (type.name, type.size))
|
||||
+ done_fields = {}
|
||||
for field in type.fields:
|
||||
- f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset))
|
||||
+ if field.name not in done_fields:
|
||||
+ f.write ("DECL_OFFSET2(%s,%s,%s)\n" % (type.name, field.name, field.offset))
|
||||
+ done_fields [field.name] = field.name
|
||||
f.write ("#endif //disable jit check\n")
|
||||
|
||||
f.write ("#endif //cross compiler checks\n")
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/mono/tools/offsets-tool/offsets-tool.py b/mono/tools/offsets-tool/offsets-tool.py
|
||||
index f06799cba12..adf7eb4bbd6 100644
|
||||
index 35445ba585c..d1586ee5ecd 100644
|
||||
--- a/mono/tools/offsets-tool/offsets-tool.py
|
||||
+++ b/mono/tools/offsets-tool/offsets-tool.py
|
||||
@@ -54,6 +54,7 @@ class OffsetsTool:
|
||||
22
files/patches/offsets-tool-extra-cflags_old.diff
Normal file
22
files/patches/offsets-tool-extra-cflags_old.diff
Normal file
@@ -0,0 +1,22 @@
|
||||
diff --git a/tools/offsets-tool-py/offsets-tool.py b/tools/offsets-tool-py/offsets-tool.py
|
||||
index 536206aa5c9..04e515f13f2 100644
|
||||
--- a/tools/offsets-tool-py/offsets-tool.py
|
||||
+++ b/tools/offsets-tool-py/offsets-tool.py
|
||||
@@ -61,6 +61,7 @@ class OffsetsTool:
|
||||
parser.add_argument ('--targetdir', dest='target_path', help='path to mono tree configured for target', required=True)
|
||||
parser.add_argument ('--abi=', dest='abi', help='ABI triple to generate', required=True)
|
||||
parser.add_argument ('--sysroot=', dest='sysroot', help='path to sysroot headers of target')
|
||||
+ parser.add_argument ('--extra-cflag=', dest='extra_cflags', action='append', help='extra flags for clang')
|
||||
args = parser.parse_args ()
|
||||
|
||||
if not args.libclang or not os.path.isfile (args.libclang):
|
||||
@@ -78,6 +79,9 @@ class OffsetsTool:
|
||||
self.target_args = []
|
||||
android_api_level = "-D__ANDROID_API=21"
|
||||
|
||||
+ if args.extra_cflags:
|
||||
+ self.target_args += args.extra_cflags
|
||||
+
|
||||
if "wasm" in args.abi:
|
||||
require_emscipten_path (args)
|
||||
self.sys_includes = [args.emscripten_path + "/system/include/libc"]
|
||||
@@ -1,215 +0,0 @@
|
||||
From 63e677701d35c7e2dad4fe74a84eb935cd396155 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
|
||||
Date: Mon, 15 May 2023 20:46:12 +0200
|
||||
Subject: [PATCH] [mono] Update offsets-tool python clang binding so it works
|
||||
with newer clang (#86256)
|
||||
|
||||
They introduced a breaking change to CursorKind.TRANSLATION_UNIT in https://github.com/llvm/llvm-project/commit/bb83f8e70bd1d56152f02307adacd718cd67e312, which means we hit an issue when using the binding against a newer clang. Update the binding to the latest upstream and add a tweak so it still works with older clang versions.
|
||||
---
|
||||
mono/tools/offsets-tool/clang/cindex.py | 137 +++++++++++++++++-
|
||||
1 file changed, 135 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mono/tools/offsets-tool/clang/cindex.py b/mono/tools/offsets-tool/clang/cindex.py
|
||||
index 44c6f49096f495..0ed1c199ba44dd 100644
|
||||
--- a/mono/tools/offsets-tool/clang/cindex.py
|
||||
+++ b/mono/tools/offsets-tool/clang/cindex.py
|
||||
@@ -286,6 +286,11 @@ def offset(self):
|
||||
"""Get the file offset represented by this source location."""
|
||||
return self._get_instantiation()[3]
|
||||
|
||||
+ #@property
|
||||
+ #def is_in_system_header(self):
|
||||
+ # """Returns true if the given source location is in a system header."""
|
||||
+ # return conf.lib.clang_Location_isInSystemHeader(self)
|
||||
+
|
||||
def __eq__(self, other):
|
||||
return conf.lib.clang_equalLocations(self, other)
|
||||
|
||||
@@ -646,6 +651,11 @@ def name(self):
|
||||
|
||||
@classmethod
|
||||
def from_id(cls, id):
|
||||
+ if cls == CursorKind and id == 300:
|
||||
+ # --- DOTNET change ---
|
||||
+ # The id of CursorKind.TRANSLATION_UNIT changed in https://github.com/llvm/llvm-project/commit/bb83f8e70bd1d56152f02307adacd718cd67e312,
|
||||
+ # add mapping from the old to the new value so using the binding with an older clang still works.
|
||||
+ return cls._kinds[350]
|
||||
if id >= len(cls._kinds) or cls._kinds[id] is None:
|
||||
raise ValueError('Unknown template argument kind %d' % id)
|
||||
return cls._kinds[id]
|
||||
@@ -1152,7 +1162,7 @@ def __repr__(self):
|
||||
# Objective-C's @synchronized statement.
|
||||
CursorKind.OBJC_AT_SYNCHRONIZED_STMT = CursorKind(220)
|
||||
|
||||
-# Objective-C's autorealease pool statement.
|
||||
+# Objective-C's autorelease pool statement.
|
||||
CursorKind.OBJC_AUTORELEASE_POOL_STMT = CursorKind(221)
|
||||
|
||||
# Objective-C's for collection statement.
|
||||
@@ -1312,7 +1322,7 @@ def __repr__(self):
|
||||
#
|
||||
# The translation unit cursor exists primarily to act as the root cursor for
|
||||
# traversing the contents of a translation unit.
|
||||
-CursorKind.TRANSLATION_UNIT = CursorKind(300)
|
||||
+CursorKind.TRANSLATION_UNIT = CursorKind(350)
|
||||
|
||||
###
|
||||
# Attributes
|
||||
@@ -1473,6 +1483,107 @@ def is_default_method(self):
|
||||
"""
|
||||
return conf.lib.clang_CXXMethod_isDefaulted(self)
|
||||
|
||||
+ #def is_deleted_method(self):
|
||||
+ # """Returns True if the cursor refers to a C++ member function or member
|
||||
+ # function template that is declared '= delete'.
|
||||
+ # """
|
||||
+ # return conf.lib.clang_CXXMethod_isDeleted(self)
|
||||
+
|
||||
+ #def is_copy_assignment_operator_method(self):
|
||||
+ # """Returnrs True if the cursor refers to a copy-assignment operator.
|
||||
+
|
||||
+ # A copy-assignment operator `X::operator=` is a non-static,
|
||||
+ # non-template member function of _class_ `X` with exactly one
|
||||
+ # parameter of type `X`, `X&`, `const X&`, `volatile X&` or `const
|
||||
+ # volatile X&`.
|
||||
+
|
||||
+
|
||||
+ # That is, for example, the `operator=` in:
|
||||
+
|
||||
+ # class Foo {
|
||||
+ # bool operator=(const volatile Foo&);
|
||||
+ # };
|
||||
+
|
||||
+ # Is a copy-assignment operator, while the `operator=` in:
|
||||
+
|
||||
+ # class Bar {
|
||||
+ # bool operator=(const int&);
|
||||
+ # };
|
||||
+
|
||||
+ # Is not.
|
||||
+ # """
|
||||
+ # return conf.lib.clang_CXXMethod_isCopyAssignmentOperator(self)
|
||||
+
|
||||
+ #def is_move_assignment_operator_method(self):
|
||||
+ # """Returnrs True if the cursor refers to a move-assignment operator.
|
||||
+
|
||||
+ # A move-assignment operator `X::operator=` is a non-static,
|
||||
+ # non-template member function of _class_ `X` with exactly one
|
||||
+ # parameter of type `X&&`, `const X&&`, `volatile X&&` or `const
|
||||
+ # volatile X&&`.
|
||||
+
|
||||
+
|
||||
+ # That is, for example, the `operator=` in:
|
||||
+
|
||||
+ # class Foo {
|
||||
+ # bool operator=(const volatile Foo&&);
|
||||
+ # };
|
||||
+
|
||||
+ # Is a move-assignment operator, while the `operator=` in:
|
||||
+
|
||||
+ # class Bar {
|
||||
+ # bool operator=(const int&&);
|
||||
+ # };
|
||||
+
|
||||
+ # Is not.
|
||||
+ # """
|
||||
+ # return conf.lib.clang_CXXMethod_isMoveAssignmentOperator(self)
|
||||
+
|
||||
+ #def is_explicit_method(self):
|
||||
+ # """Determines if a C++ constructor or conversion function is
|
||||
+ # explicit, returning 1 if such is the case and 0 otherwise.
|
||||
+
|
||||
+ # Constructors or conversion functions are declared explicit through
|
||||
+ # the use of the explicit specifier.
|
||||
+
|
||||
+ # For example, the following constructor and conversion function are
|
||||
+ # not explicit as they lack the explicit specifier:
|
||||
+
|
||||
+ # class Foo {
|
||||
+ # Foo();
|
||||
+ # operator int();
|
||||
+ # };
|
||||
+
|
||||
+ # While the following constructor and conversion function are
|
||||
+ # explicit as they are declared with the explicit specifier.
|
||||
+
|
||||
+ # class Foo {
|
||||
+ # explicit Foo();
|
||||
+ # explicit operator int();
|
||||
+ # };
|
||||
+
|
||||
+ # This method will return 0 when given a cursor pointing to one of
|
||||
+ # the former declarations and it will return 1 for a cursor pointing
|
||||
+ # to the latter declarations.
|
||||
+
|
||||
+ # The explicit specifier allows the user to specify a
|
||||
+ # conditional compile-time expression whose value decides
|
||||
+ # whether the marked element is explicit or not.
|
||||
+
|
||||
+ # For example:
|
||||
+
|
||||
+ # constexpr bool foo(int i) { return i % 2 == 0; }
|
||||
+
|
||||
+ # class Foo {
|
||||
+ # explicit(foo(1)) Foo();
|
||||
+ # explicit(foo(2)) operator int();
|
||||
+ # }
|
||||
+
|
||||
+ # This method will return 0 for the constructor and 1 for
|
||||
+ # the conversion function.
|
||||
+ # """
|
||||
+ # return conf.lib.clang_CXXMethod_isExplicit(self)
|
||||
+
|
||||
def is_mutable_field(self):
|
||||
"""Returns True if the cursor refers to a C++ field that is declared
|
||||
'mutable'.
|
||||
@@ -2059,6 +2170,7 @@ def __repr__(self):
|
||||
TypeKind.OBJCSEL = TypeKind(29)
|
||||
TypeKind.FLOAT128 = TypeKind(30)
|
||||
TypeKind.HALF = TypeKind(31)
|
||||
+TypeKind.IBM128 = TypeKind(40)
|
||||
TypeKind.COMPLEX = TypeKind(100)
|
||||
TypeKind.POINTER = TypeKind(101)
|
||||
TypeKind.BLOCKPOINTER = TypeKind(102)
|
||||
@@ -2122,6 +2234,7 @@ def __repr__(self):
|
||||
TypeKind.OCLRESERVEID = TypeKind(160)
|
||||
|
||||
TypeKind.EXTVECTOR = TypeKind(176)
|
||||
+TypeKind.ATOMIC = TypeKind(177)
|
||||
|
||||
class RefQualifierKind(BaseEnumeration):
|
||||
"""Describes a specific ref-qualifier of a type."""
|
||||
@@ -3424,6 +3537,22 @@ def cursor(self):
|
||||
[Cursor],
|
||||
bool),
|
||||
|
||||
+ #("clang_CXXMethod_isDeleted",
|
||||
+ # [Cursor],
|
||||
+ # bool),
|
||||
+
|
||||
+ #("clang_CXXMethod_isCopyAssignmentOperator",
|
||||
+ # [Cursor],
|
||||
+ # bool),
|
||||
+
|
||||
+ #("clang_CXXMethod_isMoveAssignmentOperator",
|
||||
+ # [Cursor],
|
||||
+ # bool),
|
||||
+
|
||||
+ #("clang_CXXMethod_isExplicit",
|
||||
+ # [Cursor],
|
||||
+ # bool),
|
||||
+
|
||||
("clang_CXXMethod_isPureVirtual",
|
||||
[Cursor],
|
||||
bool),
|
||||
@@ -4012,6 +4141,10 @@ def cursor(self):
|
||||
[Cursor],
|
||||
c_longlong),
|
||||
|
||||
+ #("clang_Location_isInSystemHeader",
|
||||
+ # [SourceLocation],
|
||||
+ # bool),
|
||||
+
|
||||
("clang_Type_getAlignOf",
|
||||
[Type],
|
||||
c_longlong),
|
||||
@@ -1,52 +0,0 @@
|
||||
diff --git a/mono/mini/aot-runtime-wasm.c b/mono/mini/aot-runtime-wasm.c
|
||||
index ccc5a26510c..2f7001be00b 100644
|
||||
--- a/mono/mini/aot-runtime-wasm.c
|
||||
+++ b/mono/mini/aot-runtime-wasm.c
|
||||
@@ -112,6 +112,22 @@ mono_wasm_interp_to_native_trampoline (void *target_func, InterpMethodArguments
|
||||
icall_trampoline_dispatch (cookie, target_func, margs);
|
||||
}
|
||||
|
||||
+typedef mono_bool (*GodotMonoM2nIcallTrampolineDispatch)(const char *cookie, void *target_func, InterpMethodArguments *margs);
|
||||
+
|
||||
+GodotMonoM2nIcallTrampolineDispatch m2n_icall_trampoline_dispatch_hook = NULL;
|
||||
+
|
||||
+GodotMonoM2nIcallTrampolineDispatch
|
||||
+godot_mono_get_m2n_icall_trampoline_dispatch_hook (void)
|
||||
+{
|
||||
+ return m2n_icall_trampoline_dispatch_hook;
|
||||
+}
|
||||
+
|
||||
+MONO_API void
|
||||
+godot_mono_register_m2n_icall_trampoline_dispatch_hook (GodotMonoM2nIcallTrampolineDispatch hook)
|
||||
+{
|
||||
+ m2n_icall_trampoline_dispatch_hook = hook;
|
||||
+}
|
||||
+
|
||||
#else /* TARGET_WASM */
|
||||
|
||||
MONO_EMPTY_SOURCE_FILE (aot_runtime_wasm);
|
||||
diff --git a/mono/mini/wasm_m2n_invoke.g.h b/mono/mini/wasm_m2n_invoke.g.h
|
||||
index aea7e9698ad..3bb715f9fd8 100644
|
||||
--- a/mono/mini/wasm_m2n_invoke.g.h
|
||||
+++ b/mono/mini/wasm_m2n_invoke.g.h
|
||||
@@ -1017,6 +1017,10 @@ wasm_invoke_vil (void *target_func, InterpMethodArguments *margs)
|
||||
|
||||
}
|
||||
|
||||
+typedef mono_bool (*GodotMonoM2nIcallTrampolineDispatch)(const char *cookie, void *target_func, InterpMethodArguments *margs);
|
||||
+
|
||||
+GodotMonoM2nIcallTrampolineDispatch godot_mono_get_m2n_icall_trampoline_dispatch_hook (void);
|
||||
+
|
||||
static void
|
||||
icall_trampoline_dispatch (const char *cookie, void *target_func, InterpMethodArguments *margs)
|
||||
{
|
||||
@@ -1820,5 +1824,9 @@ icall_trampoline_dispatch (const char *cookie, void *target_func, InterpMethodAr
|
||||
}
|
||||
}
|
||||
}
|
||||
+ GodotMonoM2nIcallTrampolineDispatch trampoline_dispatch_hook = godot_mono_get_m2n_icall_trampoline_dispatch_hook ();
|
||||
+ if (trampoline_dispatch_hook != NULL && trampoline_dispatch_hook (cookie, target_func, margs)) {
|
||||
+ return;
|
||||
+ }
|
||||
g_error ("CANNOT HANDLE COOKIE %s\n", cookie);
|
||||
}
|
||||
15
files/xi.cs
15
files/xi.cs
@@ -1,15 +0,0 @@
|
||||
using System.Net.Http;
|
||||
|
||||
[assembly:System.Reflection.AssemblyVersionAttribute ("0.0.0.0")]
|
||||
[assembly:System.Runtime.CompilerServices.InternalsVisibleTo ("System.Net.Http, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
|
||||
|
||||
namespace ObjCRuntime
|
||||
{
|
||||
internal class RuntimeOptions
|
||||
{
|
||||
internal static HttpMessageHandler GetHttpMessageHandler()
|
||||
{
|
||||
return new HttpClientHandler();
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
files/xi.snk
BIN
files/xi.snk
Binary file not shown.
48
format.sh
48
format.sh
@@ -1,48 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -uo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
# Loops through all text files tracked by Git.
|
||||
git grep -zIl '' |
|
||||
while IFS= read -rd '' f; do
|
||||
# Exclude csproj and hdr files, and patches.
|
||||
if [[ "$f" == *"csproj" ]]; then
|
||||
continue
|
||||
elif [[ "$f" == *"hdr" ]]; then
|
||||
continue
|
||||
elif [[ "$f" == *"diff" ]]; then
|
||||
continue
|
||||
elif [[ "$f" == *"patch" ]]; then
|
||||
continue
|
||||
fi
|
||||
# Ensures that files are UTF-8 formatted.
|
||||
recode UTF-8 "$f" 2> /dev/null
|
||||
# Ensures that files have LF line endings.
|
||||
dos2unix "$f" 2> /dev/null
|
||||
# Ensures that files do not contain a BOM.
|
||||
sed -i '1s/^\xEF\xBB\xBF//' "$f"
|
||||
# Ensures that files end with newline characters.
|
||||
tail -c1 < "$f" | read -r _ || echo >> "$f";
|
||||
# Remove trailing space characters.
|
||||
sed -z -i 's/\x20\x0A/\x0A/g' "$f"
|
||||
done
|
||||
|
||||
git diff > patch.patch
|
||||
FILESIZE="$(stat -c%s patch.patch)"
|
||||
MAXSIZE=5
|
||||
|
||||
# If no patch has been generated all is OK, clean up, and exit.
|
||||
if (( FILESIZE < MAXSIZE )); then
|
||||
printf "Files in this commit comply with the formatting rules.\n"
|
||||
rm -f patch.patch
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# A patch has been created, notify the user, clean up, and exit.
|
||||
printf "\n*** The following differences were found between the code "
|
||||
printf "and the formatting rules:\n\n"
|
||||
cat patch.patch
|
||||
printf "\n*** Aborting, please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
|
||||
rm -f patch.patch
|
||||
exit 1
|
||||
37
ios.py
37
ios.py
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
import os
|
||||
import os.path
|
||||
@@ -14,7 +14,7 @@ import runtime
|
||||
this_script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
|
||||
device_targets = ['armv7', 'arm64']
|
||||
sim_targets = ['i386', 'x86_64', 'arm64-sim']
|
||||
sim_targets = ['i386', 'x86_64']
|
||||
cross_targets = ['cross-armv7', 'cross-arm64']
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@ class iOSTargetTable:
|
||||
archs = {
|
||||
'armv7': 'arm',
|
||||
'arm64': 'arm64',
|
||||
'arm64-sim': 'arm64',
|
||||
'i386': 'i386',
|
||||
'x86_64': 'x86_64'
|
||||
}
|
||||
@@ -34,7 +33,6 @@ class iOSTargetTable:
|
||||
host_triples = {
|
||||
'armv7': 'arm-apple-darwin11',
|
||||
'arm64': 'aarch64-apple-darwin11',
|
||||
'arm64-sim': 'aarch64-apple-darwin11',
|
||||
'i386': 'i386-apple-darwin11',
|
||||
'x86_64': 'x86_64-apple-darwin11'
|
||||
}
|
||||
@@ -42,7 +40,6 @@ class iOSTargetTable:
|
||||
osxcross_tool_triples = {
|
||||
'armv7': 'arm-apple-darwin11', # TODO: ?
|
||||
'arm64': 'arm-apple-darwin11',
|
||||
'arm64-sim': 'arm-apple-darwin11',
|
||||
'i386': 'i386-apple-darwin11', # TODO: ?
|
||||
'x86_64': 'x86_64-apple-darwin11'
|
||||
}
|
||||
@@ -99,9 +96,6 @@ def setup_ios_device_template(env: dict, opts: iOSOpts, target: str):
|
||||
'ac_cv_func_futimens=no',
|
||||
'ac_cv_func_utimensat=no',
|
||||
'ac_cv_func_shm_open_working_with_mmap=no',
|
||||
'ac_cv_func_pthread_jit_write_protect_np=no',
|
||||
'ac_cv_func_preadv=no',
|
||||
'ac_cv_func_pwritev=no',
|
||||
'mono_cv_sizeof_sunpath=104',
|
||||
'mono_cv_uscore=yes'
|
||||
]
|
||||
@@ -127,7 +121,13 @@ def setup_ios_device_template(env: dict, opts: iOSOpts, target: str):
|
||||
'-DSMALL_CONFIG', '-D_XOPEN_SOURCE', '-DHOST_IOS', '-DHAVE_LARGE_FILE_SUPPORT=1'
|
||||
]
|
||||
|
||||
LDFLAGS = [
|
||||
LDFLAGS = []
|
||||
|
||||
# https://github.com/mono/mono/issues/19393
|
||||
if os.environ.get('DISABLE_NO_WEAK_IMPORTS', '0') != '1':
|
||||
LDFLAGS += ['-Wl,-no_weak_imports']
|
||||
|
||||
LDFLAGS += [
|
||||
'-arch %s' % arch,
|
||||
'-framework', 'CoreFoundation',
|
||||
'-lobjc', '-lc++'
|
||||
@@ -188,7 +188,7 @@ def setup_ios_simulator_template(env: dict, opts: iOSOpts, target: str):
|
||||
if not ios_sysroot_path:
|
||||
raise RuntimeError('Cannot find iOS SDK; specify one manually with \'--ios-sdk\'.')
|
||||
|
||||
sysroot_flags = ['-isysroot', ios_sysroot_path, '-mios-simulator-version-min=%s' % opts.ios_version_min]
|
||||
sysroot_flags = ['-isysroot', ios_sysroot_path, '-miphoneos-version-min=%s' % opts.ios_version_min]
|
||||
|
||||
arch = iOSTargetTable.archs[target]
|
||||
host_triple = iOSTargetTable.host_triples[target]
|
||||
@@ -225,9 +225,6 @@ def setup_ios_simulator_template(env: dict, opts: iOSOpts, target: str):
|
||||
'ac_cv_func_futimens=no',
|
||||
'ac_cv_func_utimensat=no',
|
||||
'ac_cv_func_shm_open_working_with_mmap=no',
|
||||
'ac_cv_func_pthread_jit_write_protect_np=no',
|
||||
'ac_cv_func_preadv=no',
|
||||
'ac_cv_func_pwritev=no',
|
||||
'mono_cv_uscore=yes'
|
||||
]
|
||||
|
||||
@@ -309,11 +306,8 @@ class iOSCrossTable:
|
||||
}
|
||||
|
||||
|
||||
def llvm_for(host_arch: str) -> str:
|
||||
return 'llvmarm64' if host_arch == 'arm64' else 'llvm64'
|
||||
|
||||
|
||||
def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: str):
|
||||
|
||||
target_triple = iOSCrossTable.target_triples[target]
|
||||
device_target = iOSCrossTable.device_targets[target]
|
||||
offsets_dumper_abi = iOSCrossTable.offsets_dumper_abis[target]
|
||||
@@ -417,7 +411,7 @@ def setup_ios_cross_template(env: dict, opts: iOSOpts, target: str, host_arch: s
|
||||
env['_ios-%s_CONFIGURE_FLAGS' % target] = CONFIGURE_FLAGS
|
||||
|
||||
# Runtime cross template
|
||||
runtime.setup_runtime_cross_template(env, opts, 'ios', target, host_triple, target_triple, device_target, llvm_for(host_arch), offsets_dumper_abi)
|
||||
runtime.setup_runtime_cross_template(env, opts, 'ios', target, host_triple, target_triple, device_target, 'llvm64', offsets_dumper_abi)
|
||||
|
||||
|
||||
def strip_libs(opts: iOSOpts, product: str, target: str):
|
||||
@@ -433,11 +427,8 @@ def configure(opts: iOSOpts, product: str, target: str):
|
||||
if is_cross(target):
|
||||
import llvm
|
||||
|
||||
host_arch='x86_64'
|
||||
|
||||
llvm.make(opts, llvm_for(host_arch))
|
||||
|
||||
setup_ios_cross_template(env, opts, target, host_arch)
|
||||
llvm.make(opts, 'llvm64')
|
||||
setup_ios_cross_template(env, opts, target, host_arch='x86_64')
|
||||
else:
|
||||
if is_sim:
|
||||
setup_ios_simulator_template(env, opts, target)
|
||||
|
||||
2
linux.py
2
linux.py
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
from desktop import run_main
|
||||
|
||||
|
||||
10
llvm.py
10
llvm.py
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
import os
|
||||
import sys
|
||||
@@ -11,7 +11,7 @@ from os_utils import *
|
||||
# TODO: OSXCROSS
|
||||
|
||||
|
||||
target_values = ['llvm32', 'llvm64', 'llvmarm64', 'llvmwin32', 'llvmwin64']
|
||||
target_values = ['llvm32', 'llvm64', 'llvmwin32', 'llvmwin64']
|
||||
mxe_targets = {
|
||||
'llvmwin32': {'arch': 'i686', 'mxe': 'mxe-Win32'},
|
||||
'llvmwin64': {'arch': 'x86_64', 'mxe': 'mxe-Win64'}
|
||||
@@ -38,8 +38,8 @@ def make(opts: BaseOpts, target: str):
|
||||
|
||||
CMAKE_ARGS += [
|
||||
'-DCMAKE_EXE_LINKER_FLAGS="-static"',
|
||||
'-DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm-project/llvm/cmake/modules/NATIVE.cmake' % opts.mono_source_root,
|
||||
'-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm-project/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe),
|
||||
'-DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm/cmake/modules/NATIVE.cmake' % opts.mono_source_root,
|
||||
'-DCMAKE_TOOLCHAIN_FILE=%s/external/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe),
|
||||
'-DLLVM_ENABLE_THREADS=Off',
|
||||
'-DLLVM_BUILD_EXECUTION_ENGINE=Off'
|
||||
]
|
||||
@@ -58,7 +58,7 @@ def make(opts: BaseOpts, target: str):
|
||||
replace_in_new_file(
|
||||
src_file='%s/sdks/builds/%s.cmake.in' % (opts.mono_source_root, mxe),
|
||||
search='@MXE_PATH@', replace=opts.mxe_prefix,
|
||||
dst_file='%s/external/llvm-project/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe)
|
||||
dst_file='%s/external/llvm/cmake/modules/%s.cmake' % (opts.mono_source_root, mxe)
|
||||
)
|
||||
|
||||
if target in ['llvm32', 'llvmwin32']:
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
import os
|
||||
|
||||
from os_utils import *
|
||||
|
||||
|
||||
def find_dotnet_cli():
|
||||
import os.path
|
||||
|
||||
for hint_dir in os.environ["PATH"].split(os.pathsep):
|
||||
hint_dir = hint_dir.strip('"')
|
||||
hint_path = os.path.join(hint_dir, "dotnet")
|
||||
if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
|
||||
return hint_path
|
||||
|
||||
|
||||
def find_msbuild():
|
||||
import os.path
|
||||
import sys
|
||||
|
||||
hint_dirs = []
|
||||
if sys.platform == "darwin":
|
||||
hint_dirs[:0] = [
|
||||
"/Library/Frameworks/Mono.framework/Versions/Current/bin",
|
||||
"/usr/local/var/homebrew/linked/mono/bin",
|
||||
]
|
||||
|
||||
for hint_dir in hint_dirs:
|
||||
hint_path = os.path.join(hint_dir, "msbuild")
|
||||
if os.path.isfile(hint_path):
|
||||
return hint_path
|
||||
|
||||
for hint_dir in os.environ["PATH"].split(os.pathsep):
|
||||
hint_dir = hint_dir.strip('"')
|
||||
hint_path = os.path.join(hint_dir, "msbuild")
|
||||
if os.path.isfile(hint_path) and os.access(hint_path, os.X_OK):
|
||||
return hint_path
|
||||
|
||||
return None
|
||||
|
||||
|
||||
def build_solution(solution_path, build_config, extra_msbuild_args=[]):
|
||||
msbuild_args = []
|
||||
|
||||
dotnet_cli = find_dotnet_cli()
|
||||
|
||||
if dotnet_cli:
|
||||
msbuild_path = dotnet_cli
|
||||
msbuild_args += ["msbuild"] # `dotnet msbuild` command
|
||||
else:
|
||||
msbuild_path = find_msbuild()
|
||||
if msbuild_path is None:
|
||||
raise BuildError("Cannot find MSBuild executable")
|
||||
|
||||
print("MSBuild path: " + msbuild_path)
|
||||
|
||||
# Build solution
|
||||
|
||||
msbuild_args += [solution_path, "/restore", "/t:Build", "/p:Configuration=" + build_config]
|
||||
msbuild_args += extra_msbuild_args
|
||||
|
||||
run_command(msbuild_path, msbuild_args, name="msbuild")
|
||||
@@ -23,8 +23,9 @@ class RuntimeOpts(BaseOpts):
|
||||
|
||||
@dataclass
|
||||
class AndroidOpts(RuntimeOpts):
|
||||
android_toolchains_prefix: str
|
||||
android_sdk_root: str
|
||||
android_ndk_version: str
|
||||
android_ndk_root: str
|
||||
android_api_version: str
|
||||
android_cmake_version: str
|
||||
toolchain_name_fmt: str = '%s-api%s-clang'
|
||||
@@ -79,8 +80,9 @@ def runtime_opts_from_args(args):
|
||||
def android_opts_from_args(args):
|
||||
return AndroidOpts(
|
||||
**vars(runtime_opts_from_args(args)),
|
||||
android_toolchains_prefix = abspath(args.toolchains_prefix),
|
||||
android_sdk_root = abspath(args.android_sdk),
|
||||
android_ndk_version = args.android_ndk_version,
|
||||
android_ndk_root = abspath(args.android_ndk),
|
||||
android_api_version = args.android_api_version,
|
||||
android_cmake_version = args.android_cmake_version
|
||||
)
|
||||
|
||||
2
osx.py
2
osx.py
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
from desktop import run_main
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
|
||||
def main(raw_args):
|
||||
import os
|
||||
@@ -23,6 +24,7 @@ def main(raw_args):
|
||||
|
||||
patches = [
|
||||
'%s/sdks/builds/fix-emscripten-8511.diff' % mono_source_root,
|
||||
'%s/sdks/builds/emscripten-pr-8457.diff' % mono_source_root
|
||||
]
|
||||
|
||||
from subprocess import Popen
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
|
||||
def main(raw_args):
|
||||
@@ -27,19 +27,16 @@ def main(raw_args):
|
||||
|
||||
patches = [
|
||||
'fix-mono-android-tkill.diff',
|
||||
'fix-mono-log-spam.diff',
|
||||
'mono-dbg-agent-clear-tls-instead-of-abort.diff',
|
||||
'bcl-profile-platform-override.diff',
|
||||
'mono_ios_asl_log_deprecated.diff',
|
||||
'wasm_m2n_trampolines_hook.diff',
|
||||
'btls-cmake-args-linux-mingw.diff',
|
||||
'btls-cmake-arm64.diff',
|
||||
'llvm-osx-regex-conflict.diff',
|
||||
'offsets-tool-extra-cflags.diff',
|
||||
'offsets-tool-newer-clang.diff',
|
||||
'offsets-tool-duplicate-fields.diff',
|
||||
'mono_ios_asl_log_deprecated.diff'
|
||||
]
|
||||
|
||||
if os.path.isfile(os.path.join(mono_source_root, 'mono/tools/offsets-tool/offsets-tool.py')):
|
||||
patches += ['offsets-tool-extra-cflags_new.diff']
|
||||
else:
|
||||
patches += ['offsets-tool-extra-cflags_old.diff']
|
||||
|
||||
from subprocess import Popen
|
||||
from sys import exit
|
||||
for patch in patches:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
import sys
|
||||
|
||||
|
||||
2
wasm.py
2
wasm.py
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
import os
|
||||
import os.path
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/python
|
||||
|
||||
from desktop import run_main
|
||||
|
||||
|
||||
Reference in New Issue
Block a user