Mxx_ru 1.6.9 → 1.6.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900a8a18e1efa1c39330786397ab24d107af3421
-  data.tar.gz: e48a95783c74c51fca524464a001476373fbd1d9
+  metadata.gz: c4a5d6f710b5089948eef9011789f6b721aa283d
+  data.tar.gz: 4b6dcd63781c43e5073131dbefab3abc965abbbc
 SHA512:
-  metadata.gz: 0163b66595b96b7859c21b3e7f9d399cd173e014aaa3c43dadfa22986e631ad6495089d602a6b9380db66876fffa64c95669c7823b55cd8e0157be8106086ab2
-  data.tar.gz: c33dab51ff1cc665842b15e2abd95011a3dfc9b774a71459b3aa88560a6805bc799ceb915e11a103eca56da0f4524d166f8a37f1588bd410d4fb71ec3e990a12
+  metadata.gz: be0a4bb10bd7f3e4a2706051ade9eee586b54fc808ef5c0e930ab239611ae7f21058a0fd108e4f027be5743d31296c046247ae540c9b1550802d36296b35316d
+  data.tar.gz: 1a40070ec8fcbe916e69945f983e17c35c472409a9dea3a7b8d090490de087d4466a1ab26b4f41aa96b87f295d6aa41031e57fb6b13e1048ca8a837a5691505e

data/Rakefile

@@ -10,7 +10,7 @@ require 'lib/mxx_ru/version'
 spec = Gem::Specification.new do |s|
   s.name = "Mxx_ru"
   s.version = MXX_RU_VERSION
-  s.licenses = ['NewBSD']
+  s.licenses = ['BSD-3-Clause']
   s.author = "The Mxx_ru Project"
   s.email = "eao197@yahoo.com"
   s.homepage = "http://sourceforge.net/projects/mxxru"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
     "to C/C++ projects"
   s.files = FileList[ "{bin,tests,lib,docs,examples}/**/*" ].
       exclude( "rdoc" ).to_a + [ "THANKS" ]
-  s.executables = 'mxxrugen'
+  s.executables = [ 'mxxrugen', 'mxxruexternals' ]
   s.require_path = "lib"
   s.has_rdoc = true
   s.rdoc_options = [ '--main', 'README' ]

data/bin/mxxruexternals

