Mxx_ru 1.3.2 → 1.4.0

data/tests/mxx_ru/lib_collection/c.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'C'
+
+  cpp_source 'c.cpp'
+}
+

data/tests/mxx_ru/lib_collection/collection_a_b.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_collection_target {
+  required_prj 'a.rb'
+  required_prj 'b.rb'
+}
+

data/tests/mxx_ru/lib_collection/collection_c_d.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_collection_target {
+  required_prj 'c.rb'
+  required_prj 'd.rb'
+}
+

data/tests/mxx_ru/lib_collection/collection_c_d_e.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_collection_target {
+  required_prj 'collection_c_d.rb'
+  required_prj 'e.rb'
+}
+

data/tests/mxx_ru/lib_collection/collection_f.rb

@@ -0,0 +1,6 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_collection_target {
+  required_prj 'f.rb'
+}
+

data/tests/mxx_ru/lib_collection/collection_i.rb

@@ -0,0 +1,6 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_collection_target {
+  required_prj 'i.rb'
+}
+

data/tests/mxx_ru/lib_collection/d.cpp

@@ -0,0 +1,8 @@
+#include <cstdio>
+
+void
+d()
+  {
+    std::printf( "d()\n" );
+  }
+

data/tests/mxx_ru/lib_collection/d.hpp

@@ -0,0 +1,8 @@
+#if !defined( D_HPP )
+#define D_HPP
+
+void
+d();
+
+#endif
+

data/tests/mxx_ru/lib_collection/d.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'D'
+
+  cpp_source 'd.cpp'
+}
+

data/tests/mxx_ru/lib_collection/e.cpp

@@ -0,0 +1,8 @@
+#include <cstdio>
+
+void
+e()
+  {
+    std::printf( "e()\n" );
+  }
+

data/tests/mxx_ru/lib_collection/e.hpp

@@ -0,0 +1,8 @@
+#if !defined( E_HPP )
+#define E_HPP
+
+void
+e();
+
+#endif
+

data/tests/mxx_ru/lib_collection/e.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'E'
+
+  cpp_source 'e.cpp'
+}
+

data/tests/mxx_ru/lib_collection/f.cpp

@@ -0,0 +1,8 @@
+#include <cstdio>
+
+void
+f()
+  {
+    std::printf( "f()\n" );
+  }
+

data/tests/mxx_ru/lib_collection/f.hpp

@@ -0,0 +1,8 @@
+#if !defined( F_HPP )
+#define F_HPP
+
+void
+f();
+
+#endif
+

data/tests/mxx_ru/lib_collection/f.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'F'
+
+  cpp_source 'f.cpp'
+}

data/tests/mxx_ru/lib_collection/g.cpp

@@ -0,0 +1,8 @@
+#include <cstdio>
+
+void
+g()
+  {
+    std::printf( "g()\n" );
+  }
+

data/tests/mxx_ru/lib_collection/g.hpp

@@ -0,0 +1,8 @@
+#if !defined( G_HPP )
+#define G_HPP
+
+void
+g();
+
+#endif
+

data/tests/mxx_ru/lib_collection/g.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'G'
+
+  cpp_source 'g.cpp'
+}

data/tests/mxx_ru/lib_collection/i.cpp

@@ -0,0 +1,10 @@
+#include "f.hpp"
+#include "g.hpp"
+
+#include "i.hpp"
+
+I_TYPE void i()
+  {
+    f();
+    g();
+  }

data/tests/mxx_ru/lib_collection/i.hpp

@@ -0,0 +1,16 @@
+#if !defined( I_HPP )
+#define I_HPP
+
+#if defined( I_MSWIN )
+  #if defined( I_PRJ )
+    #define I_TYPE __declspec(dllexport)
+  #else
+    #define I_TYPE __declspec(dllimport)
+  #endif
+#else
+  #define I_TYPE
+#endif
+
+I_TYPE void i();
+
+#endif

data/tests/mxx_ru/lib_collection/i.rb

@@ -0,0 +1,17 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::dll_target {
+  target 'I'
+  implib_path '.'
+
+  required_prj 'collection_f.rb'
+  required_prj 'g.rb'
+
+  define 'I_PRJ'
+
+  if 'mswin' == toolset.tag( 'target_os' )
+    define 'I_MSWIN'
+  end
+
+  cpp_source 'i.cpp'
+}

