diff options
author | arcadia-devtools <[email protected]> | 2022-04-06 08:19:15 +0300 |
---|---|---|
committer | arcadia-devtools <[email protected]> | 2022-04-06 08:19:15 +0300 |
commit | 60928c4d649ea546659f6f1eedd7ab80947dcbd2 (patch) | |
tree | 98e4a670083df4eba3915040c69930f44b20277e /build/plugins | |
parent | 7e9dc13d9120d62ad81b627f1017ecab025abfe1 (diff) |
intermediate changes
ref:5bc2a57c5d394201cd37814df101c8d32e444ce8
Diffstat (limited to 'build/plugins')
-rw-r--r-- | build/plugins/copy_files_to_build_prefix.py | 2 | ||||
-rw-r--r-- | build/plugins/res.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/build/plugins/copy_files_to_build_prefix.py b/build/plugins/copy_files_to_build_prefix.py index c8a6e075118..242c9937665 100644 --- a/build/plugins/copy_files_to_build_prefix.py +++ b/build/plugins/copy_files_to_build_prefix.py @@ -7,7 +7,7 @@ CURDIR = '${CURDIR}/' BINDIR = '${BINDIR}/' -def oncopy_files_to_build_prefix(unit, *args): +def on_copy_files_to_build_prefix(unit, *args): keywords = {'PREFIX': 1, 'GLOBAL': 0} # NB! keyword 'GLOBAL' is a way to skip this word from the list of files diff --git a/build/plugins/res.py b/build/plugins/res.py index a937caba816..5a868fe100c 100644 --- a/build/plugins/res.py +++ b/build/plugins/res.py @@ -1,4 +1,5 @@ from _common import iterpair, listid, pathid, rootrel_arc_src, tobuilddir, filter_out_by_keyword +import ymake def split(lst, limit): @@ -88,6 +89,9 @@ def onresource_files(unit, *args): args = iter(args[first:]) for arg in args: + if arg == 'DONT_PARSE': + # ignore explicit specification + continue if arg == 'PREFIX': prefix, dest = next(args), None elif arg == 'DEST': @@ -104,3 +108,10 @@ def onresource_files(unit, *args): unit.on_go_resource(res) else: unit.onresource(res) + +def onall_resource_files(unit, *args): + # This is only validation, actual work is done in ymake.core.conf implementation + for arg in args: + if '*' in arg or '?' in arg: + ymake.report_configure_error('Wildcards in [[imp]]ALL_RESOURCE_FILES[[rst]] are not allowed') + |