@@ -0,0 +1,204 @@
+#!/usr/bin/env ruby
+##--
+# 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.
+#++
+# This code is based on the code from RuCodeGen
+# (http://www.rubyforge.org/projects/rucodegen) project.
+# RuCodeGen is distributed under the following license:
+#--
+#
+# Copyright (c) 2005-2006, Yauheni Akhotnikau
+# 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.
+#
+#++
+
+
+# Since v.1.6.10
+#
+# Template generation scripts runner.
+
+require 'optparse'
+require 'ostruct'
+
+require 'tempfile'
+
+require 'fileutils'
+
+module MxxRuExternals
+
+module Impl
+
+# Command-line argument parsing.
+#
+# Returns object with the following methods:
+# externals_file:: Name of file with externals definition. Could be nil.
+# task:: Name of task for rake (default :install).
+#
+# Finishes script work is --help specified.
+#
+def Impl.parse_args
+  result = OpenStruct.new(
+      :externals_file => nil,
+      :libdirs => [],
+      :task => :install )
+
+  parser = OptionParser.new
+
+  parser.banner = <<BANNER
+Mxx_ru Externals command script
+
+Usage:
+
+mxxruexternals [<options>] [-f externals-file] [task]
+
+BANNER
+
+  parser.on_head( '-I', '--libdir LIBDIR',
+      'Include LIBDIR in the search path for required modules' ) do |p|
+    result.libdirs << p
+  end
+
+  parser.on_head( '-f', '--rakefile NAME',
+      'Name of file with externals definition' ) do |p|
+    result.externals_file = p
+  end
+
+  parser.on_head( '-h', '--help', 'Show this message' ) do
+    puts parser
+    exit( 1 )
+  end
+
+  parser.order!( ARGV ) do |nonarg|
+    # First non-option is a task name.
+    result.task = nonarg
+  end
+
+  result
+end
+
+end # Impl
+
+# Performs main work.
+def MxxRuExternals.run
+  options = Impl.parse_args
+
+  if options.externals_file.nil?
+    options.externals_file = 'externals.rb'
+  end
+
+  script_name = nil
+  Tempfile.open('mxxruexternals-temp', '.') do |tmpf|
+    script_name = tmpf.path
+    puts "[Info] Generation of auxilary rakefile: #{script_name}"
+    tmpf.write <<EOF
+require 'mxx_ru/externals'
+
+task :mxxru_cleanup_previous
+task :mxxru_install_final_step
+
+MxxRu::Externals::Registry.instance.turn_new_rules_on
+load '#{options.externals_file}'
+
+PREVIOUS_FILE = File.join MxxRu::Externals::EXTERNALS_STORAGE_DIR, 'previous.rb'
+BAK_FILE_NAME = lambda {|n| "\#{PREVIOUS_FILE}.\#{n}.bak" }
+MV_IF_EXISTS = lambda{ |from, to| mv(from, to) if File.exists?(from) }
+
+file PREVIOUS_FILE do
+  cp '#{options.externals_file}', PREVIOUS_FILE, :verbose => Rake.verbose
+end
+
+if File.exists?(PREVIOUS_FILE)
+  prev_digest = Digest::MD5.file(PREVIOUS_FILE)
+  curr_digest = Digest::MD5.file('#{options.externals_file}')
+
+  if prev_digest != curr_digest
+    puts "[Note] Externals description changed from the last time"
+    puts "[Note] Contents of \#{PREVIOUS_FILE} will be used"
+
+    task :mxxru_cleanup_previous do
+      MV_IF_EXISTS[BAK_FILE_NAME[4], BAK_FILE_NAME[5]]
+      MV_IF_EXISTS[BAK_FILE_NAME[3], BAK_FILE_NAME[4]]
+      MV_IF_EXISTS[BAK_FILE_NAME[2], BAK_FILE_NAME[3]]
+      MV_IF_EXISTS[BAK_FILE_NAME[1], BAK_FILE_NAME[2]]
+      mv(PREVIOUS_FILE, BAK_FILE_NAME[1])
+    end
+
+    MxxRu::Externals::Registry.instance.turn_old_rules_on
+    load PREVIOUS_FILE
+
+    task mxxru_install_final_step: [PREVIOUS_FILE]
+  else
+    puts "[Note] It seems there is no changes in externals description"
+    puts "[Note] Contents of \#{PREVIOUS_FILE} won't be used"
+  end
+else
+  task mxxru_install_final_step: [PREVIOUS_FILE]
+end
+
+task install: [:mxxru_cleanup_previous, :mxxru_install_final_step]
+task remove: [:mxxru_cleanup_previous, :mxxru_install_final_step]
+task reget: [:mxxru_cleanup_previous, :mxxru_install_final_step]
+
+EOF
+  end
+
+  cmdline = "rake ";
+  options.libdirs.each do |l| cmdline += "-I \"#{l}\" " end
+  cmdline += "-f #{script_name} #{options.task}"
+
+  puts "[Info] Launching rake with: #{cmdline}"
+  system cmdline
+
+end
+
+end # MxxRuExternals
+
+MxxRuExternals.run
+
+# vim:ft=ruby:ts=2:sts=2:sw=2:expandtab
+

data/bin/mxxrugen

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale

data/lib/mxx_ru/externals.rb

@@ -6,10 +6,67 @@ require 'singleton'
 
 require 'digest'
 
+require 'json'
+
 module MxxRu
 
 module Externals
 
