Mxx_ru 1.6.1 → 1.6.2

data/Rakefile

@@ -2,7 +2,7 @@ $:.unshift( '.' )
 
 require 'rubygems'
 
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 
 require 'lib/mxx_ru/version'
@@ -24,7 +24,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = [ "README", "Rakefile", "COPYING", "NEWS" ] + FileList[ "docs/**/*" ].to_a
 end
 
-gem = Rake::GemPackageTask.new( spec ) do |pkg|
+gem = Gem::PackageTask.new( spec ) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end
@@ -44,15 +44,16 @@ test = Rake::TestTask.new do |t|
 
   # MSWin specific files must be excluded if not Windows platform.
   test_files = test_files.delete_if { |n| /mswin/ =~ n } unless 
-      /^mswin/ =~ Config::CONFIG[ 'host_os' ]
+      /^mswin/ =~ RbConfig::CONFIG[ 'host_os' ]
 
   # Unix specific files must be excluded on Windows platform.
   test_files = test_files.delete_if { |n| /unix/ =~ n } if
-      /^mswin/ =~ Config::CONFIG[ 'host_os' ]
+      (/^mswin/ =~ RbConfig::CONFIG[ 'host_os' ] ||
+       /^mingw/ =~ RbConfig::CONFIG[ 'host_os' ])
 
   # Darwin specific files must be excluded if not MacOS platform.
   test_files = test_files.delete_if { |n| /darwin/ =~ n } unless 
-      /^darwin/ =~ Config::CONFIG[ 'host_os' ]
+      /^darwin/ =~ RbConfig::CONFIG[ 'host_os' ]
 
   t.test_files = test_files
   t.verbose = true

data/lib/mxx_ru/cpp/detect_toolset.rb

@@ -150,6 +150,8 @@ module MxxRu
       else
         if ENV[ 'COMP_ENV' ] and ENV[ 'VC_ARCH' ]
           'icc_win'
+        elsif ENV[ 'VS120COMNTOOLS' ]
+          'vc12'
         elsif ENV[ 'VS110COMNTOOLS' ]
           'vc11'
         elsif ENV[ 'VS100COMNTOOLS' ]

data/lib/mxx_ru/cpp/toolsets/vc12.rb

@@ -0,0 +1,58 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006-2013, The Mxx_ru Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#++
+
+require 'ostruct'
+require 'set'
+
+require 'mxx_ru/cpp/target'
+require 'mxx_ru/cpp/toolsets/vc8_family'
+
+module  MxxRu
+  module  Cpp
+    module Toolsets
+
+      # Toolset implementation for Visual C++ 12.0 (Visual Studio 2013)
+      #
+      # Setups following tags:
+      # [_ver_hi_] high version number. Value: 12.
+      # [_ver_lo_] low version number. Value: 0.
+      class Vc12 < MxxRu::Cpp::Toolsets::Vc8Family
+        def initialize( a_name = "vc" )
+          super( a_name )
+
+          setup_tag( "ver_hi", "12" )
+          setup_tag( "ver_lo", "0" )
+        end
+      end # class Vc11
+
+    end # module Toolsets
+  end # module Cpp
+end # module MxxRu
+
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::Vc12.new )
+

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.1'
+MXX_RU_VERSION = '1.6.2'

data/tests/unix/lib_order/a.cpp

@@ -1,4 +1,3 @@
-#include <iostream>
-
-void a() { std::cout << "a()" << std::endl; }
-
+#include <cstdio>
+
+void A() { std::printf( "A\n" ); }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: eao197@yahoo.com
@@ -271,6 +271,7 @@ files:
 - lib/mxx_ru/cpp/toolsets/icc_win.rb
 - lib/mxx_ru/cpp/toolsets/vc10.rb
 - lib/mxx_ru/cpp/toolsets/vc11.rb
+- lib/mxx_ru/cpp/toolsets/vc12.rb
 - lib/mxx_ru/cpp/toolsets/vc7.rb
 - lib/mxx_ru/cpp/toolsets/vc8.rb
 - lib/mxx_ru/cpp/toolsets/vc8_family.rb