Relintai/godot-mono-builds
1
0
Fork 0
mirror of https://github.com/Relintai/godot-mono-builds.git synced 2024-11-12 10:25:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

make: Always use --jobs and support no argument (max jobs)

Browse Source 
The jobs logic is factored out into `options.py` and used consistently
in all places where a `make` (build) is called. It's not used for
`make install`.

Scripts can now be called with `--jobs` without argument, which will
use the max amount of CPU threads reported by the OS.

Also adds `-j` alias for `--jobs`.
This commit is contained in:
Rémi Verschelde 2020-04-06 11:01:36 +02:00
parent 443ca3c7e1
commit b9e297ad91
9 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android.py
View File

@ -460,8 +460,8 @@ def make(opts: AndroidOpts, product: str, target: str):
build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
make_args = ['-j', opts.jobs, '-C', build_dir]
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir]
run_command('make', args=make_args, name='make')
run_command('make', args=['-C', '%s/mono' % build_dir, 'install'], name='make install mono')

13
bcl.py
View File

@ -64,8 +64,8 @@ def make_bcl(opts: BclOpts):
build_dir = path_join(opts.configure_dir, 'bcl')
make_args = ['-j', opts.jobs, '-C', build_dir, '-C', 'mono']
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir, '-C', 'mono']
run_command('make', args=make_args, name='make bcl')
@ -96,8 +96,8 @@ def make_product(opts: BclOpts, product: str):
mkdir_p(install_dir)
make_args = ['-C', build_dir, '-C', 'runtime', 'all-mcs', 'build_profiles=%s' % ' '.join(profiles)]
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir, '-C', 'runtime', 'all-mcs', 'build_profiles=%s' % ' '.join(profiles)]
if product == 'desktop-win32':
make_args += ['PROFILE_PLATFORM=win32'] # Requires patch: 'bcl-profile-platform-override.diff'
@ -105,8 +105,9 @@ def make_product(opts: BclOpts, product: str):
run_command('make', args=make_args, name='make profiles')
if opts.tests and len(test_profiles) > 0:
test_make_args = ['-C', build_dir, '-C', 'runtime', 'test', 'xunit-test', 'test_profiles=%s' % ' '.join(test_profiles)]
test_make_args += ['V=1'] if opts.verbose_make else []
test_make_args = make_default_args(opts)
test_make_args += ['-C', build_dir, '-C', 'runtime', 'test', 'xunit-test', 'test_profiles=%s' % ' '.join(test_profiles)]
run_command('make', args=test_make_args, name='make tests')
# Copy the bcl profiles to the output directory

4
cmd_utils.py
View File

@ -44,7 +44,9 @@ def add_base_arguments(parser, default_help):
mono_sources_default = os.environ.get('MONO_SOURCE_ROOT', '')
parser.add_argument('--verbose-make', action='store_true', default=False, help=default_help)
parser.add_argument('--jobs', default='1', help=default_help)
# --jobs supports not passing an argument, in which case the 'const' is used,
# which is the number of CPU cores on the host system.
parser.add_argument('--jobs', '-j', nargs='?', const=str(os.cpu_count()), default='1', help=default_help)
parser.add_argument('--configure-dir', default=path_join(home, 'mono-configs'), help=default_help)
parser.add_argument('--install-dir', default=path_join(home, 'mono-installs'), help=default_help)

4
desktop.py
View File

@ -167,8 +167,8 @@ 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))
make_args = ['-j', opts.jobs, '-C', build_dir]
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir]
run_command('make', args=make_args, name='make')
run_command('make', args=['-C', '%s/mono' % build_dir, 'install'], name='make install mono')

4
ios.py
View File

@ -424,8 +424,8 @@ def make(opts: iOSOpts, product: str, target: str):
build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
make_args = ['-C', build_dir]
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir]
run_command('make', args=make_args, name='make')
run_command('make', args=['-C', '%s/mono' % build_dir, 'install'], name='make install mono')

32
llvm.py
View File

