[UIEngine] move UI engine as a package

6 files changed, 78 insertions, 71 deletions

diff --git a/bsp/simulator/.config b/bsp/simulator/.config
index 59895c70dd..be55343ce7 100644
--- a/bsp/simulator/.config
+++ b/bsp/simulator/.config
@@ -39,6 +39,7 @@ CONFIG_RT_USING_MEMPOOL=y
 # CONFIG_RT_USING_NOHEAP is not set
 CONFIG_RT_USING_SMALL_MEM=y
 # CONFIG_RT_USING_SLAB is not set
+# CONFIG_RT_USING_MEMTRACE is not set
 CONFIG_RT_USING_HEAP=y
 
 #
@@ -65,7 +66,9 @@ CONFIG_RT_CONSOLE_DEVICE_NAME="console"
 # Command shell
 #
 CONFIG_RT_USING_FINSH=y
+CONFIG_FINSH_THREAD_NAME="tshell"
 CONFIG_FINSH_USING_HISTORY=y
+CONFIG_FINSH_HISTORY_LINES=5
 CONFIG_FINSH_USING_SYMTAB=y
 CONFIG_FINSH_USING_DESCRIPTION=y
 CONFIG_FINSH_THREAD_PRIORITY=20
@@ -106,6 +109,8 @@ CONFIG_RT_USING_DFS_DEVFS=y
 # CONFIG_RT_USING_DFS_ROMFS is not set
 # CONFIG_RT_USING_DFS_RAMFS is not set
 # CONFIG_RT_USING_DFS_UFFS is not set
+# CONFIG_RT_USING_DFS_JFFS2 is not set
+# CONFIG_RT_USING_DFS_NFS is not set
 
 #
 # Device Drivers
@@ -114,6 +119,7 @@ CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_USING_SERIAL=y
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
+# CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PIN is not set
 # CONFIG_RT_USING_MTD_NOR is not set
@@ -151,26 +157,6 @@ CONFIG_RT_USING_SERIAL=y
 # CONFIG_RT_USING_MODBUS is not set
 
 #
-# RT-Thread UI Engine
-#
-CONFIG_RT_USING_GUIENGINE=y
-CONFIG_RTGUI_NAME_MAX=16
-# CONFIG_RTGUI_USING_TTF is not set
-CONFIG_RTGUI_USING_FONT16=y
-CONFIG_RTGUI_USING_FONT12=y
-# CONFIG_RTGUI_USING_FONTHZ is not set
-# CONFIG_RTGUI_IMAGE_XPM is not set
-CONFIG_RTGUI_IMAGE_JPEG_NONE=y
-# CONFIG_RTGUI_IMAGE_JPEG is not set
-# CONFIG_RTGUI_IMAGE_TJPGD is not set
-# CONFIG_RTGUI_IMAGE_PNG_NONE is not set
-# CONFIG_RTGUI_IMAGE_PNG is not set
-CONFIG_RTGUI_IMAGE_LODEPNG=y
-# CONFIG_RTGUI_IMAGE_BMP is not set
-CONFIG_RTGUI_IMAGE_CONTAINER=y
-CONFIG_RTGUI_USING_DEMO=y
-
-#
 # VBUS(Virtual Software BUS)
 #
 # CONFIG_RT_USING_VBUS is not set
@@ -188,8 +174,21 @@ CONFIG_RTGUI_USING_DEMO=y
 #
 # system packages
 #
+
+#
+# RT-Thread GUI Engine
+#
+# CONFIG_PKG_USING_GUIENGINE is not set
+# CONFIG_GUIENGINE_IMAGE_JPEG_NONE is not set
+# CONFIG_GUIENGINE_IMAGE_JPEG is not set
+# CONFIG_GUIENGINE_IMAGE_TJPGD is not set
+# CONFIG_GUIENGINE_IMAGE_PNG_NONE is not set
+# CONFIG_GUIENGINE_IMAGE_PNG is not set
+# CONFIG_GUIENGINE_IMAGE_LODEPNG is not set
+# CONFIG_PKG_USING_GUIENGINE_V200 is not set
+# CONFIG_PKG_USING_GUIENGINE_LATEST_VERSION is not set
+# CONFIG_PKG_USING_LWEXT4 is not set
 # CONFIG_PKG_USING_PARTITION is not set
-CONFIG_RT_USING_PERSIMMON_EXAMPLE=y
 # CONFIG_PKG_USING_SQLITE is not set
 # CONFIG_PKG_USING_RTI is not set
 
@@ -201,8 +200,26 @@ CONFIG_RT_USING_PERSIMMON_EXAMPLE=y
 # CONFIG_PKG_USING_MONGOOSE is not set
 # CONFIG_PKG_USING_WEBTERMINAL is not set
 # CONFIG_PKG_USING_CJSON is not set
+# CONFIG_PKG_USING_LJSON is not set
 # CONFIG_PKG_USING_EZXML is not set
 # CONFIG_PKG_USING_NANOPB is not set