data/tests/mxx_ru/lib_collection/main.cpp

@@ -0,0 +1,18 @@
+#include "a.hpp"
+#include "b.hpp"
+#include "c.hpp"
+#include "d.hpp"
+#include "e.hpp"
+#include "i.hpp"
+
+int
+main()
+  {
+    a();
+    b();
+    c();
+    d();
+    e();
+    i();
+  }
+

data/tests/mxx_ru/lib_collection/main.rb

@@ -0,0 +1,12 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::exe_target {
+  target 'main'
+
+  required_prj 'collection_a_b.rb'
+  required_prj 'collection_c_d_e.rb'
+  required_prj 'collection_i.rb'
+
+  cpp_source 'main.cpp'
+}
+

data/tests/mxx_ru/lib_collection/tc_lib_collection.rb

@@ -0,0 +1,17 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_LibCollection < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/mxx_ru/lib_collection'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'main.rb' )
+      clean( 'main.rb' )
+    }
+  end
+
+end

data/tests/mxx_ru/toolset/tc_tag_search.rb

@@ -0,0 +1,68 @@
+require 'test/unit'
+require 'fileutils'
+
+require 'mxx_ru/cpp/toolset'
+
+class TC_TagSearch < Test::Unit::TestCase
+  class SpecialObject
+    def each( &block )
+      [ 'first', 'second', 'third' ].each &block
+    end
+  end
+
+  def setup
+    @ts = MxxRu::Cpp::Toolset.new( 'dummy' )
+  end
+
+  def test_no_tag
+    assert_equal( '12345', @ts.tag( 'missing', '12345' ) )
+
+    assert_raise( MxxRu::Cpp::Toolset::UnknownTagEx ) do
+      @ts.tag( 'missing' )
+    end
+  end
+
+  def test_no_tag_array
+    assert_equal( '12345', @ts.tag( [ 'one', 'two', 'three' ], '12345' ) )
+
+    assert_raise( MxxRu::Cpp::Toolset::UnknownTagEx ) do
+      @ts.tag( [ 'one', 'two', 'three' ] )
+    end
+  end
+
+  def test_exist
+    tag = 'defined'
+    value = 'value'
+
+    @ts.setup_tag( tag, value )
+
+    assert_equal( value, @ts.tag( tag, 'wrong-search-result' ) )
+  end
+
+  def test_exist_array
+    tags = [ 'first', 'second', 'third' ]
+    values = [ '1', '2', '3' ]
+
+    tags.zip( values ).each do |pair|
+      @ts.setup_tag( *pair )
+    end
+
+    assert_equal( values[ 0 ], @ts.tag( tags, 'wrong-search-result' ) )
+    assert_equal( values[ 1 ],
+        @ts.tag( [ tags[1], tags[0], tags[2] ], 'wrong-search-result' ) )
+  end
+
+  def test_invalid_key_type
+    assert_raise( MxxRu::InvalidValueEx ) do
+      @ts.tag( 1 )
+    end
+  end
+
+  def test_special_object_with_each
+
+    @ts.setup_tag( 'second', '2' )
+    assert_equal( '2', @ts.tag( SpecialObject.new, '2222' ) )
+  end
+
+end
+

data/tests/test_with_compilation.rb

@@ -102,7 +102,7 @@ if $0 == __FILE__
 
     test_case :check_attrs do
       assert_equal( 'tests', @path_name )
-      assert_equal( 'lib', @lib_path )
+      assert_equal( '../lib', @lib_path )
       assert_equal( false, @need_change_cwd )
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2006-10-07 00:00:00 +04:00
+  version: 1.4.0
+date: 2007-02-19 00:00:00 +03:00
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ post_install_message:
 authors: 
 - The Mxx_ru Project
 files: 
+- bin/mxxrugen
 - tests/c
 - tests/cpp
 - tests/mxx_ru
@@ -74,16 +75,11 @@ files:
 - 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
@@ -96,7 +92,6 @@ files:
 - tests/cpp/mswin_res_dll/tc_mswin_res_dll.rb
 - tests/cpp/mswin_res_dll/h/dll.hpp
 - tests/cpp/mswin_res_dll/h/res.h
