Mxx_ru 1.3.2 → 1.4.0

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

@@ -44,27 +44,27 @@ module  MxxRu
 
         # Returns compiler name.
         def compiler_name
-          return "bcc32"
+          tag( COMPILER_NAME_TAG, "bcc32" )
         end
 
         # Returns linker name.
         def linker_name
-          return "ilink32"
+          tag( LINKER_NAME_TAG, "ilink32" )
         end
 
         # Returns librarian name.
         def librarian_name
-          return "tlib"
+          tag( LIBRARIAN_NAME_TAG, "tlib" )
         end
 
         # Returns resource compiler name.
         def rc_name
-          return "brc32"
+          tag( RC_NAME_TAG, "brc32" )
         end
 
         # Returns the name of import library creator.
         def import_librarian_name
-          return "implib"
+          tag( IMPORT_LIBRARIAN_NAME_TAG, "implib" )
         end
 
         # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.

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

@@ -45,22 +45,22 @@ module  MxxRu
 
         # Returns C compiler name
         def c_compiler_name
-          return "c89"
+          tag( [ C_COMPILER_NAME_TAG, COMPILER_NAME_TAG ], "c89" )
         end
 
         # Returns C++ compiler name.
         def cpp_compiler_name
-          return "c89"
+          tag( [ CPP_COMPILER_NAME_TAG, COMPILER_NAME_TAG ], "c89" )
         end
 
         # Returns linker name.
         def linker_name
-          return "c89"
+          tag( LINKER_NAME_TAG, "c89" )
         end
 
         # Returns librarian name.
         def librarian_name
-          return "ar"
+          tag( LIBRARIAN_NAME_TAG, "ar" )
         end
 
         # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
