aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-08-02 14:57:48 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-08-02 14:57:48 +0300
commit6d33d6ed03659640a628e99d108e80d942f9676a (patch)
treed911cf65c38378e67a9f08a8f9962853b1277982 /build/conf
parent76d7f7f8d7f6a5cb29a68b429e27ecfe85b58b65 (diff)
downloadydb-6d33d6ed03659640a628e99d108e80d942f9676a.tar.gz
Allow configuring license exceptions via dedicated macro
Docs will be updated in one of the folliwing PRs.
Diffstat (limited to 'build/conf')
-rw-r--r--build/conf/license.conf7
-rw-r--r--build/conf/python.conf2
2 files changed, 6 insertions, 3 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf
index 7116d7a1d5..ba2a73ef6a 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -424,7 +424,7 @@ macro LICENSE(Flags...) {
SET(LICENSE_NAMES $Flags)
}
-### @usage RESTRICT_LICENSES(ALLOW_ONLY|DENY LicenseProperty...)
+### @usage LICENSE_RESTRICTION(ALLOW_ONLY|DENY LicenseProperty...)
###
### Restrict licenses of direct and indirect module dependencies.
###
@@ -435,8 +435,11 @@ macro LICENSE(Flags...) {
###
### Note: Can be used multiple times on the same module all specified constraints will be checked.
### All macro invocation for the same module must use same constraints type (DENY or ALLOW_ONLY)
-macro RESTRICT_LICENSES(TYPE, EXCEPT[], RESTRICTIONS...) {
+macro LICENSE_RESTRICTION(TYPE, RESTRICTIONS...) {
SET_APPEND(MODULE_LICENSES_RESTRICTION_TYPES $TYPE)
SET_APPEND(MODULE_LICENSES_RESTRICTIONS $RESTRICTIONS)
+}
+
+macro LICENSE_RESTRICTION_EXCEPTIONS(EXCEPT...) {
SET_APPEND(MODULE_LICENSES_RESTRICTION_EXCEPTIONS $EXCEPT)
}
diff --git a/build/conf/python.conf b/build/conf/python.conf
index 1673934290..dd79062fde 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -211,7 +211,7 @@ multimodule PY3_PROGRAM {
}
module PY3_BIN_LIB: PY3_LIBRARY {
- .IGNORED=RESTRICT_LICENSES
+ .IGNORED=LICENSE_RESTRICTION LICENSE_RESTRICTION_EXCEPTIONS
# Notify pybuild to skip all python main function definitions
ENABLE(IGNORE_PY_MAIN)
_REQUIRE_EXPLICIT_LICENSE()