-- tests/cpp/mswin_res_dll/o/dll.o
 - tests/cpp/mswin_res_dll/res/tree_fol.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_1.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_2.bmp
@@ -108,7 +103,6 @@ files:
 - tests/cpp/mswin_res_exe/res
 - tests/cpp/mswin_res_exe/tc_mswin_res_exe.rb
 - tests/cpp/mswin_res_exe/h/res.h
-- tests/cpp/mswin_res_exe/o/main.o
 - tests/cpp/mswin_res_exe/res/tree_fol.bmp
 - tests/cpp/mswin_res_exe/res/tree_state_1.bmp
 - tests/cpp/mswin_res_exe/res/tree_state_2.bmp
@@ -163,6 +157,8 @@ files:
 - tests/cpp/vc_cleanup/lib/simple_target_root
 - tests/mxx_ru/binary_library
 - tests/mxx_ru/change_default_value
+- tests/mxx_ru/generators
+- tests/mxx_ru/lib_collection
 - tests/mxx_ru/lib_path
 - tests/mxx_ru/obj_placements
 - tests/mxx_ru/opt_lib_ext
@@ -170,6 +166,7 @@ files:
 - tests/mxx_ru/qt_gen
 - tests/mxx_ru/target_ext
 - tests/mxx_ru/tc_makestyle_generator.rb
+- tests/mxx_ru/toolset
 - tests/mxx_ru/vc8
 - tests/mxx_ru/binary_library/tc_binary_library.rb
 - tests/mxx_ru/binary_library/tc_binary_target_lib_methods.rb
@@ -183,6 +180,42 @@ 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/generators/cpp
+- tests/mxx_ru/generators/cpp/tc_generator.rb
+- tests/mxx_ru/generators/cpp/tc_options.rb
+- tests/mxx_ru/generators/cpp/tc_template_params.rb
+- tests/mxx_ru/lib_collection/a.cpp
+- tests/mxx_ru/lib_collection/a.hpp
+- tests/mxx_ru/lib_collection/a.rb
+- tests/mxx_ru/lib_collection/b.cpp
+- tests/mxx_ru/lib_collection/b.hpp
+- tests/mxx_ru/lib_collection/b.rb
+- tests/mxx_ru/lib_collection/c.cpp
+- tests/mxx_ru/lib_collection/c.hpp
+- tests/mxx_ru/lib_collection/c.rb
+- tests/mxx_ru/lib_collection/collection_a_b.rb
+- tests/mxx_ru/lib_collection/collection_c_d.rb
+- tests/mxx_ru/lib_collection/collection_c_d_e.rb
+- tests/mxx_ru/lib_collection/collection_f.rb
+- tests/mxx_ru/lib_collection/collection_i.rb
+- tests/mxx_ru/lib_collection/d.cpp
+- tests/mxx_ru/lib_collection/d.hpp
+- tests/mxx_ru/lib_collection/d.rb
+- tests/mxx_ru/lib_collection/e.cpp
+- tests/mxx_ru/lib_collection/e.hpp
+- tests/mxx_ru/lib_collection/e.rb
+- tests/mxx_ru/lib_collection/f.cpp
+- tests/mxx_ru/lib_collection/f.hpp
+- tests/mxx_ru/lib_collection/f.rb
+- tests/mxx_ru/lib_collection/g.cpp
+- tests/mxx_ru/lib_collection/g.hpp
+- tests/mxx_ru/lib_collection/g.rb
+- tests/mxx_ru/lib_collection/i.cpp
+- tests/mxx_ru/lib_collection/i.hpp
+- tests/mxx_ru/lib_collection/i.rb
+- tests/mxx_ru/lib_collection/main.cpp
+- tests/mxx_ru/lib_collection/main.rb
+- tests/mxx_ru/lib_collection/tc_lib_collection.rb
 - tests/mxx_ru/lib_path/build.rb
 - tests/mxx_ru/lib_path/bye.c
 - tests/mxx_ru/lib_path/bye.rb
@@ -192,7 +225,6 @@ files:
 - tests/mxx_ru/lib_path/hi_lib
 - tests/mxx_ru/lib_path/main.c
 - tests/mxx_ru/lib_path/main.rb
