add install for macosx

3 files changed, 97 insertions, 16 deletions

diff --git a/xmake/scripts/base/install.lua b/xmake/scripts/base/install.lua
index f0ccd92af..4f4eef18f 100644
--- a/xmake/scripts/base/install.lua
+++ b/xmake/scripts/base/install.lua
@@ -32,14 +32,94 @@ local utils     = require("base/utils")
 local config    = require("base/config")
 local platform  = require("platform/platform")
 
+-- install target from the project script
+function install._done_from_project(target)
+
+    -- check
+    assert(target)
+
+    -- install it using the project script first
+    local installscript = target.installscript
+    if type(installscript) == "function" then
+
+        -- remove it
+        target.installscript = nil
+
+        -- install it
+        return installscript(target)
+    end
+
+    -- continue
+    return 0
+end
+
+-- install target from the platform script
+function install._done_from_platform(target)
+
+    -- check
+    assert(target)
+
+    -- the platform install script file
+    local installscript = nil
+    local scriptfile = platform.directory() .. "/install.lua"
+    if os.isfile(scriptfile) then 
+
+        -- load the install script
+        local script, errors = loadfile(scriptfile)
+        if script then 
+            installscript = script()
+            if type(installscript) == "table" and installscript.main then 
+                installscript = installscript.main
+            end
+        else
+            utils.error(errors)
+        end
+    end
+
+    -- install it
+    if type(installscript) == "function" then
+        return installscript(target)
+    end
+
+    -- continue
+    return 0
+end
+
+-- install target from the given target configure
+function install._done(target)
+
+    -- check
+    assert(target)
+
+    -- install it from the project script
+    local ok = install._done_from_project(target)
+    if ok ~= 0 then return utils.ifelse(ok == 1, true, false) end
+
+    -- install it from the platform script
+    local ok = install._done_from_platform(target)
+    if ok ~= 0 then return utils.ifelse(ok == 1, true, false) end
+
+    -- ok
+    return true
+end
+
 -- done install from the configure
 function install.done(configs)
 
     -- check
     assert(configs)
 
-    -- dump
-    utils.dump(configs)
+    -- install targets
+    for _, target in pairs(configs) do
+
+        -- install it
+        if not install._done(target) then
+            -- errors
+            utils.error("install %s failed!", target.name)
+            return false
+        end
+
+    end
 
     -- ok
     return true
diff --git a/xmake/scripts/base/package.lua b/xmake/scripts/base/package.lua
index 32f1ef759..12565e8c1 100644
--- a/xmake/scripts/base/package.lua
+++ b/xmake/scripts/base/package.lua
@@ -184,7 +184,7 @@ function package._done_from_default(target)
     assert(target.kind)
 
     -- the package scripts
-    local pkgscripts = 
+    local packagescripts = 
     {
         static = package._done_library
     ,   shared = package._done_library
@@ -192,8 +192,8 @@ function package._done_from_default(target)
     }
 
     -- package it
-    local pkgscript = pkgscripts[target.kind]
-    if pkgscript then return pkgscript(target) end
+    local packagescript = packagescripts[target.kind]
+    if packagescript then return packagescript(target) end
 
     -- continue
     return 0
@@ -206,14 +206,14 @@ function package._done_from_project(target)
     assert(target)
 
     -- package it using the project script first
-    local pkgscript = target.pkgscript
-    if type(pkgscript) == "function" then
+    local packagescript = target.packagescript
+    if type(packagescript) == "function" then
 
         -- remove it
-        target.pkgscript = nil
+        target.packagescript = nil
 
         -- package it
-        return pkgscript(target)
+        return packagescript(target)
     end
 
     -- continue
@@ -227,16 +227,16 @@ function package._done_from_platform(target)
     assert(target)
 
     -- the platform package script file
-    local pkgscript = nil
+    local packagescript = nil
     local scriptfile = platform.directory() .. "/package.lua"
     if os.isfile(scriptfile) then 
 
         -- load the package script
         local script, errors = loadfile(scriptfile)
         if script then 
-            pkgscript = script()
-            if type(pkgscript) == "table" and pkgscript.main then 
-                pkgscript = pkgscript.main
+            packagescript = script()
+            if type(packagescript) == "table" and packagescript.main then 
+                packagescript = packagescript.main
             end
         else
             utils.error(errors)
@@ -244,8 +244,8 @@ function package._done_from_platform(target)
     end
 
     -- package it
-    if type(pkgscript) == "function" then
-        return pkgscript(target)
+    if type(packagescript) == "function" then
+        return packagescript(target)
     end
 
     -- continue
diff --git a/xmake/scripts/base/project.lua b/xmake/scripts/base/project.lua
index 5df41cfe5..1cd8b5f25 100644
--- a/xmake/scripts/base/project.lua
+++ b/xmake/scripts/base/project.lua
@@ -1088,7 +1088,8 @@ function project._load_targets(file)
                         ,   "warnings"
                         ,   "optimize"
                         ,   "languages"
-                        ,   "pkgscript"} 
+                        ,   "installscript"
+                        ,   "packagescript"} 
 
     for _, interface in ipairs(interfaces) do
         newenv["set_" .. interface] = function (...) return project._api_set_values(newenv._TARGET or newenv._CONFIGS._SET, interface, ...) end