diff options
| author | ruki <[email protected]> | 2016-06-17 13:37:39 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-06-17 13:37:39 +0800 |
| commit | 850db235e7ef6a9231f45c9b1f775154ec330ca5 (patch) | |
| tree | a5ef0ce16dc7076d22cadfaccdabe552e55b1ec3 | |
| parent | 44a93238e12d1a8ca5dd732afb2513d823f7c9b8 (diff) | |
fix file argument conflict bug
| -rw-r--r-- | xmake/core/main.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/task.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/main.lua b/xmake/core/main.lua index 4abb59c67..37017a03c 100644 --- a/xmake/core/main.lua +++ b/xmake/core/main.lua @@ -91,7 +91,7 @@ function main._init() assert(projectdir) -- init the xmake.lua file path - local projectfile = option.find(xmake._ARGV, "file", "f") or xmake._PROJECT_FILE + local projectfile = option.find(xmake._ARGV, "file", "F") or xmake._PROJECT_FILE if projectfile and not path.is_absolute(projectfile) then projectfile = path.absolute(projectfile, projectdir) end diff --git a/xmake/core/project/task.lua b/xmake/core/project/task.lua index 76c2819f7..8f4c650c5 100644 --- a/xmake/core/project/task.lua +++ b/xmake/core/project/task.lua @@ -135,7 +135,7 @@ function task._translate_menu(menu) table.insert(options, 2, {nil, "version", "k", nil, "Print the version number and exit." }) table.insert(options, 3, {'h', "help", "k", nil, "Print this help message and exit." }) table.insert(options, 4, {}) - table.insert(options, 5, {'f', "file", "kv", nil, "Read a given xmake.lua file." }) + table.insert(options, 5, {'F', "file", "kv", nil, "Read a given xmake.lua file." }) table.insert(options, 6, {'P', "project", "kv", nil, "Change to the given project directory." , "Search priority:" , " 1. The Given Command Argument" |