Mxx_ru 1.1.0 → 1.2.0

data/NEWS

@@ -1,5 +1,22 @@
 Changes in Mxx_ru
 
+1.2.0 version (2006.04.15)
+
+  Added command-line arguments --mxx-brief-show, --mxx-brief-hide and
+  method Mxx_ru.enable_show_brief for controlling brief description of
+  executed commands.
+
+  Argument prj_alias for composite_target, exe_target, lib_target and
+  dll_target now optional. If it omitted than Mxx_ru try detect prj_alias form
+  Kernel#caller result (assume what call to *_target method was made directly
+  in project file).
+
+  Added methods Abstract_target#required_prjs, Cpp::Target#c_sources,
+  Cpp::Target#cpp_sources those accept Enumerable (plural form for
+  corresponding singular analogs). New methods can accept result of Dir.glob().
+
+  Some fixes for MinGW C++, Borland C++ compilers.
+
 1.1.0 version (2006.02..2006.04)
 
   Documentation and commentaries are translated to english.

data/Rakefile

@@ -4,18 +4,18 @@ Gem::manage_gems
 require 'rake/gempackagetask'
 
 PKG_NAME = 
-RKG_VERSION = '1.1.0'
+RKG_VERSION = '1.2.0'
 
 spec = Gem::Specification.new do |s|
   s.name = "Mxx_ru"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
   s.author = "The Mxx_ru Project"
   s.email = "eao197@yahoo.com"
   s.homepage = "http://www.rubyforge.com/projects/mxx-ru"
   s.platform = Gem::Platform::RUBY
   s.summary = "Mxx_ru (Make++ on Ruby) is a cross-platform build tool"
   s.files = FileList[ "{bin,tests,lib,docs,examples}/**/*" ].
-      exclude( "rdoc" ).to_a
+      exclude( "rdoc" ).to_a + [ "THANKS" ]
   s.require_path = "lib"
 # s.autorequire = "rucodegen"
 # s.test_file = "tests/ts_rucodegen.rb"

data/THANKS

@@ -0,0 +1 @@
+Konstantine Nazarov (rut at user dot sourceforge dot net)

data/lib/mxx_ru/abstract_target.rb

@@ -179,6 +179,25 @@ module Mxx_ru
     # Vector of source code generators.
     attr_reader :mxx_generators
 
+    # Metacode for generating 'plural' version of singular method.
+    # Plural version accept Enumerable-type argument and call
+    # singular version for each member of Enumerable argument.
+    #
+    # For example:
+    #  define_plural_form_method :required_prj
+    #  define_plural_form_method :cpp_source
+    # produces methods
+    #   required_prjs( items )
+    #   cpp_sources( items )
+    #
+    def Abstract_target.define_plural_form_method( singular_method )
+      class_eval %Q{
+        def #{singular_method}s(a)
+          a.each { |e| #{singular_method}( e ) }
+        end
+      }
+    end
+
     def initialize( a_prj_alias )
       @mxx_full_targets_names = Array.new
       @mxx_prj_alias = a_prj_alias
@@ -214,6 +233,13 @@ module Mxx_ru
       return target
     end
 
+    # Plural form of required_prj.
+    #
+    # For example:
+    #  required_prjs [ 'module1/prj.rb', 'module2/prj.rb' ]
+    #  required_prjs Dir.glob( 'modules/**/prj.rb' )
+    define_plural_form_method :required_prj
+
     # Add one more generator to the target.
     # Reference to the target is returned.
     def generator( a_generator )
@@ -236,12 +262,16 @@ module Mxx_ru
     #
     # [a_cmd_lines] Array of String
     # [a_to_destroy_on_fail] Files required to be cleaned up if any of given command fail.
-    def Abstract_target.run( a_cmd_lines, a_to_destroy_on_fail )
+    # [brief_desc] Brief description of command (will be shown if --mxx-brief-desc
+    #              specified in command line)
+    def Abstract_target.run( a_cmd_lines, a_to_destroy_on_fail, brief_desc = nil )
+
+      puts "#{brief_desc.capitalize} ..." \
+          if Mxx_ru::Util::Mode.instance.is_brief_desc and nil != brief_desc
 
       a_cmd_lines.each { |c|
-          if Mxx_ru::Util::Mode.instance.is_show_cmd
-            puts "<<< #{c} >>>"
-          end
+          puts "<<< #{c} >>>" \
+              if Mxx_ru::Util::Mode.instance.is_show_cmd
 
           # Do not actually execute in dry-run mode.
           if !Mxx_ru::Util::Mode.instance.is_dry_run

data/lib/mxx_ru/cpp/composite.rb

@@ -96,7 +96,8 @@ module  Mxx_ru
     #     required_prj 'some_project.rb'
     #     required_prj 'some_another_project.rb'
     #   }
-    def Cpp.composite_target( prj_alias, &block )
+    def Cpp.composite_target( prj_alias = nil, &block )
+      prj_alias = Mxx_ru::Util::prj_alias_form_caller( caller ) unless prj_alias
       Mxx_ru::setup_target Composite_target.new( prj_alias, &block )
     end
 

data/lib/mxx_ru/cpp/qt.rb

@@ -173,14 +173,16 @@ module Cpp
           header_file, [ ui ] ).state
           Mxx_ru::Abstract_target::run(
             [ "#{@uic_name} -o #{header_file} #{ui}" ],
-            [ header_file ] )
+            [ header_file ],
+            "building header file #{header_file}" )
         end
         if Target_state::EXISTS != Target_state.detect(
           cpp_file, [ ui, header_file ] ).state
           Mxx_ru::Abstract_target::run(
             [ "#{@uic_name} -i #{header_file} " +
               "-o #{cpp_file} #{ui}" ],
-            [ cpp_file ] )
+            [ cpp_file ],
+            "building source file #{cpp_file}" )
         end
       }
     end
