rename set_script api to on_script

4 files changed, 42 insertions, 8 deletions

diff --git a/xmake/core/base/deprecated/interpreter.lua b/xmake/core/base/deprecated/interpreter.lua
index c68ad065a..ca95385f0 100644
--- a/xmake/core/base/deprecated/interpreter.lua
+++ b/xmake/core/base/deprecated/interpreter.lua
@@ -111,5 +111,34 @@ function deprecated_interpreter.api_register_add_scope(self, ...)
     self:_api_register_xxx_scope("add", implementation, ...)
 end
 
+-- register api for set_script
+function deprecated_interpreter.api_register_set_script(self, scope_kind, prefix, ...)
+
+    -- check
+    assert(self)
+
+    -- define implementation
+    local implementation = function (self, scope, name, script)
+
+        -- warning
+        utils.warning("please uses on_%s(), \"set_%s()\" has been deprecated!", name, name, scope)
+
+        -- bind script and get new script with sandbox
+        local newscript, errors = sandbox.bind(script, self)
+        if not newscript then
+            utils.error("set_%s(): %s", name, errors)
+            utils.abort()
+        end
+
+        -- update script?
+        scope[name] = {}
+        table.insert(scope[name], newscript)
+
+    end
+
+    -- register implementation
+    self:_api_register_xxx_values(scope_kind, "set", prefix, implementation, ...)
+end
+
 -- return module: deprecated_interpreter
 return deprecated_interpreter
diff --git a/xmake/core/base/deprecated/project.lua b/xmake/core/base/deprecated/project.lua
index cc4f341a0..33a63c1af 100644
--- a/xmake/core/base/deprecated/project.lua
+++ b/xmake/core/base/deprecated/project.lua
@@ -258,6 +258,11 @@ function deprecated_project.api_register(interp)
     deprecated_interpreter.api_register_set_scope(interp, "target", "option")
     deprecated_interpreter.api_register_add_scope(interp, "target", "option")
    
+    -- register api: set_runscript() and set_installscript() and set_packagescript()
+    deprecated_interpreter.api_register_set_script(interp, "target", nil,           "runscript"
+                                                                                ,   "installscript"
+                                                                                ,   "packagescript")
+
     -- register api: os(), kinds(), modes(), plats(), archs(), options()
     interp:api_register("os",       deprecated_project._api_os)
     interp:api_register("kinds",    deprecated_project._api_kinds)
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 7f8d8fcb4..6b5abf568 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -716,8 +716,8 @@ function interpreter.api_register_add_array(self, scope_kind, prefix, ...)
     self:_api_register_xxx_values(scope_kind, "add", prefix, implementation, ...)
 end
 
--- register api for set_script
-function interpreter.api_register_set_script(self, scope_kind, prefix, ...)
+-- register api for on_script
+function interpreter.api_register_on_script(self, scope_kind, prefix, ...)
 
     -- check
     assert(self)
@@ -728,7 +728,7 @@ function interpreter.api_register_set_script(self, scope_kind, prefix, ...)
         -- bind script and get new script with sandbox
         local newscript, errors = sandbox.bind(script, self)
         if not newscript then
-            utils.error("set_%s(\"%s\"): %s", scope, name, errors)
+            utils.error("on_%s(): %s", name, errors)
             utils.abort()
         end
 
@@ -739,7 +739,7 @@ function interpreter.api_register_set_script(self, scope_kind, prefix, ...)
     end
 
     -- register implementation
-    self:_api_register_xxx_values(scope_kind, "set", prefix, implementation, ...)
+    self:_api_register_xxx_values(scope_kind, "on", prefix, implementation, ...)
 end
 
 -- register api for set_keyvalues
diff --git a/xmake/core/base/project.lua b/xmake/core/base/project.lua
index 58daf394f..c697c6847 100644
--- a/xmake/core/base/project.lua
+++ b/xmake/core/base/project.lua
@@ -333,10 +333,10 @@ function project._interpreter()
     -- register api: target() and option()
     interp:api_register_scope("target", "option")
 
-    -- register api: set_script() for target
-    interp:api_register_set_script("target", nil,           "runscript"
-                                                        ,   "installscript"
-                                                        ,   "packagescript")
+    -- register api: on_run() and on_install() and on_package()
+    interp:api_register_on_script("target", nil,            "run"
+                                                        ,   "install"
+                                                        ,   "package")
 
     -- register api: set_values() for target
     interp:api_register_set_values("target", nil,           "kind"