merge Packdev (#159)

* update to v1.8.7

* Update pikaBeforBuild-keil.bat

* remove trash

* cmsis-pack v0.9.2

* Delete README.md

* rm big bin file

Co-authored-by: Gabriel Wang <gabriel.wang@arm.com>

port/cmsis-pack/PikaTech.PikaScript.pdsc

@@ -16,8 +16,8 @@
   <repository type="git">https://github.com/pikasTech/pikascript.git</repository>
   
   <releases>
-    <release date="2022-06-23" version="0.9.1" url="https://raw.githubusercontent.com/pikaTech/pikaScript/master/port/cmsis-pack/PikaTech.PikaScript.0.9.1.pack">
-        - First cmsis-pack
+    <release date="2022-06-24" version="0.9.2" url="https://raw.githubusercontent.com/pikaTech/pikaScript/master/port/cmsis-pack/PikaTech.PikaScript.0.9.2.pack">
+        - PikaScript v1.8.7
     </release>
     
   </releases>
@@ -136,11 +136,11 @@
   -->
 
     <components>
-        <bundle Cbundle="PikaScript" Cclass="PikaScript" Cversion="1.8.6">
+        <bundle Cbundle="PikaScript" Cclass="PikaScript" Cversion="1.8.7">
             <description>an ultra-lightweight Python engine</description>
             <doc>https://pikadoc.readthedocs.io/en/latest/index.html</doc>
 
-            <component Cgroup="PikaScript" Csub="Core" Cversion="1.8.6">
+            <component Cgroup="PikaScript" Csub="Core" Cversion="1.8.7">
               <description>PikaScript Kernel</description>
               <files>
                 <file attr="config" category="header"   name="pikascript-core/BaseObj.h" />
@@ -193,13 +193,10 @@
                 
                 <file attr="config" category="utility"  name="rust-msc-latest-win10.exe"    version="1.0.0"/>
                 <file attr="config" category="utility"  name="pikaPackage.exe"              version="1.0.0"/>
-                <file attr="config" category="utility"  name="pikaBeforBuild-keil.bat"      version="1.0.1"/>
-                <file attr="config" category="source"   name="requestment.txt"              version="1.0.0"/>
+                <file attr="config" category="utility"  name="pikaBeforBuild-keil.bat"      version="1.0.2"/>
+                <file attr="config" category="source"   name="requestment.txt"              version="1.0.1"/>
                 <file attr="config" category="source"   name="main.py" />
                 
-                <!-- PLOOC -->
-                
-                
               </files>
               <RTE_Components_h>
 
@@ -207,7 +204,7 @@
               </RTE_Components_h>
             </component>
             
-            <component Cgroup="PikaScript" Csub="PikaStdLib" Cversion="1.8.6" condition="Kernel">
+            <component Cgroup="PikaScript" Csub="PikaStdLib" Cversion="1.8.7" condition="Kernel">
               <description>The standard library for PikaScript</description>
               <files>
                 <file attr="config" category="sourceC"   name="pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c" />

port/cmsis-pack/pikascript/PikaTech.PikaScript.pdsc

@@ -16,8 +16,8 @@
   <repository type="git">https://github.com/pikasTech/pikascript.git</repository>
   
   <releases>
-    <release date="2022-06-23" version="0.9.1" url="https://raw.githubusercontent.com/pikaTech/pikaScript/master/port/cmsis-pack/PikaTech.PikaScript.0.9.1.pack">
-        - First cmsis-pack
+    <release date="2022-06-24" version="0.9.2" url="https://raw.githubusercontent.com/pikaTech/pikaScript/master/port/cmsis-pack/PikaTech.PikaScript.0.9.2.pack">
+        - PikaScript v1.8.7
     </release>
     
   </releases>
@@ -136,11 +136,11 @@
   -->
 
     <components>
-        <bundle Cbundle="PikaScript" Cclass="PikaScript" Cversion="1.8.6">
+        <bundle Cbundle="PikaScript" Cclass="PikaScript" Cversion="1.8.7">
             <description>an ultra-lightweight Python engine</description>
             <doc>https://pikadoc.readthedocs.io/en/latest/index.html</doc>
 
-            <component Cgroup="PikaScript" Csub="Core" Cversion="1.8.6">
+            <component Cgroup="PikaScript" Csub="Core" Cversion="1.8.7">
               <description>PikaScript Kernel</description>
               <files>
                 <file attr="config" category="header"   name="pikascript-core/BaseObj.h" />
@@ -193,13 +193,10 @@
                 
                 <file attr="config" category="utility"  name="rust-msc-latest-win10.exe"    version="1.0.0"/>
                 <file attr="config" category="utility"  name="pikaPackage.exe"              version="1.0.0"/>
-                <file attr="config" category="utility"  name="pikaBeforBuild-keil.bat"      version="1.0.1"/>
-                <file attr="config" category="source"   name="requestment.txt"              version="1.0.0"/>
+                <file attr="config" category="utility"  name="pikaBeforBuild-keil.bat"      version="1.0.2"/>
+                <file attr="config" category="source"   name="requestment.txt"              version="1.0.1"/>
                 <file attr="config" category="source"   name="main.py" />
                 
-                <!-- PLOOC -->
-                
-                
               </files>
               <RTE_Components_h>
 
@@ -207,7 +204,7 @@
               </RTE_Components_h>
             </component>
             
-            <component Cgroup="PikaScript" Csub="PikaStdLib" Cversion="1.8.6" condition="Kernel">
+            <component Cgroup="PikaScript" Csub="PikaStdLib" Cversion="1.8.7" condition="Kernel">
               <description>The standard library for PikaScript</description>
               <files>
                 <file attr="config" category="sourceC"   name="pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c" />

port/cmsis-pack/pikascript/pikaBeforBuild-keil.bat

@@ -7,4 +7,47 @@
 
 @copy /B "pikascript-api\*.*"
 @copy /B "pikascript-core\*.*"
-@copy /B "pikascript-lib\PikaStdLib\*.*"
+@copy /B "pikascript-lib\PikaStdLib\*.*"
+
+@echo clean up...
+@del "pikascript-api\PikaDebug.h"
+@del "pikascript-api\PikaDebug_Debuger.h"
+@del "pikascript-api\PikaMain.h"
+@del "pikascript-api\pikaScript.h"
+@del "pikascript-api\PikaStdData.h"
+@del "pikascript-api\PikaStdData_ByteArray.h"
+@del "pikascript-api\PikaStdData_Dict.h"
+@del "pikascript-api\PikaStdData_List.h"
+@del "pikascript-api\PikaStdData_String.h"
+@del "pikascript-api\PikaStdData_Utils.h"
+@del "pikascript-api\PikaStdLib.h"
+@del "pikascript-api\PikaStdLib_MemChecker.h"
+@del "pikascript-api\PikaStdLib_PikaObj.h"
+@del "pikascript-api\PikaStdLib_RangeObj.h"
+@del "pikascript-api\PikaStdLib_StringObj.h"
+@del "pikascript-api\PikaStdLib_SysObj.h"
+@del "pikascript-api\PikaStdTask.h"
+@del "pikascript-api\PikaStdTask_Task.h"
+
+@del "pikascript-api\__asset_pikaModules_py_a.c"
+@del "pikascript-api\PikaDebug_Debuger-api.c"
+@del "pikascript-api\PikaDebug-api.c"
+@del "pikascript-api\PikaMain-api.c"
+@del "pikascript-api\pikaScript.c"
+@del "pikascript-api\PikaStdData_ByteArray-api.c"
+@del "pikascript-api\PikaStdData_Dict-api.c"
+@del "pikascript-api\PikaStdData_List-api.c"
+@del "pikascript-api\PikaStdData_String-api.c"
+@del "pikascript-api\PikaStdData_Utils-api.c"
+@del "pikascript-api\PikaStdData-api.c"
+@del "pikascript-api\PikaStdLib_MemChecker-api.c"
+@del "pikascript-api\PikaStdLib_PikaObj-api.c"
+@del "pikascript-api\PikaStdLib_RangeObj-api.c"
+@del "pikascript-api\PikaStdLib_StringObj-api.c"
+@del "pikascript-api\PikaStdLib_SysObj-api.c"
+@del "pikascript-api\PikaStdLib-api.c"
+@del "pikascript-api\PikaStdTask_Task-api.c"
+@del "pikascript-api\PikaStdTask-api.c"
+@del "pikascript-api\compiler-info.txt"
+@del "pikascript-api\main.py.o"
+@del "pikascript-api\pikaModules.py.a"

port/cmsis-pack/pikascript/pikascript-api/pikaScript.c

@@ -8,8 +8,8 @@
 PikaObj *__pikaMain;
 PikaObj *pikaScriptInit(void){
     __platform_printf("======[pikascript packages installed]======\r\n");
-    __platform_printf("PikaStdLib==v1.8.6\r\n");
-    __platform_printf("pikascript-core==v1.8.6\r\n");
+    __platform_printf("PikaStdLib==v1.8.7\r\n");
+    __platform_printf("pikascript-core==v1.8.7\r\n");
     __platform_printf("===========================================\r\n");
     __pikaMain = newRootObj("pikaMain", New_PikaMain);
     extern unsigned char pikaModules_py_a[];

port/cmsis-pack/pikascript/requestment.txt

@@ -1,2 +1,2 @@
-pikascript-core==v1.8.6
-PikaStdLib==v1.8.6
+pikascript-core==v1.8.7
+PikaStdLib==v1.8.7

src/__pika_ooc.h

@@ -29,7 +29,7 @@
 #ifndef __PIKA_OOC_H__
 #define __PIKA_OOC_H__
     #if PIKA_PLOOC_ENABLE
-        #include "plooc_class.h"
+        #include "../pikascript-lib/PLOOC/plooc_class.h"
     #else
     #define private_member(X) X
     #endif