Mxx_ru 1.6.6 → 1.6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41c054d191474b23162b43e95280b56fb8cf543a
-  data.tar.gz: 66d35e45eae73922b7f5ceda48d3963d67fc9059
+  metadata.gz: b65c551e624ecad29a513d7af93989985acb4455
+  data.tar.gz: ce616be948582f09e650fa28feeb76dc54035914
 SHA512:
-  metadata.gz: 83af9a9bddc72971b8a80eac406dc66fc04d4a6d8324648c1329bb3bd38e1c028a42dd3617e2baff32661fd1e3093bda5316e980803197251f5fc8138376d2c3
-  data.tar.gz: 8dc6ca2b069e2172623545c8f7de9d6d0dd3006fee31d08bba31b4bd9256e08d2d28378920c78d765fd18c00b681260f9abf247122e74691c79ce667d6829cff
+  metadata.gz: c454658a0f9b740e0da247913482674c2cc83f50b9179afc10274fc403c959b7b02192d7c9659be94dfb6f9251fd5654e72e4f4216c11b0e759c10fd819f04b8
+  data.tar.gz: fbedcdc011c11cfd9f244807ca3b7c7c76edd012c16146475a7a4febdc4a55a5a4e001160f37381d457b1d9139bba549611c74a120298fd40b6ac16d83bb59cb

data/COPYING

@@ -1,6 +1,6 @@
 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/NEWS

@@ -1,5 +1,13 @@
 Changes in Mxx_ru
 
+1.6.7 version (2016.03.04)
+
+  mxx_ru/externals.rb added (with git_externals, svn_externals and hg_externals).
+
+1.6.6 version (2015.08.01)
+
+  Support for VC++14.0 added.
+
 1.6.5 version (2015.04.10)
 
   Bugfix release (fix for compiler flags for forcing C++14 mode).

data/README

@@ -2,7 +2,7 @@ Copyright (c) 1996-2005, 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.
 

data/lib/mxx_ru/externals.rb

