summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-11-17 20:55:40 +0800
committerruki <[email protected]>2018-11-17 20:55:40 +0800
commit0708e1cb9f7c49a41f6a56695c66036525451f75 (patch)
tree89d8f23adf4726f49a66f091eee1eb4a817c4483
parentc58513ec6ded191db1d97e93d84569d1cdda1282 (diff)
improve on_xxx params
-rw-r--r--xmake/actions/build/build.lua4
-rw-r--r--xmake/actions/clean/main.lua4
-rw-r--r--xmake/actions/install/install.lua4
-rw-r--r--xmake/actions/package/main.lua4
-rw-r--r--xmake/actions/run/main.lua4
-rw-r--r--xmake/actions/uninstall/uninstall.lua4
6 files changed, 12 insertions, 12 deletions
diff --git a/xmake/actions/build/build.lua b/xmake/actions/build/build.lua
index 47be3f485..11a3065ca 100644
--- a/xmake/actions/build/build.lua
+++ b/xmake/actions/build/build.lua
@@ -58,7 +58,7 @@ function _on_build_target(target)
for _, r in ipairs(target:orderules()) do
local on_build = r:script("build")
if on_build then
- on_build(target, _do_build_target)
+ on_build(target, {origin = _do_build_target})
done = true
end
end
@@ -134,7 +134,7 @@ function _build_target(target)
for i = 1, 3 do
local script = scripts[i]
if script ~= nil then
- script(target, i == 2 and _do_build_target or nil)
+ script(target, {origin = (i == 2 and _do_build_target or nil)})
end
end
diff --git a/xmake/actions/clean/main.lua b/xmake/actions/clean/main.lua
index 906cd9fce..9c6005927 100644
--- a/xmake/actions/clean/main.lua
+++ b/xmake/actions/clean/main.lua
@@ -96,7 +96,7 @@ function _on_clean_target(target)
for _, r in ipairs(target:orderules()) do
local on_clean = r:script("clean")
if on_clean then
- on_clean(target, _do_clean_target)
+ on_clean(target, {origin = _do_clean_target})
done = true
end
end
@@ -151,7 +151,7 @@ function _clean_target(target)
for i = 1, 5 do
local script = scripts[i]
if script ~= nil then
- script(target, i == 3 and _do_clean_target or nil)
+ script(target, {origin = (i == 3 and _do_clean_target or nil)})
end
end
end
diff --git a/xmake/actions/install/install.lua b/xmake/actions/install/install.lua
index be775597e..399d33e25 100644
--- a/xmake/actions/install/install.lua
+++ b/xmake/actions/install/install.lua
@@ -113,7 +113,7 @@ function _on_install_target(target)
for _, r in ipairs(target:orderules()) do
local on_install = r:script("install")
if on_install then
- on_install(target, _do_install_target)
+ on_install(target, {origin = _do_install_target})
done = true
end
end
@@ -171,7 +171,7 @@ function _install_target(target)
for i = 1, 5 do
local script = scripts[i]
if script ~= nil then
- script(target, i == 3 and _do_install_target or nil)
+ script(target, {origin = (i == 3 and _do_install_target or nil)})
end
end
diff --git a/xmake/actions/package/main.lua b/xmake/actions/package/main.lua
index 0c6171dd6..c721baf77 100644
--- a/xmake/actions/package/main.lua
+++ b/xmake/actions/package/main.lua
@@ -152,7 +152,7 @@ function _on_package_target(target)
for _, r in ipairs(target:orderules()) do
local on_package = r:script("package")
if on_package then
- on_package(target, _do_package_target)
+ on_package(target, {origin = _do_package_target})
done = true
end
end
@@ -196,7 +196,7 @@ function _package(target)
for i = 1, 5 do
local script = scripts[i]
if script ~= nil then
- script(target, i == 3 and _do_package_target or nil)
+ script(target, {origin = (i == 3 and _do_package_target or nil)})
end
end
diff --git a/xmake/actions/run/main.lua b/xmake/actions/run/main.lua
index bfd9e414b..74896a189 100644
--- a/xmake/actions/run/main.lua
+++ b/xmake/actions/run/main.lua
@@ -90,7 +90,7 @@ function _on_run_target(target)
for _, r in ipairs(target:orderules()) do
local on_run = r:script("run")
if on_run then
- on_run(target, _do_run_target)
+ on_run(target, {origin = _do_run_target})
done = true
end
end
@@ -145,7 +145,7 @@ function _run(target)
for i = 1, 5 do
local script = scripts[i]
if script ~= nil then
- script(target, i == 3 and _do_run_target or nil)
+ script(target, {origin = (i == 3 and _do_run_target or nil)})
end
end
end
diff --git a/xmake/actions/uninstall/uninstall.lua b/xmake/actions/uninstall/uninstall.lua
index c2475ce43..abd6acad3 100644
--- a/xmake/actions/uninstall/uninstall.lua
+++ b/xmake/actions/uninstall/uninstall.lua
@@ -97,7 +97,7 @@ function _on_uninstall_target(target)
for _, r in ipairs(target:orderules()) do
local on_uninstall = r:script("uninstall")
if on_uninstall then
- on_uninstall(target, _do_uninstall_target)
+ on_uninstall(target, {origin = _do_uninstall_target})
done = true
end
end
@@ -155,7 +155,7 @@ function _uninstall_target(target)
for i = 1, 5 do
local script = scripts[i]
if script ~= nil then
- script(target, i == 3 and _do_uninstall_target or nil)
+ script(target, {origin = (i == 3 and _do_uninstall_target or nil)})
end
end