Mxx_ru 1.6.10.1 → 1.6.11

data/lib/mxx_ru/cpp/obj_placement.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,
@@ -319,6 +319,74 @@ module  MxxRu
     # For compatibility with older versions.
     Runtime_subdir_obj_placement = RuntimeSubdirObjPlacement
 
+    # The generator of folder name for compilation results,
+    # building a hierarchy of subfolders in a special folder,
+    # which name is choosen based on toolset and runtime mode.
+    #
+    # For example, let src/lib/l.cpp and src/main/m.cpp files would be
+    # the sources of lib/l.lib library and m.exe application.
+    # If project is compiled in RELEASE mode, then following files
+    # would be created: toolset-id/release/src/lib/l.obj,
+    # toolset-id/release/src/main/m.obj,
+    # toolset-id/release/lib/l.lib and toolset-id/release/m.exe.
+    # Thus the presence of subfolders required will be supervised
+    # (for example, toolset-id/release/src/lib,
+    # toolset-id/release/src/main,...).
+    # If some subfolder doesn't exist, it will be created.
+    #
+    # An example of usage:
+    #
+    #  MxxRu::Cpp::composite_target( MxxRu::BUILD_ROOT )
+    #      global_obj_placement(
+    #        MxxRu::Cpp::ToolsetRuntimeSubdirObjPlacement.new(
+    #          "output" ) )
+    #
+    #      required_prj( "src/lib/prj.rb" )
+    #      required_prj( "src/main/prj.rb" )
+    #    end
+    #  end
+    #
+    class ToolsetRuntimeSubdirObjPlacement < RuntimeSubdirObjPlacement
+      # a_root_dir  A folder, where subfolders for exact toolset and
+      # runtime-modes will be created. If contains nil, subfolders are created
+      # in current folder.
+      #
+      # [_a_debug_subdir_] Subfolder name for MxxRu::Cpp::RUNTIME_DEBUG mode.
+      # [_a_default_subdir_] Subfolder name for MxxRu::Cpp::RUNTIME_DEFAULT mode.
+      # [_a_release_subdir_] Subfolder name for MxxRu::Cpp::RUNTIME_RELEASE mode.
+      def initialize(
+        a_root_dir = nil,
+        a_debug_subdir = "debug",
+        a_default_subdir = "default",
+        a_release_subdir = "release" )
+
+        super( a_root_dir, a_debug_subdir, a_debug_subdir, a_release_subdir )
+      end
+
+      def get_obj(
+        source_path_name,
+        toolset,
+        target )
+
+        if source_path_name &&
+          "" != source_path_name &&
+          "." != source_path_name
+          result = File.join( @root_dir,
+            toolset.make_identification_string,
+            runtime_mode_path( target ),
+            source_path_name )
+        else
+          result = File.join( @root_dir,
+            toolset.make_identification_string,
+            runtime_mode_path( target ) )
+        end
+
+        MxxRu::Util.ensure_path_exists( result )
+
+        return result
+      end
+    end # class ToolsetRuntimeSubdirObjPlacement
+
     # Creation of obj_placement object, which should be used by default.
     def Cpp.default_obj_placement
       return SourceSubdirObjPlacement.new

data/lib/mxx_ru/cpp/target.rb

@@ -906,8 +906,6 @@ module MxxRu
       def build
         if nil == @mxx_last_build_result
 
-          check_all_options_definition
-
           builder = self.method( :normal_mode_builder )
           builder = self.method( :option_extraction_mode_builder ) \
               if MxxRu::Cpp::Mode.instance.is_option_extraction
@@ -922,8 +920,6 @@ module MxxRu
       def clean
         if nil == @mxx_last_build_result
 
-          check_all_options_definition
-
           cleaner = self.method( :normal_mode_cleaner )
           cleaner = self.method( :option_extraction_mode_cleaner ) \
               if MxxRu::Cpp::Mode.instance.is_option_extraction
@@ -1009,6 +1005,10 @@ module MxxRu
         required_prjs_state = build_required_projects
         MxxRu::Cpp::Mode.instance.after_subprj_processing
 
+        # Since v.1.6.11 options are set only after building
+        # of required projects.
+        check_all_options_definition
+
         run_generators
         if !MxxRu::Cpp::Mode.instance.is_no_depends_analyzer
           run_depends_analyzer
@@ -1033,6 +1033,10 @@ module MxxRu
         clean_required_prjs
         MxxRu::Cpp::Mode.instance.after_subprj_processing
 
+        # Since v.1.6.11 options are set only after processing
+        # of required projects.
+        check_all_options_definition
+
         clean_generators
         clean_objs
         clean_resources

data/lib/mxx_ru/cpp/toolset.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,
@@ -1034,6 +1034,22 @@ module  MxxRu
       # Get the C++ standard version
       attr_reader :cpp_std
 