-- tests/mxx_ru/lib_path/o
 - tests/mxx_ru/lib_path/tc_lib_path.rb
 - tests/mxx_ru/obj_placements/tc_custom_subdir.rb
 - tests/mxx_ru/opt_lib_ext/build.rb
@@ -200,7 +232,6 @@ files:
 - tests/mxx_ru/opt_lib_ext/hi.h
 - tests/mxx_ru/opt_lib_ext/hi.rb
 - tests/mxx_ru/opt_lib_ext/main.c
-- tests/mxx_ru/opt_lib_ext/o
 - tests/mxx_ru/opt_lib_ext/tc_opt_lib_ext.rb
 - tests/mxx_ru/opt_lib_ext/test-no-ext.rb
 - tests/mxx_ru/opt_lib_ext/test-with-ext.rb
@@ -209,11 +240,11 @@ files:
 - tests/mxx_ru/target_ext/dll_hi.cpp
 - tests/mxx_ru/target_ext/exe_hi.cpp
 - tests/mxx_ru/target_ext/lib_hi.cpp
-- tests/mxx_ru/target_ext/o
 - tests/mxx_ru/target_ext/prj_dll.rb
 - tests/mxx_ru/target_ext/prj_exe.rb
 - tests/mxx_ru/target_ext/prj_lib.rb
 - tests/mxx_ru/target_ext/tc_target_ext.rb
+- tests/mxx_ru/toolset/tc_tag_search.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
@@ -284,16 +315,20 @@ files:
 - lib/mxx_ru/binary_library.rb
 - lib/mxx_ru/binary_target.rb
 - lib/mxx_ru/binary_unittest.rb
+- lib/mxx_ru/cmd_line_option_processor.rb
 - lib/mxx_ru/compat.rb
 - lib/mxx_ru/cpp
 - lib/mxx_ru/cpp.rb
 - lib/mxx_ru/ex.rb
+- lib/mxx_ru/generators
 - lib/mxx_ru/makestyle_generator.rb
 - lib/mxx_ru/textfile_unittest.rb
 - lib/mxx_ru/util.rb
+- lib/mxx_ru/version.rb
 - lib/mxx_ru/cpp/analyzer.rb
 - lib/mxx_ru/cpp/composite.rb
 - lib/mxx_ru/cpp/detect_toolset.rb
+- lib/mxx_ru/cpp/lib_collection.rb
 - lib/mxx_ru/cpp/mode.rb
 - lib/mxx_ru/cpp/obj_placement.rb
 - lib/mxx_ru/cpp/obj_placements
@@ -318,6 +353,24 @@ files:
 - lib/mxx_ru/cpp/toolsets/vc7.rb
 - lib/mxx_ru/cpp/toolsets/vc8.rb
 - lib/mxx_ru/cpp/toolsets/vc_family.rb
+- lib/mxx_ru/generators/bin-unittest
+- lib/mxx_ru/generators/cpp-composite
+- lib/mxx_ru/generators/cpp-dll
+- lib/mxx_ru/generators/cpp-exe
+- lib/mxx_ru/generators/cpp-lib
+- lib/mxx_ru/generators/cpp-lib-collection
+- lib/mxx_ru/generators/impl
+- lib/mxx_ru/generators/bin-unittest/g.rb
+- lib/mxx_ru/generators/bin-unittest/template.erb
+- lib/mxx_ru/generators/cpp-composite/g.rb
+- lib/mxx_ru/generators/cpp-dll/g.rb
+- lib/mxx_ru/generators/cpp-exe/g.rb
+- lib/mxx_ru/generators/cpp-lib/g.rb
+- lib/mxx_ru/generators/cpp-lib-collection/g.rb
+- lib/mxx_ru/generators/impl/cpp
+- lib/mxx_ru/generators/impl/std_receiver.rb
+- lib/mxx_ru/generators/impl/cpp/generation.rb
+- lib/mxx_ru/generators/impl/cpp/template.erb
 - examples/exe_and_lib
 - examples/exe_dll_lib
 - examples/exe_dll_lib_2
@@ -369,8 +422,8 @@ extra_rdoc_files:
 - Rakefile
 - COPYING
 - NEWS
-executables: []
-
+executables: 
+- mxxrugen
 extensions: []
 
 requirements: []