make the current project configure

1 files changed, 123 insertions, 7 deletions

diff --git a/xmake/scripts/base/project.lua b/xmake/scripts/base/project.lua
index 49088fca4..0b7783e2c 100644
--- a/xmake/scripts/base/project.lua
+++ b/xmake/scripts/base/project.lua
@@ -28,6 +28,117 @@ local utils         = require("base/utils")
 local config        = require("base/config")
 local preprocessor  = require("base/preprocessor")
 
+-- make the given configure to scope
+function project._make_configs(scope, configs)
+
+    -- check
+    assert(scope and configs)
+
+    -- the current mode
+    local mode = config.get("mode")
+    assert(mode)
+
+    -- the current platform
+    local plat = config.get("plat")
+    assert(plat)
+
+    -- done
+    for k, v in pairs(configs) do
+        
+        -- check
+        assert(type(k) == "string")
+
+        -- enter the platform configure?
+        if k == "_PLATFORMS" then
+
+            -- append configure to scope for the current mode
+            for _k, _v in pairs(v) do
+                if _k == plat then
+                    project._make_configs(scope, _v)
+                end
+            end
+
+        -- enter the mode configure?
+        elseif k == "_MODES" then
+
+            -- append configure to scope for the current mode
+            for _k, _v in pairs(v) do
+                if _k == mode then
+                    project._make_configs(scope, _v)
+                end
+            end
+
+        -- append configure to scope
+        elseif not k:startswith("_") then
+
+            -- wrap it first
+            local values = utils.wrap(v)
+
+            -- append all 
+            for _, _v in ipairs(values) do
+
+                -- the configure item
+                scope[k] = scope[k] or {}
+                local item = scope[k]
+
+                -- append it
+                item[table.getn(item) + 1] = _v
+            end
+        end
+    end
+end
+
+-- make the current project configure
+function project._make()
+
+    -- the configs
+    local configs = project._CONFIGS
+    assert(configs and configs._TARGET)
+   
+    -- init current config
+    project._CURRENT = project._CURRENT or {}
+    local current = project._CURRENT
+
+    -- init all targets
+    for name, target in pairs(configs._TARGET) do
+
+        -- init target scope first
+        current[name] = current[name] or {}
+        local scope = current[name]
+
+        -- make the root configure to this scope
+        project._make_configs(scope, configs)
+
+        -- make the target configure to this scope
+        project._make_configs(scope, target)
+    end
+
+    -- remove repeat values and unwrap it
+    for _, target in pairs(current) do
+        for k, v in pairs(target) do
+
+            -- remove repeat first
+            v = utils.unique(v)
+
+            -- unwrap it if be only one
+            v = utils.unwrap(v)
+
+            -- update it
+            target[k] = v
+        end
+    end
+end
+
+-- get the current configure for targets
+function project.targets()
+
+    -- check
+    assert(project._CURRENT)
+
+    -- return it
+    return project._CURRENT
+end
+
 -- load xproj
 function project.loadxproj(file)
 
@@ -35,11 +146,10 @@ function project.loadxproj(file)
     assert(file)
 
     -- init configures
-    local configures = {   "kind"
+    local configures = {    "kind"
                         ,   "deps"
                         ,   "files"
                         ,   "links" 
-                        ,   "mflags" 
                         ,   "headers" 
                         ,   "headerdir" 
                         ,   "targetdir" 
@@ -47,9 +157,12 @@ function project.loadxproj(file)
                         ,   "linkdirs" 
                         ,   "includedirs" 
                         ,   "cflags" 
+                        ,   "cxflags" 
                         ,   "cxxflags" 
-                        ,   "ldflags" 
+                        ,   "mflags" 
                         ,   "mxflags" 
+                        ,   "mxxflags" 
+                        ,   "ldflags" 
                         ,   "defines"} 
 
     -- init filter
@@ -86,7 +199,7 @@ function project.loadxproj(file)
     end
 
     -- load and execute the xmake.xproj
-    local newenv, errors = preprocessor.loadfile(file, "project", configures, {"target", "platforms"}, filter, import)
+    local newenv, errors = preprocessor.loadfile(file, "project", configures, {"target", "platforms", "modes"}, filter, import)
     if newenv and newenv._CONFIGS then
         -- ok
         project._CONFIGS = newenv._CONFIGS
@@ -98,17 +211,20 @@ function project.loadxproj(file)
         return string.format("load %s failed!", file)
     end
 
+    -- make the current project configure
+    project._make()
+
 end
 
--- dump configs
+-- dump the current configure
 function project.dump()
     
     -- check
-    assert(project._CONFIGS)
+    assert(project._CURRENT)
 
     -- dump
     if xmake._OPTIONS.verbose then
-        utils.dump(project._CONFIGS, "_PARENT")
+        utils.dump(project._CURRENT)
     end
    
 end