From c01b8530b5191c6469893f8afd44a934aba128c4 Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Fri, 18 Nov 2022 11:37:06 +0800 Subject: [PATCH 1/5] add sharedLibrary Signed-off-by: changzheng6 --- configcheck/configSchema_rich.json | 9 ------- modulecheck/module.json | 39 ++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/configcheck/configSchema_rich.json b/configcheck/configSchema_rich.json index 37dee95e..8e953fdd 100755 --- a/configcheck/configSchema_rich.json +++ b/configcheck/configSchema_rich.json @@ -1004,7 +1004,6 @@ "distroFilter", "uiSyntax", "testRunner", - "dependencies", "libIsolation" ] }, @@ -3117,14 +3116,6 @@ } } }, - "dependencies": { - "description": "Indicates the module names that this module depends on", - "type": "array", - "items": { - "type": "string", - "maxLength": 127 - } - }, "libIsolation": { "description": "Indicates whether to isolate the shared libraries in this module.", "type": "boolean" diff --git a/modulecheck/module.json b/modulecheck/module.json index ffa0aba6..829ae793 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -75,7 +75,8 @@ "definePermissions", "testRunner", "dependencies", - "libIsolation" + "libIsolation", + "export" ] }, "required": [ @@ -100,7 +101,8 @@ "enum": [ "entry", "feature", - "har" + "har", + "sharedLibrary" ] }, "srcEntrance": { @@ -956,16 +958,39 @@ } }, "dependencies": { - "description": "Indicates the module names that this module depends on", - "type": "array", - "items": { - "type": "string", - "maxLength": 127 + "description": "Indicates the dependency that this module depends on", + "type": "object", + "propertyNames": { + "enum": [ + "moduleName", + "bundleName" + ] + }, + "required": [ + "moduleName" + ], + "properties":{ + "moduleName": { + "description": "Indicates the module name of the dependency shared library.", + "type": "string", + "maxLength": 31 + }, + "bundleName": { + "description": "Indicates the bundle name of the dependency shared library.", + "type": "string", + "maxLength": 127, + "minLength": 7, + "pattern": "^[a-zA-Z][0-9a-zA-Z_/.]+$" + } } }, "libIsolation": { "description": "Indicates whether to isolate the shared libraries in this module.", "type": "boolean" + }, + "export": { + "description": "Indicates whether can export the shared library.", + "type": "boolean" } } } -- Gitee From fde91b9d686b5afb01bdcf29e4800d96bdd5606e Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Fri, 18 Nov 2022 11:56:46 +0800 Subject: [PATCH 2/5] add sharedLibrary Signed-off-by: changzheng6 --- modulecheck/module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulecheck/module.json b/modulecheck/module.json index 829ae793..dfc3ce21 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -958,7 +958,7 @@ } }, "dependencies": { - "description": "Indicates the dependency that this module depends on", + "description": "Indicates the module and bundle names that this module depends on.", "type": "object", "propertyNames": { "enum": [ -- Gitee From 0defe9a617185f6d3fdf108a95606269882a1084 Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Mon, 21 Nov 2022 16:58:05 +0800 Subject: [PATCH 3/5] add sharedLibrary Signed-off-by: changzheng6 --- modulecheck/module.json | 44 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/modulecheck/module.json b/modulecheck/module.json index dfc3ce21..12460c78 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -959,28 +959,30 @@ }, "dependencies": { "description": "Indicates the module and bundle names that this module depends on.", - "type": "object", - "propertyNames": { - "enum": [ - "moduleName", - "bundleName" - ] - }, - "required": [ - "moduleName" - ], - "properties":{ - "moduleName": { - "description": "Indicates the module name of the dependency shared library.", - "type": "string", - "maxLength": 31 + "type": "array", + "items": { + "propertyNames": { + "enum": [ + "moduleName", + "bundleName" + ] }, - "bundleName": { - "description": "Indicates the bundle name of the dependency shared library.", - "type": "string", - "maxLength": 127, - "minLength": 7, - "pattern": "^[a-zA-Z][0-9a-zA-Z_/.]+$" + "required": [ + "moduleName" + ], + "properties":{ + "moduleName": { + "description": "Indicates the module name of the dependency shared library.", + "type": "string", + "maxLength": 31 + }, + "bundleName": { + "description": "Indicates the bundle name of the dependency shared library.", + "type": "string", + "maxLength": 127, + "minLength": 7, + "pattern": "^[a-zA-Z][0-9a-zA-Z_/.]+$" + } } } }, -- Gitee From 6a49078952c4d3ff7ca7fdc4120a50a3dd2d57ac Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Mon, 21 Nov 2022 16:59:49 +0800 Subject: [PATCH 4/5] add sharedLibrary Signed-off-by: changzheng6 --- modulecheck/module.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modulecheck/module.json b/modulecheck/module.json index 12460c78..046749bf 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -961,6 +961,7 @@ "description": "Indicates the module and bundle names that this module depends on.", "type": "array", "items": { + "type": "object", "propertyNames": { "enum": [ "moduleName", -- Gitee From f450f8eca714fe5e8ef7fc70037521cd05bed162 Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Thu, 24 Nov 2022 16:56:41 +0800 Subject: [PATCH 5/5] add sharedLibrary Signed-off-by: changzheng6 --- modulecheck/module.json | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/modulecheck/module.json b/modulecheck/module.json index 046749bf..3521fdc4 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -16,6 +16,42 @@ "description": "Indicates the configuration of a .hap file. The module configuration is valid only for the current .hap file.", "type": "object", "allOf": [ + { + "if": { + "properties": { + "type": { + "const": "shared" + } + } + }, + "then": { + "propertyNames": { + "enum": [ + "name", + "type", + "srcEntrance", + "description", + "process", + "mainElement", + "deviceTypes", + "installationFree", + "virtualMachine", + "uiSyntax", + "metadata", + "requestPermissions", + "definePermissions", + "testRunner", + "dependencies", + "libIsolation" + ] + }, + "required": [ + "name", + "type", + "deviceTypes" + ] + } + }, { "if": { "properties": { @@ -38,8 +74,6 @@ "virtualMachine", "uiSyntax", "metadata", - "abilities", - "extensionAbilities", "requestPermissions", "definePermissions", "testRunner", @@ -102,7 +136,7 @@ "entry", "feature", "har", - "sharedLibrary" + "shared" ] }, "srcEntrance": { -- Gitee