@@ -225,7 +227,8 @@ module Cpp
           Mxx_ru::Abstract_target::run(
             [ "#{moc_name} -o #{moc_full} " + 
               "#{header_full}" ],
-            [ moc_full ] )
+            [ moc_full ],
+            "building moc file #{moc_full}" )
         end
 
         add_cpp_source( a_target, moc )
@@ -282,7 +285,8 @@ module Cpp
           Mxx_ru::Abstract_target::run(
             [ "#{moc_name} -o #{moc_full} " + 
               "#{cpp_full}" ],
-            [ moc_full ] )
+            [ moc_full ],
+            "building moc file #{moc_full}" )
         end
       }
     end

data/lib/mxx_ru/cpp/rucodegen.rb

@@ -88,14 +88,20 @@ class RuCodeGen < Abstract_generator
   # Perform code generation.
   def build( target )
     @scripts.each do |s|
-      Abstract_target.run( make_build_cmd( s, :build ), [] )
+      Abstract_target.run(
+          make_build_cmd( s, :build ),
+          [],
+          "running code generation script #{s} (build mode)" )
     end
   end
 
   # Perform cleanup of generated files.
   def clean( target )
     @scripts.each do |s|
-      Abstract_target.run( make_build_cmd( s, :clean ), [] )
+      Abstract_target.run(
+          make_build_cmd( s, :clean ),
+          [],
+          "running code generation script #{s} (clean mode)" )
     end
   end
 

data/lib/mxx_ru/cpp/target.rb

@@ -788,6 +788,18 @@ module Mxx_ru
 
       # Add one C-file to the target.
       #
+      # Note: if a_file_name contains prefix equal to current sources_root
+      # than mxx_ru does not add sources_root to name of file. For example:
+      #   Mxx_ru::Cpp::exe_target( 'some/module/prj.rb' ) {
+      #     ...
+      #     c_source 'f1.c' # become 'some/module/f1.c'
+      #     c_source 'some/module/impl/f2.c' # remains 'some/module/impl/f2.c
+      # This approach will be useful with Dir.glob:
+      #   Mxx_ru::Cpp::exe_target( 'some/module/prj.rb' ) {
+      #     ...
+      #     c_sources Dir.glob( 'some/module/**/*.c' )
+      #   }
+      #
       # [_a_file_name_] The name of a file added.
       # [_a_options_] Optional list of a compiler options for that file.
       #               When command line would be created, this options would
@@ -799,6 +811,18 @@ module Mxx_ru
 
       # Add one C++-file to the target.
       #
