From c6ca975a0448621fdd7a5a2d5bbac22685722759 Mon Sep 17 00:00:00 2001
From: Gabriel Wang <gabriel.wang@arm.com>
Date: Mon, 29 Aug 2022 23:44:05 +0100
Subject: [PATCH] update the script to generate pdsc

---
 port/cmsis-pack/PikaTech.PikaScript.pdsc            | 12 ++++++------
 port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc | 12 ++++++------
 port/cmsis-pack/pikascript/PikaTech.PikaScript.xml  |  8 +++++++-
 port/cmsis-pack/pikascript/makepdsc.py              |  3 ++-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/port/cmsis-pack/PikaTech.PikaScript.pdsc b/port/cmsis-pack/PikaTech.PikaScript.pdsc
index d26f7604d..7e996f948 100644
--- a/port/cmsis-pack/PikaTech.PikaScript.pdsc
+++ b/port/cmsis-pack/PikaTech.PikaScript.pdsc
@@ -94,16 +94,16 @@
       <require Cclass="PikaScript" Cgroup="PikaScript" Csub="Core" Cversion="1.10.3" />
     </condition>
 
+    <condition id="NO_LVGL_Pack">
+      <description>The existance of the LVGL</description>
+      <!--<deny Cclass="LVGL" Cgroup="lvgl" Cversion="9.0.0-dev" />-->
+      <require condition="Kernel" />
+    </condition>
+
     <condition id="PLOOC_Pack">
       <description>The Kernel of the PikaScript</description>
       <require Cclass="Language Extension" Cgroup="PLOOC" />
     </condition>
-    
-    <condition id="NO_LVGL_Pack">
-      <description>The existance of the LVGL</description>
-      <deny Cclass="LVGL" Cgroup="lvgl" Cversion="9.0.0-dev" />
-      <require condition="Kernel" />
-    </condition>
 
     <condition id="NO_PLOOC_Pack">
       <description>The Kernel of the PikaScript</description>
diff --git a/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc b/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc
index d26f7604d..7e996f948 100644
--- a/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc
+++ b/port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc
@@ -94,16 +94,16 @@
       <require Cclass="PikaScript" Cgroup="PikaScript" Csub="Core" Cversion="1.10.3" />
     </condition>
 
+    <condition id="NO_LVGL_Pack">
+      <description>The existance of the LVGL</description>
+      <!--<deny Cclass="LVGL" Cgroup="lvgl" Cversion="9.0.0-dev" />-->
+      <require condition="Kernel" />
+    </condition>
+
     <condition id="PLOOC_Pack">
       <description>The Kernel of the PikaScript</description>
       <require Cclass="Language Extension" Cgroup="PLOOC" />
     </condition>
-    
-    <condition id="NO_LVGL_Pack">
-      <description>The existance of the LVGL</description>
-      <deny Cclass="LVGL" Cgroup="lvgl" Cversion="9.0.0-dev" />
-      <require condition="Kernel" />
-    </condition>
 
     <condition id="NO_PLOOC_Pack">
       <description>The Kernel of the PikaScript</description>
diff --git a/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml b/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml
index fdd40e6ea..392dff46a 100644
--- a/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml
+++ b/port/cmsis-pack/pikascript/PikaTech.PikaScript.xml
@@ -94,6 +94,12 @@
       <require Cclass="PikaScript" Cgroup="PikaScript" Csub="Core" Cversion="@VERSION" />
     </condition>
 
+    <condition id="NO_LVGL_Pack">
+      <description>The existance of the LVGL</description>
+      <!--<deny Cclass="LVGL" Cgroup="lvgl" Cversion="9.0.0-dev" />-->
+      <require condition="Kernel" />
+    </condition>
+
     <condition id="PLOOC_Pack">
       <description>The Kernel of the PikaScript</description>
       <require Cclass="Language Extension" Cgroup="PLOOC" />
@@ -170,7 +176,7 @@
         </files>
       </component>
 
-      <component Cgroup="PikaScript" Csub="pika_lvgl" Cversion="@LVGL_VERSION" condition="Kernel">
+      <component Cgroup="PikaScript" Csub="pika_lvgl" Cversion="@LVGL_VERSION" condition="NO_LVGL_Pack">
         <description>The lvgl module for PikaScript</description>
         <files>
 @LVGL_LIB
diff --git a/port/cmsis-pack/pikascript/makepdsc.py b/port/cmsis-pack/pikascript/makepdsc.py
index 3ac53b98e..1bafaa240 100644
--- a/port/cmsis-pack/pikascript/makepdsc.py
+++ b/port/cmsis-pack/pikascript/makepdsc.py
@@ -50,6 +50,7 @@ def collect(name, groupList: list[Group], subfix=".xml"):
 formatc = '<file attr="config" category="sourceC"  name="%s" />'
 formath = '<file attr="config" category="header"  name="%s" />'
 formatcfg = '<file attr="config" category="source"  name="%s" />'
+formatccond = '<file attr="config" category="sourceC"  name="%s" condition="NO_LVGL_Pack" />'
 
 kernal_c = Group("kernalH", "pikascript-core", ".c")
 kernal_h = Group("kernalC", "pikascript-core", ".h",
@@ -58,7 +59,7 @@ kernal_cfg = Group("kernalCfg", "pikascript-core", ".cfg",
                    format=formatcfg)
 lib_c = Group("libC", "pikascript-lib/PikaStdLib", ".c", format=formatc)
 lib_h = Group("libH", "pikascript-lib/PikaStdLib", ".h", format=formath)
-lvgl_c = Group("libC", "pikascript-lib/pika_lvgl", ".c", format=formatc)
+lvgl_c = Group("libC", "pikascript-lib/pika_lvgl", ".c", format=formatccond)
 lvgl_h = Group("libH", "pikascript-lib/pika_lvgl", ".h", format=formath)
 
 api_c = Group("apiC", "pikascript-api", ".c",   format=formatc)