Mxx_ru 1.4.0 → 1.4.1

data/THANKS

@@ -1 +1,3 @@
 Konstantine Nazarov (rut at user dot sourceforge dot net)
+Igor Mironchick (imironchick at gmail dot com)
+

data/lib/mxx_ru/cpp/target.rb

@@ -837,7 +837,9 @@ module MxxRu
         a_rc_file,
         a_depends =nil )
 
-        @mxx_mswin_rc_file = MswinRcFile.new( a_rc_file, a_depends )
+        @mxx_mswin_rc_file = MswinRcFile.new(
+            create_full_src_file_name( a_rc_file ),
+            a_depends )
       end
 
       # Set compiled mswin resource file name.

data/lib/mxx_ru/version.rb

@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.4.0'
+MXX_RU_VERSION = '1.4.1'
 

data/tests/cpp/mswin_res_exe/build.rb

@@ -5,14 +5,17 @@ Mxx_ru::setup_target(
 		target( "mswin_res_exe" )
 		screen_mode( Mxx_ru::Cpp::SCREEN_WINDOW )
 
-		cpp_source( "main.cpp" )
-
 		mswin_rc_include_path( "h" )
-		mswin_rc_file( "main.rc",
-			[   "h/res.h",
-				"res/tree_fol.bmp",
-				"res/tree_state_1.bmp",
-				"res/tree_state_2.bmp" ] )
+
+		sources_root( "src" ) {
+			cpp_source( "main.cpp" )
+
+			mswin_rc_file( "main.rc",
+				[   "h/res.h",
+					"res/tree_fol.bmp",
+					"res/tree_state_1.bmp",
+					"res/tree_state_2.bmp" ] )
+		}
 
 		lib( "user32.lib" )
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2007-02-19 00:00:00 +03:00
+  version: 1.4.1
+date: 2007-06-25 00:00:00 +04:00
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool
 require_paths: 
 - lib
@@ -31,11 +31,6 @@ authors:
 files: 
 - bin/mxxrugen
 - tests/c
-- tests/cpp
-- tests/mxx_ru
-- tests/qt
-- tests/test_with_compilation.rb
-- tests/unix
 - tests/c/pcre
 - tests/c/pcre/chartables.c
 - tests/c/pcre/config.h
@@ -56,92 +51,95 @@ files:
 - tests/c/pcre/perltest
 - tests/c/pcre/printint.c
 - tests/c/pcre/study.c
+- tests/cpp
 - tests/cpp/cpp_sources_glob
-- tests/cpp/mswin_res_dll
-- tests/cpp/mswin_res_exe
-- tests/cpp/o
-- tests/cpp/rucodegen
-- tests/cpp/rucodegen.embedded
-- 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/tc_cpp_sources_glob.rb
 - tests/cpp/cpp_sources_glob/some/module
 - tests/cpp/cpp_sources_glob/some/module/1
+- tests/cpp/cpp_sources_glob/some/module/1/f1.cpp
 - tests/cpp/cpp_sources_glob/some/module/2
+- tests/cpp/cpp_sources_glob/some/module/2/f2.cpp
 - tests/cpp/cpp_sources_glob/some/module/3
+- tests/cpp/cpp_sources_glob/some/module/3/f3.cpp
 - tests/cpp/cpp_sources_glob/some/module/4
+- tests/cpp/cpp_sources_glob/some/module/4/f4.cpp
 - 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/prj.rb
-- tests/cpp/cpp_sources_glob/some/module/1/f1.cpp
-- tests/cpp/cpp_sources_glob/some/module/2/f2.cpp
-- tests/cpp/cpp_sources_glob/some/module/3/f3.cpp
-- tests/cpp/cpp_sources_glob/some/module/4/f4.cpp
+- tests/cpp/cpp_sources_glob/tc_cpp_sources_glob.rb
+- tests/cpp/mswin_res_dll
 - tests/cpp/mswin_res_dll/build.rb
 - tests/cpp/mswin_res_dll/dll.cpp
 - tests/cpp/mswin_res_dll/dll.rb
 - tests/cpp/mswin_res_dll/dll.rc
 - tests/cpp/mswin_res_dll/h
+- tests/cpp/mswin_res_dll/h/dll.hpp
+- tests/cpp/mswin_res_dll/h/res.h
 - tests/cpp/mswin_res_dll/main.cpp
 - tests/cpp/mswin_res_dll/main.rb
 - tests/cpp/mswin_res_dll/o
 - tests/cpp/mswin_res_dll/res
-- 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/res/tree_fol.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_1.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_2.bmp
+- tests/cpp/mswin_res_dll/tc_mswin_res_dll.rb
+- tests/cpp/mswin_res_exe
 - tests/cpp/mswin_res_exe/build.rb
 - tests/cpp/mswin_res_exe/h
-- tests/cpp/mswin_res_exe/main.cpp
-- tests/cpp/mswin_res_exe/main.rc
+- tests/cpp/mswin_res_exe/h/res.h
 - tests/cpp/mswin_res_exe/o
 - 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/res/tree_fol.bmp
 - tests/cpp/mswin_res_exe/res/tree_state_1.bmp
 - tests/cpp/mswin_res_exe/res/tree_state_2.bmp
+- tests/cpp/mswin_res_exe/src
+- tests/cpp/mswin_res_exe/src/main.cpp
+- tests/cpp/mswin_res_exe/src/main.rc
+- tests/cpp/mswin_res_exe/tc_mswin_res_exe.rb
+- tests/cpp/o
+- tests/cpp/rucodegen
 - tests/cpp/rucodegen/h
 - tests/cpp/rucodegen/host_config.cpp
 - tests/cpp/rucodegen/host_config.rb
 - tests/cpp/rucodegen/impl
-- tests/cpp/rucodegen/o
-- tests/cpp/rucodegen/prj.rb
-- tests/cpp/rucodegen/tc_rucodegen.rb
 - tests/cpp/rucodegen/impl/conn_params.cpp
 - tests/cpp/rucodegen/impl/conn_params.rb
 - tests/cpp/rucodegen/impl/h
-- tests/cpp/rucodegen/impl/o
 - tests/cpp/rucodegen/impl/h/conn_params.hpp
+- tests/cpp/rucodegen/impl/o
+- tests/cpp/rucodegen/o
+- tests/cpp/rucodegen/prj.rb
+- tests/cpp/rucodegen/tc_rucodegen.rb
+- tests/cpp/rucodegen.embedded
 - tests/cpp/rucodegen.embedded/h
 - tests/cpp/rucodegen.embedded/host_config.cpp
 - tests/cpp/rucodegen.embedded/impl
-- tests/cpp/rucodegen.embedded/o
-- tests/cpp/rucodegen.embedded/prj.rb
-- tests/cpp/rucodegen.embedded/tc_rucodegen.rb
 - tests/cpp/rucodegen.embedded/impl/conn_params.cpp
 - tests/cpp/rucodegen.embedded/impl/conn_params.rb
 - tests/cpp/rucodegen.embedded/impl/h
-- tests/cpp/rucodegen.embedded/impl/o
 - tests/cpp/rucodegen.embedded/impl/h/conn_params.hpp
+- tests/cpp/rucodegen.embedded/impl/o
+- tests/cpp/rucodegen.embedded/o
+- tests/cpp/rucodegen.embedded/prj.rb
+- tests/cpp/rucodegen.embedded/tc_rucodegen.rb
+- tests/cpp/textfile_unittest
 - tests/cpp/textfile_unittest/build.rb
 - tests/cpp/textfile_unittest/etalons
+- tests/cpp/textfile_unittest/etalons/out_0.txt
+- tests/cpp/textfile_unittest/etalons/out_1.txt
+- tests/cpp/textfile_unittest/etalons/out_128.txt
 - tests/cpp/textfile_unittest/main.cpp
 - tests/cpp/textfile_unittest/o
 - tests/cpp/textfile_unittest/prj.rb
 - tests/cpp/textfile_unittest/prj.ut.rb
 - tests/cpp/textfile_unittest/tc_textfile_unittest.rb
-- tests/cpp/textfile_unittest/etalons/out_0.txt
-- tests/cpp/textfile_unittest/etalons/out_1.txt
-- tests/cpp/textfile_unittest/etalons/out_128.txt
+- tests/cpp/toolset_name.rb
+- tests/cpp/vc_cleanup
 - tests/cpp/vc_cleanup/dll_hi.cpp
 - tests/cpp/vc_cleanup/exe_hi.cpp
 - tests/cpp/vc_cleanup/lib
+- tests/cpp/vc_cleanup/lib/simple_target_root
 - tests/cpp/vc_cleanup/lib_hi.cpp
 - tests/cpp/vc_cleanup/o
 - tests/cpp/vc_cleanup/prj_dll_no_implib.rb
@@ -154,36 +152,27 @@ files:
 - tests/cpp/vc_cleanup/prj_lib_with_simple_target_root.rb
 - tests/cpp/vc_cleanup/simple_target_root
 - tests/cpp/vc_cleanup/tc_vc_cleanup.rb
-- tests/cpp/vc_cleanup/lib/simple_target_root
+- tests/mxx_ru
 - 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
-- tests/mxx_ru/plural_form_methods
-- 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
+- tests/mxx_ru/change_default_value
 - tests/mxx_ru/change_default_value/ignoring_by_build_root
-- tests/mxx_ru/change_default_value/ignoring_by_child_1
-- tests/mxx_ru/change_default_value/ok
 - tests/mxx_ru/change_default_value/ignoring_by_build_root/build.rb
 - tests/mxx_ru/change_default_value/ignoring_by_build_root/child_1.rb
+- tests/mxx_ru/change_default_value/ignoring_by_child_1
 - tests/mxx_ru/change_default_value/ignoring_by_child_1/build.rb
 - tests/mxx_ru/change_default_value/ignoring_by_child_1/child_1.rb
 - tests/mxx_ru/change_default_value/ignoring_by_child_1/child_2.rb
+- tests/mxx_ru/change_default_value/ok
 - tests/mxx_ru/change_default_value/ok/build.rb
 - tests/mxx_ru/change_default_value/ok/child_1.rb
+- tests/mxx_ru/generators
 - 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
 - tests/mxx_ru/lib_collection/a.cpp
 - tests/mxx_ru/lib_collection/a.hpp
 - tests/mxx_ru/lib_collection/a.rb
@@ -216,6 +205,7 @@ files:
 - 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
 - tests/mxx_ru/lib_path/build.rb
 - tests/mxx_ru/lib_path/bye.c
 - tests/mxx_ru/lib_path/bye.rb
@@ -226,7 +216,9 @@ files:
 - tests/mxx_ru/lib_path/main.c
 - tests/mxx_ru/lib_path/main.rb
 - tests/mxx_ru/lib_path/tc_lib_path.rb
+- tests/mxx_ru/obj_placements
 - tests/mxx_ru/obj_placements/tc_custom_subdir.rb
+- tests/mxx_ru/opt_lib_ext
 - tests/mxx_ru/opt_lib_ext/build.rb
 - tests/mxx_ru/opt_lib_ext/hi.c
 - tests/mxx_ru/opt_lib_ext/hi.h
@@ -235,8 +227,11 @@ files:
 - 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
+- tests/mxx_ru/plural_form_methods
 - tests/mxx_ru/plural_form_methods/tc.rb
+- tests/mxx_ru/qt_gen
 - tests/mxx_ru/qt_gen/tc_uic_result_subdir.rb
+- tests/mxx_ru/target_ext
 - tests/mxx_ru/target_ext/dll_hi.cpp
 - tests/mxx_ru/target_ext/exe_hi.cpp
 - tests/mxx_ru/target_ext/lib_hi.cpp
@@ -244,7 +239,10 @@ files:
 - 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/tc_makestyle_generator.rb
+- tests/mxx_ru/toolset
 - tests/mxx_ru/toolset/tc_tag_search.rb
+- tests/mxx_ru/vc8
 - 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
@@ -252,26 +250,30 @@ files:
 - tests/mxx_ru/vc8/tc_drop_default_manifest.rb
 - tests/mxx_ru/vc8/tc_invalid_params.rb
 - tests/mxx_ru/vc8/ts_vc8.rb
+- tests/qt
 - tests/qt/aclock
-- tests/qt/iconview
-- tests/qt/toplevel
 - tests/qt/aclock/aclock.cpp
 - tests/qt/aclock/aclock.h
 - tests/qt/aclock/main.cpp
 - tests/qt/aclock/prj.rb
+- tests/qt/iconview
 - tests/qt/iconview/main.cpp
 - tests/qt/iconview/prj.rb
+- tests/qt/toplevel
 - tests/qt/toplevel/main.cpp
 - tests/qt/toplevel/options.ui
 - tests/qt/toplevel/prj.rb
+- tests/test_with_compilation.rb
+- tests/unix
 - tests/unix/lib_linking_mode
-- tests/unix/lib_order
 - tests/unix/lib_linking_mode/a.hpp
 - tests/unix/lib_linking_mode/a_shared.cpp
 - tests/unix/lib_linking_mode/a_shared.rb
 - tests/unix/lib_linking_mode/a_static.cpp
 - tests/unix/lib_linking_mode/a_static.rb
 - tests/unix/lib_linking_mode/etalon
+- tests/unix/lib_linking_mode/etalon/shared.txt
+- tests/unix/lib_linking_mode/etalon/static.txt
 - tests/unix/lib_linking_mode/main.impl.cpp
 - tests/unix/lib_linking_mode/main_conflict.cpp
 - tests/unix/lib_linking_mode/main_conflict.rb
@@ -292,8 +294,7 @@ files:
 - tests/unix/lib_linking_mode/out
 - tests/unix/lib_linking_mode/tc_conflicted_build.rb
 - tests/unix/lib_linking_mode/tc_normal_build.rb
-- tests/unix/lib_linking_mode/etalon/shared.txt
-- tests/unix/lib_linking_mode/etalon/static.txt
+- tests/unix/lib_order
 - tests/unix/lib_order/a.cpp
 - tests/unix/lib_order/a.hpp
 - tests/unix/lib_order/a.rb
@@ -318,13 +319,6 @@ files:
 - 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
@@ -332,13 +326,13 @@ files:
 - lib/mxx_ru/cpp/mode.rb
 - lib/mxx_ru/cpp/obj_placement.rb
 - lib/mxx_ru/cpp/obj_placements
+- lib/mxx_ru/cpp/obj_placements/custom_subdir.rb
 - lib/mxx_ru/cpp/qt.rb
 - lib/mxx_ru/cpp/rucodegen.rb
 - lib/mxx_ru/cpp/source_file.rb
 - lib/mxx_ru/cpp/target.rb
 - lib/mxx_ru/cpp/toolset.rb
 - lib/mxx_ru/cpp/toolsets
-- lib/mxx_ru/cpp/obj_placements/custom_subdir.rb
 - lib/mxx_ru/cpp/toolsets/bcc_win32_5.rb
 - lib/mxx_ru/cpp/toolsets/bcc_win32_family.rb
 - lib/mxx_ru/cpp/toolsets/c89_etk_nsk.rb
@@ -353,33 +347,38 @@ 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/cpp.rb
+- lib/mxx_ru/ex.rb
+- lib/mxx_ru/generators
 - 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
 - lib/mxx_ru/generators/cpp-composite/g.rb
+- lib/mxx_ru/generators/cpp-dll
 - lib/mxx_ru/generators/cpp-dll/g.rb
+- lib/mxx_ru/generators/cpp-exe
 - lib/mxx_ru/generators/cpp-exe/g.rb
+- lib/mxx_ru/generators/cpp-lib
 - lib/mxx_ru/generators/cpp-lib/g.rb
+- lib/mxx_ru/generators/cpp-lib-collection
 - lib/mxx_ru/generators/cpp-lib-collection/g.rb
+- lib/mxx_ru/generators/impl
 - 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
+- lib/mxx_ru/generators/impl/std_receiver.rb
+- lib/mxx_ru/makestyle_generator.rb
+- lib/mxx_ru/textfile_unittest.rb
+- lib/mxx_ru/util.rb
+- lib/mxx_ru/version.rb
 - examples/exe_and_lib
-- examples/exe_dll_lib
-- examples/exe_dll_lib_2
-- examples/simple_exe
 - examples/exe_and_lib/main.cpp
 - examples/exe_and_lib/prj.rb
 - examples/exe_and_lib/say.cpp
 - examples/exe_and_lib/say.hpp
 - examples/exe_and_lib/say.rb
+- examples/exe_dll_lib
 - examples/exe_dll_lib/inout.cpp
 - examples/exe_dll_lib/inout.hpp
 - examples/exe_dll_lib/inout.rb
@@ -388,22 +387,24 @@ files:
 - examples/exe_dll_lib/say.cpp
 - examples/exe_dll_lib/say.hpp
 - examples/exe_dll_lib/say.rb
+- examples/exe_dll_lib_2
 - examples/exe_dll_lib_2/build.rb
 - examples/exe_dll_lib_2/inout
-- examples/exe_dll_lib_2/lib
-- examples/exe_dll_lib_2/main
-- examples/exe_dll_lib_2/say
 - examples/exe_dll_lib_2/inout/inout.cpp
 - examples/exe_dll_lib_2/inout/inout.hpp
 - examples/exe_dll_lib_2/inout/o
 - examples/exe_dll_lib_2/inout/prj.rb
+- examples/exe_dll_lib_2/lib
+- examples/exe_dll_lib_2/main
 - examples/exe_dll_lib_2/main/main.cpp
 - examples/exe_dll_lib_2/main/o
 - examples/exe_dll_lib_2/main/prj.rb
+- examples/exe_dll_lib_2/say
 - examples/exe_dll_lib_2/say/o
 - examples/exe_dll_lib_2/say/prj.rb
 - examples/exe_dll_lib_2/say/say.cpp
 - examples/exe_dll_lib_2/say/say.hpp
+- examples/simple_exe
 - examples/simple_exe/main.cpp
 - examples/simple_exe/prj.rb
 - THANKS