enable boolean for only key option and add is_absolute

6 files changed, 68 insertions, 8 deletions

diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index a6bcf0e35..7dcd29e65 100755
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -55,6 +55,7 @@ typedef struct __xm_machine_impl_t
 // the path functions
 tb_int_t xm_path_absolute(lua_State* lua);
 tb_int_t xm_path_translate(lua_State* lua);
+tb_int_t xm_path_is_absolute(lua_State* lua);
 
 // the string functions
 tb_int_t xm_string_startswith(lua_State* lua);
@@ -68,6 +69,7 @@ static luaL_Reg const g_path_functions[] =
 {
     { "absolute",       xm_path_absolute    }
 ,   { "translate",      xm_path_translate   }
+,   { "is_absolute",    xm_path_is_absolute }
 ,   { tb_null,          tb_null             }
 };
 
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 0b65dc2a2..aaa94682e 100755
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -16,6 +16,7 @@ xmake_C_FILES 			+= \
 						machine \
 						path/absolute \
 						path/translate \
+						path/is_absolute \
 						string/startswith 
 						
 
diff --git a/core/src/xmake/path/is_absolute.c b/core/src/xmake/path/is_absolute.c
new file mode 100755
index 000000000..d6760fbfa
--- /dev/null
+++ b/core/src/xmake/path/is_absolute.c
@@ -0,0 +1,52 @@
+/*!The Automatic Cross-platform Build Tool
+ * 
+ * XMake is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ * 
+ * XMake is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with XMake; 
+ * If not, see <a href="http://www.gnu.org/licenses/"> http://www.gnu.org/licenses/</a>
+ * 
+ * Copyright (C) 2009 - 2015, ruki All rights reserved.
+ *
+ * @author      ruki
+ * @file        is_absolute.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME                "is_absolute"
+#define TB_TRACE_MODULE_DEBUG               (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * implementation
+ */
+tb_int_t xm_path_is_absolute(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // get the path 
+    tb_char_t const* path = luaL_checkstring(lua, 1);
+    tb_check_return_val(path, 0);
+
+    // done path:is_absolute() 
+    lua_pushboolean(lua, tb_path_is_absolute(path));
+
+    // ok
+    return 1;
+}
diff --git a/xmake/scripts/action/config.lua b/xmake/scripts/action/config.lua
index e12ac898c..fb822422e 100644
--- a/xmake/scripts/action/config.lua
+++ b/xmake/scripts/action/config.lua
@@ -31,13 +31,16 @@ function config._save_option(file, option)
  
     -- check
     assert(file and option)
-
-    -- save number
-    if type(option) == "number" then  
-        file:write(option)  
+    
     -- save string
-    elseif type(option) == "string" then  
+    if type(option) == "string" then  
         file:write(string.format("%q", option))  
+    -- save boolean
+    elseif type(option) == "boolean" then  
+        file:write(tostring(option))  
+    -- save number 
+    elseif type(option) == "number" then  
+        file:write(option)  
     -- save table
     elseif type(option) == "table" then  
 
diff --git a/xmake/scripts/base/main.lua b/xmake/scripts/base/main.lua
index 811f0a650..ff4ddfaac 100644
--- a/xmake/scripts/base/main.lua
+++ b/xmake/scripts/base/main.lua
@@ -271,7 +271,9 @@ function main._done_option()
 
     -- init the xmake.lua file path
     options.file = options.file or options._DEFAULTS.file or "xmake.lua"
-    options.file = path.absolute(options.file, options.project)
+    if not path.is_absolute(options.file) then
+        options.file = path.absolute(options.file, options.project)
+    end
     assert(options.file)
 
     -- load and execute the xmake.lua script of the given project
diff --git a/xmake/scripts/base/option.lua b/xmake/scripts/base/option.lua
index 13ac012d9..89a346a9d 100644
--- a/xmake/scripts/base/option.lua
+++ b/xmake/scripts/base/option.lua
@@ -65,7 +65,7 @@ function option.init(argv, menu)
         -- only key?
         else
             key = arg
-            value = ""
+            value = true
         end
 
         -- --key?
@@ -151,7 +151,7 @@ function option.init(argv, menu)
             end
 
             -- check mode
-            if (opt[3] == "k" and #value ~= 0) or (opt[3] == "kv" and #value == 0) then
+            if (opt[3] == "k" and type(value) ~= "boolean") or (opt[3] == "kv" and type(value) ~= "string") then
 
                 -- invalid option
                 print("invalid option: " .. arg)