Mxx_ru 1.6.12 → 1.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b22a1fe4d06b2b8a537c03680b8b9021882bf59b
-  data.tar.gz: 8938721558b2f234f099987b2743ed5139248fd2
+  metadata.gz: 8c2b4e6fc5bc2e37bf49d1ddc64e0d3cc9960dd0
+  data.tar.gz: 7c966d4f38376eb214b0c2cfc16ae3134a9177a8
 SHA512:
-  metadata.gz: d5b331516811a910aaf04ac02cd30b2ae5d88edf87bdafd748d8e82ab704ef4823b7a6e7d6acd76c2f13d4bda3cac69b5e6947ad4e907c4e3a4d65c2929d10f3
-  data.tar.gz: 09ed8e1dca20eecbf807abd1d59c2e9b8568cbdade6d1c896f6bc1ff6f4598164b77ca79e206c434087c9444dce886883c563ae56991ea7038e6c04f2af10cba
+  metadata.gz: 1758dddeefac16dfd3a9d23c3cf42360f19486ae43d5770a6760c00f2d209c89ea5d5132d4c0af12651e043a0f2aa6cc9adc6c4abcc126e177ca3b1540f33489
+  data.tar.gz: 9a076f7b445fe98ce2ecfa5cb47a330dfb5fa9e2dc2553e8441bb9d5a2902934e01c827c7b978a1b42d6b3dd016e04e12c2023bd3577f6784c5f0b26b2780d2f

data/Rakefile

@@ -33,6 +33,9 @@ gem = Gem::PackageTask.new( spec ) do |pkg|
 end
 
 test = Rake::TestTask.new do |t|
+  is_mswin = (/^mswin/ =~ RbConfig::CONFIG[ 'host_os' ] ||
+       /^mingw/ =~ RbConfig::CONFIG[ 'host_os' ])
+
   test_files = FileList[ 'tests/**/{tc,ts}*.rb' ]
 
   # Visual C++ 8.0-9.0 specific files must be excluded when working with
@@ -46,13 +49,10 @@ test = Rake::TestTask.new do |t|
       /(mxx_ru\/cpp\/toolsets\/){0,1}vc\d/ =~ ENV[ 'MXX_RU_CPP_TOOLSET' ]
 
   # MSWin specific files must be excluded if not Windows platform.
-  test_files = test_files.delete_if { |n| /mswin/ =~ n } unless 
-      /^mswin/ =~ RbConfig::CONFIG[ 'host_os' ]
+  test_files = test_files.delete_if { |n| /mswin/ =~ n } unless is_mswin
 
   # Unix specific files must be excluded on Windows platform.
-  test_files = test_files.delete_if { |n| /unix/ =~ n } if
-      (/^mswin/ =~ RbConfig::CONFIG[ 'host_os' ] ||
-       /^mingw/ =~ RbConfig::CONFIG[ 'host_os' ])
+  test_files = test_files.delete_if { |n| /unix/ =~ n } if is_mswin
 
   # Darwin specific files must be excluded if not MacOS platform.
   test_files = test_files.delete_if { |n| /darwin/ =~ n } unless 

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-2015, The Mxx_ru Project
+# Copyright (c) 2006-2016, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -36,12 +36,11 @@ module  MxxRu
       # Toolset implemetation for Clang compiler.
       class ClangFamily < GccFamily
       public
-				
-				def initialize( name )
-					super( name )
-				end
+        def initialize( name )
+          super( name )
+        end
 
-				# See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
+        # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
         def setup_mandatory_options( target )
 
           if RUNTIME_DEBUG == target.mxx_runtime_mode
@@ -49,7 +48,12 @@ module  MxxRu
             target.linker_option( "-g" )
           elsif RUNTIME_RELEASE == target.mxx_runtime_mode
             target.define( "NDEBUG" )
-            target.linker_option( "-s" )
+
+            # -s switch is non-supported on clang+msvc.
+            if 'mswin' != tag( 'host_os' )
+              target.linker_option( "-s" )
+            end
+
             if OPTIM_SIZE == target.mxx_optimization
               target.compiler_option( "-Os" )
             else
@@ -175,6 +179,185 @@ module  MxxRu
         end
       end # class ClangFamily
 