+      # Note: if a_file_name contains prefix equal to current sources_root
+      # than mxx_ru does not add sources_root to name of file. For example:
+      #   Mxx_ru::Cpp::exe_target( 'some/module/prj.rb' ) {
+      #     ...
+      #     cpp_source 'f1.cpp' # become 'some/module/f1.cpp'
+      #     cpp_source 'some/module/impl/f2.cpp' # remains 'some/module/impl/f2.cpp
+      # This approach will be useful with Dir.glob:
+      #   Mxx_ru::Cpp::exe_target( 'some/module/prj.rb' ) {
+      #     ...
+      #     cpp_sources Dir.glob( 'some/module/**/*.cpp' )
+      #   }
+      #
       # [_a_file_name_] The name of a file added.
       # [_a_options_] Optional list of a compiler options for that file.
       #               When command line would be created, this options would
@@ -808,6 +832,11 @@ module Mxx_ru
           create_full_src_file_name( a_file_name ), a_options ) )
       end
 
+      # Plural form for c_source and cpp_source. Does not allow specify options
+      # for source files.
+      define_plural_form_method :c_source
+      define_plural_form_method :cpp_source
+
       # Set mswin resource file name.
       #
       # [_a_rc_file_] The name of rc-file.
@@ -936,11 +965,18 @@ module Mxx_ru
 
       # Creation of a complete name of a source file
       # taking the value of mxx_sources_root into account
+      #
+      # If a_file_name starts with current value of mxx_sources_root
+      # than a_file_name remains unchanged.
       def create_full_src_file_name( a_file_name )
         if "" == mxx_sources_root
           return a_file_name
         else
-          return File.join( [ mxx_sources_root, a_file_name ] )
+          if a_file_name[ 0..mxx_sources_root.size ] == mxx_sources_root + '/'
+            return a_file_name
+          else
+            return File.join( [ mxx_sources_root, a_file_name ] )
+          end
         end
       end
 
@@ -1356,7 +1392,8 @@ module Mxx_ru
     def Cpp.generate_simple_target_method( target_type )
       target_class_name = target_type.to_s.capitalize
       class_eval %Q{
-        def Cpp.#{target_type}( prj_alias, &block )
+        def Cpp.#{target_type}( prj_alias = nil, &block )
+          prj_alias = Mxx_ru::Util::prj_alias_form_caller( caller ) unless prj_alias
           Mxx_ru::setup_target #{target_class_name}.new( prj_alias, &block )
         end
       }

data/lib/mxx_ru/cpp/toolset.rb

@@ -353,7 +353,10 @@ module  Mxx_ru
             full_name, target.mxx_mswin_rc_file.name,
             target.mxx_all_mswin_rc_options, target )
 
-          Mxx_ru::Abstract_target::run( cmd_lines, [ full_name ] )
+          Mxx_ru::Abstract_target::run(
+              cmd_lines,
+              [ full_name ],
+              "compilling #{full_name}" )
 
           state = Mxx_ru::Target_state.new( Mxx_ru::Target_state::REBUILT )
         end
@@ -406,7 +409,10 @@ module  Mxx_ru
             lib_file, target.mxx_obj_files,
             target.mxx_all_librarian_options, target )
 
-          Mxx_ru::Abstract_target::run( cmd_lines, [ lib_file ] )
+          Mxx_ru::Abstract_target::run(
+              cmd_lines,
+              [ lib_file ],
+              "building #{lib_file}" )
 
           lib_state = Mxx_ru::Target_state.new( Mxx_ru::Target_state::REBUILT )
         end
@@ -486,7 +492,10 @@ module  Mxx_ru
           cmd_lines = make_dll_command_lines(
             dll_file, dll_info, link_lists, target )
 
-          Mxx_ru::Abstract_target::run( cmd_lines, [ dll_file ] )
+          Mxx_ru::Abstract_target::run(
+              cmd_lines,
+              [ dll_file ],
+              "building #{dll_file}" )
 
           dll_state = Mxx_ru::Target_state.new( Mxx_ru::Target_state::REBUILT )
         end
@@ -555,7 +564,10 @@ module  Mxx_ru
           cmd_lines = make_exe_command_lines(
             exe_file, exe_info, link_lists, target )
 