+# CONFIG_PKG_USING_GAGENT_CLOUD is not set
+
+#
+# Wi-Fi
+#
+
+#
+# Marvell WiFi
+#
+# CONFIG_PKG_USING_WLANMARVELL is not set
+
+#
+# Wiced WiFi
+#
+# CONFIG_PKG_USING_WLAN_WICED is not set
+# CONFIG_PKG_USING_COAP is not set
+# CONFIG_PKG_USING_NOPOLL is not set
 
 #
 # security packages
@@ -237,24 +254,11 @@ CONFIG_PKG_USING_FASTLZ=y
 CONFIG_PKG_FASTLZ_PATH="/packages/misc/fastlz"
 CONFIG_PKG_FASTLZ_VER="v1.0.0"
 # CONFIG_PKG_USING_MINILZO is not set
+# CONFIG_PKG_USING_QUICKLZ is not set
 
 #
 # example package: hello
 #
 # CONFIG_PKG_USING_HELLO is not set
-
-#
-# Privated Packages of RealThread
-#
-# CONFIG_PKG_USING_CODEC is not set
-# CONFIG_PKG_USING_PLAYER is not set
-CONFIG_PKG_USING_PERSIMMON_SRC=y
-CONFIG_PKG_PERSIMMON_SRC_PATH="/realthread-packages/persimmon-src"
-# CONFIG_PKG_USING_PERSIMMON_SRC_v1_0_0 is not set
-CONFIG_PKG_USING_PERSIMMON_LATEST_VERSION=y
-CONFIG_PKG_PERSIMMON_SRC_VER="latest_version"
-
-#
-# Network Utilities
-#
+# CONFIG_PKG_USING_MULTIBUTTON is not set
 CONFIG_RT_USING_DFS_WINSHAREDIR=y
diff --git a/bsp/simulator/applications/application.c b/bsp/simulator/applications/application.c
index 2ffa50f197..56c8f6f565 100755
--- a/bsp/simulator/applications/application.c
+++ b/bsp/simulator/applications/application.c
@@ -36,7 +36,7 @@ void rt_init_thread_entry(void *parameter)
     platform_init();
     mnt_init();
 
