Extend Make to generate and build other targets

This commit is contained in:
Ali 2021-11-12 20:38:27 +04:00
parent 383b555437
commit f882d76a3c
2 changed files with 31 additions and 12 deletions

View File

@ -377,6 +377,7 @@ def generate_project(arguments):
disable_extensions = False
disable_provisioning_profiles = False
generate_dsym = False
target_name = "Telegram"
if arguments.disableExtensions is not None:
disable_extensions = arguments.disableExtensions
@ -384,6 +385,8 @@ def generate_project(arguments):
disable_provisioning_profiles = arguments.disableProvisioningProfiles
if arguments.generateDsym is not None:
generate_dsym = arguments.generateDsym
if arguments.target is not None:
target_name = arguments.target
call_executable(['killall', 'Xcode'], check_result=False)
@ -394,6 +397,7 @@ def generate_project(arguments):
generate_dsym=generate_dsym,
configuration_path=bazel_command_line.configuration_path,
bazel_app_arguments=bazel_command_line.get_project_generation_arguments(),
target_name=target_name
)
@ -559,6 +563,13 @@ if __name__ == '__main__':
'''
)
generateProjectParser.add_argument(
'--target',
type=str,
help='A custom bazel target name to build.',
metavar='target_name'
)
buildParser = subparsers.add_parser('build', help='Build the app')
buildParser.add_argument(
'--buildNumber',

View File

@ -10,13 +10,21 @@ def remove_directory(path):
shutil.rmtree(path)
def generate(build_environment: BuildEnvironment, disable_extensions, disable_provisioning_profiles, generate_dsym, configuration_path, bazel_app_arguments):
def generate(build_environment: BuildEnvironment, disable_extensions, disable_provisioning_profiles, generate_dsym, configuration_path, bazel_app_arguments, target_name):
project_path = os.path.join(build_environment.base_path, 'build-input/gen/project')
app_target = 'Telegram'
if '/' in target_name:
app_target_spec = target_name.split('/')[0] + '/' + target_name.split('/')[1] + ':' + target_name.split('/')[1]
app_target = target_name
app_target_clean = app_target.replace('/', '_')
else:
app_target_spec = '{target}:{target}'.format(target=target_name)
app_target = target_name
app_target_clean = app_target.replace('/', '_')
os.makedirs(project_path, exist_ok=True)
remove_directory('{}/Tulsi.app'.format(project_path))
remove_directory('{project}/{target}.tulsiproj'.format(project=project_path, target=app_target))
remove_directory('{project}/{target}.tulsiproj'.format(project=project_path, target=app_target_clean))
tulsi_path = os.path.join(project_path, 'Tulsi.app/Contents/MacOS/Tulsi')
@ -78,9 +86,9 @@ def generate(build_environment: BuildEnvironment, disable_extensions, disable_pr
bazel_build_arguments = []
bazel_build_arguments += ['--override_repository=build_configuration={}'.format(configuration_path)]
if disable_extensions:
bazel_build_arguments += ['--//Telegram:disableExtensions']
bazel_build_arguments += ['--//{}:disableExtensions'.format(app_target)]
if disable_provisioning_profiles:
bazel_build_arguments += ['--//Telegram:disableProvisioningProfiles']
bazel_build_arguments += ['--//{}:disableProvisioningProfiles'.format(app_target)]
if generate_dsym:
bazel_build_arguments += ['--apple_generate_dsym']
@ -88,11 +96,11 @@ def generate(build_environment: BuildEnvironment, disable_extensions, disable_pr
tulsi_path,
'--',
'--verbose',
'--create-tulsiproj', app_target,
'--create-tulsiproj', app_target_clean,
'--workspaceroot', './',
'--bazel', bazel_wrapper_path,
'--outputfolder', project_path,
'--target', '{target}:{target}'.format(target=app_target),
'--target', '{target_spec}'.format(target_spec=app_target_spec),
'--build-options', ' '.join(bazel_build_arguments)
])
@ -100,17 +108,17 @@ def generate(build_environment: BuildEnvironment, disable_extensions, disable_pr
additional_arguments += ['--override_repository=build_configuration={}'.format(configuration_path)]
additional_arguments += bazel_app_arguments
if disable_extensions:
additional_arguments += ['--//Telegram:disableExtensions']
additional_arguments += ['--//{}:disableExtensions'.format(app_target)]
additional_arguments_string = ' '.join(additional_arguments)
tulsi_config_path = 'build-input/gen/project/{target}.tulsiproj/Configs/{target}.tulsigen'.format(target=app_target)
tulsi_config_path = 'build-input/gen/project/{target}.tulsiproj/Configs/{target}.tulsigen'.format(target=app_target_clean)
with open(tulsi_config_path, 'rb') as tulsi_config:
tulsi_config_json = json.load(tulsi_config)
for category in ['BazelBuildOptionsDebug', 'BazelBuildOptionsRelease']:
tulsi_config_json['optionSet'][category]['p'] += ' {}'.format(additional_arguments_string)
tulsi_config_json['sourceFilters'] = [
'Telegram/...',
'{}/...'.format(app_target),
'submodules/...',
'third-party/...'
]
@ -121,12 +129,12 @@ def generate(build_environment: BuildEnvironment, disable_extensions, disable_pr
tulsi_path,
'--',
'--verbose',
'--genconfig', '{project}/{target}.tulsiproj:{target}'.format(project=project_path, target=app_target),
'--genconfig', '{project}/{target}.tulsiproj:{target}'.format(project=project_path, target=app_target_clean),
'--bazel', bazel_wrapper_path,
'--outputfolder', project_path,
'--no-open-xcode'
])
xcodeproj_path = '{project}/{target}.xcodeproj'.format(project=project_path, target=app_target)
xcodeproj_path = '{project}/{target}.xcodeproj'.format(project=project_path, target=app_target_clean)
call_executable(['open', xcodeproj_path])