+      # Toolset implemetation for Clang compiler for Win32.
+      class ClangMswinFamily < ClangFamily
+      public
+        # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
+        def setup_mandatory_options( target )
+
+          super( target )
+
+          # All defines and all include_path should be applied
+          # to resource compiler too.
+          target.mxx_all_defines.each { |d|
+            target.compiler_option( "-D" + d )
+            target.mswin_rc_option( "/d" + d )
+          }
+
+          target.mxx_all_include_paths.each { |p|
+            target.compiler_option( "-I" + p )
+            target.mswin_rc_option( "/i" + p )
+          }
+
+          # Resource compiler specific options.
+          target.mxx_all_mswin_rc_defines.each { |d|
+            target.mswin_rc_option( "/d" + d )
+          }
+          target.mxx_all_mswin_rc_include_paths.each { |p|
+            target.mswin_rc_option( "/i" + p )
+          }
+        end
+
+        # Returns librarian name.
+        def librarian_name
+          tag( LIBRARIAN_NAME_TAG, "llvm-ar" )
+        end
+
+        # Returns resource compiler name.
+        def rc_name
+          return tag( RC_NAME_TAG, "rc" )
+        end
+
+        # See description at MxxRu::Cpp::Toolset#exe_file_name.
+        def exe_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".exe", target )
+        end
+
+        # See description at MxxRu::Cpp::Toolset#lib_file_name.
+        def lib_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, '.lib', target )
+        end
+
+        # See description at MxxRu::Cpp::Toolset#dll_file_name.
+        def dll_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, '.dll', target )
+        end
+
+        # See description at MxxRu::Cpp::Toolset#make_lib_command_lines.
+        def make_lib_command_lines(
+          lib_name,
+          obj_files,
+          librarian_options,
+          target )
+
+          result = "r #{librarian_options.join(' ')} " +
+            "#{lib_name} #{obj_files.join(' ')}"
+
+          return [ "#{librarian_name} #{result}" ]
+        end
+
+        # See description at MxxRu::Cpp::Toolset#clean_dll_specific_files.
+        #
+        # Delete import library if exists.
+        def clean_dll_specific_files(
+          a_dll_file,
+          a_dll_info,
+          a_target )
+
+          # Delete import library if exists.
+          if nil != a_dll_info.link_name
+            implib_name = File.join( [ a_dll_info.link_path,
+              lib_file_name( a_dll_info.link_name, a_target ) ] )
+            MxxRu::Util::delete_file( implib_name )
+          end
+        end
+
+        # See description at MxxRu::Cpp::Toolset#implib_link_name.
+        def implib_link_name(
+          dll_real_name,
+          target )
+
+          # It's required to pass import library name to linker on mswin platform
+          if nil != target.mxx_implib_path
+            return lib_link_name( target.mxx_target_name, target )
+          end
+
+          return nil
+        end
+
+        # See description at MxxRu::Cpp::Toolset#implib_link_path.
+        def implib_link_path(
+          dll_real_name,
+          dll_real_path,
+          target )
+          return target.mxx_obj_placement.get_lib(
+            target.mxx_implib_path, self, target )
+        end
+
+        # See description at MxxRu::Cpp::Toolset#make_dll_requirements.
+        def make_dll_requirements(
+          a_dll_name,
+          a_dll_info,
+          a_linker_lists,
+          a_target )
+
+          result = DllRequirements.new
+
+          # Dependencies are exists only if import library is present.
+          if nil != a_dll_info.link_name
+            result.add_libs( [ a_dll_info.link_name ] )
+            result.add_lib_paths( [ a_dll_info.link_path ] )
+          end
+
+          return result
+        end
+
+        # Return string containing port-specific linker option for DLL linking.
+        #
+        # All parameters are similar to make_dll_command_lines parameters.
+        #
+        # Return empty string in a base class.
+        def port_specific_dll_link_options(
+          a_dll_name, a_dll_info, a_linker_lists, a_target )
+          # Build import library if it's required.
+          if nil != a_dll_info.link_name
+            full_lib_name = File.join( [ a_dll_info.link_path,
+              lib_file_name( a_dll_info.link_name, a_target ) ] )
+
+            return "-Wl,/IMPLIB:#{full_lib_name}"
+          end
+
+          return ""
+        end
+
+        # Checks library name for suffix '.lib' and return name without
+        # that suffix.
+        def port_specific_lib_name_checker(library_name)
+          if /\.lib$/i =~ library_name
+            MxxRu::Util::remove_file_ext(library_name)            
+          else
+            library_name
+          end
+        end
+
+        # Return command line switch for forcing specified library type.
+        def lib_linking_mode_switch( linking_mode )
+          ""
+        end
+
+        def enclose_linker_include_lib_options_into_brackes( options )
+          " #{options} "
+        end
+
+        # See description at MxxRu::Cpp::Toolset#mswin_res_file_name.
+        def mswin_res_file_name( source_name )
+          return source_name + ".res"
+        end
+
+        # See description at MxxRu::Cpp::Toolset#make_mswin_res_command_lines.
+        def make_mswin_res_command_lines(
+          res_name,
+          rc_file,
+          rc_options,
+          target )
+
+          return [ "#{rc_name} " +
+            "#{rc_options.join(' ')} /r " +
+            "/fo#{res_name} #{rc_file}" ]
+        end
+
+      end # class ClangMswinFamily
+
     end # module Toolsets
 
   end # module Cpp

