Mxx_ru 1.6.14.4 → 1.6.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51b7fa56ba4db7adbbd32d34f3c3617414125678
-  data.tar.gz: a5a85fcef9c5bb7ca0373c18729ae8b22000bfbc
+SHA256:
+  metadata.gz: e9d07e2c44752b3e4f1ea25fc8a4cc94a98108fbda433f399ec285d030c5c856
+  data.tar.gz: b856c28eb41e4258011f4b72a444e92497a0c25d3de7d71c6b235ac96a8c6a18
 SHA512:
-  metadata.gz: 325560369c83869952fce27aa21fbd26b0254286d3b7bbe0faf6c2b03b24d33adf2fb053df7f1f64c4370ac37b10769f504201af7cdf7fb70ed0ff9c04b0d3f7
-  data.tar.gz: 487e2b5860352ce831721b0f4819cb5ca1733728dd2a073816bceb30ca44f904eb5b8f57cecbe31b975976a222e1995143240d93a7c701417e3f1ab603a23ae3
+  metadata.gz: fb64dcd9b181593de2035a74b778d03d1fba02cc6e4e1c104dcf51733a6b2d7ff16313185450bcf10d05a7594c15797d73a641c054174c629b33a266289b7a45
+  data.tar.gz: 90128796f0fc0ce74fc3994008ea71a294807246098785ffd90a62a41ef97b09d91d3fb048132727c328d0c3665fb4ed7d3585438c4c604478b076fb243b3be3

data/COPYING

@@ -1,6 +1,6 @@
 Copyright (c) 1996-2004, Yauheni Akhotnikau
 Copyright (c) 2004-2006, JSC Intervale
-Copyright (c) 2006-2016, The Mxx_ru Project
+Copyright (c) 2006-2018, The Mxx_ru Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/Rakefile

@@ -22,7 +22,6 @@ spec = Gem::Specification.new do |s|
       exclude( "rdoc" ).to_a + [ "THANKS" ]
   s.executables = [ 'mxxrugen', 'mxxruexternals' ]
   s.require_path = "lib"
-  s.has_rdoc = true
   s.rdoc_options = [ '--main', 'README' ]
   s.extra_rdoc_files = [ "README", "Rakefile", "COPYING", "NEWS" ] + FileList[ "docs/**/*" ].to_a
 end

data/lib/mxx_ru/cpp/analyzer.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006-2015, The Mxx_ru Project
+# Copyright (c) 2006-2018, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -27,6 +27,7 @@
 #++
 
 require 'singleton'
+require 'pathname'
 
 module  MxxRu
   module  Cpp
@@ -183,7 +184,6 @@ module  MxxRu
         # [_a_file_name_] File name.
         # [_a_owner_obj_] File object contained include directive.
         def process_std_include_path_file( a_file_name, a_owner_obj )
-
           @include_paths.find { |path|
               test_name = File.join( [ path, a_file_name ] )
               if File.exists?( test_name )
@@ -204,7 +204,12 @@ module  MxxRu
           a_local_path,
           a_owner_obj )
 
-          test_name = File.join( [ a_local_path, a_file_name ] )
+          test_name = # This trick is necessary to handle relative includes
+                      # like ../details/some_header.h.
+                      # Without calling cleanpath there could be created many
+                      # names in form local/path/details/../details/../details
+            Pathname.new(
+              File.join( a_local_path, a_file_name ) ).cleanpath
           if File.exists?( test_name )
             add_depend_to( a_owner_obj, test_name )
           else

data/lib/mxx_ru/cpp/detect_toolset.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006-2015, The Mxx_ru Project
+# Copyright (c) 2006-2019, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -147,11 +147,13 @@ module MxxRu
       if RbConfig::CONFIG['host_os'] =~ /linux/
         # Assume that GCC is default compiler on Linux.
         "gcc_linux"
-      elsif RbConfig::CONFIG['host_os'] =~ /^freebsd(9|10)$/
+      elsif RbConfig::CONFIG['host_os'] =~ /^freebsd(9|10|11|12)$/
         "clang_freebsd"
       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/toolset.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006-2016, The Mxx_ru Project
+# Copyright (c) 2006-2021, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -277,6 +277,11 @@ module  MxxRu
     # Since v.1.6.14.3
     CPP_STD17 = 4
 
