Mxx_ru 1.6.14.9 → 1.6.14.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9d07e2c44752b3e4f1ea25fc8a4cc94a98108fbda433f399ec285d030c5c856
-  data.tar.gz: b856c28eb41e4258011f4b72a444e92497a0c25d3de7d71c6b235ac96a8c6a18
+  metadata.gz: 00d671247fa8a2875c456acdb7872795482df1c9292742bea38653732ad2e4f5
+  data.tar.gz: 34039de6bfed6139cae5c57ac11ae0cce4054503cdb071c969c1f0fd5352e013
 SHA512:
-  metadata.gz: fb64dcd9b181593de2035a74b778d03d1fba02cc6e4e1c104dcf51733a6b2d7ff16313185450bcf10d05a7594c15797d73a641c054174c629b33a266289b7a45
-  data.tar.gz: 90128796f0fc0ce74fc3994008ea71a294807246098785ffd90a62a41ef97b09d91d3fb048132727c328d0c3665fb4ed7d3585438c4c604478b076fb243b3be3
+  metadata.gz: ca859d9be86f523c88f7239bafa19c71591ffe222d4904139748e86f88d5beb3401ae1fed1b626f0775f50b7c04bfcb9b130eb8722f6c7782046e6cb1462e039
+  data.tar.gz: a7e606dc300e5e62de3be3e65d7eedf68d25ecfeece4a7b5c7bc97827a2f76de4228207652bb368164c7a155deaf288c192ebc80675ab172bcc1a61f16dcb54a

data/bin/mxxruexternals

@@ -2,7 +2,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,
@@ -85,6 +85,7 @@ def Impl.parse_args
   result = OpenStruct.new(
       :externals_file => nil,
       :libdirs => [],
+      :trace => false,
       :task => :install )
 
   parser = OptionParser.new
@@ -108,6 +109,10 @@ BANNER
     result.externals_file = p
   end
 
+  parser.on_head( '--trace', 'Use --trace for rake invocation' ) do
+    result.trace = true
+  end
+
   parser.on_head( '-h', '--help', 'Show this message' ) do
     puts parser
     exit( 1 )
@@ -152,7 +157,7 @@ file PREVIOUS_FILE do
   cp '#{options.externals_file}', PREVIOUS_FILE, :verbose => Rake.verbose
 end
 
-if File.exists?(PREVIOUS_FILE)
+if File.exist?(PREVIOUS_FILE)
   prev_digest = Digest::MD5.file(PREVIOUS_FILE)
   curr_digest = Digest::MD5.file('#{options.externals_file}')
 
@@ -188,6 +193,7 @@ EOF
   end
 
   cmdline = "rake ";
+  cmdline += '--trace ' if options.trace
   options.libdirs.each do |l| cmdline += "-I \"#{l}\" " end
   cmdline += "-f #{script_name} #{options.task}"
 

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-2019, 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,
@@ -152,6 +152,8 @@ module MxxRu
       else
         if ENV[ 'COMP_ENV' ] and ENV[ 'VC_ARCH' ]
           'icc_win'
+        elsif ENV[ 'VS170COMNTOOLS' ]
+          'vc17'
         elsif ENV[ 'VS160COMNTOOLS' ]
           'vc16'
         elsif ENV[ 'VS140COMNTOOLS' ]

data/lib/mxx_ru/cpp/ext_cmake_project.rb

@@ -272,7 +272,7 @@ private
         clean_installed_files
         run_native_clean
       end
-      FileUtils.rm_r( ctx.cmake_build_dir, file_utils_options )
+      FileUtils.rm_r( ctx.cmake_build_dir, **file_utils_options )
     end
   end
 
@@ -336,7 +336,7 @@ private
   def clean_installed_files
     do_with_install_manifest_content do |file_to_remove|
       if File.exists?( file_to_remove )
-        FileUtils.rm( file_to_remove, file_utils_options )
+        FileUtils.rm( file_to_remove, **file_utils_options )
       end
     end
   end

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

@@ -36,10 +36,10 @@ module  MxxRu
   module  Cpp
     module Toolsets
 
