Merge pull request #5953 from Freed-Wu/dev

rename luarocks.module to lua.module, platform.linux.driver to platform.linux.module

3 files changed, 42 insertions, 17 deletions

diff --git a/xmake/rules/platform/linux/driver/xmake.lua b/xmake/rules/platform/linux/driver/xmake.lua
index 297dcc83e..a050185b3 100644
--- a/xmake/rules/platform/linux/driver/xmake.lua
+++ b/xmake/rules/platform/linux/driver/xmake.lua
@@ -18,23 +18,8 @@
 -- @file        xmake.lua
 --
 
--- build linux driver module
 rule("platform.linux.driver")
-    set_sourcekinds("cc")
-    on_load(function (target)
-        import("driver_modules").load(target)
-    end)
     on_config(function (target)
-        import("driver_modules").config(target)
-    end)
-    on_link(function (target, opt)
-        import("driver_modules").link(target, opt)
-    end)
-    on_install(function (target)
-        import("driver_modules").install(target)
+        wprint('deprecated: please use add_rules("platform.linux.module") instead of add_rules("platform.linux.driver")')
     end)
-    on_uninstall(function (target)
-        import("driver_modules").uninstall(target)
-    end)
-
-
+    add_deps("platform.linux.module")
diff --git a/xmake/rules/platform/linux/driver/driver_modules.lua b/xmake/rules/platform/linux/module/driver_modules.lua
index 8218a972c..8218a972c 100644
--- a/xmake/rules/platform/linux/driver/driver_modules.lua
+++ b/xmake/rules/platform/linux/module/driver_modules.lua
diff --git a/xmake/rules/platform/linux/module/xmake.lua b/xmake/rules/platform/linux/module/xmake.lua
new file mode 100644
index 000000000..297dcc83e
--- /dev/null
+++ b/xmake/rules/platform/linux/module/xmake.lua
@@ -0,0 +1,40 @@
+--!A cross-platform build utility based on Lua
+--
+-- 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) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        xmake.lua
+--
+
+-- build linux driver module
+rule("platform.linux.driver")
+    set_sourcekinds("cc")
+    on_load(function (target)
+        import("driver_modules").load(target)
+    end)
+    on_config(function (target)
+        import("driver_modules").config(target)
+    end)
+    on_link(function (target, opt)
+        import("driver_modules").link(target, opt)
+    end)
+    on_install(function (target)
+        import("driver_modules").install(target)
+    end)
+    on_uninstall(function (target)
+        import("driver_modules").uninstall(target)
+    end)
+
+