-          Mxx_ru::Abstract_target::run( cmd_lines, [ exe_file ] )
+          Mxx_ru::Abstract_target::run(
+              cmd_lines,
+              [ exe_file ],
+              "building #{exe_file}" )
 
           exe_state = Mxx_ru::Target_state.new( Mxx_ru::Target_state::REBUILT )
         end
@@ -893,7 +905,10 @@ module  Mxx_ru
               target )
 
             # Executing.
-            Mxx_ru::Abstract_target::run( cmd_lines, [ o.name ] )
+            Mxx_ru::Abstract_target::run(
+                cmd_lines,
+                [ o.name ],
+                "compiling #{o.source.name}" )
           }
 
       end

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

@@ -428,7 +428,9 @@ module  Mxx_ru
 
           if 0 != a_linker_lists.lib_paths.size
             result << "/L;"
-            a_linker_lists.lib_paths.each { |p| result << "#{p};" }
+            unix2win_mass( a_linker_lists.lib_paths ).each { |p|
+              result << "#{p};"
+            }
             result << " "
           end
 

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

@@ -206,7 +206,9 @@ module  Mxx_ru
           a_linker_lists.lib_paths.each { |p| result << "-L#{p} " }
 
           result << "#{a_linker_lists.objs.join(' ')} "
-          a_linker_lists.libs.each { |l| result << "-l#{l} " }
+          a_linker_lists.libs.each { |l|
+              result << "-l#{port_specific_lib_name_checker(l)} "
+          }
 
           result << port_specific_dll_link_options(
             a_dll_name, a_dll_info, a_linker_lists, a_target )
@@ -258,7 +260,9 @@ module  Mxx_ru
           a_linker_lists.lib_paths.each { |p| result << "-L#{p} " }
 
           result << "#{a_linker_lists.objs.join(' ')} "
-          a_linker_lists.libs.each { |l| result << "-l#{l} " }
+          a_linker_lists.libs.each { |l|
+              result << "-l#{port_specific_lib_name_checker(l)} "
+          }
 
           result << port_specific_exe_link_options(
             a_exe_name, a_exe_info, a_linker_lists, a_target )
@@ -286,6 +290,11 @@ module  Mxx_ru
           return ""
         end
 
+        # Return correct name of library to be given for linker.
+        def port_specific_lib_name_checker(library_name)
+          library_name
+        end
+
       end # class Gcc_family
 
       # Toolset implemetation for GCC compiler for Win32.
@@ -373,6 +382,16 @@ module  Mxx_ru
           return ""
         end
 
+        # Checks library name for suffix '.lib' and return name without
+        # that suffix.
+        def port_specific_lib_name_checker(library_name)
+          if /\.lib$/i =~ library_name
+            Mxx_ru::Util::remove_file_ext(library_name)            
+          else
+            library_name
+          end
+        end
+
       end # class Gcc_mswin_family
 
     end # module Toolsets

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

@@ -64,6 +64,10 @@ module  Mxx_ru
             target.linker_option( "-mconsole" )
           end
 