+      # Make toolset identification string.
+      #
+      # This string can be used for creation of toolset-specific
+      # file or directory names and so on.
+      #
+      # Since v.1.6.11
+      def make_identification_string
+        if @id_string.nil?
+          raw_id = make_toolset_id_string
+          # Normalize ID alphabet.
+          @id_string = raw_id.gsub( /[^A-Za-z0-9_]/, '_' )
+        end
+
+        @id_string
+      end
+
     protected
       # Creating object file names.
       # Returns array of ObjInfo objects.
@@ -1282,6 +1298,14 @@ module  MxxRu
         @cpp_std = version if @cpp_std < version
       end
 
+      # Real implementation of make_identification_string.
+      #
+      # Must be reimplemented the proper way in derived classes.
+      #
+      # Since v.1.6.11
+      def make_toolset_id_string
+        "#{name}_generic"
+      end
     end # class Toolset
 
     # Current toolset.

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

@@ -156,6 +156,23 @@ module  MxxRu
           end
         end
         
+      private
+        # Create toolset identification string.
+        def make_toolset_id_string
+          result = IO.popen( "clang -v 2>&1", :err => [:child, :out] ) do |io|
+            target = 'generic'
+            version = 'unknown'
+            io.each_line do |line|
+              if /^Target:\s*(?<trgt>\S+)/ =~ line
+                target = trgt
+              elsif /clang version (?<v>\S+)/ =~ line
+                version = v
+              end
+            end
+            version + '--' + target
+          end
+          "clang_#{result}"
+        end
       end # class ClangFamily
 
     end # module Toolsets

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

@@ -316,6 +316,23 @@ module  MxxRu
         def port_specific_lib_name_checker(library_name)
           library_name
         end
+
+        # Create toolset identification string.
+        def make_toolset_id_string
+          result = IO.popen( "gcc -v 2>&1", :err => [:child, :out] ) do |io|
+            target = 'generic'
+            version = 'unknown'
+            io.each_line do |line|
+              if /^Target:\s*(?<trgt>\S+)/ =~ line
+                target = trgt
+              elsif /^gcc version (?<v>\S+)/ =~ line
+                version = v
+              end
+            end
+            version + '--' + target
+          end
+          "gcc_#{result}"
+        end
       end # class GccFamily
 
       # For compatibility with previous versions.

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

@@ -62,6 +62,14 @@ module  MxxRu
           return tag( RC_NAME_TAG, "rc" )
         end
 
+        # Returns C compiler name.
+        # For Visual C++ the only one compiler is used.
+        def c_compiler_name; compiler_name end
+
+        # Returns C++ compiler name.
+        # For Visual C++ the only one compiler is used.
+        def cpp_compiler_name; compiler_name; end
+
         # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
         def setup_mandatory_options( target )
 
@@ -436,6 +444,22 @@ module  MxxRu
           }
         end
 
+        # Create toolset identification string.
+        def make_toolset_id_string
+          result = IO.popen( 'cl /?', :err => [:child, :out] ) do |io|
+            target = 'generic'
+            version = 'unknown'
+            io.each_line do |line|
+              if /Optimizing Compiler Version (?<v>\S+) for (?<trgt>\S+)/ =~ line
+                target = trgt
+                version = v
+                break
+              end
+            end
+            version + '_' + target
+          end
+          "vc#{tag('ver_hi','x')}_#{tag('ver_lo','x')}_#{result}"
+        end
       end # class VcFamily
 
       # For compatibility with previous versions.

data/lib/mxx_ru/externals.rb

@@ -1,3 +1,29 @@
+#--
+# 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 'rake'
 require 'rake/tasklib'
 
@@ -8,6 +34,8 @@ require 'digest'
 
 require 'json'
 
+require 'mxx_ru/helpers'
+
 module MxxRu
 
 module Externals
@@ -54,7 +82,7 @@ class Registry
         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} previous rules differ with current"
           puts "[Note] #{name} WILL BE REGET"
           obj.define_rules :old_rules
         end
@@ -69,20 +97,6 @@ end
 
 module Impl
 
-module Utils
-  # Return nil if tool not found.
-  # Return version if tool is found.
-  def Utils.external_tool_version_probe(cmd_line, version_re)
-    ver = nil
-    IO.popen(cmd_line, :err => [:child, :out]).grep(version_re) do |s|
-      ver = version_re.match(s)[1]
-    end
-    ver
-  rescue
-    nil
-  end
-end # module Utils
-
 module OptionsHolder
   def option(*values)
     make_options.push(*values)
@@ -110,7 +124,7 @@ class CurlDownloder
   include OptionsHolder
 
   def CurlDownloder.check_presence
-    Utils.external_tool_version_probe('curl --version', /^curl\s(\S+)\s/)
+    MxxRu::Helpers.external_tool_version_probe('curl --version', /^curl\s(\S+)\s/)
   end
 
   def CurlDownloder.downloader_id