-      # Toolset implementation for Visual C++ 15.0 (Visual Studio 2017)
+      # Toolset implementation for Visual C++ 16.0 (Visual Studio 2019)
       #
       # Setups following tags:
-      # [_ver_hi_] high version number. Value: 15.
+      # [_ver_hi_] high version number. Value: 16.
       # [_ver_lo_] low version number. Value: 0.
       class Vc16 < MxxRu::Cpp::Toolsets::Vc8Family
         def initialize( a_name = "vc" )

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

@@ -0,0 +1,71 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006-2021, 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++ 17.0 (Visual Studio 2022)
+      #
+      # Setups following tags:
+      # [_ver_hi_] high version number. Value: 17.
+      # [_ver_lo_] low version number. Value: 0.
+      class Vc17 < MxxRu::Cpp::Toolsets::Vc8Family
+        def initialize( a_name = "vc" )
+          super( a_name )
+
+          setup_tag( "ver_hi", "17" )
+          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 Vc17
+
+    end # module Toolsets
+  end # module Cpp
+end # module MxxRu
+
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::Vc17.new )
+

data/lib/mxx_ru/externals.rb

@@ -1,5 +1,5 @@
 #--
-# 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,
@@ -238,8 +238,6 @@ end # class WebDownloader
 
 module ExternalBasics
 
-  attr_reader :url
-
   attr_reader :paths
 
   attr_reader :name
@@ -290,7 +288,7 @@ private
   end
 
   def rm_dir_if_exists(dir_name)
-    rm_r(dir_name, fileop_options) if Dir.exists?(dir_name)
+    rm_r(dir_name, **fileop_options) if Dir.exists?(dir_name)
   end
 
   def rm_directories(dirs)
@@ -298,7 +296,7 @@ private
   end
 
   def rm_file_if_exists(file_name)
-    rm(file_name, fileop_options) if File.exists?(file_name)
+    rm(file_name, **fileop_options) if File.exists?(file_name)
   end
 
   def rm_files(files)
@@ -353,7 +351,7 @@ private
         directory dir_dep
 
         directory actual_dst => [ext_prj_sources_dir, dir_dep] do
-          cp_r(File.join(ext_prj_sources_dir, src), actual_dst, fileop_options)
+          cp_r(File.join(ext_prj_sources_dir, src), actual_dst, **fileop_options)
         end
       end
 
@@ -368,7 +366,7 @@ private
         directory dir_dep
 
         file dst => [ext_prj_sources_dir, dir_dep] do
-          cp(File.join(ext_prj_sources_dir, src), dst, fileop_options)
+          cp(File.join(ext_prj_sources_dir, src), dst, **fileop_options)
         end
       end
 
@@ -384,7 +382,7 @@ private
 
         ext_prj_sources_tmp_dir = subdir_name(make_tmp_name(@name))
         exporter.call(ext_prj_sources_tmp_dir)
-        mv(ext_prj_sources_tmp_dir, ext_prj_sources_dir, fileop_options)
+        mv(ext_prj_sources_tmp_dir, ext_prj_sources_dir, **fileop_options)
       end
 
       task @install_task_name =>
@@ -475,7 +473,6 @@ class Svn < Rake::TaskLib
     Registry::handle_external(@name, self)
   end
 
-  attr_reader :rev
   def rev(v); @rev = v; end
   alias :rev= :rev
 
@@ -498,7 +495,7 @@ class Svn < Rake::TaskLib
 
       sh_args << @url << tmp_dir
 
-      sh *sh_args
+      sh(*sh_args)
     end
   end
 
@@ -520,7 +517,6 @@ class Git < Rake::TaskLib
     Registry::handle_external(@name, self)
   end
 
-  attr_reader :tag
   def tag(v); @tag = v; end
   alias :tag= :tag
 
@@ -532,7 +528,6 @@ class Git < Rake::TaskLib
     @recursive = true
   end
 
-  attr_reader :commit
   def commit(v); @commit = v; end
   alias :commit= :commit
 
@@ -559,14 +554,14 @@ class Git < Rake::TaskLib
 
         sh_args << @url << tmp_dir
 
-        sh *sh_args
+        sh(*sh_args)
       else
         # To extract specific commit is necessary to do
         # at least two commands: clone (without limitiation of depth) and
         # checkout for specific commit.
 
         # Do `clone repo tmp_dir` 
