fix the command is too long for nmake

4 files changed, 121 insertions, 6 deletions

diff --git a/xmake/scripts/tools/ar.lua b/xmake/scripts/tools/ar.lua
index b2e2618eb..b80dc4ddf 100644
--- a/xmake/scripts/tools/ar.lua
+++ b/xmake/scripts/tools/ar.lua
@@ -40,10 +40,14 @@ function ar.init(self, name)
 end
 
 -- make the link command
-function ar.command_link(self, objfiles, targetfile, flags)
+function ar.command_link(self, objfiles, targetfile, flags, logfile)
+
+    -- redirect
+    local redirect = ""
+    if logfile then redirect = string.format(" > %s 2>&1", logfile) end
 
     -- make it
-    return string.format("%s %s %s %s", self._NAME, flags, targetfile, objfiles)
+    return string.format("%s %s %s %s%s", self._NAME, flags, targetfile, objfiles, redirect)
 end
 
 -- the main function
diff --git a/xmake/scripts/tools/cat.lua b/xmake/scripts/tools/cat.lua
new file mode 100644
index 000000000..32fea4e24
--- /dev/null
+++ b/xmake/scripts/tools/cat.lua
@@ -0,0 +1,43 @@
+--!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        cat.lua
+--
+
+-- define module: cat
+local cat = cat or {}
+
+-- load modules
+local io = require("base/io")
+local os = require("base/os")
+
+-- the main function
+function cat.main(self, ...)
+
+    -- cat all
+    for _, v in ipairs(...) do
+        if os.isfile(v) then io.cat(v) end
+    end
+
+    -- ok
+    return true
+end
+
+-- return module: cat
+return cat
diff --git a/xmake/scripts/tools/crun.lua b/xmake/scripts/tools/crun.lua
new file mode 100644
index 000000000..f8897cede
--- /dev/null
+++ b/xmake/scripts/tools/crun.lua
@@ -0,0 +1,60 @@
+--!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        crun.lua
+--
+
+-- define module: crun
+local crun = crun or {}
+
+-- load modules
+local io = require("base/io")
+local os = require("base/os")
+
+-- the main function
+function crun.main(self, ...)
+
+    -- run all command files
+    local ok = -1
+    for _, v in ipairs(...) do
+
+        -- open file
+        local file = io.open(v, "r")
+        if file then
+            
+            -- read command
+            local cmd = file:read("*all")
+            if cmd and #cmd ~= 0 then
+                ok = os.execute(cmd)
+            end
+
+            -- exit file
+            file:close()
+
+            -- ok?
+            if ok ~= 0 then break end
+        end
+    end
+
+    -- ok?
+    return ok
+end
+
+-- return module: crun
+return crun
diff --git a/xmake/scripts/tools/gcc.lua b/xmake/scripts/tools/gcc.lua
index 6a5fc9d82..d02384494 100644
--- a/xmake/scripts/tools/gcc.lua
+++ b/xmake/scripts/tools/gcc.lua
@@ -112,17 +112,25 @@ function gcc.init(self, name)
 end
 
 -- make the compile command
-function gcc.command_compile(self, srcfile, objfile, flags)
+function gcc.command_compile(self, srcfile, objfile, flags, logfile)
+
+    -- redirect
+    local redirect = ""
+    if logfile then redirect = string.format(" > %s 2>&1", logfile) end
 
     -- make it
-    return string.format("%s -c %s -o %s %s", self._NAME, flags, objfile, srcfile)
+    return string.format("%s -c %s -o %s %s%s", self._NAME, flags, objfile, srcfile, redirect)
 end
 
 -- make the link command
-function gcc.command_link(self, objfiles, targetfile, flags)
+function gcc.command_link(self, objfiles, targetfile, flags, logfile)
+
+    -- redirect
+    local redirect = ""
+    if logfile then redirect = string.format(" > %s 2>&1", logfile) end
 
     -- make it
-    return string.format("%s -o %s %s %s", self._NAME, targetfile, objfiles, flags)
+    return string.format("%s -o %s %s %s%s", self._NAME, targetfile, objfiles, flags, redirect)
 end
 
 -- make the define flag