@@ -130,7 +144,7 @@ class WgetDownloder
   include OptionsHolder
 
   def WgetDownloder.check_presence
-    Utils.external_tool_version_probe('wget --version', /^GNU Wget\s(\S+)\s/)
+    MxxRu::Helpers.external_tool_version_probe('wget --version', /^GNU Wget\s(\S+)\s/)
   end
 
   def WgetDownloder.downloader_id

data/lib/mxx_ru/generators/ext-cmake-prj/g.rb

@@ -0,0 +1,181 @@
+#--
+# 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.
+#++
+
+# Since v.1.6.11
+#
+# Implementation of project's stabs generation for external cmake projects.
+
+require 'erb'
+require 'optparse'
+
+require 'mxx_ru/generators/impl/std_receiver'
+
+module MxxRu
+
+module Generators
+
+module ExtCMakeProject
+
+# Class for storing command-line arguments as options.
+#
+# Usage:
+#   options = Options.parse( args, banner )
+#
+class Options
+  # Name of subfolder with CMakeLists.txt file
+  attr_accessor :where
+  # Name of output file (-o, --output-file). nil if missing.
+  attr_accessor :output_file
+
+  # Parsing command-line arguments and returning Options instance.
+  #
+  # Calls exit(1) if --help present in _args_.
+  #
+  def Options.parse( args, banner )
+    parser = OptionParser.new
+
+    result = Options.new
+
+    parser.banner = banner
+
+    parser.on( '-w', '--where SUBFOLDER', 'Name of subfolder with CMakeLists.txt' ) do |p|
+      result.where = p
+    end
+    parser.on( '-o', '--output-file FILE', 'Output file name' ) do |p|
+      result.output_file = p
+    end
+
+    parser.on_tail( '-h', '--help', 'Show this message' ) do
+      puts parser
+      exit(1)
+    end
+
+    parser.parse!(args)
+
+    result
+  end
+end # class Options
+
+# Class to be used in ERb template generation.
+#
+# Usage:
+#   template_params = TemplateParams.new( target_type, options )
+#   template = ERb.new( IO.read( some_template_file ) )
+#   result = template.generate( template.get_binding )
+#
+class TemplateParams
+  # For a case when project_path is undetectable.
+  UNKNOWN_CMAKELISTS_LOCATION = 'subfolder with CMakeLists.txt'
+  # For a case when output_file is undetectable.
+  DEFAULT_PROJECT_NAME = 'prj.rb'
+
+  attr_reader :where
+  attr_reader :project
+
+  # Param target_type must be present in @@setup_target_functions.
+  def initialize( options )
+    @where = try_detect_where( options )
+    @project = try_detect_project( options )
+  end
+
+  # Returns binding to use in ERb generation.
+  def get_binding
+    binding
+  end
+
+private
+  def try_detect_where( options )
+    options.where ? options.where : UNKNOWN_CMAKELISTS_LOCATION
+  end
+
+  def try_detect_project( options )
+    options.output_file ?
+        File.basename( options.output_file ) :
+        DEFAULT_PROJECT_NAME
+  end
+
+end # class TemplateParams
+
+# Main class for code generation of binary unit test projects.
+#
+# Usage:
+#   receiver = StdReceiver.new
+#   generator = Generator.new( args, receiver )
+#   generator.run
+#
+class Generator
+  def initialize( args, receiver )
+    @args = args
+    @receiver = receiver
+  end
+
+  def run
+    options = Options.parse( @args,
+        "Stubs for externals cmake projects generator\n\n" +
+        "Usage:\n" +
+        "mxxrugen [<mxxrugen-options>] ext-cmake-prj [<options>]\n\n" )
+    result = do_generation( options )
+    @receiver.receive( result, options.output_file )
+  end
+
+private
+  # Performs main generation actions.
+  #
+  # Returns generation result as String.
+  def do_generation( options )
+    template = IO.read( File.join( File.dirname( __FILE__ ), 'template.erb' ) )
+    generator = ERB.new( template )
+
+    params = TemplateParams.new( options )
+    generator.result( params.get_binding ).gsub( /\n\n\n+/, "\n\n" )
+  end
+end
+
+# Helper method for generation.
+#
+# Usage:
+#   # For using StdReceiver.
+#   generate_for( ARGV )
+#
+#   # For using custom Receiver.
+#   generate_for( ARGV, CustomReceiver.new )
+#
+def ExtCMakeProject.generate_for( args, receiver = nil )
+  generator = Generator.new( args,
+      receiver ? receiver : MxxRu::Generators::Impl::StdReceiver.new )
+  generator.run
+end
+
+end # module ExtCMakeProject
+
+end # module Generators
+
+end # module MxxRu
+
+MxxRu::Generators::ExtCMakeProject::generate_for( ARGV )
+