From 5a9adaee19d062cfff96aacc4c08476ea219f26f Mon Sep 17 00:00:00 2001
From: liuyaning6 <liuyaning6@huawei.com>
Date: Mon, 23 May 2022 14:49:58 +0800
Subject: [PATCH] fix OAT problems

Signed-off-by: liuyaning6 <liuyaning6@huawei.com>
---
 OAT.xml | 70 ++++++++++++++++++++++++---------------------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index 7caf7864036..8dbe6f13cef 100755
--- a/OAT.xml
+++ b/OAT.xml
@@ -12,57 +12,43 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-	 
-	 Notes:
-	 This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun@huawei.com. 	 
---> 
-<!-- OAT(OSS Audit Tool) configuration guide:
-basedir: Root dir, the basedir + project path is the real source file location.
-licensefile: 
-1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
 
-tasklist(only for batch mode):
-1. task: Define oat check thread, each task will start a new thread.
-2. task name: Only an name, no practical effect.
-3. task policy: Default policy for projects under this task, this field is required and the specified policy must defined in policylist.
-4. task filter: Default filefilter for projects under this task, this field is required and the specified filefilter must defined in filefilterlist.
-5. task project: Projects to be checked, the path field define the source root dir of the project.
+    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README.
+    All configurations in this file will be merged to OAT-Default.xml, if you have any questions or concerns, please create issue in OpenHarmony/tools_oat and @jalenchen or chenyaxun.
 
+    licensefile:
+    1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
 
-policyList:
-1. policy: All policyitems will be merged to default OAT.xml rules, the name of policy doesn't affect OAT check process.
-2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
-<policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
-3. policyitem type:	
-    "compatibility" is used to check license compatibility in the specified path; 
-    "license" is used to check source license header in the specified path;
-    "copyright" is used to check source copyright header in the specified path;
-    "import" is used to check source dependency in the specified path, such as import ... ,include ...
-    "filetype" is used to check file type in the specified path, supported file types: archive, binary
-    "filename" is used to check whether the specified file exists in the specified path(support projectroot in default OAT.xml), supported file names: LICENSE, README, README.OpenSource
+    policylist:
+    1. policy: If the OAT-Default.xml policies do not meet your requirements, please add policies here.
+    2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
+    <policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
+    3. policyitem type:
+        "compatibility" is used to check license compatibility in the specified path;
+        "license" is used to check source license header in the specified path;
+        "copyright" is used to check source copyright header in the specified path;
+        "import" is used to check source dependency in the specified path, such as import ... ,include ...
+        "filetype" is used to check file type in the specified path, supported file types: archive, binary
+        "filename" is used to check whether the specified file exists in the specified path(projectroot means the root dir of the project), supported file names: LICENSE, README, README.OpenSource
+    4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license.
+    5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
+    6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
+    7. policyitem filefilter: Used to bind filefilter which define filter rules.
+    7. policyitem desc: Used to describe the reason of this policy item, committers will check this while merging the code.
+    8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
 
-4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license. 
-5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
-6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
-7. policyitem filefilter: Used to bind filefilter which define filter rules.
-8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
-
-Note:If the text contains special characters, please escape them according to the following rules:
-" == &gt;
-& == &gt;
-' == &gt;
-< == &gt;
-> == &gt;
+    Note:If the text contains special characters, please escape them according to the following rules:
+    " == &quot;
+    & == &amp;
+    ' == &apos;
+    < == &lt;
+    > == &gt;
 -->
 <configuration>
     <oatconfig> 
         <licensefile>LICENSE.TXT</licensefile>
         <policylist>
             <policy name="projectPolicy" desc="">
-                <!--policyitem type="compatibility" name="curl" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/-->
-                <!--policyitem type="compatibility" name="GPL-2.0+" path=".*" desc="不使用或者使用但是是独立进程，被X进程调用，自研进程不受GPL影响"/>
-                <policyitem type="license" name="LGPL" path=".*" desc="未使用，或者使用了，被X进程以动态链接方式调用"/>
-                <policyitem type="copyright" name="xxx" path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc="xxxx开发代码"/-->
             </policy>
         </policylist>
         <filefilterlist>
@@ -73,9 +59,11 @@ Note:If the text contains special characters, please escape them according to th
                 <filteritem type="filepath" name="src/lldb-mi.exports" desc="exports文件，无需检测"/>
                 <filteritem type="filepath" name="src/module.modulemap" desc="modulemap文件，无需检测"/>
                 <filteritem type="filepath" name="LICENSE.TXT" desc="LICENSE.TXT文件"/>
+                <filteritem type="filepath" name=".arcconfig" desc=".arcconfigT文件，无需检测"/>
             </filefilter>
             <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies" >
                 <filteritem type="filepath" name="src/.*" desc="无需添加版权头，不检测"/>
+                <filteritem type="filepath" name=".arcconfig" desc="无需添加版权头，不检测"/>
             </filefilter>
             <filefilter name="licenseFileNamePolicyFilter" desc="Filters for LICENSE file policies" >
             </filefilter>
-- 
Gitee