aboutsummaryrefslogtreecommitdiffstats
path: root/build/plugins
diff options
context:
space:
mode:
authorAlexSm <alex@ydb.tech>2023-12-22 17:10:22 +0100
committerGitHub <noreply@github.com>2023-12-22 17:10:22 +0100
commit148f920350c60c0ca2d89b637a5aea9093eee450 (patch)
tree6314b1433dac833398c333731e83f0ad77e81a0b /build/plugins
parent7116d46ae7c0259b5f9d489de263f8701e432b1c (diff)
downloadydb-148f920350c60c0ca2d89b637a5aea9093eee450.tar.gz
Library import 2 (#639)
Diffstat (limited to 'build/plugins')
-rw-r--r--build/plugins/java.py1
-rw-r--r--build/plugins/res.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/build/plugins/java.py b/build/plugins/java.py
index a567b2e029..69da60361d 100644
--- a/build/plugins/java.py
+++ b/build/plugins/java.py
@@ -483,4 +483,3 @@ def on_setup_project_coords_if_needed(unit, *args):
else:
value = 'project(\\":{}\\")'.format(project_dir.replace('/', ':'))
unit.set(['EXPORT_GRADLE_CLASSPATH', value])
- unit.set(['EXPORT_GRADLE_CLASSPATH_GLOBAL', value])
diff --git a/build/plugins/res.py b/build/plugins/res.py
index bd3d3abe23..24c183ad7f 100644
--- a/build/plugins/res.py
+++ b/build/plugins/res.py
@@ -56,6 +56,11 @@ def onresource_files(unit, *args):
key = 'resfs/file/' + (
dest or (prefix + (path if not prefix_to_strip else remove_prefix(path, prefix_to_strip)))
)
+ if key in res:
+ unit.message(
+ ['warn', "Dublicated resource file {} in RESOURCE_FILES() macro. Skipped it.".format(path)]
+ )
+ continue
src = 'resfs/src/{}={}'.format(key, rootrel_arc_src(path, unit))
res += ['-', src, path, key]