-        sh *(push_options_to(['git', 'clone']).push(@url).push(tmp_dir))
+        sh( *(push_options_to(['git', 'clone']).push(@url).push(tmp_dir)) )
         # Do `checkout commit` inside tmp_dir
         cd tmp_dir do
           sh 'git', 'checkout', @commit
@@ -589,7 +584,6 @@ class Hg < Rake::TaskLib
     Registry::handle_external(@name, self)
   end
 
-  attr_reader :tag
   def tag(v); @tag = v; end
   alias :tag= :tag
 
@@ -606,7 +600,7 @@ class Hg < Rake::TaskLib
 
       sh_args << @url << tmp_dir
 
-      sh *sh_args
+      sh(*sh_args)
     end
   end
 
@@ -697,7 +691,7 @@ class ArchiveAsExternals < Rake::TaskLib
       # Temporary directory must be removed in a case of any error.
       successful = false
       begin
-        mkdir(tmp_dir, fileop_options) if !Dir.exists?(tmp_dir)
+        mkdir(tmp_dir, **fileop_options) if !Dir.exists?(tmp_dir)
 
         cd tmp_dir do
           download_archive
@@ -750,19 +744,19 @@ private
 
   def download_archive_from_web
     web_downloader = Impl::WebDownloader.instance.make_downloader(self)
-    sh *(web_downloader.make_download_sh_args(@url, archive_name))
+    sh( *(web_downloader.make_download_sh_args(@url, archive_name)) )
   end
 
   def download_archive_via_cp
     # On Windows path can look like '/d:/...'.
     # The leading slash must be removed.
     path = uri_path.gsub(/^(\/)(\w:)(.+)$/, '\2\3')
-    cp(path, archive_name, fileop_options)
+    cp(path, archive_name, **fileop_options)
   end
 
   def unpack_archive
     sh(*make_unpacker_args)
-    rm(archive_name, fileop_options)
+    rm(archive_name, **fileop_options)
     names = Dir['*']
     if 1 == names.size and Dir.exists?(names.first)
       # This is the only folder in the distributive.
@@ -771,11 +765,11 @@ private
         # Files like '.gitignore' won't be found without FNM_DOTMATCH.
         # But in that case '.' and '..' will be found too.
         Dir.glob('*', File::FNM_DOTMATCH).each do |n|
-          mv(n, '..', fileop_options) if n != '.' && n != '..'
+          mv(n, '..', **fileop_options) if n != '.' && n != '..'
         end
       end
       # This single directory no more needed.
-      rm_r(names.first, fileop_options)
+      rm_r(names.first, **fileop_options)
     end
   end
 
@@ -793,7 +787,7 @@ private
 
   def make_unpacker_args
     handler = @@archive_handlers[@archive_type]
-    self.instance_eval &handler
+    self.instance_eval(&handler)
   end
 end # class ArchiveAsExternals
 
@@ -835,7 +829,7 @@ desc "Remove and get again all external projects"
 task :reget
 
 local_rc_file = File.join(Dir.getwd, '.externalsrc')
-if File.exists?(local_rc_file)
+if File.exist?(local_rc_file)
   load local_rc_file
 end
 

data/lib/mxx_ru/util.rb

@@ -234,7 +234,7 @@ module MxxRu
 
       def initialize
         if !Mode.instance.is_keep_tmps
-          ObjectSpace.define_finalizer( self, Proc.new{ TmpFiles.finalizer } )
+          ObjectSpace.define_finalizer( @@names, Proc.new{ TmpFiles.finalizer } )
         end
 
         # Counter to ensure unique file names.

data/lib/mxx_ru/version.rb

@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.14.9'
+MXX_RU_VERSION = '1.6.14.10'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.14.9
+  version: 1.6.14.10
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-11-15 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
@@ -118,6 +118,7 @@ files:
 - 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/vc17.rb
 - lib/mxx_ru/cpp/toolsets/vc7.rb
 - lib/mxx_ru/cpp/toolsets/vc8.rb
 - lib/mxx_ru/cpp/toolsets/vc8_family.rb