+    # C++17 standard.
+    #
+    # Since v.1.6.14.9
+    CPP_STD20 = 5
+
     # Base toolset class.
     # Toolset is a compiler and tool set for compiling an application.
     class Toolset
@@ -1043,6 +1048,13 @@ module  MxxRu
         set_cpp_std CPP_STD17
       end
 
+      # Set C++20 standard version.
+      #
+      # Since v.1.6.14.9
+      def force_cpp20
+        set_cpp_std CPP_STD20
+      end
+
       # Get the C++ standard version
       attr_reader :cpp_std
 

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

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006-2017, The Mxx_ru Project
+# Copyright (c) 2006-2021, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -78,7 +78,9 @@ module  MxxRu
             target.compiler_option( "-I" + p )
           }
 
-          if CPP_STD17 == cpp_std
+          if CPP_STD20 == cpp_std
+            target.cpp_compiler_option( '-std=c++20' )
+          elsif CPP_STD17 == cpp_std
             target.cpp_compiler_option( '-std=c++17' )
           elsif CPP_STD14 == cpp_std
             target.cpp_compiler_option( '-std=c++14' )

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

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006-2015, The Mxx_ru Project
+# Copyright (c) 2006-2021, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -103,7 +103,9 @@ module  MxxRu
             target.compiler_option( "-I" + p )
           }
 
-          if CPP_STD17 == cpp_std
+          if CPP_STD20 == cpp_std
+            target.cpp_compiler_option( '-std=c++20' )
+          elsif CPP_STD17 == cpp_std
             target.cpp_compiler_option( '-std=c++17' )
           elsif CPP_STD14 == cpp_std
             target.cpp_compiler_option( '-std=c++14' )

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

@@ -0,0 +1,71 @@
+#--
+# 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_STD20 == cpp_std
+            target.cpp_compiler_option( '/std:c++20' )
+          elsif 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 Vc16
+
+    end # module Toolsets
+  end # module Cpp
+end # module MxxRu
+
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::Vc16.new )
+

data/lib/mxx_ru/version.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006-2017, The Mxx_ru Project
+# Copyright (c) 2006-2021, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -34,4 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.14.4'
+MXX_RU_VERSION = '1.6.14.9'
+

data/tests/cpp/custom_target_prefix/tc_custom_target_prefix.rb

@@ -12,7 +12,7 @@ class TC_CustomTargetPrefix < Test::Unit::TestCase
   test_case :build_and_clean do
     build( 'dll.rb' )
 
-    assert( File.exists?( EXPECTED_NAME ),
+    assert( File.exist?( EXPECTED_NAME ),
         "Expected name is '#{EXPECTED_NAME}'" )
 
     clean( 'dll.rb' )

data/tests/mxx_ru/tc_makestyle_generator.rb

@@ -39,7 +39,7 @@ class TC_makestyle_generator < Test::Unit::TestCase
 
     g1.build( "dummy" )
 
-    assert( FileTest.exists?( "a" ) )
+    assert( FileTest.exist?( "a" ) )
   end
 
   def test_build_no_real_rebuild
@@ -71,7 +71,7 @@ class TC_makestyle_generator < Test::Unit::TestCase
 
     assert( FileTest.size( "t1" ) > 0 )
     assert( FileTest.size( "t2" ) > 0 )
-    assert( !FileTest.exists?( "t3" ) )
+    assert( !FileTest.exist?( "t3" ) )
 
     File.truncate( "t1", 0 )
     File.truncate( "t2", 0 )
@@ -80,7 +80,7 @@ class TC_makestyle_generator < Test::Unit::TestCase
 
     assert( FileTest.size( "t1" ) > 0 )
     assert( FileTest.size( "t2" ) > 0 )
-    assert( !FileTest.exists?( "t3" ) )
+    assert( !FileTest.exist?( "t3" ) )
 
   end
 
@@ -102,9 +102,9 @@ class TC_makestyle_generator < Test::Unit::TestCase
 
     g.clean( "dummy" )
 
-    assert( !FileTest.exists?( "t1" ) )
-    assert( !FileTest.exists?( "t2" ) )
-    assert( !FileTest.exists?( "t3" ) )
+    assert( !FileTest.exist?( "t1" ) )
+    assert( !FileTest.exist?( "t2" ) )
+    assert( !FileTest.exist?( "t3" ) )
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.14.4
+  version: 1.6.14.9
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2021-11-06 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
@@ -397,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool