support add_files *.a using ar

3 files changed, 101 insertions, 6 deletions

diff --git a/xmake/scripts/tools/ar.lua b/xmake/scripts/tools/ar.lua
index b80dc4ddf..66a29c4c3 100644
--- a/xmake/scripts/tools/ar.lua
+++ b/xmake/scripts/tools/ar.lua
@@ -32,7 +32,7 @@ local config    = require("base/config")
 function ar.init(self, name)
 
     -- save name
-    self._NAME = name or "ar"
+    self.name = name or "ar"
 
     -- init arflags
     self.arflags = { "-crs" }
@@ -47,7 +47,7 @@ function ar.command_link(self, objfiles, targetfile, flags, logfile)
     if logfile then redirect = string.format(" > %s 2>&1", logfile) end
 
     -- make it
-    return string.format("%s %s %s %s%s", self._NAME, flags, targetfile, objfiles, redirect)
+    return string.format("%s %s %s %s%s", self.name, flags, targetfile, objfiles, redirect)
 end
 
 -- the main function
diff --git a/xmake/scripts/tools/extract.lua b/xmake/scripts/tools/extract.lua
new file mode 100644
index 000000000..635eb8d73
--- /dev/null
+++ b/xmake/scripts/tools/extract.lua
@@ -0,0 +1,95 @@
+--!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        extract.lua
+--
+
+-- define module: extract
+local extract = extract or {}
+
+-- load modules
+local os        = require("base/os")
+local path      = require("base/path")
+local utils     = require("base/utils")
+local string    = require("base/string")
+
+-- the main function
+--
+-- extract /home/[lib]xxx.[a|lib] /home/xxx/*.[o|obj]
+-- only support: ar -x library
+function extract.main(self, ...)
+
+    -- check
+    local args = ...
+    assert(#args == 3)
+
+    -- get toolname
+    local toolname = args[1]
+    assert(toolname)
+
+    -- be not ar?
+    if not toolname:find("ar", 1, true) then
+        utils.error("%s is not ar!", toolname)
+        return false
+    end
+
+    -- get library and object file path
+    local libfile = args[2]
+    local objfile = args[3]
+    assert(libfile and objfile)
+
+    -- get object directory
+    local objdir = path.directory(objfile)
+    if not os.isdir(objdir) then os.mkdir(objdir) end
+    if not os.isdir(objdir) then
+        utils.error("%s not found!", objdir)
+        return false
+    end
+
+    -- absolute the library path
+    libfile = path.absolute(libfile)
+    assert(libfile)
+
+    -- enter the object directory
+    ok, errors = os.cd(objdir)
+    if not ok then
+        utils.error(errors)
+        return false
+    end
+
+    -- extract it
+    local ok = os.execute(string.format("%s -x %s", toolname, libfile))
+    if ok ~= 0 then
+        utils.error("extract %s to %s failed!", libfile, objdir)
+        return false
+    end
+
+    -- leave the object directory
+    ok, errors = os.cd("-")
+    if not ok then
+        utils.error(errors)
+        return false
+    end
+
+    -- ok
+    return true
+end
+
+-- return module: extract
+return extract
diff --git a/xmake/scripts/tools/gcc.lua b/xmake/scripts/tools/gcc.lua
index ee492e134..f1b2f4d55 100644
--- a/xmake/scripts/tools/gcc.lua
+++ b/xmake/scripts/tools/gcc.lua
@@ -41,7 +41,7 @@ function gcc._check(self, flag)
 
     -- check it
     local result = flag
-    if 0 ~= os.execute(string.format("%s %s -S -o %s -xc %s > %s 2>&1", self._NAME, flag, xmake._NULDEV, xmake._NULDEV, xmake._NULDEV)) then
+    if 0 ~= os.execute(string.format("%s %s -S -o %s -xc %s > %s 2>&1", self.name, flag, xmake._NULDEV, xmake._NULDEV, xmake._NULDEV)) then
         result = ""
     end
 
@@ -59,7 +59,7 @@ end
 function gcc.init(self, name)
 
     -- save name
-    self._NAME = name or "gcc"
+    self.name = name or "gcc"
 
     -- init mxflags
     self.mxflags = {    "-fmessage-length=0"
@@ -125,7 +125,7 @@ function gcc.command_compile(self, srcfile, objfile, flags, logfile)
     if logfile then redirect = string.format(" > %s 2>&1", logfile) end
 
     -- make it
-    return string.format("%s -c %s -o %s %s%s", self._NAME, flags, objfile, srcfile, redirect)
+    return string.format("%s -c %s -o %s %s%s", self.name, flags, objfile, srcfile, redirect)
 end
 
 -- make the link command
@@ -136,7 +136,7 @@ function gcc.command_link(self, objfiles, targetfile, flags, logfile)
     if logfile then redirect = string.format(" > %s 2>&1", logfile) end
 
     -- make it
-    return string.format("%s -o %s %s %s%s", self._NAME, targetfile, objfiles, flags, redirect)
+    return string.format("%s -o %s %s %s%s", self.name, targetfile, objfiles, flags, redirect)
 end
 
 -- make the define flag