add vsenv utils for tools

4 files changed, 77 insertions, 2 deletions

diff --git a/xmake/platforms/iphoneos/checker.lua b/xmake/platforms/iphoneos/checker.lua
index 21b8bad2d..29602000a 100644
--- a/xmake/platforms/iphoneos/checker.lua
+++ b/xmake/platforms/iphoneos/checker.lua
@@ -48,7 +48,7 @@ function _check_toolchains(config)
     checker.check_toolchain(config, "mm",   "xcrun -sdk iphoneos ", "clang",    "the objc compiler") 
     checker.check_toolchain(config, "mxx",  "xcrun -sdk iphoneos ", "clang++",  "the objc++ compiler") 
     checker.check_toolchain(config, "mxx",  "xcrun -sdk iphoneos ", "clang",    "the objc++ compiler") 
-    checker.check_toolchain(config, "as",   path.join(os.toolsdir(), "gas-preprocessor.pl xcrun -sdk iphoneos "), "clang", "the assember", _check_as)
+    checker.check_toolchain(config, "as",   path.join(os.toolsdir(), "utils/gas-preprocessor.pl xcrun -sdk iphoneos "), "clang", "the assember", _check_as)
     checker.check_toolchain(config, "ld",   "xcrun -sdk iphoneos ", "clang++",  "the linker") 
     checker.check_toolchain(config, "ld",   "xcrun -sdk iphoneos ", "clang",    "the linker") 
     checker.check_toolchain(config, "ar",   "xcrun -sdk iphoneos ", "ar",       "the static library linker") 
diff --git a/xmake/platforms/watchos/checker.lua b/xmake/platforms/watchos/checker.lua
index ba1ae0e59..44bfa42e0 100644
--- a/xmake/platforms/watchos/checker.lua
+++ b/xmake/platforms/watchos/checker.lua
@@ -48,7 +48,7 @@ function _check_toolchains(config)
     checker.check_toolchain(config, "mm",   "xcrun -sdk watchos ", "clang",    "the objc compiler") 
     checker.check_toolchain(config, "mxx",  "xcrun -sdk watchos ", "clang++",  "the objc++ compiler") 
     checker.check_toolchain(config, "mxx",  "xcrun -sdk watchos ", "clang",    "the objc++ compiler") 
-    checker.check_toolchain(config, "as",   path.join(os.toolsdir(), "gas-preprocessor.pl xcrun -sdk watchos "), "clang", "the assember", _check_as)
+    checker.check_toolchain(config, "as",   path.join(os.toolsdir(), "utils/gas-preprocessor.pl xcrun -sdk watchos "), "clang", "the assember", _check_as)
     checker.check_toolchain(config, "ld",   "xcrun -sdk watchos ", "clang++",  "the linker") 
     checker.check_toolchain(config, "ld",   "xcrun -sdk watchos ", "clang",    "the linker") 
     checker.check_toolchain(config, "ar",   "xcrun -sdk watchos ", "ar",       "the static library linker") 
diff --git a/xmake/tools/gas-preprocessor.pl b/xmake/tools/utils/gas-preprocessor.pl
index 98dfe4ad9..98dfe4ad9 100755
--- a/xmake/tools/gas-preprocessor.pl
+++ b/xmake/tools/utils/gas-preprocessor.pl
diff --git a/xmake/tools/utils/vsenv.lua b/xmake/tools/utils/vsenv.lua
new file mode 100644
index 000000000..28ddedb1a
--- /dev/null
+++ b/xmake/tools/utils/vsenv.lua
@@ -0,0 +1,75 @@
+--!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        vsenv.lua
+--
+
+-- imports
+import("core.project.config")
+
+-- enter the given environment
+function _enter(name)
+
+    -- get the pathes for the vs environment
+    local old = nil
+    local new = config.get("__vsenv_" .. name)
+    if new then
+
+        -- get the current pathes
+        old = os.getenv(name) or ""
+
+        -- append the current pathes
+        new = new .. ";" .. old
+
+        -- update the pathes for the environment
+        os.setenv(name, new)
+    end
+
+    -- return the previous environment
+    return old;
+end
+
+-- leave the given environment
+function _leave(name, old)
+
+    -- restore the previous environment
+    if old then 
+        os.setenv(name, old)
+    end
+end
+
+-- enter the vs environment
+function enter()
+
+    _g.pathes    = _enter("path")
+    _g.libs      = _enter("lib")
+    _g.includes  = _enter("include")
+    _g.libpathes = _enter("libpath")
+
+end
+
+-- leave the vs environment
+function leave()
+
+    _leave("path",      _g.pathes)
+    _leave("lib",       _g.libs)
+    _leave("include",   _g.includes)
+    _leave("libpath",   _g.libpathes)
+
+end