@ -66,22 +66,19 @@ def make(opts: BaseOpts, target: str):
CMAKE_ARGS += [os.environ.get('llvm-%s_CMAKE_ARGS' % target, '')]
make_args = [
'-j', opts.jobs,
'-C', '%s/llvm' % opts.mono_source_root,
'-f', 'build.mk', 'install-llvm',
'LLVM_BUILD=%s' % build_dir,
'LLVM_PREFIX=%s' % install_dir,
'LLVM_CMAKE_ARGS=%s' % ' '.join([a for a in CMAKE_ARGS if a])
]
make_args += ['V=1'] if opts.verbose_make else []
# IMPORTANT: We must specify the jobs count for this Makefile.
# The Makefile itself runs Make as well with the '-j' option, which tells it to spawn as many jobs as possible.
# This can result in errors like 'posix_spawn failed: Resource temporarily unavailable' on macOS due to the process limit.
# The job count seems to be inherited from the parent Make process, so that fixes the issue.
make_args += ['-j', opts.jobs]
# Note: This is handle automatically in make_default_args.
make_args = make_default_args(opts)
make_args += [
'-C', '%s/llvm' % opts.mono_source_root,
'-f', 'build.mk', 'install-llvm',
'LLVM_BUILD=%s' % build_dir,
'LLVM_PREFIX=%s' % install_dir,
'LLVM_CMAKE_ARGS=%s' % ' '.join([a for a in CMAKE_ARGS if a])
]
if not find_executable('cmake') and not 'CMAKE' in os.environ:
print('WARNING: Cannot find CMake. Required by the llvm Makefile.')
@ -98,15 +95,14 @@ def clean(opts: BaseOpts, target: str):
rm_rf(stamp_file)
make_args = [
'-C', '%s/llvm' % opts.mono_source_root,
make_args = make_default_args(opts)
make_args += [
'-C', '%s/llvm' % opts.mono_source_root,
'-f', 'build.mk', 'clean-llvm',
'LLVM_BUILD=%s' % build_dir,
'LLVM_PREFIX=%s' % install_dir
'LLVM_BUILD=%s' % build_dir,
'LLVM_PREFIX=%s' % install_dir
]
make_args += ['V=1'] if opts.verbose_make else []
run_command('make', args=make_args, name='make clean')

6
options.py
View File

@ -111,3 +111,9 @@ def desktop_opts_from_args(args):
**vars(runtime_opts_from_args(args)),
with_llvm = args.with_llvm
)
def make_default_args(opts: BaseOpts):
make_args = ['-j%s' % opts.jobs]
make_args += ['V=1'] if opts.verbose_make else []
return make_args

10
reference_assemblies.py
View File

@ -13,8 +13,9 @@ def build(opts: BaseOpts):
mkdir_p(install_dir)
make_args = ['-C', build_dir, 'build-reference-assemblies']
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir, 'build-reference-assemblies']
run_command('make', args=make_args, name='make build-reference-assemblies')
@ -24,8 +25,9 @@ def install(opts: BaseOpts):
mkdir_p(install_dir)
make_args = ['-C', build_dir, 'install-local', 'DESTDIR=%s' % install_dir, 'prefix=/']
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir, 'install-local', 'DESTDIR=%s' % install_dir, 'prefix=/']
run_command('make', args=make_args, name='make install-local')

4
wasm.py
View File

@ -128,8 +128,8 @@ def make(opts: RuntimeOpts, product: str, target: str):
build_dir = path_join(opts.configure_dir, '%s-%s-%s' % (product, target, opts.configuration))
install_dir = path_join(opts.install_dir, '%s-%s-%s' % (product, target, opts.configuration))
make_args = ['-j', opts.jobs, '-C', build_dir]
make_args += ['V=1'] if opts.verbose_make else []
make_args = make_default_args(opts)
make_args += ['-C', build_dir]
make_env = os.environ.copy()
make_env['PATH'] = emsdk_root + ':' + make_env['PATH']