Mxx_ru 1.5.0 → 1.5.1

data/lib/mxx_ru/cpp/detect_toolset.rb

@@ -26,10 +26,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #++
 
+require 'rbconfig'
+
 require 'mxx_ru/cpp/toolset'
 
 module MxxRu
   module Cpp
+    ENV_VAR = "MXX_RU_CPP_TOOLSET"
 
     # Detect current toolset based on values of environment variables
     #
@@ -46,14 +49,7 @@ module MxxRu
     # saved to the toolset created using a setup_tag method.
     def Cpp.detect_toolset
       begin
-        env_var = "MXX_RU_CPP_TOOLSET"
-
-        env = ENV[ env_var ]
-        if nil == env
-          raise MxxRu::InvalidValueEx.new(
-            "Environment variable '#{env_var}' not found (not set " +
-            "or empty" )
-        end
+        env = get_or_detect_toolset_variable_content
 
         # Exctracting file name, responsible for toolset object creation.
         toolset_file_name_regexp = /^(\S+)(.*)$/
@@ -117,6 +113,52 @@ module MxxRu
           "'#{files_to_load.join('; ')}'" ) unless load_result
     end
 
+    # Gets or detects value for MXX_RU_CPP_TOOLSET.
+    #
+    # Since v.1.5.1
+    #
+    def Cpp.get_or_detect_toolset_variable_content
+      env = ENV[ ENV_VAR ]
+      if env.nil?
+        $stderr.puts "Environment variable #{ENV_VAR} not found. " +
+            "Try to detect toolset by HOST_OS and/or PATH..."
+        env = try_detect_toolset_myself
+        if env
+          $stderr.puts "Detection successed. Toolset is: #{env}"
+        else
+          $stderr.puts "Detection failed."
+          raise MxxRu::InvalidValueEx.new(
+            "Environment variable '#{ENV_VAR}' not found (not set " +
+            "or empty" )
+        end
+      end
+
+      env
+    end
+
+    # Try to detect toolset from host_os and PATH.
+    #
+    # Since v.1.5.1
+    #
+    # Only Windows platform and MS C++, Linux and GCC is detected now.
+    #
+    # Returns name of toolset of throw exception if toolset is not detectable.
+    def Cpp.try_detect_toolset_myself
+      if Config::CONFIG['host_os'] =~ /linux/
+        # Assume that GCC is default compiler on Linux.
+        "gcc_linux"
+      else
+        case ENV['PATH']
+          when /Microsoft Visual Studio \.NET 2003\\VC7\\BIN/i
+            "vc7"
+          when /Microsoft Visual Studio 8\.0\\VC\\BIN/i
+            "vc8"
+          when /Microsoft Visual Studio 9\.0\\VC\\BIN/i
+            "vc9"
+        end
+      end
+    end
+
   end # module Cpp
 end # module MxxRu
 

data/lib/mxx_ru/util.rb

@@ -367,6 +367,12 @@ module MxxRu
       return @@host_os
     end
 
+    # This flag is set to true on Windows.
+    #
+    # Since v.1.5.1
+    #
+    IS_WINDOWS_PLATFORM = !((Config::CONFIG['host_os'] =~ /mswin|mingw/).nil?)
+
     # Transform separators in file names to correct ones on the given platform.
     #
     # For example on mswin32 we change "/" to "\".
@@ -375,7 +381,7 @@ module MxxRu
     #
     # *IMPORTANT! In current version only mswin32 platform is tracked!*
     def Util.native_pathname( a_pathname )
-      if "mswin32" == Util::host_os
+      if IS_WINDOWS_PLATFORM
         return a_pathname.gsub( "/", "\\" )
       end
 

data/lib/mxx_ru/version.rb

@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.5.0'
+MXX_RU_VERSION = '1.5.1'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 +04:00
+date: 2010-05-20 00:00:00 +04:00
 default_executable: 
 dependencies: []