+EXTERNALS_STORAGE_DIR = '.externals'
+
+class Registry
+  include Singleton
+
+  INITIAL_MODE = 0
+  NEW_RULES_MODE = 1
+  OLD_RULES_MODE = 2
+
+  def initialize
+    @mode = INITIAL_MODE
+    @externals = {}
+  end
+
+  def turn_new_rules_on
+    @mode = NEW_RULES_MODE
+  end
+
+  def turn_old_rules_on
+    @mode = OLD_RULES_MODE
+  end
+
+  def Registry.handle_external(*args)
+    Registry.instance.handle_external(*args)
+  end
+
+  def handle_external(name, obj)
+    if INITIAL_MODE == @mode
+      raise "Use mxxruexternals command for handling externals.\n" +
+          "For example:\n\n" +
+          "mxxruexternals -f my_externals.rb\n"
+    elsif NEW_RULES_MODE == @mode
+      @externals[ name ] = obj.make_hash
+      obj.define_rules :new_rules
+    elsif OLD_RULES_MODE == @mode
+      fresh_version = @externals.fetch(name, nil)
+      if fresh_version
+        puts "[Note] #{name} previous rules found"
+        old_hash = obj.make_hash
+        if old_hash == fresh_version
+          puts "[Note] #{name} previous rules the same with current"
+        else
+          puts "[Note] #{name} previous rules differs with current"
+          puts "[Note] #{name} WILL BE REGET"
+          obj.define_rules :old_rules
+        end
+      else
+        puts "[Note] #{name} not present in the current version"
+        puts "[Note] #{name} WILL BE REMOVED"
+        obj.define_rules :old_rules
+      end
+    end
+  end
+end
+
 module Impl
 
 module Utils
@@ -43,6 +100,10 @@ private
     @options = [] unless @options
     @options
   end
+
+  def options_to_map
+    { options: @options }
+  end
 end # module OptionsHolder
 
 class CurlDownloder
@@ -162,7 +223,6 @@ private
 end # class WebDownloader
 
 module ExternalBasics
-  EXTERNALS_STORAGE_DIR = '.externals'
 
   attr_reader :url
 
@@ -182,7 +242,12 @@ module ExternalBasics
     @paths.merge!(value)
   end
 
-  alias :map :map_dir
+  def map(value)
+    STDERR.print("#{caller(1)[0]}: 'map_dir' must be used instead of 'map'," +
+      " 'map' is deprecated\n")
+
+    map_dir(value)
+  end
 
   def map_file(value)
     raise "map_file() value must be a Hash" unless value.is_a?(Hash)
@@ -194,13 +259,18 @@ private
 
   def defaults(name)
     @name = name
-    @remove_task_name = "#{@name}:remove"
-    @reget_task_name = "#{@name}:reget"
+    @install_task_name = "#{@name}_#{object_id}"
+    @remove_task_name = "#{@install_task_name}:remove"
+    @reget_task_name = "#{@install_task_name}:reget"
     @paths = {}
     @files = {}
     @verbose = Rake.verbose
   end
 
+  def basics_to_map
+    { url: @url, paths: @paths, files: @files }
+  end
+
   def fileop_options
     { :verbose => @verbose }
   end
@@ -238,17 +308,25 @@ private
     "#{prefixes.join('.')}.#{Process.pid}.#{Thread.current.object_id}"
   end
 
-  def define(&exporter)
+  # Note: argument old_or_new can receive values :new_rules or :old_rules.
+  def define(old_or_new, &exporter)
     ensure_basics_correctness(@name)
 
     ext_prj_sources_dir, dir_subtargets, file_subtargets =
-        define_basic_task(&exporter)
+        define_basic_task(old_or_new, &exporter)
 
-    define_remove_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
-    define_reget_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
+    define_remove_task(
+        old_or_new,
+        ext_prj_sources_dir,
+        dir_subtargets,
+        file_subtargets)
+
+    if :new_rules == old_or_new
+      define_reget_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
+    end
   end
 
-  def define_basic_task(&exporter)
+  def define_basic_task(old_or_new, &exporter)
     ext_prj_sources_dir = subdir_name(@name.to_s)
 
     directory EXTERNALS_STORAGE_DIR
@@ -257,11 +335,14 @@ private
     @paths.each do |src, dst|
       src, actual_dst, dir_dep = handle_dir_map_pair(src, dst)
 
-      directory dir_dep
+      define_only_if_new_rules(old_or_new) do
+        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)
+        directory actual_dst => [ext_prj_sources_dir, dir_dep] do
+          cp_r(File.join(ext_prj_sources_dir, src), actual_dst, fileop_options)
+        end
       end
+
       dir_subtargets << actual_dst
     end
 
