添加更多软件包

.github/workflows/build.yml

@@ -59,21 +59,15 @@ jobs:
             xmake smart-image -f ext4 -vD -o build/${{ matrix.arch }}-ext4.img
           popd
 
-      - name: ⬆️ upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-smart-apps-${{ github.run_number }}
-          path: |
-            apps/build/cross
-            apps/build/rootfs
-            apps/build/*.img
-
   build-linux-apps:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         app:
+          - busybox
+          - cpp
           - hello
+          - micropython
           - zlib
 
     steps:
@@ -95,10 +89,3 @@ jobs:
             xmake f -a x86_64 --target_os=linux -vyD
             xmake -j$(nproc) -vyD ${{ matrix.app }}
           popd
-
-      - name: ⬆️ upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-smart-apps-${{ github.run_number }}
-          path: |
-            apps/build/cross

apps/busybox/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-06-21     zhouquan     initial version
+-- 2023-06-21     xqyjlj       initial version
 --
 
 add_rules("mode.debug", "mode.release")

apps/cpp/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/hello/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/micropython/xmake.lua

@@ -0,0 +1,32 @@
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- You may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- 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.
+--
+-- Copyright (C) 2022-2023 RT-Thread Development Team
+--
+-- @author      xqyjlj  
+-- @file        xmake.lua
+--
+-- Change Logs:
+-- Date           Author       Notes
+-- ------------   ----------   -----------------------------------------------
+-- 2023-06-21     xqyjlj       initial version
+--
+add_rules("mode.debug", "mode.release")
+
+add_requires("micropython", {configs = {shared = false}})
+
+target("micropython")
+do
+    set_kind("phony")
+    add_packages("micropython")
+end
+target_end()

apps/shm_ping/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/shm_pong/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/umailbox/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/webclient/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/webserver/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 add_rules("mode.debug", "mode.release")
 

apps/zlib/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-03-10     zhouquan     initial version
+-- 2023-03-10     xqyjlj       initial version
 --
 
 add_rules("mode.debug", "mode.release")

prebuilt/qemu-virt64-aarch64/run.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# @author      zhouquan
+# @author      xqyjlj  
 # @file        run.sh
 #
 # Change Logs:
 # Date           Author       Notes
 # ------------   ----------   -----------------------------------------------
-# 2023-01-12     zhouquan     initial version
+# 2023-01-12     xqyjlj       initial version
 #
 
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

prebuilt/qemu-virt64-aarch64/run_debug.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# @author      zhouquan
+# @author      xqyjlj  
 # @file        run.sh
 #
 # Change Logs:
 # Date           Author       Notes
 # ------------   ----------   -----------------------------------------------
-# 2023-01-12     zhouquan     initial version
+# 2023-01-12     xqyjlj       initial version
 #
 
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

prebuilt/qemu-virt64-riscv/run.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# @author      zhouquan
+# @author      xqyjlj  
 # @file        run.sh
 #
 # Change Logs:
 # Date           Author       Notes
 # ------------   ----------   -----------------------------------------------
-# 2023-01-12     zhouquan     initial version
+# 2023-01-12     xqyjlj       initial version
 #
 
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

prebuilt/qemu-virt64-riscv/run_debug.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# @author      zhouquan
+# @author      xqyjlj  
 # @file        run.sh
 #
 # Change Logs:
 # Date           Author       Notes
 # ------------   ----------   -----------------------------------------------
-# 2023-01-12     zhouquan     initial version
+# 2023-01-12     xqyjlj       initial version
 #
 
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

readme.md

@@ -86,7 +86,7 @@ xmake 是一个基于 Lua 的轻量级跨平台构建工具，使用 xmake.lua 
 
    ```shell
    cd prebuilt/qemu-virt64-aarch64/
-   ./qemu.sh
+   ./run.sh
    ```
 
    ![image-20230531174321326](./assets/image-20230531174321326.png)

repo/packages/a/aarch64-smart-musleabi/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-05-08     zhouquan     initial version
+-- 2023-05-08     xqyjlj       initial version
 --
 package("aarch64-smart-musleabi")
 do

repo/packages/a/arm-smart-musleabi/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-05-12     zhouquan     initial version
+-- 2023-05-12     xqyjlj       initial version
 --
 package("arm-smart-musleabi")
 do

repo/packages/b/busybox/scripts/deploy.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        deploy.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-05-09     zhouquan     initial version
+-- 2023-05-09     xqyjlj       initial version
 --
 import("rt.rt_utils")
 

repo/packages/b/busybox/xmake.lua

@@ -12,13 +12,13 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      zhouquan
+-- @author      xqyjlj  
 -- @file        xmake.lua
 --
 -- Change Logs:
 -- Date           Author       Notes
 -- ------------   ----------   -----------------------------------------------
--- 2023-05-04     zhouquan     initial version
+-- 2023-05-04     xqyjlj       initial version
 --
 package("busybox")
 do

repo/packages/f/ffmpeg/scripts/deploy.lua

@@ -0,0 +1,35 @@
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- You may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- 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.
+--
+-- Copyright (C) 2023-2023 RT-Thread Development Team
+--
+-- @author      xqyjlj  
+-- @file        deploy.lua
+--
+-- Change Logs:
+-- Date           Author       Notes
+-- ------------   ----------   -----------------------------------------------
+-- 2023-05-11     xqyjlj       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir)
+    for _, filepath in ipairs(os.files(path.join(installdir, "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "bin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "lib") .. "/lib*.so*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "lib", filename))
+    end
+end