+          if THREADING_MULTI == target.mxx_threading_mode
+            target.compiler_option( "-mthreads" )
+          end
+
           # ��� defines � ��� include_path ������ ���������������� � ��
           # ���������� ��������.
           target.mxx_all_defines.each { |d|

data/lib/mxx_ru/makestyle_generator.rb

@@ -100,7 +100,10 @@ class Makestyle_generator < Abstract_generator
 
     if need_build
       # It's required to run all commands to build target.
-      Abstract_target.run( @build_cmds, [] )
+      Abstract_target.run(
+          @build_cmds,
+          [],
+          "building #{@target_files.join(', ')}" )
     end
   end
 

data/lib/mxx_ru/util.rb

@@ -41,10 +41,15 @@ module Mxx_ru
     MXXARG_KEEP_TMPS = "--mxx-keep-tmps"
     MXXARG_SHOW_TMPS = "--mxx-show-tmps"
     MXXARG_DRY_RUN = "--mxx-dry-run"
+    MXXARG_BRIEF_DESC = '--mxx-brief-show'
+    MXXARG_BRIEF_DESC_DISABLED = '--mxx-brief-hide'
 
     # OS name, script is run on.
     @@host_os = nil
 
+    # Regular expression to parse entries in Kernel#caller result.
+    CALLER_ENTRY_REGEX = /^(.+):\d+(:in\s.+){0,1}$/
+
     # Class, which detects Mxx_ru current mode.
     class Mode
       include Singleton
@@ -53,6 +58,7 @@ module Mxx_ru
       attr_reader :is_show_cmd
       attr_reader :is_keep_tmps
       attr_reader :is_show_tmps
+      attr_reader :is_brief_desc
 
       # Constructor checks for special arguments in command line.
       def initialize
@@ -61,6 +67,11 @@ module Mxx_ru
         @is_keep_tmps = ARGV.include?( MXXARG_KEEP_TMPS )
         @is_show_tmps = ARGV.include?( MXXARG_SHOW_TMPS )
         @is_dry_run = ARGV.include?( MXXARG_DRY_RUN )
+        @is_brief_desc = ARGV.include?( MXXARG_BRIEF_DESC )
+        @is_brief_desc_disabled = ARGV.include?( MXXARG_BRIEF_DESC_DISABLED )
+
+        @is_brief_desc = false if @is_brief_desc_disabled
+
         @is_manual_dry_run = false
       end
 
@@ -73,11 +84,18 @@ module Mxx_ru
 
       # On/Off manual dry-run mode.
       # In some cases it's efficient to turn it on for some time.
-      # For example, it's used to handle subprojects with --mxx-cpp-1 option set.
+      # For example, it's used to handle subprojects with --mxx-cpp-1 option
+      # set.
       def manual_dry_run( a_is_manual_dry_run )
         @is_manual_dry_run = a_is_manual_dry_run
       end
 
+      # Try to manually enable 'show-brief' mode. Attempt ignored if
+      # '--mxx-show-brief-disabled' was specified.
+      def try_enable_show_brief
+        @is_brief_desc = true unless @is_brief_desc_disabled
+      end
+
     end
 
     # Returns file name without last extension.
@@ -177,10 +195,10 @@ module Mxx_ru
 
     end # class Tmp_files
 
-    # Auxiliary function for correct execution of build method of target object.
-    # Before execution Tmp_files.push is executed, and after execution of build method
-    # Tmp_files.pop is called. This way we are removing temporary files
-    # created during a compilation of given target.
+    # Auxiliary function for correct execution of build method of target
+    # object.  Before execution Tmp_files.push is executed, and after execution
+    # of build method Tmp_files.pop is called. This way we are removing
+    # temporary files created during a compilation of given target.
     def Util.build_call_wrapper( a_target )
       begin
         Tmp_files.instance.push
@@ -194,8 +212,8 @@ module Mxx_ru
     # Create folder if it isn't exist.
     #
     # All chain of names is tracked. For example, if we trying to create
-    # output/release/lib folder, and only output is exists, then release/lib folders
-    # are created.
+    # output/release/lib folder, and only output is exists, then release/lib
+    # folders are created.
     def Util.create_dir( a_name )
       # Dividing the chain.
       chain = Array.new
@@ -219,7 +237,8 @@ module Mxx_ru
     # If dry-run mode wasn't set, checking for existance.
     # If it isn't exists, trying to create it.
     #
-    # In a dry-run mode Mxx_ru always assumes folder is exists, even if it isn't.
+    # In a dry-run mode Mxx_ru always assumes folder is exists, even if it
+    # isn't.
     def Util.ensure_path_exists( a_path_name )
       if !Mxx_ru::Util::Mode.instance.is_dry_run
         if !FileTest.exists?( a_path_name )
@@ -252,7 +271,38 @@ module Mxx_ru
       return a_pathname
     end
 
+    # Extract file name from 'Kernel#caller' result for using this
+    # name as project alias.
+    def Util.prj_alias_form_caller( caller_result )
+      r = CALLER_ENTRY_REGEX.match( caller_result[ 0 ] )[ 1 ]
+      # Name can starts with './' ('./some/module/prj.rb'). That name
+      # must be transformed to 'some/module/prj.rb'.
+      if r[ 0..1 ] == './'
+        r[ 2...r.size ]
+      else
+        r
+      end
+    end
+
   end # module Util
 
+  # Manually enable 'show-brief' mode.
+  #
+  # Intended to use in project files:
+  #   Mxx_ru::Cpp::exe_target( 'some.prj' ) {
+  #     ...
+  #     Mxx_ru::enable_show_brief
+  #     ...
+  #   }
+  # 'show-brief' is global mode. Once enabled it cannot be disabled
+  # form inside another project file.
+  #
+  # Call to Mxx_ru::enable_show_brief ignored if '--mxx-show-brief-disabled'
+  # specified in command-line.
+  #
+  def Mxx_ru.enable_show_brief
+    Util::Mode.instance.try_enable_show_brief
+  end
+
 end # module Mxx_ru
 

data/tests/cpp/cpp_sources_glob/build.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::composite_target( Mxx_ru::BUILD_ROOT ) {
+  global_include_path '.'
+
+  required_prjs Dir.glob( '**/prj.rb' )
+}

data/tests/cpp/cpp_sources_glob/some/module/1/f1.cpp

@@ -0,0 +1,8 @@
+#include <iostream>
+
+#include "some/module/funcs.hpp"
+
+void f1()
+	{
+		std::cout << "f1()" << std::endl;
+	}

data/tests/cpp/cpp_sources_glob/some/module/2/f2.cpp

@@ -0,0 +1,8 @@
+#include <iostream>
+
+#include "some/module/funcs.hpp"
+
+void f2()
+	{
+		std::cout << "f2()" << std::endl;
+	}

data/tests/cpp/cpp_sources_glob/some/module/3/f3.cpp

@@ -0,0 +1,8 @@
+#include <iostream>
+
+#include "some/module/funcs.hpp"
+
+void f3()
+	{
+		std::cout << "f3()" << std::endl;
+	}

data/tests/cpp/cpp_sources_glob/some/module/4/f4.cpp

@@ -0,0 +1,8 @@
+#include <iostream>
+
+#include "some/module/funcs.hpp"
+
+void f4()
+	{
+		std::cout << "f4()" << std::endl;
+	}

data/tests/cpp/cpp_sources_glob/some/module/funcs.hpp

@@ -0,0 +1,9 @@
+#if !defined( SOME_MODULE_FUNCS_HPP )
+#define SOME_MODULE_FUNCS_HPP
+
+void f1();
+void f2();
+void f3();
+void f4();
+
+#endif

data/tests/cpp/cpp_sources_glob/some/module/main.cpp

@@ -0,0 +1,11 @@
+#include <iostream>
+
+#include "some/module/funcs.hpp"
+
+int main()
+	{
+		f1();
+		f2();
+		f3();
+		f4();
+	}

data/tests/cpp/cpp_sources_glob/some/module/prj.rb

@@ -0,0 +1,10 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::exe_target {
+
+  Mxx_ru::enable_show_brief
+
+  target( 'test' )
+
+  cpp_sources Dir.glob( 'some/module/**/*.cpp' )
+}

data/tests/cpp/rucodegen/prj.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 require 'mxx_ru/cpp/rucodegen'
 
-Mxx_ru::setup_target Mxx_ru::Cpp::Exe_target.new( "test/cpp/rucodegen/prj.rb" ) {
+Mxx_ru::setup_target Mxx_ru::Cpp::Exe_target.new( "tests/cpp/rucodegen/prj.rb" ) {
 	target "host_config"
 
 	rucodegen = generator Mxx_ru::Cpp::RuCodeGen.new( self )

data/tests/cpp/vc_cleanup/prj_dll_no_implib.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::dll_target( "prj_dll_no_implib.rb" ) {
+Mxx_ru::Cpp::dll_target {
   target( "dll_no_implib" )
 
   cpp_source( "dll_hi.cpp" )

data/tests/cpp/vc_cleanup/prj_dll_no_implib_simple_target_root.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::dll_target( "prj_dll_no_implib_simple_target_root.rb" ) {
+Mxx_ru::Cpp::dll_target {
   target_root( "simple_target_root" )
   target( "dll_no_implib_simple_target_root" )
 

data/tests/cpp/vc_cleanup/prj_dll_with_implib.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::dll_target( "prj_dll_with_implib.rb" ) {
+Mxx_ru::Cpp::dll_target {
   target( "dll_with_implib" )
 
   implib_path( "lib" )

data/tests/cpp/vc_cleanup/prj_dll_with_implib_simple_target_root.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::dll_target( "prj_dll_with_implib_simple_target_root.rb" ) {
+Mxx_ru::Cpp::dll_target {
 
   target_root( "simple_target_root" )
   target( "dll_with_implib_simple_target_root" )

data/tests/cpp/vc_cleanup/prj_exe_no_implib.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::exe_target( "prj_exe_no_implib.rb" ) {
+Mxx_ru::Cpp::exe_target {
   target( "exe_no_implib" )
 
   cpp_source( "exe_hi.cpp" )

data/tests/cpp/vc_cleanup/prj_exe_no_implib_simple_target_root.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::exe_target( "prj_exe_no_implib_simple_target_root.rb" ) {
+Mxx_ru::Cpp::exe_target {
   target_root( "simple_target_root" )
   target( "exe_no_implib_simple_target_root" )
 

data/tests/cpp/vc_cleanup/prj_lib.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::lib_target( "prj_lib.rb" ) {
+Mxx_ru::Cpp::lib_target {
   target( "lib/lib_hi.1.0.0" )
 
   cpp_source( "lib_hi.cpp" )

data/tests/cpp/vc_cleanup/prj_lib_with_simple_target_root.rb

@@ -2,7 +2,7 @@
 
 require 'mxx_ru/cpp'
 
-Mxx_ru::Cpp::lib_target( "prj_lib_with_simple_target_root.rb" ) {
+Mxx_ru::Cpp::lib_target {
   target_root( "simple_target_root" )
   target( "lib_hi" )
 

data/tests/mxx_ru/plural_form_methods/tc.rb

@@ -0,0 +1,72 @@
+require 'test/unit'
+
+require 'mxx_ru/cpp'
+
+class TC_PluralFormMethods < Test::Unit::TestCase
+  def test_required_prj
+    test_value = [ 'test_required_prj_sub1', 'test_required_prj_sub2' ]
+
+    test_value.each { |p| Mxx_ru::Cpp::composite_target( p ) {} }
+
+    t = Mxx_ru::Cpp::composite_target( 'test_required_prj' ) {
+        required_prjs test_value
+      }
+
+    assert_equal( test_value.size, t.mxx_required_prjs.size )
+    t.mxx_required_prjs.each { |p|
+      assert( test_value.member?( p.prj_alias ) )
+    }
+  end
+
+  def test_c_sources
+    test_files = [ 'hello.c', 'greeting.c' ]
+
+    t = Mxx_ru::setup_target(
+      Mxx_ru::Cpp::Exe_target.new( 'test_c_sources' ) {
+        target 'test_c_sources'
+
+        c_sources test_files
+      },
+      false )
+
+    defined_sources = t.mxx_c_files.inject( [] ) { |r, f| r << File.basename( f.name ) }
+
+    assert_equal( test_files, defined_sources )
+  end
+
+  def test_cpp_sources
+    test_files = [ 'hello.cpp', 'greeting.cpp' ]
+
+    path = 'some/test'
+    t = Mxx_ru::setup_target(
+      Mxx_ru::Cpp::Exe_target.new( "#{path}/test_cpp_sources" ) {
+        target 'test_cpp_sources'
+
+        cpp_sources test_files
+      },
+      false )
+
+    expected_sources = test_files.inject( [] ) { |r, f| r << "#{path}/#{f}" }
+    defined_sources = t.mxx_cpp_files.inject( [] ) { |r, f| r << f.name }
+
+    assert_equal( expected_sources, defined_sources )
+  end
+
+  def test_cpp_sources_with_special_prefix
+    path = 'some/test'
+    test_files = [ "#{path}/hello.cpp", "#{path}/greeting.cpp" ]
+
+    t = Mxx_ru::setup_target(
+      Mxx_ru::Cpp::Exe_target.new( "#{path}/test_cpp_sources" ) {
+        target 'test_cpp_sources'
+
+        cpp_sources test_files
+      },
+      false )
+
+    defined_sources = t.mxx_cpp_files.inject( [] ) { |r, f| r << f.name }
+
+    assert_equal( test_files, defined_sources )
+  end
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-04-09
+  version: 1.2.0
+date: 2006-04-16
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool
 require_paths: 
   - lib
@@ -51,6 +51,7 @@ files:
   - tests/c/pcre/perltest
   - tests/c/pcre/printint.c
   - tests/c/pcre/study.c
+  - tests/cpp/cpp_sources_glob
   - tests/cpp/mswin_res_dll
   - tests/cpp/mswin_res_exe
   - tests/cpp/o
@@ -58,6 +59,25 @@ files:
   - tests/cpp/textfile_unittest
   - tests/cpp/toolset_name.rb
   - tests/cpp/vc_cleanup
+  - tests/cpp/cpp_sources_glob/build.rb
+  - tests/cpp/cpp_sources_glob/some
+  - tests/cpp/cpp_sources_glob/some/module
+  - tests/cpp/cpp_sources_glob/some/module/1
+  - tests/cpp/cpp_sources_glob/some/module/2
+  - tests/cpp/cpp_sources_glob/some/module/3
+  - tests/cpp/cpp_sources_glob/some/module/4
+  - tests/cpp/cpp_sources_glob/some/module/funcs.hpp
+  - tests/cpp/cpp_sources_glob/some/module/main.cpp
+  - tests/cpp/cpp_sources_glob/some/module/o
+  - tests/cpp/cpp_sources_glob/some/module/prj.rb
+  - tests/cpp/cpp_sources_glob/some/module/1/f1.cpp
+  - tests/cpp/cpp_sources_glob/some/module/1/o
+  - tests/cpp/cpp_sources_glob/some/module/2/f2.cpp
+  - tests/cpp/cpp_sources_glob/some/module/2/o
+  - tests/cpp/cpp_sources_glob/some/module/3/f3.cpp
+  - tests/cpp/cpp_sources_glob/some/module/3/o
+  - tests/cpp/cpp_sources_glob/some/module/4/f4.cpp
+  - tests/cpp/cpp_sources_glob/some/module/4/o
   - tests/cpp/mswin_res_dll/build.rb
   - tests/cpp/mswin_res_dll/dll.cpp
   - tests/cpp/mswin_res_dll/dll.rb
@@ -120,6 +140,7 @@ files:
   - tests/cpp/vc_cleanup/tc_vc_cleanup.rb
   - tests/cpp/vc_cleanup/lib/simple_target_root
   - tests/mxx_ru/change_default_value
+  - tests/mxx_ru/plural_form_methods
   - tests/mxx_ru/tc_makestyle_generator.rb
   - tests/mxx_ru/vc8
   - tests/mxx_ru/change_default_value/ignoring_by_build_root
@@ -132,6 +153,7 @@ files:
   - tests/mxx_ru/change_default_value/ignoring_by_child_1/child_2.rb
   - tests/mxx_ru/change_default_value/ok/build.rb
   - tests/mxx_ru/change_default_value/ok/child_1.rb
+  - tests/mxx_ru/plural_form_methods/tc.rb
   - tests/mxx_ru/vc8/tc_actual_manifest.rb
   - tests/mxx_ru/vc8/tc_append_mt_commands.rb
   - tests/mxx_ru/vc8/tc_default_manifest.rb
@@ -145,10 +167,12 @@ files:
   - tests/qt/aclock/aclock.cpp
   - tests/qt/aclock/aclock.h
   - tests/qt/aclock/main.cpp
+  - tests/qt/aclock/o
   - tests/qt/aclock/prj.rb
   - tests/qt/iconview/main.cpp
   - tests/qt/iconview/prj.rb
   - tests/qt/toplevel/main.cpp
+  - tests/qt/toplevel/o
   - tests/qt/toplevel/options.ui
   - tests/qt/toplevel/options.ui.h
   - tests/qt/toplevel/prj.rb
@@ -221,6 +245,7 @@ files:
   - examples/exe_dll_lib_2/say/say.hpp
   - examples/simple_exe/main.cpp
   - examples/simple_exe/prj.rb
+  - THANKS
   - README
   - Rakefile
   - COPYING