@@ -269,47 +350,56 @@ private
     @files.each do |src, dst|
       dst, dir_dep = handle_file_map_pair(src, dst)
 
-      directory dir_dep
+      define_only_if_new_rules(old_or_new) do
+        directory dir_dep
 
-      file dst => [ext_prj_sources_dir, dir_dep] do
-        cp(File.join(ext_prj_sources_dir, src), dst, fileop_options)
+        file dst => [ext_prj_sources_dir, dir_dep] do
+          cp(File.join(ext_prj_sources_dir, src), dst, fileop_options)
+        end
       end
+
       file_subtargets << dst
     end
 
-    directory ext_prj_sources_dir => [EXTERNALS_STORAGE_DIR] do
-      # All old destinations must be removed because source code
-      # will be exported again.
-      rm_directories(dir_subtargets)
-      rm_files(file_subtargets)
+    define_only_if_new_rules(old_or_new) do
+      directory ext_prj_sources_dir => [EXTERNALS_STORAGE_DIR] do
+        # All old destinations must be removed because source code
+        # will be exported again.
+        rm_directories(dir_subtargets)
+        rm_files(file_subtargets)
 
-      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)
-    end
+        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)
+      end
 
-    desc "Get #{@name} external project"
-    task @name => [dir_subtargets, file_subtargets].flatten!
+      task @install_task_name =>
+        [:mxxru_cleanup_previous, dir_subtargets, file_subtargets].flatten!
 
-    task default: @name
+      task install: @install_task_name
+    end
 
     return ext_prj_sources_dir, dir_subtargets, file_subtargets
   end
 
-  def define_remove_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
-    desc "Remove #{@name} external project"
+  def define_remove_task(
+    old_or_new, ext_prj_sources_dir, dir_subtargets, file_subtargets)
+
     task @remove_task_name do
       rm_files(file_subtargets)
       rm_directories(dir_subtargets)
       rm_dir_if_exists(ext_prj_sources_dir)
     end
 
-    task :remove => @remove_task_name
+    if :new_rules == old_or_new
+      task :remove => @remove_task_name
+    else
+      task :mxxru_cleanup_previous => @remove_task_name
+    end
   end
 
   def define_reget_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
-    desc "Remove and get fresh #{@name} external project"
-    task @reget_task_name => [@remove_task_name, @name]
+    task @reget_task_name => [@remove_task_name, @install_task_name]
 
     task :reget => @reget_task_name
   end
@@ -347,6 +437,13 @@ private
     end
     [dst, dst_parts.first]
   end
+
+  # Helper function for doing some actions only if old_or_new is :new_rules.
+  def define_only_if_new_rules(old_or_new, &block)
+    if :new_rules == old_or_new
+      block.call
+    end
+  end
 end
 
 end # module Impl
@@ -361,7 +458,24 @@ class Svn < Rake::TaskLib
 
     yield self if block_given?
 
-    define do |tmp_dir|
+    Registry::handle_external(@name, self)
+  end
+
+  attr_reader :rev
+  def rev(v); @rev = v; end
+  alias :rev= :rev
+
+  def with_externals
+    @with_externals = true
+  end
+
+  def make_hash
+    options_to_map.merge!( basics_to_map ).merge!(
+      { :rev => @rev, :with_externals => @with_externals } )
+  end
+
+  def define_rules(old_or_new)
+    define(old_or_new) do |tmp_dir|
       sh_args = [ 'svn', 'export' ]
 
       sh_args << '-r' << @rev.to_s if @rev
@@ -374,13 +488,6 @@ class Svn < Rake::TaskLib
     end
   end
 
-  attr_reader :rev
-  def rev(v); @rev = v; end
-  alias :rev= :rev
-
-  def with_externals
-    @with_externals = true
-  end
 end
 
 class Git < Rake::TaskLib
@@ -396,7 +503,36 @@ class Git < Rake::TaskLib
 
     raise "#{name}: tag and commit cannot be specified together" if @tag and @commit
 