data/lib/mxx_ru/cpp/toolsets/clang_linux.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-2016, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

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

@@ -0,0 +1,54 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006-2016, 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 'mxx_ru/cpp/toolsets/clang_family'
+
+module  MxxRu
+  module  Cpp
+    module Toolsets
+
+      # Toolset implemetation for Clang compiler.
+      class ClangMsVC < ClangMswinFamily
+      public
+				
+        def initialize( a_name = "clang" )
+          super( a_name )
+          setup_tag( "host_os", "mswin" )
+          setup_tag( "target_os", "mswin" )
+        end
+
+      end # class ClangFamily
+
+    end # module Toolsets
+
+  end # module Cpp
+
+end # module MxxRu
+
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::ClangMsVC.new )
+

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.12'
+MXX_RU_VERSION = '1.6.13'

data/tests/cpp/rucodegen.embedded/impl/h/conn_params.hpp

@@ -1,4 +1,4 @@
-#if !defined( IMPL__CONN_PARAMS_HPP )
+#if !defined( IMPL_CONN_PARAMS_HPP )
 #define IMPL_CONN_PARAMS_HPP
 
 namespace impl

data/tests/cpp/rucodegen/impl/h/conn_params.hpp

@@ -1,4 +1,4 @@
-#if !defined( IMPL__CONN_PARAMS_HPP )
+#if !defined( IMPL_CONN_PARAMS_HPP )
 #define IMPL_CONN_PARAMS_HPP
 
 namespace impl

data/tests/mxx_ru/vc8/restore_default_manifest.rb

@@ -0,0 +1,20 @@
+require 'mxx_ru/cpp'
+require 'mxx_ru/cpp/toolsets/vc8'
+
+module  MxxRu
+  module  Cpp
+    module Toolsets
+
+      # Extension of Vc8Family class for possibility of
+      # default manifest restoring.
+      #
+      class Vc8Family
+        def self.restore_default_manifest(manifest)
+          @@default_manifest = manifest
+        end
+      end # class Vc8Family
+
+    end # module Toolsets
+  end # module Cpp
+end # module MxxRu
+

data/tests/mxx_ru/vc8/tc_actual_manifest.rb

@@ -1,24 +1,6 @@
 require 'test/unit'
 
-require 'mxx_ru/cpp'
-require 'mxx_ru/cpp/toolsets/vc8'
-
-module  MxxRu
-  module  Cpp
-    module Toolsets
-
-      # Extension of Vc8Family class for possibility of
-      # default manifest restoring.
-      #
-      class Vc8Family
-        def self.restore_default_manifest(manifest)
-          @@default_manifest = manifest
-        end
-      end # class Vc8Family
-
-    end # module Toolsets
-  end # module Cpp
-end # module MxxRu
+require_relative 'restore_default_manifest'
 
 class TC_ActualManifest < Test::Unit::TestCase
   def initialize( test_method_name )

data/tests/mxx_ru/vc8/tc_define_manifest.rb

@@ -1,16 +1,22 @@
 require 'test/unit'
 
-require 'mxx_ru/cpp'
-require 'mxx_ru/cpp/toolsets/vc8'
+require_relative 'restore_default_manifest'
 
 class TC_DefineManifest < Test::Unit::TestCase
   def initialize( test_method_name )
     super test_method_name
+  end
 
+  def setup
+    @old_manifest = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
     # Default manifest should not be used.
     Mxx_ru::Cpp::Toolsets::Vc8::manifest nil
   end
 
+  def teardown
+    Mxx_ru::Cpp::Toolsets::Vc8::restore_default_manifest @old_manifest
+  end
+
   def test_target_autogen
     target = Mxx_ru::Cpp::Exe_target.new( 'target_autogen.rb' )
 

data/tests/mxx_ru/vc8/tc_drop_default_manifest.rb

@@ -1,9 +1,18 @@
 require 'test/unit'
 
-require 'mxx_ru/cpp'
-require 'mxx_ru/cpp/toolsets/vc8'
+require_relative 'restore_default_manifest'
 
 class TC_DropDefaultManifest < Test::Unit::TestCase
+  def setup
+    @old_manifest = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
+    # Default manifest should not be used.
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest nil
+  end
+
+  def teardown
+    Mxx_ru::Cpp::Toolsets::Vc8::restore_default_manifest @old_manifest
+  end
+
   def test_drop_default_manifest
     Mxx_ru::Cpp::Toolsets::Vc8::manifest( nil )
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.13
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-09-07 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
@@ -103,6 +103,7 @@ files:
 - lib/mxx_ru/cpp/toolsets/clang_family.rb
 - lib/mxx_ru/cpp/toolsets/clang_freebsd.rb
 - lib/mxx_ru/cpp/toolsets/clang_linux.rb
+- lib/mxx_ru/cpp/toolsets/clang_msvc.rb
 - lib/mxx_ru/cpp/toolsets/gcc_cygwin.rb
 - lib/mxx_ru/cpp/toolsets/gcc_darwin.rb
 - lib/mxx_ru/cpp/toolsets/gcc_family.rb
@@ -168,7 +169,6 @@ files:
 - tests/cpp/custom_target_prefix/dll.cpp
 - tests/cpp/custom_target_prefix/dll.rb
 - tests/cpp/custom_target_prefix/tc_custom_target_prefix.rb
-- tests/cpp/lib_from_lib_dependecies/a.cpp
 - tests/cpp/lib_from_lib_dependecies/a.rb
 - tests/cpp/lib_from_lib_dependecies/b.cpp
 - tests/cpp/lib_from_lib_dependecies/b.rb
@@ -313,6 +313,7 @@ files:
 - tests/mxx_ru/target_ext/tc_target_ext.rb
 - tests/mxx_ru/tc_makestyle_generator.rb
 - tests/mxx_ru/toolset/tc_tag_search.rb
+- tests/mxx_ru/vc8/restore_default_manifest.rb
 - tests/mxx_ru/vc8/tc_actual_manifest.rb
 - tests/mxx_ru/vc8/tc_append_mt_commands.rb
 - tests/mxx_ru/vc8/tc_default_manifest.rb
@@ -337,33 +338,22 @@ files:
 - tests/unix/lib_linking_mode/a_static.rb
 - tests/unix/lib_linking_mode/etalon/shared.txt
 - tests/unix/lib_linking_mode/etalon/static.txt
-- tests/unix/lib_linking_mode/liba.a
-- tests/unix/lib_linking_mode/liba.so
 - tests/unix/lib_linking_mode/main.impl.cpp
 - tests/unix/lib_linking_mode/main_conflict.cpp
 - tests/unix/lib_linking_mode/main_conflict.rb
 - tests/unix/lib_linking_mode/main_conflict_2.rb
-- tests/unix/lib_linking_mode/main_shared
 - tests/unix/lib_linking_mode/main_shared.cpp
 - tests/unix/lib_linking_mode/main_shared.rb
 - tests/unix/lib_linking_mode/main_shared.ut.rb
 - tests/unix/lib_linking_mode/main_shared_2.cpp
 - tests/unix/lib_linking_mode/main_shared_2.rb
 - tests/unix/lib_linking_mode/main_shared_2.ut.rb
-- tests/unix/lib_linking_mode/main_static
 - tests/unix/lib_linking_mode/main_static.cpp
 - tests/unix/lib_linking_mode/main_static.rb
 - tests/unix/lib_linking_mode/main_static.ut.rb
 - 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/a_shared.o
-- tests/unix/lib_linking_mode/o/a_static.o
-- tests/unix/lib_linking_mode/o/main_conflict.o
-- tests/unix/lib_linking_mode/o/main_shared.o
-- tests/unix/lib_linking_mode/o/main_static.o
-- tests/unix/lib_linking_mode/out/shared.txt
-- tests/unix/lib_linking_mode/out/static.txt
 - tests/unix/lib_linking_mode/tc_conflicted_build.rb
 - tests/unix/lib_linking_mode/tc_normal_build.rb
 - tests/unix/lib_order/a.cpp

data/tests/cpp/lib_from_lib_dependecies/a.cpp

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

data/tests/unix/lib_linking_mode/out/static.txt

@@ -1,2 +0,0 @@
-A::A [static]
-A::~A [static]