Просмотр исходного кода

Use ALLOW_ONLY mode in default license restrictions

thegeorg 1 год назад
Родитель
Сommit
6dedede622
2 измененных файлов с 10 добавлено и 10 удалено
  1. 4 4
      build/conf/go.conf
  2. 6 6
      build/ymake.core.conf

+ 4 - 4
build/conf/go.conf

@@ -879,12 +879,12 @@ module GO_PROGRAM: _GO_BASE_UNIT {
 
     when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
         # FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
-        MODULE_LICENSES_RESTRICTION_TYPES = DENY
-        MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+        MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
+        MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
     }
     when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
-        MODULE_LICENSES_RESTRICTION_TYPES = DENY
-        MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+        MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
+        MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
     }
 }
 

+ 6 - 6
build/ymake.core.conf

@@ -992,12 +992,12 @@ module _LINK_UNIT: _BASE_UNIT {
 
     when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
         # FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
-        MODULE_LICENSES_RESTRICTION_TYPES = DENY
-        MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+        MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
+        MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
     }
     when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
-        MODULE_LICENSES_RESTRICTION_TYPES = DENY
-        MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+        MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
+        MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
     }
     ENABLE(COMMON_LINK_SETTINGS)
     CHECK_PROVIDES()
@@ -1871,8 +1871,8 @@ module FAT_OBJECT: LIBRARY {
     }
 
     when ($OS_IOS == "yes" || $OS_ANDROID == "yes" || $MAPSMOBI_BUILD_TARGET == "yes") {
-        MODULE_LICENSES_RESTRICTION_TYPES = DENY
-        MODULE_LICENSES_RESTRICTIONS = REQUIRE_DISCLOSURE FORBIDDEN NDA
+        MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
+        MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION
     }
 
     # FIXME: This is weird legacy