-    define do |tmp_dir|
+    Registry::handle_external(@name, self)
+  end
+
+  attr_reader :tag
+  def tag(v); @tag = v; end
+  alias :tag= :tag
+
+  def unlimited_depth
+    @unlimited_depth = true
+  end
+  
+  def recursive
+    @recursive = true
+  end
+
+  attr_reader :commit
+  def commit(v); @commit = v; end
+  alias :commit= :commit
+
+  def make_hash
+    options_to_map.merge!( basics_to_map ).merge!(
+      { :recursive => @recursive,
+        :unlimited_depth => @unlimited_depth,
+        :tag => @tag,
+        :commit => @commit
+      } )
+  end
+
+  def define_rules(old_or_new)
+    define(old_or_new) do |tmp_dir|
       if @commit.nil?
         # No specific commit.
         # Simple clone (probably with --depth 1) is enough.
@@ -425,21 +561,6 @@ class Git < Rake::TaskLib
     end
   end
 
-  attr_reader :tag
-  def tag(v); @tag = v; end
-  alias :tag= :tag
-
-  def unlimited_depth
-    @unlimited_depth = true
-  end
-  
-  def recursive
-    @recursive = true
-  end
-
-  attr_reader :commit
-  def commit(v); @commit = v; end
-  alias :commit= :commit
 end
 
 class Hg < Rake::TaskLib
@@ -451,7 +572,19 @@ class Hg < Rake::TaskLib
 
     yield self if block_given?
 
-    define do |tmp_dir|
+    Registry::handle_external(@name, self)
+  end
+
+  attr_reader :tag
+  def tag(v); @tag = v; end
+  alias :tag= :tag
+
+  def make_hash
+    options_to_map.merge!( basics_to_map ).merge!( { :tag => @tag } )
+  end
+
+  def define_rules(old_or_new)
+    define(old_or_new) do |tmp_dir|
       sh_args = ['hg', 'clone']
 
       sh_args << '--updaterev' << @tag.to_s if @tag
@@ -463,9 +596,6 @@ class Hg < Rake::TaskLib
     end
   end
 
-  attr_reader :tag
-  def tag(v); @tag = v; end
-  alias :tag= :tag
 end # class Hg
 
 # Implementation of externals represented as downloadable
@@ -477,13 +607,13 @@ class ArchiveAsExternals < Rake::TaskLib
 
   @@archive_handlers = {
     :tar => proc {
-        ['tar', 'x'].push(*@unpaker_options).push('-f').push(archive_name)
+        ['tar', 'x'].push(*@unpacker_options).push('-f').push(archive_name)
       },
     :zip => proc {
-        ['unzip'].push(*@unpaker_options).push(archive_name)
+        ['unzip'].push(*@unpacker_options).push(archive_name)
       },
     :sevenzip => proc {
-        ['7z', 'x'].push(*@unpaker_options).push(archive_name)
+        ['7z', 'x'].push(*@unpacker_options).push(archive_name)
       }
   }
 
@@ -508,29 +638,14 @@ class ArchiveAsExternals < Rake::TaskLib
 
   def initialize(name)
     defaults(name)
-    @unpaker_options = []
+    @unpacker_options = []
 
     yield self if block_given?
 
     parse_uri
     detect_archive_type
 
-    define do |tmp_dir|
-      # Temporary directory must be removed in a case of any error.
-      successful = false
-      begin
-        mkdir(tmp_dir, fileop_options) if !Dir.exists?(tmp_dir)
-
-        cd tmp_dir do
-          download_archive
-          unpack_archive
-        end
-
-        successful = true
-      ensure
-        rm_dir_if_exists(tmp_dir) unless successful
-      end
-    end
+    Registry::handle_external(@name, self)
   end
 
   def md5(v)
@@ -550,7 +665,36 @@ class ArchiveAsExternals < Rake::TaskLib
   end
 
   def unpacker_option(v)
-    @unpaker_options.push(v)
+    @unpacker_options.push(v)
+  end
+
+  def make_hash
+    all_downloader_options.merge( basics_to_map ).merge!(
+      { :md5 => @md5,
+        :sha1 => @sha1,
+        :sha256 => @sha256,
+        :sha512 => @sha512,
+        :unpacker_options => @unpacker_options
+      } )
+  end
+
+  def define_rules(old_or_new)
+    define(old_or_new) do |tmp_dir|
+      # Temporary directory must be removed in a case of any error.
+      successful = false
+      begin
+        mkdir(tmp_dir, fileop_options) if !Dir.exists?(tmp_dir)
+
+        cd tmp_dir do
+          download_archive
+          unpack_archive
+        end
+
+        successful = true
+      ensure
+        rm_dir_if_exists(tmp_dir) unless successful
+      end
+    end
   end
 
 private
