improve interpreter and restore project.version

1 files changed, 17 insertions, 2 deletions

diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index f7b499113..a0ea2b064 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -327,8 +327,23 @@ function project._load(force)
         return false, (errors or "load project file failed!")
     end
 
-    -- load the project info
-    project._INFO = project._load_scope(nil, true, true)
+    -- load the root info of the project 
+    local rootinfo, errors = project._load_scope("root", true, true) 
+    if not rootinfo then
+        return false, errors
+    end
+
+    -- load the root info of the target
+    local rootinfo_target, errors = project._load_scope("root.target", true, true) 
+    if not rootinfo_target then
+        return false, errors
+    end
+
+    -- save the root info
+    for name, value in pairs(rootinfo_target) do
+        rootinfo["target." .. name] = value
+    end
+    project._INFO = rootinfo
 
     -- leave the project directory
     oldir, errors = os.cd(oldir)