Mxx_ru 1.6.8 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73efa525294417a45416e080580599b7ddc46c74
-  data.tar.gz: e76fb9f6de5eeff271e0a6596fa8059cfcf45ac0
+  metadata.gz: 900a8a18e1efa1c39330786397ab24d107af3421
+  data.tar.gz: e48a95783c74c51fca524464a001476373fbd1d9
 SHA512:
-  metadata.gz: fd8d76c2e95b1feabb5905c9fea9b022c0260426d01c603a98bedd662831dbbc91ad64930361196378b63729e8d754f55b638ae098afd108a094bf3e96248a44
-  data.tar.gz: 443864dbe6a9927c2fda510dcd5aac15e67354f226ad1add2cf42cf290a02ac1739aebd8ef7c4f7a8dc52b24d289c6bab269d279acfecfba62f9b241b8901b55
+  metadata.gz: 0163b66595b96b7859c21b3e7f9d399cd173e014aaa3c43dadfa22986e631ad6495089d602a6b9380db66876fffa64c95669c7823b55cd8e0157be8106086ab2
+  data.tar.gz: c33dab51ff1cc665842b15e2abd95011a3dfc9b774a71459b3aa88560a6805bc799ceb915e11a103eca56da0f4524d166f8a37f1588bd410d4fb71ec3e990a12

data/NEWS

@@ -1,5 +1,13 @@
 Changes in Mxx_ru
 
+1.6.9 version (2016.03.31)
+
+  Support of stars in src- and dst-names in map_dir/map_file (MxxRu::externals).
+
+1.6.8 version (2016.03.09)
+
+  Extended version of MxxRu::externals with arch_externals.
+
 1.6.7 version (2016.03.04)
 
   mxx_ru/externals.rb added (with git_externals, svn_externals and hg_externals).

data/lib/mxx_ru/externals.rb

@@ -255,12 +255,11 @@ private
 
     dir_subtargets = []
     @paths.each do |src, dst|
-      last_item = File.split(src).last
-      actual_dst = File.join(dst, last_item)
+      src, actual_dst, dir_dep = handle_dir_map_pair(src, dst)
 
-      directory dst
+      directory dir_dep
 
-      directory actual_dst => [ext_prj_sources_dir, dst] do
+      directory actual_dst => [ext_prj_sources_dir, dir_dep] do
         cp_r(File.join(ext_prj_sources_dir, src), actual_dst, fileop_options)
       end
       dir_subtargets << actual_dst
@@ -268,7 +267,8 @@ private
 
     file_subtargets = []
     @files.each do |src, dst|
-      dir_dep = File.split(dst).first
+      dst, dir_dep = handle_file_map_pair(src, dst)
+
       directory dir_dep
 
       file dst => [ext_prj_sources_dir, dir_dep] do
@@ -313,6 +313,40 @@ private
 
     task :reget => @reget_task_name
   end
+
+  # Check the presence of start in src and make actual_dst and dir_dep
+  # in dependence of the result. If start is present then it is removed
+  # from actual_src.
+  #
+  # Returns triplet: [actual_src, actual_dst, dir_dep]
+  #
+  def handle_dir_map_pair(src, dst)
+    src_parts = File.split(src)
+    if '*' == src_parts.last
+      # Since v.1.6.9: source path must be copied with different name.
+      # Source name must not contain '*' at the end.
+      src = src_parts.first
+      # The first part original dst must be used as destination.
+      [src, dst, File.split(dst).first]
+    else
+      # Last name of src must be added to dst to create actual destination.
+      [src, File.join(dst, src_parts.last), dst]
+    end
+  end
+
+  # Check the presence of start in dst and make actual_dst and dir_dep
+  # in dependence of the result.
+  #
+  # Returns pair: [actual_dst, dir_dep]
+  #
+  def handle_file_map_pair(src, dst)
+    dst_parts = File.split(dst)
+    if '*' == dst_parts.last
+      # Since v.1.6.9: original name of file must be preserved.
+      dst = File.join(dst_parts.first, File.split(src).last)
+    end
+    [dst, dst_parts.first]
+  end
 end
 
 end # module Impl

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.8'
+MXX_RU_VERSION = '1.6.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-31 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