add .xmakerc.lua

3 files changed, 31 insertions, 3 deletions

diff --git a/xmake/core/_xmake_main.lua b/xmake/core/_xmake_main.lua
index 9e80593fe..93f225c56 100644
--- a/xmake/core/_xmake_main.lua
+++ b/xmake/core/_xmake_main.lua
@@ -66,6 +66,11 @@ function _loadfile_impl(filepath, mode, opt)
     end
     io.file_close(file)
 
+    -- do on_load()
+    if opt.on_load then
+        data = opt.on_load(data) or data
+    end
+
     -- load script from string
     return load(data, "@" .. displaypath, mode)
 end
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 12dc62fa4..2c3cfc52d 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -691,13 +691,17 @@ function interpreter.new()
 end
 
 -- load script file, e.g. xmake.lua 
-function interpreter:load(file)
+--
+-- @param opt   {on_load_data = function (data) return data end}
+--
+function interpreter:load(file, opt)
 
     -- check
     assert(self and self._PUBLIC and self._PRIVATE and file)
 
     -- load the script
-    local script, errors = loadfile(file)
+    opt = opt or {}
+    local script, errors = loadfile(file, "bt", {on_load = opt.on_load_data})
     if not script then
         return nil, errors
     end
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index 4baa8ab5c..0a6451b80 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -291,6 +291,16 @@ function project.file()
     return os.projectfile()
 end
 
+-- get the global rcfile: ~/.xmakerc.lua
+function project.rcfile()
+    local xmakerc = project._XMAKE_RCFILE
+    if xmakerc == nil then
+        xmakerc = os.getenv("XMAKE_RCFILE") or "~/.xmakerc.lua"
+        project._XMAKE_RCFILE = xmakerc
+    end
+    return xmakerc
+end
+
 -- get the project directory
 function project.directory()
     return os.projectdir()
@@ -329,7 +339,16 @@ function project._load(force, disable_filter)
     local interp = project.interpreter()
 
     -- load script
-    local ok, errors = interp:load(project.file())
+    local ok, errors = interp:load(project.file(), {on_load_data = function (data) 
+            local xmakerc_file = project.rcfile()
+            if xmakerc_file and os.isfile(xmakerc_file) then
+                local rcdata = io.readfile(xmakerc_file)
+                if rcdata then
+                    data = rcdata .. "\n" .. data
+                end
+            end
+            return data
+        end})
     if not ok then
         return false, (errors or "load project file failed!")
     end