fix:some apps not packaged error

Author: zhengchenxiao

repo/packages/c/cpp/scripts/deploy.lua

@@ -0,0 +1,46 @@
+-- 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-09     xqyjlj       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir, version)
+    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, "usr", "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "bin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "usr", "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "sbin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename))
+    end
+    
+end

repo/packages/c/cpp/xmake.lua

@@ -30,12 +30,28 @@ do
     on_install("cross@linux,windows", function(package)
         local sourcedir_files = path.join(os.curdir(),"apps", "cpp", "*")
         local bakdir = path.join(os.curdir())
+        local items_to_remove = {
+            "apps",
+            "assets",
+            "env.sh",
+            "README.md",
+            "repo",
+            "sdk",
+            "tools"
+        }
         print("sourcedir_files: " .. sourcedir_files)
         print("bakdir: " .. bakdir)
-        
+
         os.cp(sourcedir_files, bakdir)
+        for _, item in ipairs(items_to_remove) do
+            local item_path = path.join(bakdir, item)
+            if os.exists(item_path) then
+                print("Removing: " .. item_path)
+                os.rm(item_path)
+        end
 
         import("package.tools.xmake").install(package)
+        end
     end)
 
 end

repo/packages/h/hello/scripts/deploy.lua

@@ -0,0 +1,46 @@
+-- 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-09     xqyjlj       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir, version)
+    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, "usr", "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "bin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "usr", "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "sbin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename))
+    end
+    
+end

repo/packages/h/hello/xmake.lua

@@ -30,11 +30,29 @@ do
     on_install("cross@linux,windows", function(package)
         local sourcedir_files = path.join(os.curdir(),"apps", "hello", "*")
         local bakdir = path.join(os.curdir())
+        local items_to_remove = {
+            "apps",
+            "assets",
+            "env.sh",
+            "README.md",
+            "repo",
+            "sdk",
+            "tools"
+        }
         print("sourcedir_files: " .. sourcedir_files)
         print("bakdir: " .. bakdir)
 
         os.cp(sourcedir_files, bakdir)
+        for _, item in ipairs(items_to_remove) do
+            local item_path = path.join(bakdir, item)
+            if os.exists(item_path) then
+                print("Removing: " .. item_path)
+                os.rm(item_path)
+        end
+
+        import("package.tools.xmake").install(package)
+        end
+
     end)
 
-    
 end

repo/packages/p/player/scripts/deploy.lua

@@ -0,0 +1,46 @@
+-- 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-09     xqyjlj       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir, version)
+    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, "usr", "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "bin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "usr", "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "sbin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename))
+    end
+    
+end

repo/packages/p/player/xmake.lua

@@ -30,12 +30,28 @@ do
     on_install("cross@linux,windows", function(package)
         local sourcedir_files = path.join(os.curdir(),"apps", "player", "*")
         local bakdir = path.join(os.curdir())
+        local items_to_remove = {
+            "apps",
+            "assets",
+            "env.sh",
+            "README.md",
+            "repo",
+            "sdk",
+            "tools"
+        }
         print("sourcedir_files: " .. sourcedir_files)
         print("bakdir: " .. bakdir)
-        
+
         os.cp(sourcedir_files, bakdir)
+        for _, item in ipairs(items_to_remove) do
+            local item_path = path.join(bakdir, item)
+            if os.exists(item_path) then
+                print("Removing: " .. item_path)
+                os.rm(item_path)
+        end
 
         import("package.tools.xmake").install(package)
+        end
     end)
 
 end

repo/packages/s/shm_ping/scripts/deploy.lua

@@ -0,0 +1,46 @@
+-- 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-09     xqyjlj       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir, version)
+    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, "usr", "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "bin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "usr", "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "sbin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename))
+    end
+    
+end

repo/packages/s/shm_ping/xmake.lua

@@ -30,12 +30,28 @@ do
     on_install("cross@linux,windows", function(package)
         local sourcedir_files = path.join(os.curdir(),"apps", "shm_ping", "*")
         local bakdir = path.join(os.curdir())
+        local items_to_remove = {
+            "apps",
+            "assets",
+            "env.sh",
+            "README.md",
+            "repo",
+            "sdk",
+            "tools"
+        }
         print("sourcedir_files: " .. sourcedir_files)
         print("bakdir: " .. bakdir)
-        
+
         os.cp(sourcedir_files, bakdir)
+        for _, item in ipairs(items_to_remove) do
+            local item_path = path.join(bakdir, item)
+            if os.exists(item_path) then
+                print("Removing: " .. item_path)
+                os.rm(item_path)
+        end
 
         import("package.tools.xmake").install(package)
+        end
     end)
 
 end

repo/packages/s/shm_pong/scripts/deploy.lua

@@ -0,0 +1,46 @@
+-- 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-09     xqyjlj       initial version
+--
+import("rt.rt_utils")
+
+function main(rootfs, installdir, version)
+    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, "usr", "bin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "bin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "usr", "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "usr", "sbin", filename))
+    end
+
+    for _, filepath in ipairs(os.files(path.join(installdir, "sbin") .. "/*")) do
+        local filename = path.filename(filepath)
+        rt_utils.cp_with_symlink(filepath, path.join(rootfs, "sbin", filename))
+    end
+    
+end

repo/packages/s/shm_pong/xmake.lua

@@ -30,12 +30,28 @@ do
     on_install("cross@linux,windows", function(package)
         local sourcedir_files = path.join(os.curdir(),"apps", "shm_pong", "*")
         local bakdir = path.join(os.curdir())
+        local items_to_remove = {
+            "apps",
+            "assets",
+            "env.sh",
+            "README.md",
+            "repo",
+            "sdk",
+            "tools"
+        }
         print("sourcedir_files: " .. sourcedir_files)
         print("bakdir: " .. bakdir)
-        
+
         os.cp(sourcedir_files, bakdir)
+        for _, item in ipairs(items_to_remove) do
+            local item_path = path.join(bakdir, item)
+            if os.exists(item_path) then
+                print("Removing: " .. item_path)
+                os.rm(item_path)
+        end
 
         import("package.tools.xmake").install(package)
+        end
     end)
 
 end