diff options
| author | ruki <[email protected]> | 2015-07-10 16:59:16 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-07-10 16:59:16 +0800 |
| commit | e2b2d08d459dc0c3459befb443c9c76520bcf61d (patch) | |
| tree | 5a031da80823f8aade87c7d9896170d6202310c0 /xmake/scripts/action/_package.lua | |
| parent | ebd3cf08de2fea05bbf32d095f5a5c5a3c38a4f1 (diff) | |
add install for macosx
Diffstat (limited to 'xmake/scripts/action/_package.lua')
| -rw-r--r-- | xmake/scripts/action/_package.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmake/scripts/action/_package.lua b/xmake/scripts/action/_package.lua index 1860b931b..e39604a33 100644 --- a/xmake/scripts/action/_package.lua +++ b/xmake/scripts/action/_package.lua @@ -150,24 +150,24 @@ function _package._makeconf(target_name, target) configs_arch.targetfile = _package._backup(configs_arch.targetdir, rule.targetfile(target_name, target)) -- save the package script - local pkgscript = target.pkgscript - if type(pkgscript) == "string" and os.isfile(pkgscript) then - local script, errors = loadfile(pkgscript) + local packagescript = target.packagescript + if type(packagescript) == "string" and os.isfile(packagescript) then + local script, errors = loadfile(packagescript) if script then - pkgscript = script() - if type(pkgscript) == "table" and pkgscript.main then - pkgscript = pkgscript.main + packagescript = script() + if type(packagescript) == "table" and packagescript.main then + packagescript = packagescript.main end else utils.error(errors) return false end end - if target.pkgscript and type(pkgscript) ~= "function" then + if target.packagescript and type(packagescript) ~= "function" then utils.error("invalid package script!") return false end - configs_target.pkgscript = pkgscript + configs_target.packagescript = packagescript -- ok return true |