-#if defined(RT_USING_GUIENGINE) && defined(RTGUI_USING_DEMO)
+#if defined(PKG_USING_GUIENGINE) && defined(RTGUI_USING_DEMO)
     {
         extern int rt_gui_demo_init(void);
         rt_gui_demo_init();
diff --git a/bsp/simulator/applications/platform.c b/bsp/simulator/applications/platform.c
index c77e336844..3ee4a59e88 100644
--- a/bsp/simulator/applications/platform.c
+++ b/bsp/simulator/applications/platform.c
@@ -29,7 +29,7 @@ int platform_init(void)
 
 #endif /* RT_USING_DFS */
 
-#ifdef RT_USING_GUIENGINE
+#ifdef PKG_USING_GUIENGINE
     {
         extern void rt_hw_sdl_start(void);
         extern int rtgui_system_server_init(void);
diff --git a/bsp/simulator/drivers/SConscript b/bsp/simulator/drivers/SConscript
index 8a769dfd81..593a3fdfdc 100644
--- a/bsp/simulator/drivers/SConscript
+++ b/bsp/simulator/drivers/SConscript
@@ -8,7 +8,7 @@ LIBPATH = []
 CPPPATH = [cwd]
 
 # remove no need file.
-if GetDepend('RT_USING_GUIENGINE') == False:
+if GetDepend('PKG_USING_GUIENGINE') == False:
     SrcRemove(src, 'sdl_fb.c')
 else:
     LIBS.append('SDL2')
diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h
index 778e3f7d61..995ab93c3b 100755
--- a/bsp/simulator/rtconfig.h
+++ b/bsp/simulator/rtconfig.h
@@ -37,6 +37,7 @@
 /* RT_USING_NOHEAP is not set */
 #define RT_USING_SMALL_MEM
 /* RT_USING_SLAB is not set */
+/* RT_USING_MEMTRACE is not set */
 #define RT_USING_HEAP
 
 /* Kernel Device Object */
@@ -59,7 +60,9 @@
 /* Command shell */
 
 #define RT_USING_FINSH
+#define FINSH_THREAD_NAME "tshell"
 #define FINSH_USING_HISTORY
+#define FINSH_HISTORY_LINES 5
 #define FINSH_USING_SYMTAB
 #define FINSH_USING_DESCRIPTION
 #define FINSH_THREAD_PRIORITY 20
@@ -98,6 +101,8 @@
 /* RT_USING_DFS_ROMFS is not set */
 /* RT_USING_DFS_RAMFS is not set */
 /* RT_USING_DFS_UFFS is not set */
+/* RT_USING_DFS_JFFS2 is not set */
+/* RT_USING_DFS_NFS is not set */
 
 /* Device Drivers */
 
@@ -105,6 +110,7 @@
 #define RT_USING_SERIAL
 /* RT_USING_CAN is not set */
 /* RT_USING_HWTIMER is not set */
+/* RT_USING_CPUTIME is not set */
 /* RT_USING_I2C is not set */
 /* RT_USING_PIN is not set */
 /* RT_USING_MTD_NOR is not set */
@@ -135,25 +141,6 @@
 
 /* RT_USING_MODBUS is not set */
 
-/* RT-Thread UI Engine */
-
-#define RT_USING_GUIENGINE
-#define RTGUI_NAME_MAX 16
-/* RTGUI_USING_TTF is not set */
-#define RTGUI_USING_FONT16
-#define RTGUI_USING_FONT12
-/* RTGUI_USING_FONTHZ is not set */
-/* RTGUI_IMAGE_XPM is not set */
-#define RTGUI_IMAGE_JPEG_NONE
-/* RTGUI_IMAGE_JPEG is not set */
-/* RTGUI_IMAGE_TJPGD is not set */
-/* RTGUI_IMAGE_PNG_NONE is not set */
-/* RTGUI_IMAGE_PNG is not set */
-#define RTGUI_IMAGE_LODEPNG
-/* RTGUI_IMAGE_BMP is not set */
-#define RTGUI_IMAGE_CONTAINER
-#define RTGUI_USING_DEMO
-
 /* VBUS(Virtual Software BUS) */
 
 /* RT_USING_VBUS is not set */
@@ -167,8 +154,19 @@
 
 /* system packages */
 
+/* RT-Thread GUI Engine */
+
+/* PKG_USING_GUIENGINE is not set */
+/* GUIENGINE_IMAGE_JPEG_NONE is not set */
+/* GUIENGINE_IMAGE_JPEG is not set */
+/* GUIENGINE_IMAGE_TJPGD is not set */
+/* GUIENGINE_IMAGE_PNG_NONE is not set */
+/* GUIENGINE_IMAGE_PNG is not set */
+/* GUIENGINE_IMAGE_LODEPNG is not set */
+/* PKG_USING_GUIENGINE_V200 is not set */
+/* PKG_USING_GUIENGINE_LATEST_VERSION is not set */
+/* PKG_USING_LWEXT4 is not set */
 /* PKG_USING_PARTITION is not set */
-#define RT_USING_PERSIMMON_EXAMPLE
 /* PKG_USING_SQLITE is not set */
 /* PKG_USING_RTI is not set */
 
@@ -179,8 +177,22 @@
 /* PKG_USING_MONGOOSE is not set */
 /* PKG_USING_WEBTERMINAL is not set */
 /* PKG_USING_CJSON is not set */
+/* PKG_USING_LJSON is not set */
 /* PKG_USING_EZXML is not set */
 /* PKG_USING_NANOPB is not set */
+/* PKG_USING_GAGENT_CLOUD is not set */
+
+/* Wi-Fi */
+
+/* Marvell WiFi */
+
+/* PKG_USING_WLANMARVELL is not set */
+
+/* Wiced WiFi */
+
+/* PKG_USING_WLAN_WICED is not set */
+/* PKG_USING_COAP is not set */
+/* PKG_USING_NOPOLL is not set */
 
 /* security packages */
 
@@ -208,21 +220,12 @@
 
 #define PKG_USING_FASTLZ
 /* PKG_USING_MINILZO is not set */
+/* PKG_USING_QUICKLZ is not set */
 
 /* example package: hello */
 
 /* PKG_USING_HELLO is not set */
-
-/* Privated Packages of RealThread */
-
-/* PKG_USING_CODEC is not set */
-/* PKG_USING_PLAYER is not set */
-#define PKG_USING_PERSIMMON_SRC
-/* PKG_USING_PERSIMMON_SRC_v1_0_0 is not set */
-#define PKG_USING_PERSIMMON_LATEST_VERSION
-
-/* Network Utilities */
-
+/* PKG_USING_MULTIBUTTON is not set */
 #define RT_USING_DFS_WINSHAREDIR
 #include "rtconfig_project.h"
 
diff --git a/bsp/simulator/rtconfig.py b/bsp/simulator/rtconfig.py
index 915cc3f686..8eae0db7fa 100755
--- a/bsp/simulator/rtconfig.py
+++ b/bsp/simulator/rtconfig.py
@@ -50,7 +50,7 @@ if PLATFORM == 'gcc':
 
     DEVICE = ' -ffunction-sections -fdata-sections'
     DEVICE = '  '
-    CFLAGS = DEVICE + ' -I/usr/include -w -D_REENTRANT'
+    CFLAGS = DEVICE + ' -I/usr/include -w -D_REENTRANT -D_LINUX -DHAVE_SYS_SIGNALS'
     AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
     #LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-linux.map -lpthread'
     LFLAGS = DEVICE + ' -Wl,-Map=rtthread-linux.map -pthread -T gcc.ld'