diff options
| author | ruki <[email protected]> | 2015-12-07 10:24:42 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-12-07 10:24:42 +0800 |
| commit | cbd6458e80f4335ddc62cb236731b258b1ba66ed (patch) | |
| tree | 97b53b7b519595cb94a42f4aff8c2dbbbb3949b5 /xmake/scripts | |
| parent | aaa157e94ea35a19f023483baffcff1b72e96a77 (diff) | |
add packages and console_tbox template
Diffstat (limited to 'xmake/scripts')
| -rw-r--r-- | xmake/scripts/_xmake_main.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/action/_create.lua | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xmake/scripts/_xmake_main.lua b/xmake/scripts/_xmake_main.lua index c8ca48589..50f0d313c 100644 --- a/xmake/scripts/_xmake_main.lua +++ b/xmake/scripts/_xmake_main.lua @@ -30,6 +30,7 @@ xmake._VERSION = _VERSION xmake._PROGRAM_DIR = _PROGRAM_DIR xmake._PROJECT_DIR = _PROJECT_DIR xmake._SCRIPTS_DIR = _PROGRAM_DIR .. "/scripts" +xmake._PACKAGES_DIR = _PROGRAM_DIR .. "/packages" xmake._TEMPLATES_DIR = _PROGRAM_DIR .. "/templates" xmake._PROJECT_FILE = "xmake.lua" xmake._OPTIONS = {} diff --git a/xmake/scripts/action/_create.lua b/xmake/scripts/action/_create.lua index 7f91039ad..1a18c79b6 100644 --- a/xmake/scripts/action/_create.lua +++ b/xmake/scripts/action/_create.lua @@ -42,7 +42,7 @@ function _create.done() assert(options) -- the target name - local targetname = options.target or path.basename(xmake._PROJECT_DIR) or "demo" + local targetname = options.target or options.name or path.basename(xmake._PROJECT_DIR) or "demo" -- trace utils.printf("create %s ...", targetname) @@ -99,7 +99,7 @@ function _create.done() end -- done the template files - if not module.done(targetname, xmake._PROJECT_DIR) then + if not module.done(targetname, xmake._PROJECT_DIR, xmake._PACKAGES_DIR) then utils.error("update the template failed!") return false end |