Mxx_ru 1.3.0 → 1.3.1

data/tests/mxx_ru/vc8/tc_append_mt_commands.rb

@@ -1,104 +1,104 @@
-require 'test/unit'
-
-require 'mxx_ru/util'
-require 'mxx_ru/cpp'
-require 'mxx_ru/cpp/toolsets/vc8'
-
-class TC_AppendMtCommands < Test::Unit::TestCase
-
-  def make_exe_target( prj_alias )
-    Mxx_ru::Cpp::Exe_target.new( prj_alias ) {
-      target 'sample'
-    }
-  end
-
-  def make_dll_target( prj_alias )
-    Mxx_ru::Cpp::Dll_target.new( prj_alias ) {
-      target 'sample'
-    }
-  end
-
-  def produce_manifest( target, hash )
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest( hash )
-    Mxx_ru::Cpp::toolset.setup_mandatory_options( target )
-    
-    target.vc8_actual_manifest
-  end
-
-  def test_exe_autogen_to_default_file
-    target = make_exe_target( 'exe_autogen' )
-
-    produce_manifest( target,
-      :target => target,
-      :autogen => :to_default_file,
-      :mt => {} )
-
-    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
-      './sample.exe',
-      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
-      Mxx_ru::Cpp::Linker_lists.new(),
-      target )
-
-    assert( r.size > 2, "r.size (#{r.size}) should be greater than 2" )
-    assert_equal( "del \"#{Mxx_ru::Util::native_pathname('./sample.exe.manifest')}\"", r[ -1 ] )
-    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
-      '/manifest "./sample.exe.manifest"', r[ -2 ] )
-  end
-
-  def test_exe_autogen_to_default_file_keep_manifest
-    target = make_exe_target( 'exe_autogen_keep_manifest' )
-
-    produce_manifest( target,
-      :target => target,
-      :autogen => :to_default_file,
-      :mt => { :keep_manifest_file => true } )
-
-    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
-      './sample.exe',
-      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
-      Mxx_ru::Cpp::Linker_lists.new(),
-      target )
-
-    assert( r.size > 1, "r.size (#{r.size}) should be greater than 1" )
-    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
-      '/manifest "./sample.exe.manifest"', r[ -1 ] )
-  end
-
-  def test_exe_noautogen_keep_manifest
-    target = make_exe_target( 'exe_noautogen_keep_manifest' )
-
-    produce_manifest( target,
-      :target => target,
-      :mt => { :manifest => 'some.manifest',
-        :keep_manifest_file => true } )
-
-    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
-      './sample.exe',
-      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
-      Mxx_ru::Cpp::Linker_lists.new(),
-      target )
-
-    assert( r.size > 1, "r.size (#{r.size}) should be greater than 1" )
-    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
-      '/manifest "some.manifest"', r[ -1 ] )
-  end
-
-  def test_exe_noautogen_nokeep_manifest
-    target = make_exe_target( 'exe_noautogen_keep_nomanifest' )
-
-    produce_manifest( target,
-      :target => target,
-      :mt => { :manifest => 'some.manifest' } )
-
-    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
-      './sample.exe',
-      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
-      Mxx_ru::Cpp::Linker_lists.new(),
-      target )
-
-    assert( r.size > 1, "r.size (#{r.size}) should be greater than 1" )
-    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
-      '/manifest "some.manifest"', r[ -1 ] )
-  end
-end
-
+require 'test/unit'
+
+require 'mxx_ru/util'
+require 'mxx_ru/cpp'
+require 'mxx_ru/cpp/toolsets/vc8'
+
+class TC_AppendMtCommands < Test::Unit::TestCase
+
+  def make_exe_target( prj_alias )
+    Mxx_ru::Cpp::Exe_target.new( prj_alias ) {
+      target 'sample'
+    }
+  end
+
+  def make_dll_target( prj_alias )
+    Mxx_ru::Cpp::Dll_target.new( prj_alias ) {
+      target 'sample'
+    }
+  end
+
+  def produce_manifest( target, hash )
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest( hash )
+    Mxx_ru::Cpp::toolset.setup_mandatory_options( target )
+    
+    target.vc8_actual_manifest
+  end
+
+  def test_exe_autogen_to_default_file
+    target = make_exe_target( 'exe_autogen' )
+
+    produce_manifest( target,
+      :target => target,
+      :autogen => :to_default_file,
+      :mt => {} )
+
+    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
+      './sample.exe',
+      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
+      Mxx_ru::Cpp::Linker_lists.new(),
+      target )
+
+    assert( r.size > 2, "r.size (#{r.size}) should be greater than 2" )
+    assert_equal( "del \"#{Mxx_ru::Util::native_pathname('./sample.exe.manifest')}\"", r[ -1 ] )
+    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
+      '/manifest "./sample.exe.manifest"', r[ -2 ] )
+  end
+
+  def test_exe_autogen_to_default_file_keep_manifest
+    target = make_exe_target( 'exe_autogen_keep_manifest' )
+
+    produce_manifest( target,
+      :target => target,
+      :autogen => :to_default_file,
+      :mt => { :keep_manifest_file => true } )
+
+    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
+      './sample.exe',
+      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
+      Mxx_ru::Cpp::Linker_lists.new(),
+      target )
+
+    assert( r.size > 1, "r.size (#{r.size}) should be greater than 1" )
+    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
+      '/manifest "./sample.exe.manifest"', r[ -1 ] )
+  end
+
+  def test_exe_noautogen_keep_manifest
+    target = make_exe_target( 'exe_noautogen_keep_manifest' )
+
+    produce_manifest( target,
+      :target => target,
+      :mt => { :manifest => 'some.manifest',
+        :keep_manifest_file => true } )
+
+    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
+      './sample.exe',
+      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
+      Mxx_ru::Cpp::Linker_lists.new(),
+      target )
+
+    assert( r.size > 1, "r.size (#{r.size}) should be greater than 1" )
+    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
+      '/manifest "some.manifest"', r[ -1 ] )
+  end
+
+  def test_exe_noautogen_nokeep_manifest
+    target = make_exe_target( 'exe_noautogen_keep_nomanifest' )
+
+    produce_manifest( target,
+      :target => target,
+      :mt => { :manifest => 'some.manifest' } )
+
+    r = Mxx_ru::Cpp::toolset.make_exe_command_lines(
+      './sample.exe',
+      Mxx_ru::Cpp::Exe_info.new( 'sample.exe', './' ),
+      Mxx_ru::Cpp::Linker_lists.new(),
+      target )
+
+    assert( r.size > 1, "r.size (#{r.size}) should be greater than 1" )
+    assert_equal( 'mt /nologo /outputresource:"./sample.exe;#1" ' +
+      '/manifest "some.manifest"', r[ -1 ] )
+  end
+end
+