@@ -230,7 +230,7 @@ module  MxxRu
 
           # And all required libraries.
           a_target.mxx_required_prjs.each { |d|
-            if d.kind_of?( MxxRu::BinaryTarget )
+            if Toolset::has_linkable_dependecies?( d )
               result.add_libs( d.mxx_required_libs )
               result.add_lib_paths( d.mxx_required_lib_paths )
             end

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

@@ -51,22 +51,22 @@ module  MxxRu
 
         # Returns C compiler name.
         def c_compiler_name
-          return "gcc"
+          tag( [ C_COMPILER_NAME_TAG, COMPILER_NAME_TAG ], "gcc" )
         end
 
         # Returns C++ compiler name.
         def cpp_compiler_name
-          return "g++"
+          tag( [ CPP_COMPILER_NAME_TAG, COMPILER_NAME_TAG ], "g++" )
         end
 
         # Returns linker name.
         def linker_name
-          return "g++"
+          tag( LINKER_NAME_TAG, "g++" )
         end
 
         # Returns librarian name.
         def librarian_name
-          return "ar"
+          tag( LIBRARIAN_NAME_TAG, "ar" )
         end
 
         # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
@@ -234,7 +234,7 @@ module  MxxRu
 
           # And all required libraries.
           a_target.mxx_required_prjs.each { |d|
-            if d.kind_of?( MxxRu::BinaryTarget )
+            if Toolset::has_linkable_dependecies?( d )
               result.add_libs( d.mxx_required_libs )
               result.add_lib_paths( d.mxx_required_lib_paths )
             end

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

@@ -47,7 +47,7 @@ module  MxxRu
 
         # Returns resource compiler name.
         def rc_name
-          return "windres"
+          tag( RC_NAME_TAG, "windres" )
         end
 
         # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
@@ -59,7 +59,7 @@ module  MxxRu
           super( target )
 
           if SCREEN_WINDOW == target.mxx_screen_mode
-            target.compiler_option( "-mwindows" )
+            target.linker_option( "-mwindows" )
           else
             target.linker_option( "-mconsole" )
           end

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

@@ -65,6 +65,11 @@ module  MxxRu
       # [_ver_lo_] low version number. Value: 0.
       class Vc8 < MxxRu::Cpp::Toolsets::VcFamily
 
+        # Tag name for a custom manifest tool name.
+        #
+        # Since v.1.4.0
+        MT_NAME_TAG = 'mt_name'
+
         # Actual manifest description.
         class ActualManifest
           attr_reader :manifest_file
@@ -397,7 +402,7 @@ module  MxxRu
 
         # Name of manifest tool executable
         def mt_name
-          "mt"
+          tag( MT_NAME_TAG, "mt" )
         end
 
         # Checking manifest params validity.

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

@@ -44,22 +44,22 @@ module  MxxRu
 
         # Returns compiler name.
         def compiler_name
-          return "cl"
+          return tag( COMPILER_NAME_TAG, "cl" )
         end
 
         # Returns linker name.
         def linker_name
-          return "link"
+          return tag( LINKER_NAME_TAG, "link" )
         end
 
         # Returns librarian name.
         def librarian_name
-          return "lib"
+          return tag( LIBRARIAN_NAME_TAG, "lib" )
         end
 
         # Returns resource compiler name.
         def rc_name
-          return "rc"
+          return tag( RC_NAME_TAG, "rc" )
         end
 
         # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.

data/lib/mxx_ru/generators/bin-unittest/g.rb

@@ -0,0 +1,200 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006, 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.4.0
+#
+# Implementation of project's stabs generation for binary unit test projects.
+
+require 'erb'
+require 'optparse'
+
+require 'mxx_ru/generators/impl/std_receiver'
+
+module MxxRu
+
+module Generators
+
+module BinaryUnittest
+
+# Class for storing command-line arguments as options.
+#
+# Usage:
+#   options = Options.parse( args, banner )
+#
+class Options
+  # Project path (name of project directory in cmd-line). nil if missing.
+  attr_accessor :project_path
+  # 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( '-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.order!( args ) do |noarg|
+      # Any non-options is considered as project path name.
+      result.project_path = noarg
+    end
+
+    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.
+  YOUR_PROJECT_PATH = 'your project path'
+  # For a case when output_file is undetectable.
+  DEFAULT_UNITTEST_PROJECT = 'prj.ut.rb'
+
+  # Path name.
+  attr_reader :path_name
+  # Name of unit test project file.
+  attr_reader :unittest_project
+
+  # Param target_type must be present in @@setup_target_functions.
+  def initialize( options )
+    @path_name = try_detect_path_name( options )
+    @unittest_project = try_detect_unittest_project( options )
+  end
+
+  # Returns binding to use in ERb generation.
+  def get_binding
+    binding
+  end
+
+private
+  # Try to setup name of path_name from options.
+  #
+  # If project_path specified target name is gotten from it.
+  # Otherwise if --output-file specified then name is constructed from it.
+  # Otherwise value 'your project path' is used.
+  #
+  def try_detect_path_name( options )
+    if options.project_path
+        options.project_path
+      elsif options.output_file
+        File.dirname( options.output_file )
+      else
+        YOUR_PROJECT_PATH
+      end
+  end
+
+  # Try to setup name of unit test project file from options.
+  #
+  # If --output-file specified then its value used.
+  # Otherwise value 'prj.ut.rb' is used.
+  #
+  def try_detect_unittest_project( options )
+    options.output_file ?
+        File.basename( options.output_file ) :
+        DEFAULT_UNITTEST_PROJECT
+  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 binary unit test projects generator\n\n" +
+        "Usage:\n" +
+        "mxxrugen [<mxxrugen-options>] bin-unittest [<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 BinaryUnittest.generate_for( args, receiver = nil )
+  generator = Generator.new( args,
+      receiver ? receiver : MxxRu::Generators::Impl::StdReceiver.new )
+  generator.run
+end
+
+end # module BinaryUnittest
+
+end # module Generators
+
+end # module MxxRu
+
+MxxRu::Generators::BinaryUnittest::generate_for( ARGV )
+

data/lib/mxx_ru/generators/bin-unittest/template.erb

@@ -0,0 +1,16 @@
+require 'rubygems'
+
+gem 'Mxx_ru', '>= 1.3.0'
+
+require 'mxx_ru/binary_unittest'
+
+# Set path to your unit test projet here.
+path = '<%= path_name %>'
+
+MxxRu::setup_target(
+  MxxRu::BinaryUnittestTarget.new(
+    # Set name of your unit test project here.
+    "#{path}/<%= unittest_project %>",
+    # Set name of your project to be tested here.
+    "#{path}/prj.rb" ) )
+

data/lib/mxx_ru/generators/cpp-composite/g.rb

@@ -0,0 +1,37 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006, 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.4.0
+#
+# Generator for MxxRu::Cpp::composite_target stub.
+
+require 'mxx_ru/generators/impl/cpp/generation'
+
+MODULE = MxxRu::Generators::Impl::Cpp
+MODULE::generate_for( MODULE::COMPOSITE, ARGV )
+

data/lib/mxx_ru/generators/cpp-dll/g.rb

@@ -0,0 +1,37 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006, 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.4.0
+#
+# Generator for MxxRu::Cpp::dll_target stub.
+
+require 'mxx_ru/generators/impl/cpp/generation'
+
+MODULE = MxxRu::Generators::Impl::Cpp
+MODULE::generate_for( MODULE::DLL, ARGV )
+