reimpl compiler and linker

7 files changed, 321 insertions, 4 deletions

diff --git a/xmake/tools/compiler/gcc.lua b/xmake/tools/compiler/gcc.lua
index 9d6e8a484..437948610 100755
--- a/xmake/tools/compiler/gcc.lua
+++ b/xmake/tools/compiler/gcc.lua
@@ -45,10 +45,6 @@ function init(shellname)
         ["-W1"]                     = "-Wall"
     ,   ["-W2"]                     = "-Wall"
     ,   ["-W3"]                     = "-Wall"
-
-        -- strip
-    ,   ["-s"]                      = "-s"
-    ,   ["-S"]                      = "-S"
  
     }
 end
diff --git a/xmake/tools/linker/ar.lua b/xmake/tools/linker/ar.lua
new file mode 100644
index 000000000..12beaab0a
--- /dev/null
+++ b/xmake/tools/linker/ar.lua
@@ -0,0 +1,44 @@
+--!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) 2015 - 2016, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        ar.lua
+--
+
+-- init it
+function init(shellname)
+    
+    -- save the shell name
+    _g.shellname = shellname or "ar"
+
+    -- init arflags
+    _g.arflags = { "-crs" }
+
+end
+
+-- make the command
+function command(objfiles, targetfile, flags, logfile)
+
+    -- redirect
+    local redirect = ""
+    if logfile then redirect = format(" > %s 2>&1", logfile) end
+
+    -- make it
+    return format("%s %s %s %s%s", _g.shellname, flags, targetfile, objfiles, redirect)
+end
+
diff --git a/xmake/tools/linker/clang++.lua b/xmake/tools/linker/clang++.lua
new file mode 100755
index 000000000..6b2feaa2f
--- /dev/null
+++ b/xmake/tools/linker/clang++.lua
@@ -0,0 +1,33 @@
+--!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) 2015 - 2016, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        clang++.lua
+--
+
+-- inherit clang
+inherit("clang")
+
+-- init it
+function init(shellname)
+    
+    -- init super
+    _super.init(shellname or "clang++")
+
+end
+
diff --git a/xmake/tools/linker/clang.lua b/xmake/tools/linker/clang.lua
new file mode 100755
index 000000000..712b578e3
--- /dev/null
+++ b/xmake/tools/linker/clang.lua
@@ -0,0 +1,40 @@
+--!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) 2015 - 2016, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        clang.lua
+--
+
+-- inherit gcc
+inherit("gcc")
+
+-- init it
+function init(shellname)
+    
+    -- init super
+    _super.init(shellname or "clang")
+
+    -- init shflags
+    _super._g.shflags = { "-dynamiclib", "-fPIC" }
+
+    -- init flags map
+    _super._g.mapflags["-s"] = "-Wl,-S"
+    _super._g.mapflags["-S"] = "-Wl,-S"
+ 
+end
+
diff --git a/xmake/tools/linker/g++.lua b/xmake/tools/linker/g++.lua
new file mode 100755
index 000000000..7b2837b8e
--- /dev/null
+++ b/xmake/tools/linker/g++.lua
@@ -0,0 +1,33 @@
+--!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) 2015 - 2016, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        g++.lua
+--
+
+-- inherit gcc
+inherit("gcc")
+
+-- init it
+function init(shellname)
+    
+    -- init super
+    _super.init(shellname or "g++")
+
+end
+
diff --git a/xmake/tools/linker/gcc.lua b/xmake/tools/linker/gcc.lua
new file mode 100755
index 000000000..6bc839768
--- /dev/null
+++ b/xmake/tools/linker/gcc.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) 2015 - 2016, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        gcc.lua
+--
+
+-- init it
+function init(shellname)
+    
+    -- save the shell name
+    _g.shellname = shellname or "gcc"
+
+    -- init shflags
+    _g.shflags = { "-shared", "-fPIC" }
+
+    -- init flags map
+    _g.mapflags = 
+    {
+        -- strip
+        ["-s"]  = "-s"
+    ,   ["-S"]  = "-S"
+ 
+    }
+end
+
+-- get the property
+function get(name)
+
+    -- get it
+    return _g[name]
+end
+
+-- make the link flag
+function link(lib)
+
+    -- make it
+    return "-l" .. lib
+end
+
+-- make the linkdir flag
+function linkdir(dir)
+
+    -- make it
+    return "-L" .. dir
+end
+
+-- make the command
+function command(objfiles, targetfile, flags, logfile)
+
+    -- redirect
+    local redirect = ""
+    if logfile then redirect = format(" > %s 2>&1", logfile) end
+
+    -- make it
+    return format("%s -o %s %s %s%s", _g.shellname, targetfile, objfiles, flags, redirect)
+end
+
+-- check the given flags 
+function check(flags)
+
+    -- done
+    local ok = false
+    try
+    {
+        function ()
+    
+            -- check it
+            os.run("%s %s -S -o $(nuldev) -xc $(nuldev) > $(nuldev) 2>&1", _g.shellname, flags)
+            
+            -- ok
+            ok = true
+
+        end
+    }
+
+    -- ok?
+    return ok
+end
+
diff --git a/xmake/tools/make.lua b/xmake/tools/make.lua
new file mode 100644
index 000000000..8cab41067
--- /dev/null
+++ b/xmake/tools/make.lua
@@ -0,0 +1,76 @@
+--!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) 2015 - 2016, ruki All rights reserved.
+--
+-- @author      ruki
+-- @file        make.lua
+--
+
+-- imports
+import("core.base.option")
+
+-- init it
+function init(shellname)
+
+    -- save name
+    _g.shellname = shellname or "make"
+
+end
+
+-- run it
+function run(makefile, target, jobs)
+
+    -- enable jobs?
+    if jobs ~= nil then
+        if tonumber(jobs) ~= 0 then
+            jobs = "-j" .. jobs
+        else
+            jobs = "-j"
+        end
+    else
+        jobs = ""
+    end
+
+    -- is verbose?
+    local verbose = ifelse(option.get("verbose"), "-v", "")
+
+    -- run it
+    local ok = nil
+    if makefile and os.isfile(makefile) then
+        ok = os.execute("%s -r %s -f %s %s VERBOSE=%s", _g.shellname, jobs, makefile, target or "", verbose)
+    else  
+        ok = os.execute("%s -r %s %s VERBOSE=%s", _g.shellname, jobs, target or "", verbose)
+    end
+
+    -- failed 
+    if ok ~= 0 then
+
+        -- attempt to run it again for getting the error logs without jobs
+        if makefile and os.isfile(makefile) then
+            ok = os.execute("%s -r -f %s %s VERBOSE=%s", _g.shellname, makefile, target or "", verbose)
+        else  
+            ok = os.execute("%s -r %s VERBOSE=%s", _g.shellname, target or "", verbose)
+        end
+
+    end
+
+    -- always failed?
+    if ok ~= 0 then
+        raise(ok)
+    end
+
+end