@@ -0,0 +1,289 @@
+require 'rake'
+require 'rake/tasklib'
+
+module MxxRu
+
+module Externals
+
+module ExternalBasics
+  EXTERNALS_STORAGE_DIR = '.externals'
+
+  attr_reader :url
+
+  attr_reader :paths
+
+  attr_reader :name
+
+  def url(value)
+    @url = value
+  end
+
+  alias :url= :url
+
+  def map_dir(value)
+    raise "map_dir() value must be a Hash" unless value.is_a?(Hash)
+
+    @paths.merge!(value)
+  end
+
+  alias :map :map_dir
+
+  def map_file(value)
+    raise "map() value must be a Hash" unless value.is_a?(Hash)
+
+    @files.merge!(value)
+  end
+
+  def option(*values)
+    @options.push(*values)
+  end
+
+private
+
+  def defaults(name)
+    @name = name
+    @remove_task_name = "#{@name}:remove"
+    @reget_task_name = "#{@name}:reget"
+    @paths = {}
+    @files = {}
+    @options = []
+    @verbose = Rake.verbose
+  end
+
+  def fileop_options
+    { :verbose => @verbose }
+  end
+
+  def rm_dir_if_exists(dir_name)
+    rm_r(dir_name, fileop_options) if Dir.exists?(dir_name)
+  end
+
+  def rm_directories(dirs)
+    dirs.each { |d| rm_dir_if_exists(d) }
+  end
+
+  def rm_file_if_exists(file_name)
+    rm(file_name, fileop_options) if File.exists?(file_name)
+  end
+
+  def rm_files(files)
+    files.each { |f| rm_file_if_exists(f) }
+  end
+
+  def ensure_basics_correctness(name)
+    raise "#{name}: url not specified" unless @url
+    raise "#{name}: path or file map must be specified" if @paths.empty? and @files.empty?
+  end
+
+  def make_name(prefix, suffix)
+    prefix.to_s + suffix
+  end
+
+  def subdir_name(subdir)
+    File.join(EXTERNALS_STORAGE_DIR, subdir)
+  end
+
+  def make_tmp_name(*prefixes)
+    "#{prefixes.join('.')}.#{Process.pid}.#{Thread.current.object_id}"
+  end
+
+  def add_options(receiver)
+    receiver.push(*@options)
+  end
+
+  def define(src_type, &exporter)
+    ensure_basics_correctness(@name)
+
+    ext_prj_sources_dir, dir_subtargets, file_subtargets = define_basic_task(src_type, &exporter)
+
+    define_remove_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
+    define_reget_task(ext_prj_sources_dir, dir_subtargets, file_subtargets)
+  end
+
+  def define_basic_task(src_type, &exporter)
+    ext_prj_sources_dir = subdir_name(@name.to_s)
+
+    directory EXTERNALS_STORAGE_DIR
+
+    dir_subtargets = []
+    @paths.each do |src, dst|
+      last_item = File.split(src).last
+      actual_dst = File.join(dst, last_item)
+
+      directory dst
+
+      directory actual_dst => [ext_prj_sources_dir, dst] do
+        cp_r(File.join(ext_prj_sources_dir, src), actual_dst, fileop_options)
+      end
+      dir_subtargets << actual_dst
+    end
+
+    file_subtargets = []
+    @files.each do |src, dst|
+      dir_dep = File.split(dst).first
+      directory dir_dep
+
+      file dst => [ext_prj_sources_dir, dir_dep] do
+        cp(File.join(ext_prj_sources_dir, src), dst, fileop_options)
+      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)
+
+      ext_prj_sources_tmp_dir = subdir_name(make_tmp_name src_type, @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 default: @name
+
+    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"
+    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
+  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 => @reget_task_name
+  end
+end
+
+class Svn < Rake::TaskLib
+  include ExternalBasics
+
+  def initialize(name)
+    defaults(name)
+    @with_externals = false
+
+    yield self if block_given?
+
+    define 'svn' do |tmp_dir|
+      sh_args = [ 'svn', 'export' ]
+
+      sh_args << '-r' << @rev.to_s if @rev
+      sh_args << '--ignore-externals' unless @with_externals
+      add_options(sh_args)
+
+      sh_args << @url << tmp_dir
+
+      sh *sh_args
+    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
+  include ExternalBasics
+
+  def initialize(name)
+    defaults(name)
+    @unlimited_depth = false
+    @recursive = false
+
+    yield self if block_given?
+
+    define 'git' do |tmp_dir|
+      sh_args = ['git', 'clone']
+
+      sh_args << '--branch' << @tag.to_s if @tag
+      sh_args << '--depth' << '1' unless @unlimited_depth
+      sh_args << '--recursive' if @recursive
+      add_options(sh_args)
+
+      sh_args << @url << tmp_dir
+
+      sh *sh_args
+    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
+end
+
+class Hg < Rake::TaskLib
+  include ExternalBasics
+
+  def initialize(name)
+    defaults(name)
+
+    yield self if block_given?
+
+    define 'hg' do |tmp_dir|
+      sh_args = ['hg', 'clone']
+
+      sh_args << '--updaterev' << @tag.to_s if @tag
+      add_options(sh_args)
+
+      sh_args << @url << tmp_dir
+
+      sh *sh_args
+    end
+  end
+
+  attr_reader :tag
+  def tag(v); @tag = v; end
+  alias :tag= :tag
+end
+
+end # module Externals
+
+def MxxRu.svn_externals(name, &block)
+  Externals::Svn.new(name, &block)
+end
+
+def MxxRu.git_externals(name, &block)
+  Externals::Git.new(name, &block)
+end
+
+def MxxRu.hg_externals(name, &block)
+  Externals::Hg.new(name, &block)
+end
+
+end # module MxxRu
+
+desc "Remove all external projects"
+task :remove do
+  d = MxxRu::Externals::ExternalBasics::EXTERNALS_STORAGE_DIR
+  rm_r(d, :verbose => Rake.verbose) if Dir.exists?(d)
+end
+
+desc "Remove and get again all external projects"
+task :reget
+
+# vim:ts=2:sts=2:sw=2:expandtab
+

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.6.6'
+MXX_RU_VERSION = '1.6.7.1'

data/tests/externals/check_git.rb

@@ -0,0 +1,7 @@
+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'
+end

data/tests/externals/check_hg.rb

@@ -0,0 +1,9 @@
+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_file 'INSTALL' => 'INSTALL.eigen'
+end
+

data/tests/externals/check_svn.rb

@@ -0,0 +1,17 @@
+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_file 'README' => 'README.so_5'
+end
+
+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'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7.1
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: eao197@yahoo.com
@@ -118,6 +118,7 @@ files:
 - lib/mxx_ru/cpp/toolsets/vc_family.rb
 - lib/mxx_ru/environment_setup.rb
 - lib/mxx_ru/ex.rb
+- lib/mxx_ru/externals.rb
 - lib/mxx_ru/generators/bin-unittest/g.rb
 - lib/mxx_ru/generators/bin-unittest/template.erb
 - lib/mxx_ru/generators/cpp-build-root/g.rb
@@ -213,6 +214,9 @@ files:
 - tests/darwin/bundle_target_type/my_test_bundle.c
 - tests/darwin/bundle_target_type/my_test_bundle.rb
 - tests/darwin/bundle_target_type/tc_normal_build.rb
+- tests/externals/check_git.rb
+- tests/externals/check_hg.rb
+- tests/externals/check_svn.rb
 - tests/mxx_ru/binary_library/tc_binary_library.rb
 - tests/mxx_ru/binary_library/tc_binary_target_lib_methods.rb
 - tests/mxx_ru/change_default_value/ignoring_by_build_root/build.rb