Mxx_ru 1.6.11 → 1.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 697cc2084b112e7ca1cfba8406bed2eb81348381
-  data.tar.gz: d5f235271c3609516dc81474a69461f0e5215cd7
+  metadata.gz: b22a1fe4d06b2b8a537c03680b8b9021882bf59b
+  data.tar.gz: 8938721558b2f234f099987b2743ed5139248fd2
 SHA512:
-  metadata.gz: ac2ed6842dceedf6a7712aa808f4b4c7d5e583f2cae29a05603428b2cd25dfa1345df1e7c4d51ec65cbff0d457c3e3d3c90d652ab5f0e300b4a8f61fb13e630e
-  data.tar.gz: d3b1017f16864ebe875a379053f5ac059464adb6d4d45d333385fec3ed3f2e4517a9525a4365ac9c57af2337f092fa855b05d32c4847edf097cbf4e8aa337ab9
+  metadata.gz: d5b331516811a910aaf04ac02cd30b2ae5d88edf87bdafd748d8e82ab704ef4823b7a6e7d6acd76c2f13d4bda3cac69b5e6947ad4e907c4e3a4d65c2929d10f3
+  data.tar.gz: 09ed8e1dca20eecbf807abd1d59c2e9b8568cbdade6d1c896f6bc1ff6f4598164b77ca79e206c434087c9444dce886883c563ae56991ea7038e6c04f2af10cba

data/lib/mxx_ru/cpp.rb

@@ -34,8 +34,10 @@ require 'mxx_ru/cpp/composite'
 require 'mxx_ru/cpp/lib_collection'
 
 require 'mxx_ru/cpp/obj_placements/custom_subdir'
+require 'mxx_ru/cpp/obj_placements/prj_aware_runtime_subdir'
 
 require 'mxx_ru/cpp/ext_cmake_project'
 
 # Determining which toolset should be used.
 MxxRu::Cpp::detect_toolset
+

data/lib/mxx_ru/cpp/obj_placements/prj_aware_runtime_subdir.rb