@@ -669,7 +813,7 @@ end # module MxxRu
 
 desc "Remove all external projects"
 task :remove do
-  d = MxxRu::Externals::Impl::ExternalBasics::EXTERNALS_STORAGE_DIR
+  d = MxxRu::Externals::EXTERNALS_STORAGE_DIR
   rm_r(d, :verbose => Rake.verbose) if Dir.exists?(d)
 end
 

data/lib/mxx_ru/version.rb

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

data/tests/externals/check_git.rb

@@ -3,5 +3,5 @@ require 'mxx_ru/externals'
 MxxRu::git_externals :asio do |ext|
 	ext.url 'https://github.com/chriskohlhoff/asio.git' 
 	ext.tag 'asio-1-11-0'
-	ext.map 'asio' => 'dev'
+	ext.map_dir 'asio' => 'dev'
 end

data/tests/externals/check_hg.rb

@@ -3,7 +3,7 @@ require 'mxx_ru/externals'
 MxxRu::hg_externals :eigen do |ext|
   ext.url = 'https://bitbucket.org/eigen/eigen' 
   ext.tag = '3.2.5'
-  ext.map 'Eigen' => 'dev'
+  ext.map_dir 'Eigen' => 'dev'
   ext.map_file 'INSTALL' => 'INSTALL.eigen'
 end
 

data/tests/externals/check_svn.rb

@@ -3,8 +3,8 @@ require 'mxx_ru/externals'
 MxxRu::svn_externals :so_5 do |ext|
   ext.url 'http://svn.code.sf.net/p/sobjectizer/repo/branches/so_5/5.5'
   ext.option '-q' 
-  ext.map 'dev/so_5' => 'dev'
-  ext.map 'dev/test/so_5' => 'dev/test'
+  ext.map_dir 'dev/so_5' => 'dev'
+  ext.map_dir 'dev/test/so_5' => 'dev/test'
   ext.map_file 'README' => 'README.so_5'
 end
 
@@ -12,6 +12,6 @@ MxxRu::svn_externals :socomm do |ext|
   ext.url 'http://svn.code.sf.net/p/sobjectizer/repo/branches/so_comm_1/1.1' 
   ext.option '-q' 
   ext.rev 2290
-  ext.map 'dev/so_comm_1' => 'dev'
-  ext.map 'dev/test/so_comm_1' => 'dev/test'
+  ext.map_dir 'dev/so_comm_1' => 'dev'
+  ext.map_dir 'dev/test/so_comm_1' => 'dev/test'
 end

data/tests/externals/check_tar.rb

@@ -4,7 +4,7 @@ MxxRu::arch_externals :asio_tgz do |e|
 	e.url 'https://github.com/chriskohlhoff/asio/archive/asio-1-11-0.tar.gz' 
 	e.sha1 '1be2489015a1e1c7b8666a5a803d984cdec4a12b'
 
-	e.map 'asio/src' => 'dev/asio_tgz'
+	e.map_dir 'asio/src' => 'dev/asio_tgz'
 
 	e.downloader_option :wget, '--no-use-server-timestamps'
 	e.downloader_option :wget, '-T', '36'

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10.1
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-19 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
 executables:
 - mxxrugen
+- mxxruexternals
 extensions: []
 extra_rdoc_files:
 - README
@@ -26,6 +27,7 @@ files:
 - README
 - Rakefile
 - THANKS
+- bin/mxxruexternals
 - bin/mxxrugen
 - examples/exe_and_lib/main.cpp
 - examples/exe_and_lib/prj.rb
@@ -350,7 +352,7 @@ files:
 - tests/unix/lib_order/tc_normal_build.rb
 homepage: http://sourceforge.net/projects/mxxru
 licenses:
-- NewBSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -370,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool