From bb38407c1a929f2b098022b1e3d9f1dc75798dbf Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 29 Jun 2015 11:11:22 +0800 Subject: package binary and static target --- xmake/scripts/action/_package.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'xmake/scripts/action') diff --git a/xmake/scripts/action/_package.lua b/xmake/scripts/action/_package.lua index 6c71e4fa1..af7cac9bf 100644 --- a/xmake/scripts/action/_package.lua +++ b/xmake/scripts/action/_package.lua @@ -121,12 +121,12 @@ function _package._makeconf(target_name, target) configs[target_name] = configs[target_name] or {} local configs_target = configs[target_name] - -- init configs for files - configs_target.files = configs_target.files or {} + -- init configs for architectures + configs_target.archs = configs_target.archs or {} -- init configs for architecture - configs_target.files[arch] = configs_target.files[arch] or {} - local configs_arch = configs_target.files[arch] + configs_target.archs[arch] = configs_target.archs[arch] or {} + local configs_arch = configs_target.archs[arch] -- save name configs_target.name = target_name @@ -134,17 +134,17 @@ function _package._makeconf(target_name, target) -- save kind configs_target.kind = target.kind - -- save the root directory - configs_arch.rootdir = rule.packagedir(target_name, arch) + -- save the target directory + configs_arch.targetdir = rule.backupdir(target_name, arch) -- save the config file - configs_arch.config_h = _package._backup(configs_arch.rootdir, rule.config_h(target)) + configs_arch.config_h = _package._backup(configs_arch.targetdir, rule.config_h(target)) -- save the target file - configs_arch.targetfile = _package._backup(configs_arch.rootdir, rule.targetfile(target_name, target)) + configs_arch.targetfile = _package._backup(configs_arch.targetdir, rule.targetfile(target_name, target)) - -- save the target directory - configs_arch.targetdir = options.outputdir or target.targetdir or config.get("buildir") + -- save the output directory + configs_arch.outputdir = options.outputdir or config.get("buildir") -- save the header files configs_arch.headerfiles = rule.headerfiles(target) -- cgit v1.3.1