@@ -0,0 +1,218 @@
+#--
+# 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/util'
+require 'mxx_ru/cpp/obj_placement'
+require 'mxx_ru/cpp/target'
+
+require 'digest'
+
+module MxxRu
+
+module Cpp
+
+# Since v.1.6.12
+#
+# This class is similar to RuntimeSubdirObjPlacement and
+# ToolsetRuntimeSubdirObjPlacement but stores intermediate files (like
+# object files, compiled resources and so on) in special subfolders.
+# 
+# These subfoldes use special naming in forms:
+# 
+#    <final_path>/_objs/<runtime>/<prj_alias>/<subdir>
+#    <final_path>/_objs/<toolset>/<runtime>/<prj_alias>/<subdir>
+#
+# where subdir is created from a path to source file. A path is
+# transformed (all separators like / or :) is changed to _. It
+# means that so_5/rt/impl will be transformed to so_5_rt_impl.
+# If the result is too long it is transformed another time: part
+# of result name will be changed to SHA1 digest. For example a name
+# so_5/disp/prio_one_thread/quoted_round_robin will be transformed to
+# so_5_disp_prio_one_thread_quoted_round_robin and then to
+# so_5__robin-8f160349ec35.
+#    
+# Usage example:
+#
+#   MxxRu::Cpp::composite_target {
+#     global_obj_placement MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement.new(
+#       # Final resuls going here.
+#       'bin32' )
+#
+#     required_prj 'so_5/prj.rb'
+#     required_prj 'so_5/prj_s.rb'
+#     ...
+#   }
+#
+# The directory structure could looks like:
+#
+#   bin32/
+#   `- _objs/
+#      `- release/
+#         `- so_5_prj_rb/
+#            `- ...
+#         `- so_5_prj_s_rb/
+#            `- ...
+#   `- release/
+#
+# This ObjPlacement also allows to use toolset id in directory structure:
+#
+#   MxxRu::Cpp::composite_target {
+#     global_obj_placement MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement.new(
+#       # Final resuls going here.
+#       'bin32',
+#       # Enable toolset identification
+#       MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement::USE_COMPILER_ID )
+#
+#     required_prj 'so_5/prj.rb'
+#     required_prj 'so_5/prj_s.rb'
+#     ...
+#   }
+# 
+# The directory structure could looks like:
+#
+#   bin32/
+#   `- _objs/
+#      `- gcc_4_8_2__x86_64_w64_mingw32/
+#         `- release/
+#            `- so_5_prj_rb/
+#               `- ...
+#            `- so_5_prj_s_rb/
+#               `- ...
+#   `- gcc_4_8_2__x86_64_w64_mingw32/
+#      `- release/
+#
+class PrjAwareRuntimeSubdirObjPlacement < MxxRu::Cpp::ObjPlacement
+  USE_COMPILER_ID = true
+  DO_NOT_USE_COMPILER_ID = false
+
+  # Constructor
+  def initialize( final_results_path, use_compiler_id = DO_NOT_USE_COMPILER_ID )
+    @final_results_path = final_results_path
+    @intermediate_path = File.join( @final_results_path, '_objs' )
+    @use_compiler_id = use_compiler_id
+  end
+
+  # Make name for obj file.
+  def get_obj( source_path_name, toolset, target )
+    root_path = USE_COMPILER_ID == @use_compiler_id ?
+        File.join( @intermediate_path, toolset.make_identification_string ) :
+        @intermediate_path
+
+    target_tmps = create_target_tmps_name( target )
+    result = if source_path_name &&
+        "" != source_path_name &&
+        "." != source_path_name
+      File.join( root_path, runtime_mode_path( target ), target_tmps,
+        transform_path( source_path_name ) )
+    else
+      File.join( root_path, target_tmps, runtime_mode_path( target ) )
+    end
+
+    MxxRu::Util.ensure_path_exists( result )
+
+    result
+  end
+
+  # Returns result of get_obj method.
+  def get_mswin_res( source_path_name, toolset, target )
+    get_obj( source_path_name, toolset, target )
+  end
+
+  # Returns final_results_path
+  def get_lib( source_path_name, toolset, target )
+    final_result_path_component( source_path_name, toolset, target )
+  end
+
+  # Returns final_results_path
+  def get_dll( source_path_name, toolset, target )
+    final_result_path_component( source_path_name, toolset, target )
+  end
+
+  # Returns final_results_path
+  def get_exe( source_path_name, toolset, target )
+    final_result_path_component( source_path_name, toolset, target )
+  end
+
+protected
+  # Make final_results_path if needed and return name of it
+  def final_result_path_component( target_root, toolset, target )
+    root_path = USE_COMPILER_ID == @use_compiler_id ?
+        File.join( @final_results_path, toolset.make_identification_string ) :
+        @final_results_path
+
+    result = if target_root &&
+        "" != target_root &&
+        "." != target_root
+      File.join( root_path, runtime_mode_path( target ), target_root )
+    else
+      File.join( root_path, runtime_mode_path( target ) )
+    end
+
+    MxxRu::Util.ensure_path_exists( result )
+
+    result
+  end
+
+  # Returns folder name, which is used for target's runtime mode.
+  #
+  # [_a_target_] Target, actions are performed for.
+  def runtime_mode_path( a_target )
+    case a_target.mxx_runtime_mode
+      when MxxRu::Cpp::RUNTIME_DEBUG
+        return 'debug'
+
+      when MxxRu::Cpp::RUNTIME_RELEASE
+        return 'release'
+
+      else
+        return 'default'
+    end
+  end
+
+  def transform_path( path )
+    normalized_value = path.gsub( /[\\\/\.:]/, '_' )
+    if 24 < normalized_value.size
+      r = normalized_value[ 0..3 ] + '__' + normalized_value[ -5..-1 ] + '-' +
+        Digest::SHA1.new.update(normalized_value).hexdigest[ 0..11 ]
+      normalized_value = r
+    end
+    normalized_value
+  end
+
+  def create_target_tmps_name( target )
+    transform_path( target.prj_alias )
+  end
+
+end # class PrjAwareRuntimeSubdirObjPlacement
+
+end # module Cpp
+
+end # module MxxRu
+
+# vim:ts=2:sts=2:sw=2:expandtab
+

data/lib/mxx_ru/generators/externals/template.erb

@@ -34,7 +34,7 @@ MxxRu::hg_externals :extname do |e|
 # Stub for externals from Subversion.
 =begin
 MxxRu::svn_externals :extname do |e|
-  e.url 'https://..." # URL to Svn repository.
+  e.url 'https://...' # URL to Svn repository.
 
   # Some useful defaults.
   e.option '-q'
@@ -50,7 +50,7 @@ end
 # Stub for externals from some downloadable archive.
 =begin
 MxxRu::arch_externals :soci do |e|
-  e.url 'http://..." # URL to archive with source code.
+  e.url 'http://...' # URL to archive with source code.
 
   e.map_dir 'src-dir' => 'dest-dir'
 

data/lib/mxx_ru/version.rb

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

data/tests/cpp/lib_from_lib_dependecies/a.cpp

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

data/tests/mxx_ru/obj_placements/tc_prj_aware_runtime_subdir.rb

@@ -0,0 +1,122 @@
+require 'test/unit'
+require 'fileutils'
+
+require 'mxx_ru/cpp/obj_placements/prj_aware_runtime_subdir'
+
+class TC_PrjAwareRuntimeSubdirObjPlacement < Test::Unit::TestCase
+  FINAL_PATH = 'bin'
+
+  class DummyTarget
+    attr_reader :prj_alias
+    attr_reader :mxx_runtime_mode
+    def initialize(a_alias, a_runtime)
+      @prj_alias = a_alias
+      @mxx_runtime_mode = a_runtime
+    end
+  end
+
+  class DummyToolset
+    def make_identification_string
+      'dummy_toolset'
+    end
+  end
+
+  def teardown
+    FileUtils.rm_r( FINAL_PATH ) if File.directory?( FINAL_PATH )
+  end
+
+  def test_final_path_no_toolset_name
+    target = DummyTarget.new( 'some/prj.rb', MxxRu::Cpp::RUNTIME_RELEASE )
+    toolset = DummyToolset.new
+
+    p = MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement.new( FINAL_PATH )
+
+    expected_part = '/release'
+
+    r = p.get_exe( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+    r = p.get_exe( 'exe', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/exe', r )
+
+    r = p.get_dll( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+    r = p.get_dll( 'dll', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/dll', r )
+
+    r = p.get_lib( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+    r = p.get_lib( 'lib', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/lib', r )
+  end
+
+  def test_final_path_with_toolset_name
+    target = DummyTarget.new( 'some/prj.rb', MxxRu::Cpp::RUNTIME_DEBUG )
+    toolset = DummyToolset.new
+
+    p = MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement.new( FINAL_PATH,
+          MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement::USE_COMPILER_ID )
+
+    expected_part = '/dummy_toolset/debug'
+
+    r = p.get_exe( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+    r = p.get_exe( 'exe', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/exe', r )
+
+    r = p.get_dll( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+    r = p.get_dll( 'dll', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/dll', r )
+
+    r = p.get_lib( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+    r = p.get_lib( 'lib', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/lib', r )
+  end
+
+  def test_intermediate_path_no_toolset_name
+    target = DummyTarget.new( 'some/prj.rb', MxxRu::Cpp::RUNTIME_RELEASE )
+    toolset = DummyToolset.new
+
+    p = MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement.new( FINAL_PATH )
+
+    expected_part = '/_objs/release/some_prj_rb'
+
+=begin
+    r = p.get_obj( '', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+
+    r = p.get_obj( '.', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part, r )
+=end
+
+    r = p.get_obj( 'prj_1/src', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/prj_1_src', r )
+
+    r = p.get_obj( 'some/very/long/path/to/src/file', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/some___file-3caf2536e0e7', r )
+  end
+
+  def test_intermediate_path_with_toolset_name
+    target = DummyTarget.new( 'some/prj.rb', MxxRu::Cpp::RUNTIME_DEBUG )
+    toolset = DummyToolset.new
+
+    p = MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement.new( FINAL_PATH,
+          MxxRu::Cpp::PrjAwareRuntimeSubdirObjPlacement::USE_COMPILER_ID )
+
+    expected_part = '/_objs/dummy_toolset/debug/some_prj_rb'
+
+    r = p.get_obj( 'prj_1/src', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/prj_1_src', r )
+
+    r = p.get_obj( 'some/very/long/path/to/src/file', toolset, target )
+    check_name_and_path( FINAL_PATH + expected_part + '/some___file-3caf2536e0e7', r )
+  end
+
+private
+  def check_name_and_path( expected, actual )
+    assert_equal( expected, actual )
+    assert( File.directory?( expected ) )
+  end
+end
+

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.12
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-08-04 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
@@ -86,6 +86,7 @@ files:
 - lib/mxx_ru/cpp/mode.rb
 - lib/mxx_ru/cpp/obj_placement.rb
 - lib/mxx_ru/cpp/obj_placements/custom_subdir.rb
+- lib/mxx_ru/cpp/obj_placements/prj_aware_runtime_subdir.rb
 - lib/mxx_ru/cpp/qt.rb
 - lib/mxx_ru/cpp/qt4.rb
 - lib/mxx_ru/cpp/qt4_via_pkg_config.rb
@@ -167,6 +168,7 @@ 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
@@ -291,6 +293,7 @@ files:
 - tests/mxx_ru/lib_path/main.rb
 - tests/mxx_ru/lib_path/tc_lib_path.rb
 - tests/mxx_ru/obj_placements/tc_custom_subdir.rb
+- tests/mxx_ru/obj_placements/tc_prj_aware_runtime_subdir.rb
 - tests/mxx_ru/opt_lib_ext/build.rb
 - tests/mxx_ru/opt_lib_ext/hi.c
 - tests/mxx_ru/opt_lib_ext/hi.h
@@ -334,22 +337,33 @@ 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
@@ -390,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool