Mxx_ru 1.6.14.6 → 1.6.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a95f0a4c0f96826f5f274dd3af1352e681d2d419d4228ee8fd722ba6579280e7
-  data.tar.gz: e198f777e3278491e6bc97e81d3bc17caf31b410357be15fefd7f433c0e7b6c8
+SHA1:
+  metadata.gz: 8978320133ed39cc39878a67041fdbb7c6c0e96a
+  data.tar.gz: 716cd0d6f5c7bf5533799fa95545ccd5dd51cfcb
 SHA512:
-  metadata.gz: 26f5d92bf73e8291d596e0cd27700f97dea9f4cd3f00fb660d773c1a30a74cd1b9517a2ab26f24aaaaace912bdc860a15328bc115b444025816c0300a9a42c8d
-  data.tar.gz: edfed027bdadf5aeea2ecc84752de1c24d06e2677ea68d13e39044843fb31d5b1c5ae0ac5e69afb8f6a8d160610682c35379257a2e03b0cc93b937f9f20549c9
+  metadata.gz: 2d30024ab86bb0981a970073d4f14b9c7231dbda8855b059e1a31fcabebf96ece6e000d34bbc57e5812551172a684a6e21c03dced7c771b831a24ddb23888a87
+  data.tar.gz: 159720d3c2fc4b50a81d43cc08e35457a83c3176ffd95e4c724c7178b5cd048d23a023ea6d3f7d6af4815ca0b527270c69b1fa0c3022c15513b601a1a5cb86e3

data/lib/mxx_ru/cpp/detect_toolset.rb

@@ -152,6 +152,8 @@ module MxxRu
       else
         if ENV[ 'COMP_ENV' ] and ENV[ 'VC_ARCH' ]
           'icc_win'
+        elsif ENV[ 'VS160COMNTOOLS' ]
+          'vc16'
         elsif ENV[ 'VS140COMNTOOLS' ]
           'vc14'
         elsif ENV[ 'VS120COMNTOOLS' ]

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

@@ -0,0 +1,69 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006-2019, 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++ 15.0 (Visual Studio 2017)
+      #
+      # Setups following tags:
+      # [_ver_hi_] high version number. Value: 15.
+      # [_ver_lo_] low version number. Value: 0.
+      class Vc16 < MxxRu::Cpp::Toolsets::Vc8Family
+        def initialize( a_name = "vc" )
+          super( a_name )
+
+          setup_tag( "ver_hi", "16" )
+          setup_tag( "ver_lo", "0" )
+        end
+
+        # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
+        def setup_mandatory_options( target )
+          super( target )
+
+          if CPP_STD17 == cpp_std
+            target.cpp_compiler_option( '/std:c++17' )
+          elsif CPP_STD14 == cpp_std
+            target.cpp_compiler_option( '/std:c++14' )
+          end
+        end
+      end # class Vc15
+
+    end # module Toolsets
+  end # module Cpp
+end # module MxxRu
+
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::Vc16.new )
+

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.14.6'
+MXX_RU_VERSION = '1.6.14.8'

data/tests/cpp/lib_from_lib_dependecies/a.cpp

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.14.6
+  version: 1.6.14.8
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies: []
 description: Mxx_ru is a cross-platform build tool primarily focused to C/C++ projects
 email: eao197@yahoo.com
@@ -117,6 +117,7 @@ files:
 - lib/mxx_ru/cpp/toolsets/vc12.rb
 - lib/mxx_ru/cpp/toolsets/vc14.rb
 - lib/mxx_ru/cpp/toolsets/vc15.rb
+- lib/mxx_ru/cpp/toolsets/vc16.rb
 - lib/mxx_ru/cpp/toolsets/vc7.rb
 - lib/mxx_ru/cpp/toolsets/vc8.rb
 - lib/mxx_ru/cpp/toolsets/vc8_family.rb
@@ -289,8 +290,10 @@ files:
 - tests/mxx_ru/lib_path/build.rb
 - tests/mxx_ru/lib_path/bye.c
 - tests/mxx_ru/lib_path/bye.rb
+- tests/mxx_ru/lib_path/bye_lib/bye.lib
 - tests/mxx_ru/lib_path/hi.c
 - tests/mxx_ru/lib_path/hi.rb
+- tests/mxx_ru/lib_path/hi_lib/hi.lib
 - tests/mxx_ru/lib_path/main.c
 - tests/mxx_ru/lib_path/main.rb
 - tests/mxx_ru/lib_path/tc_lib_path.rb
@@ -356,7 +359,6 @@ files:
 - tests/unix/lib_linking_mode/main_static_2.cpp
 - tests/unix/lib_linking_mode/main_static_2.rb
 - tests/unix/lib_linking_mode/main_static_2.ut.rb
-- tests/unix/lib_linking_mode/o/main_conflict.o
 - tests/unix/lib_linking_mode/tc_conflicted_build.rb
 - tests/unix/lib_linking_mode/tc_normal_build.rb
 - tests/unix/lib_order/a.cpp
@@ -397,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool