add name argument for tools

4 files changed, 8 insertions, 65 deletions

diff --git a/xmake/scripts/action/_lua.lua b/xmake/scripts/action/_lua.lua
index f693a1514..380c3438b 100644
--- a/xmake/scripts/action/_lua.lua
+++ b/xmake/scripts/action/_lua.lua
@@ -85,7 +85,7 @@ function _lua.done()
 
                     -- init module 
                     if module.init then
-                        module.init()
+                        module.init(options.script)
                     end
 
                     -- done module 
diff --git a/xmake/scripts/platform/windows/tools/nmake.lua b/xmake/scripts/platform/windows/tools/nmake.lua
index 81a41df88..6d6b21258 100644
--- a/xmake/scripts/platform/windows/tools/nmake.lua
+++ b/xmake/scripts/platform/windows/tools/nmake.lua
@@ -68,7 +68,10 @@ function nmake._leave(name, old)
 end
 
 -- the init function
-function nmake.init()
+function nmake.init(name)
+
+    -- save name
+    nmake._NAME = name or "nmake.exe"
 
     -- is verbose?
     nmake._VERBOSE = utils.ifelse(xmake._OPTIONS.verbose, "-v", "")
@@ -87,9 +90,9 @@ function nmake.main(mkfile, target)
     -- make command
     local cmd = nil
     if mkfile and os.isfile(mkfile) then
-        cmd = string.format("nmake /f %s %s VERBOSE=%s 2> nul", mkfile, target or "", nmake._VERBOSE)
+        cmd = string.format("%s /f %s %s VERBOSE=%s 2> nul", nmake._NAME, mkfile, target or "", nmake._VERBOSE)
     else  
-        cmd = string.format("nmake %s VERBOSE=%s 2> nul", target or "", nmake._VERBOSE)
+        cmd = string.format("%s %s VERBOSE=%s 2> nul", nmake._NAME, target or "", nmake._VERBOSE)
     end
 
     -- done 
diff --git a/xmake/scripts/tools/make.lua b/xmake/scripts/tools/make.lua
deleted file mode 100644
index c6a5ac088..000000000
--- a/xmake/scripts/tools/make.lua
+++ /dev/null
@@ -1,60 +0,0 @@
---!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        make.lua
---
-
--- load modules
-local os        = require("base/os")
-local utils     = require("base/utils")
-
--- define module: make
-local make = make or {}
-
--- the init function
-function make.init()
-
-    -- is verbose?
-    make._VERBOSE = utils.ifelse(xmake._OPTIONS.verbose, "-v", "")
-
-end
-
--- the main function
-function make.main(mkfile, target)
-
-    -- make command
-    local cmd = nil
-    if mkfile and os.isfile(mkfile) then
-        cmd = string.format("make -j4 -f %s %s VERBOSE=%s", mkfile, target or "", make._VERBOSE)
-    else  
-        cmd = string.format("make -j4 %s VERBOSE=%s", target or "", make._VERBOSE)
-    end
-
-    -- done 
-    local ok = os.execute(cmd)
-    if ok ~= 0 then
-        return false
-    end
-
-    -- ok
-    return true
-end
-
--- return module: make
-return make
diff --git a/xmake/scripts/tools/tools.lua b/xmake/scripts/tools/tools.lua
index 4c0d0da14..e29a2718b 100644
--- a/xmake/scripts/tools/tools.lua
+++ b/xmake/scripts/tools/tools.lua
@@ -124,7 +124,7 @@ function tools.load(name, root)
 
         -- init tool 
         if tool and tool.init then
-            tool.init()
+            tool.init(name)
         end
 
         -- save tool to the cache