data/tests/mxx_ru/vc8/tc_default_manifest.rb

@@ -1,17 +1,17 @@
-require 'test/unit'
-
-require 'mxx_ru/cpp'
-require 'mxx_ru/cpp/toolsets/vc8'
-
-class TC_DefaultManifest < Test::Unit::TestCase
-  def test_default
-    manifest_desc = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
-
-    assert_not_nil( manifest_desc )
-    assert_equal( manifest_desc.autogen, true )
-    assert_equal( manifest_desc.mt, true )
-    assert_equal( manifest_desc.manifest_file, :default )
-    assert_equal( manifest_desc.resource_id, :default )
-  end
-end
-
+require 'test/unit'
+
+require 'mxx_ru/cpp'
+require 'mxx_ru/cpp/toolsets/vc8'
+
+class TC_DefaultManifest < Test::Unit::TestCase
+  def test_default
+    manifest_desc = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
+
+    assert_not_nil( manifest_desc )
+    assert_equal( manifest_desc.autogen, true )
+    assert_equal( manifest_desc.mt, true )
+    assert_equal( manifest_desc.manifest_file, :default )
+    assert_equal( manifest_desc.resource_id, :default )
+  end
+end
+

data/tests/mxx_ru/vc8/tc_define_manifest.rb

@@ -1,173 +1,173 @@
-require 'test/unit'
-
-require 'mxx_ru/cpp'
-require 'mxx_ru/cpp/toolsets/vc8'
-
-class TC_DefineManifest < Test::Unit::TestCase
-  def initialize( test_method_name )
-    super test_method_name
-
-    # Default manifest should not be used.
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest nil
-  end
-
-  def test_target_autogen
-    target = Mxx_ru::Cpp::Exe_target.new( 'target_autogen.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :autogen => :to_default_file )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( false, m.mt )
-    assert_equal( :default, m.manifest_file )
-    assert_nil( m.resource_id )
-  end
-
-  def test_target_autogen_embed
-    target = Mxx_ru::Cpp::Exe_target.new( 'target_autogen_embed.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :autogen => :to_default_file,
-      :mt => {} )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( :default, m.manifest_file )
-    assert_equal( :default, m.resource_id )
-    assert_equal( false, m.keep_manifest_file )
-  end
-
-  def test_target_autogen_embed_keep_manifest
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_autogen_embed_keep_manifest.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :autogen => :to_default_file,
-      :mt => { :keep_manifest_file => true } )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( :default, m.manifest_file )
-    assert_equal( :default, m.resource_id )
-    assert_equal( true, m.keep_manifest_file )
-  end
-
-  def test_target_autogen_embed_process_manifest
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_autogen_embed_process_manifest.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :autogen => :to_default_file,
-      :mt => { :resource_id => :process_manifest } )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( :default, m.manifest_file )
-    assert_equal( :process_manifest, m.resource_id )
-  end
-
-  def test_target_autogen_file_embed
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_autogen_file_embed.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :autogen => 'hello_world.exe.manifest',
-      :mt => {} )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( 'hello_world.exe.manifest', m.manifest_file )
-    assert_equal( :default, m.resource_id )
-  end
-
-  def test_target_embed_file
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_embed_file.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :mt => { :manifest => 'hello_world.exe.manifest' } )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( false, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( 'hello_world.exe.manifest', m.manifest_file )
-    assert_equal( :default, m.resource_id )
-  end
-
-  def test_target_embed_file_isolationaware_nostaticimport
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_embed_file_isolationawate_nostaticimport.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :target => target,
-      :mt => {
-        :manifest => 'hello_world.exe.manifest',
-        :resource_id => :isolationaware_nostaticimport_manifest } )
-    
-    m = target.vc8_source_manifest
-
-    assert_not_nil( m )
-    assert_equal( false, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( 'hello_world.exe.manifest', m.manifest_file )
-    assert_equal( :isolationaware_nostaticimport_manifest, m.resource_id )
-  end
-
-  def test_autogen
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_autogen.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :autogen => :to_default_file )
-    
-    m = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( false, m.mt )
-    assert_equal( :default, m.manifest_file )
-    assert_nil( m.resource_id )
-  end
-
-  def test_autogen_embed
-    target = Mxx_ru::Cpp::Exe_target.new(
-      'target_autogen_embed.rb' )
-
-    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
-      :autogen => :to_default_file,
-      :mt => {} )
-    
-    m = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
-
-    assert_not_nil( m )
-    assert_equal( true, m.autogen )
-    assert_equal( true, m.mt )
-    assert_equal( :default, m.manifest_file )
-    assert_equal( :default, m.resource_id )
-  end
-
-end
-
+require 'test/unit'
+
+require 'mxx_ru/cpp'
+require 'mxx_ru/cpp/toolsets/vc8'
+
+class TC_DefineManifest < Test::Unit::TestCase
+  def initialize( test_method_name )
+    super test_method_name
+
+    # Default manifest should not be used.
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest nil
+  end
+
+  def test_target_autogen
+    target = Mxx_ru::Cpp::Exe_target.new( 'target_autogen.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :autogen => :to_default_file )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( false, m.mt )
+    assert_equal( :default, m.manifest_file )
+    assert_nil( m.resource_id )
+  end
+
+  def test_target_autogen_embed
+    target = Mxx_ru::Cpp::Exe_target.new( 'target_autogen_embed.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :autogen => :to_default_file,
+      :mt => {} )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( :default, m.manifest_file )
+    assert_equal( :default, m.resource_id )
+    assert_equal( false, m.keep_manifest_file )
+  end
+
+  def test_target_autogen_embed_keep_manifest
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_autogen_embed_keep_manifest.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :autogen => :to_default_file,
+      :mt => { :keep_manifest_file => true } )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( :default, m.manifest_file )
+    assert_equal( :default, m.resource_id )
+    assert_equal( true, m.keep_manifest_file )
+  end
+
+  def test_target_autogen_embed_process_manifest
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_autogen_embed_process_manifest.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :autogen => :to_default_file,
+      :mt => { :resource_id => :process_manifest } )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( :default, m.manifest_file )
+    assert_equal( :process_manifest, m.resource_id )
+  end
+
+  def test_target_autogen_file_embed
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_autogen_file_embed.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :autogen => 'hello_world.exe.manifest',
+      :mt => {} )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( 'hello_world.exe.manifest', m.manifest_file )
+    assert_equal( :default, m.resource_id )
+  end
+
+  def test_target_embed_file
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_embed_file.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :mt => { :manifest => 'hello_world.exe.manifest' } )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( false, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( 'hello_world.exe.manifest', m.manifest_file )
+    assert_equal( :default, m.resource_id )
+  end
+
+  def test_target_embed_file_isolationaware_nostaticimport
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_embed_file_isolationawate_nostaticimport.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :target => target,
+      :mt => {
+        :manifest => 'hello_world.exe.manifest',
+        :resource_id => :isolationaware_nostaticimport_manifest } )
+    
+    m = target.vc8_source_manifest
+
+    assert_not_nil( m )
+    assert_equal( false, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( 'hello_world.exe.manifest', m.manifest_file )
+    assert_equal( :isolationaware_nostaticimport_manifest, m.resource_id )
+  end
+
+  def test_autogen
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_autogen.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :autogen => :to_default_file )
+    
+    m = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( false, m.mt )
+    assert_equal( :default, m.manifest_file )
+    assert_nil( m.resource_id )
+  end
+
+  def test_autogen_embed
+    target = Mxx_ru::Cpp::Exe_target.new(
+      'target_autogen_embed.rb' )
+
+    Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+      :autogen => :to_default_file,
+      :mt => {} )
+    
+    m = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
+
+    assert_not_nil( m )
+    assert_equal( true, m.autogen )
+    assert_equal( true, m.mt )
+    assert_equal( :default, m.manifest_file )
+    assert_equal( :default, m.resource_id )
+  end
+
+end
+