Mxx_ru 1.2.1 → 1.3.0

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

@@ -32,18 +32,18 @@ require 'set'
 require 'mxx_ru/cpp/target'
 require 'mxx_ru/cpp/toolsets/vc_family'
 
-module  Mxx_ru
+module  MxxRu
   module  Cpp
 
     # Expand class Target to store source and actual manifest descriptions.
-    class Target < Mxx_ru::Binary_target
+    class Target < MxxRu::BinaryTarget
       # Get source manifest description. If target has no manifest
       # then default manifest will be returned.
       def vc8_source_manifest
         if nil != @vc8_source_manifest
           @vc8_source_manifest
         else
-          Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
+          MxxRu::Cpp::Toolsets::Vc8::default_manifest
         end
       end
 
@@ -63,10 +63,10 @@ module  Mxx_ru
       # Setups following tags:
       # [_ver_hi_] high version number. Value: 8.
       # [_ver_lo_] low version number. Value: 0.
-      class Vc8 < Mxx_ru::Cpp::Toolsets::Vc_family
+      class Vc8 < MxxRu::Cpp::Toolsets::VcFamily
 
         # Actual manifest description.
-        class Actual_manifest
+        class ActualManifest
           attr_reader :manifest_file
           attr_reader :digital_resource_id
 
@@ -95,7 +95,10 @@ module  Mxx_ru
           def keep_manifest_file?
             ( mt? and autogen? ) ? @source_manifest.keep_manifest_file : true
           end
-        end # class Actual_manifest
+        end # class ActualManifest
+
+        # For compatibility with previous versions.
+        Actual_manifest = ActualManifest
 
         @@default_manifest = OpenStruct.new(
           :autogen => true,
@@ -126,7 +129,7 @@ module  Mxx_ru
         # VC8.0 does not support Single-Thread Run-Time.
         def setup_mandatory_options( target )
           if THREADING_SINGLE == target.mxx_threading_mode
-            raise Mxx_ru::Unsupported_mode_ex.new(
+            raise MxxRu::UnsupportedModeEx.new(
               "Visual C++ 2005 not supports " +
               "single-threaded static RTL" )
           elsif THREADING_DEFAULT == target.mxx_threading_mode
@@ -185,65 +188,65 @@ module  Mxx_ru
         # Examples:
         #  # Autogenerate manifest for target. Do not embed into executable.
         #  # Manifest stored in <target>.manifest file.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :autogen => :to_default_file )
         # 
         #  # Autogenerate manifest for target. Embed into executable.
         #  # Autogenerated manifest will be deleted after embeding.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :autogen => :to_default_file,
         #    :mt => {} )
         # 
         #  # Autogenerate manifest for target. Embed into executable.
         #  # Autogenerated manifest will be kept after embeding.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :autogen => :to_default_file,
         #    :mt => { :keep_manifest_file => true } )
         # 
         #  # Autogenerate manifest for target. Embed into executable as
         #  # resource with id CREATEPROCESS_MANIFEST_RESOURCE_ID id.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :autogen => :to_default_file,
         #    :mt => { :resource_id => :process_manifest } )
         # 
         #  # Autogenerate manifest for target. Store manifest into
         #  # file 'hello_world.exe.manifest'. Embed info executable.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :autogen => 'hello_world.exe.manifest',
         #    :mt => {} )
         # 
         #  # Embed manifest from file 'hello_world.exe.manifest' into 
         #  # target executable.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :mt => { :manifest => 'hello_world.exe.manifest' } )
         #  # Embed manifest from file 'hello_world.dll.manifest' into 
         #  # target executable as resource with
         #  # ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID id.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :target => self,
         #    :mt => { :manifest => 'hello_world.exe.manifest',
         #      :resource_id => :isolationaware_nonstaticimport } )
         # 
         #  # Autogenerate manifest for all targets in build. Store manifest
         #  # in default files. Do not embed manifest into executable.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :autogen => :to_default_file )
         #    
         #  # Autogenerate manifest for all targets in build. Store manifest
         #  # in default files. Embed manifest into executable.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest(
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest(
         #    :autogen => :to_default_file,
         #    :mt => {} )
         # 
         #  # Drop default manifest for build. Only explicitly specified
         #  # manifest will be generated.
-        #  Mxx_ru::Cpp::Toolsets::Vc8::manifest( nil )
+        #  MxxRu::Cpp::Toolsets::Vc8::manifest( nil )
         #
         def self.manifest( params )
           if nil == params
@@ -299,8 +302,8 @@ module  Mxx_ru
         # (or default manifest exists).
         def setup_manifest( target )
           # Manifest can be set only for EXE or DLL.
-          if Exe_target_type::TYPE == target.target_type.name or
-            Dll_target_type::TYPE == target.target_type.name
+          if ExeTargetType::TYPE == target.target_type.name or
+            DllTargetType::TYPE == target.target_type.name
             desc = target.vc8_source_manifest
 
             if nil != desc
@@ -308,7 +311,7 @@ module  Mxx_ru
               manifest_file =
                 if :default == desc.manifest_file
                   # We must create name for manifest.
-                  if Exe_target_type::TYPE == target.target_type.name
+                  if ExeTargetType::TYPE == target.target_type.name
                     make_exe_name(
                       target.mxx_target_name,
                       target ).full_name
@@ -330,7 +333,7 @@ module  Mxx_ru
                     when :default: 
                       # Resource ID must be caclulated based on
                       # target type.
-                      Exe_target_type::TYPE == target.target_type.name ? 1 : 2
+                      ExeTargetType::TYPE == target.target_type.name ? 1 : 2
                     when :process_manifest: 1
                     when :isolationaware_manifest: 2
                     else
@@ -341,7 +344,7 @@ module  Mxx_ru
                   nil
                 end
 
-              target.vc8_actual_manifest = Actual_manifest.new(
+              target.vc8_actual_manifest = ActualManifest.new(
                   desc,
                   manifest_file,
                   digital_resource_id )
@@ -365,7 +368,7 @@ module  Mxx_ru
         # Remove autogenerated manifest file if any.
         def clean_autogenerated_manifest( target )
           m = target.vc8_actual_manifest
-          Mxx_ru::Util::delete_file( m.manifest_file ) if
+          MxxRu::Util::delete_file( m.manifest_file ) if
             m != nil and m.autogen?
         end
 
@@ -385,7 +388,7 @@ module  Mxx_ru
 
             if !m.keep_manifest_file?
               # del utility doesn't work with unix slashes
-              cmd_lines << "del \"#{Mxx_ru::Util::native_pathname(m.manifest_file)}\""
+              cmd_lines << "del \"#{MxxRu::Util::native_pathname(m.manifest_file)}\""
             end
           end
 
@@ -406,7 +409,7 @@ module  Mxx_ru
               # :resource_id must have one of avaliable values.
               if mt_hash.key?( :resource_id ) and
                   !@@resource_id_names.member?( mt_hash[ :resource_id ] )
-                raise Invalid_value_ex.new(
+                raise InvalidValueEx.new(
                   "invalid value for :resource_id key: " +
                     "'#{mt_hash[:resource_id]}'" ) 
               end
@@ -414,7 +417,7 @@ module  Mxx_ru
               if !mt_hash.key?( :manifest ) and
                 !params.key?( :autogen )
 
-                raise Invalid_value_ex.new(
+                raise InvalidValueEx.new(
                   "no manifest file name specified" )
               end
 
@@ -422,7 +425,7 @@ module  Mxx_ru
               if mt_hash.key?( :keep_manifest_file ) and
                 true != mt_hash[ :keep_manifest_file ] and
                 false != mt_hash[ :keep_manifest_file ]
-                raise Invalid_value_ex.new(
+                raise InvalidValueEx.new(
                   "value for :keep_manifest_file should be 'true' " +
                   "or 'false'" )
               end
@@ -432,7 +435,7 @@ module  Mxx_ru
               v = params[ :autogen ]
               if !( v == :to_default_file or
                 v.kind_of?( String ) )
-                raise Invalid_value_ex.new(
+                raise InvalidValueEx.new(
                   "invalid value for :autogen (must be " +
                   ":to_default_file or String instance)" )
               end
@@ -446,7 +449,7 @@ module  Mxx_ru
 
   end # module Cpp
 
-end # module Mxx_ru
+end # module MxxRu
 
-Mxx_ru::Cpp::setup_toolset( Mxx_ru::Cpp::Toolsets::Vc8.new )
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::Vc8.new )
 

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

@@ -28,12 +28,12 @@
 
 require 'mxx_ru/cpp/toolset'
 
-module  Mxx_ru
+module  MxxRu
   module  Cpp
     module Toolsets
 
       # Toolset implemetation for Visual C++
-      class Vc_family < Mxx_ru::Cpp::Toolset
+      class VcFamily < MxxRu::Cpp::Toolset
       public
         def initialize( a_name )
           super( a_name )
@@ -62,7 +62,7 @@ module  Mxx_ru
           return "rc"
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#setup_mandatory_options.
+        # See description at MxxRu::Cpp::Toolset#setup_mandatory_options.
         def setup_mandatory_options( target )
 
           target.compiler_option( "-nologo" )
@@ -89,7 +89,7 @@ module  Mxx_ru
 
           if RTL_SHARED == target.mxx_rtl_mode
             if THREADING_SINGLE == target.mxx_threading_mode
-              raise Mxx_ru::Unsupported_mode_ex.new(
+              raise MxxRu::UnsupportedModeEx.new(
                 "Visual C++ not support single-threaded shared RTL" )
             else
               if RUNTIME_DEBUG == target.mxx_runtime_mode
@@ -114,7 +114,7 @@ module  Mxx_ru
             end
           end
 
-          if target.target_type.name == Dll_target_type::TYPE
+          if target.target_type.name == DllTargetType::TYPE
             target.compiler_option( "-LD" )
           end
 
@@ -146,7 +146,7 @@ module  Mxx_ru
 
         end
 
-        # Common description see Mxx_ru::Cpp::Toolset#clean_lib_specific_files.
+        # Common description see MxxRu::Cpp::Toolset#clean_lib_specific_files.
         #
         # Removes VC specific garbage files.
         def clean_lib_specific_files(
@@ -157,7 +157,7 @@ module  Mxx_ru
           clean_vc_specific_garbage( a_lib_file )
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#clean_dll_specific_files.
+        # See description at MxxRu::Cpp::Toolset#clean_dll_specific_files.
         #
         # Removes import library if exists.
         #
@@ -169,19 +169,20 @@ module  Mxx_ru
 
           # Remove import library if exists.
           if nil != a_dll_info.link_name
-            implib_name = File.join( [ a_dll_info.link_path, a_dll_info.link_name ] )
-            Mxx_ru::Util::delete_file( implib_name )
+            implib_name = File.join(
+                [ a_dll_info.link_path, a_dll_info.link_name ] )
+            MxxRu::Util::delete_file( implib_name )
 
             # *.exp files are also created by Visual C++.
             explib_name =
-              Mxx_ru::Util::change_file_ext( implib_name, ".exp" )
-            Mxx_ru::Util::delete_file( explib_name )
+              MxxRu::Util::change_file_ext( implib_name, ".exp" )
+            MxxRu::Util::delete_file( explib_name )
           end
 
           clean_vc_specific_garbage( a_dll_file )
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#clean_exe_specific_files.
+        # See description at MxxRu::Cpp::Toolset#clean_exe_specific_files.
         #
         # Removing *.ilk, *.pdb files.
         def clean_exe_specific_files(
@@ -192,45 +193,45 @@ module  Mxx_ru
           clean_vc_specific_garbage( a_exe_file )
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#obj_file_ext.
+        # See description at MxxRu::Cpp::Toolset#obj_file_ext.
         def obj_file_ext
           return ".obj"
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_c_obj_command_lines.
+        # See description at MxxRu::Cpp::Toolset#make_c_obj_command_lines.
         def make_c_obj_command_lines(
           obj_name,
           source_name,
           compiler_options,
           target )
 
-          tmpfile = Mxx_ru::Util::Tmp_files.instance.create(
+          tmpfile = MxxRu::Util::TmpFiles.instance.create(
             "-c -TC -Fo#{obj_name} " +
             "#{compiler_options.join(' ')} #{source_name}" )
 
           return [ "#{compiler_name} @#{tmpfile}" ]
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_c_obj_command_lines.
+        # See description at MxxRu::Cpp::Toolset#make_c_obj_command_lines.
         def make_cpp_obj_command_lines(
           obj_name,
           source_name,
           compiler_options,
           target )
 
-          tmpfile = Mxx_ru::Util::Tmp_files.instance.create(
+          tmpfile = MxxRu::Util::TmpFiles.instance.create(
             "-c -TP -Fo#{obj_name} " +
             "#{compiler_options.join(' ')} #{source_name}" )
 
           return [ "#{compiler_name} @#{tmpfile}" ]
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#mswin_res_file_name.
+        # See description at MxxRu::Cpp::Toolset#mswin_res_file_name.
         def mswin_res_file_name( source_name )
           return source_name + ".res"
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_mswin_res_command_lines.
+        # See description at MxxRu::Cpp::Toolset#make_mswin_res_command_lines.
         def make_mswin_res_command_lines(
           res_name,
           rc_file,
@@ -242,36 +243,36 @@ module  Mxx_ru
             "/fo#{res_name} #{rc_file}" ]
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#lib_file_name.
+        # See description at MxxRu::Cpp::Toolset#lib_file_name.
         def lib_file_name( source_name )
           return source_name + ".lib"
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#lib_link_name.
+        # See description at MxxRu::Cpp::Toolset#lib_link_name.
         def lib_link_name( source_name )
           return lib_file_name( source_name )
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_lib_command_lines.
+        # See description at MxxRu::Cpp::Toolset#make_lib_command_lines.
         def make_lib_command_lines(
           lib_name,
           obj_files,
           librarian_options,
           target )
 
-          tmpfile = Mxx_ru::Util::Tmp_files.instance.create(
+          tmpfile = MxxRu::Util::TmpFiles.instance.create(
             "#{librarian_options.join(' ')} " +
             "/OUT:#{lib_name} #{obj_files.join(' ')}" )
 
           return [ "#{librarian_name} @#{tmpfile}" ]
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#dll_file_name.
+        # See description at MxxRu::Cpp::Toolset#dll_file_name.
         def dll_file_name( source_name )
           return source_name + ".dll"
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#implib_link_name.
+        # See description at MxxRu::Cpp::Toolset#implib_link_name.
         def implib_link_name(
           dll_real_name,
           target )
@@ -284,10 +285,10 @@ module  Mxx_ru
           return nil
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#implib_link_path.
+        # See description at MxxRu::Cpp::Toolset#implib_link_path.
         #
         # Returns a value, based on
-        # Mxx_ru::Cpp::Target#mxx_implib_path.
+        # MxxRu::Cpp::Target#mxx_implib_path.
         def implib_link_path(
           dll_real_name,
           dll_real_path,
@@ -296,7 +297,7 @@ module  Mxx_ru
             target.mxx_implib_path, self, target )
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_dll_command_lines.
+        # See description at MxxRu::Cpp::Toolset#make_dll_command_lines.
         def make_dll_command_lines(
           a_dll_name,
           a_dll_info,
@@ -320,22 +321,22 @@ module  Mxx_ru
           a_linker_lists.lib_paths.each { |p| result << "/LIBPATH:#{p} " }
 
           result << "#{a_linker_lists.objs.join(' ')} "
-          result << "#{a_linker_lists.libs.join(' ')} "
+          result << "#{make_libraries_list_for_linker(a_linker_lists.libs)} "
           result << "#{a_linker_lists.resources.join(' ')} "
 
-          tmpfile = Mxx_ru::Util::Tmp_files.instance.create( result )
+          tmpfile = MxxRu::Util::TmpFiles.instance.create( result )
 
           return [ "#{linker_name} @#{tmpfile}" ]
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_dll_requirements.
+        # See description at MxxRu::Cpp::Toolset#make_dll_requirements.
         def make_dll_requirements(
           a_dll_name,
           a_dll_info,
           a_linker_lists,
           a_target )
 
-          result = Dll_requirements.new
+          result = DllRequirements.new
 
           # Dependencies are exists only if import library is present.
           if nil != a_dll_info.link_name
@@ -346,12 +347,12 @@ module  Mxx_ru
           return result
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#exe_file_name.
+        # See description at MxxRu::Cpp::Toolset#exe_file_name.
         def exe_file_name( source_name )
           return source_name + ".exe"
         end
 
-        # See description at Mxx_ru::Cpp::Toolset#make_exe_command_lines.
+        # See description at MxxRu::Cpp::Toolset#make_exe_command_lines.
         def make_exe_command_lines(
           a_exe_name,
           a_exe_info,
@@ -368,10 +369,10 @@ module  Mxx_ru
           a_linker_lists.lib_paths.each { |p| result << "/LIBPATH:#{p} " }
 
           result << "#{a_linker_lists.objs.join(' ')} "
-          result << "#{a_linker_lists.libs.join(' ')} "
+          result << "#{make_libraries_list_for_linker(a_linker_lists.libs)} "
           result << "#{a_linker_lists.resources.join(' ')} "
 
-          tmpfile = Mxx_ru::Util::Tmp_files.instance.create( result )
+          tmpfile = MxxRu::Util::TmpFiles.instance.create( result )
 
           return [ "#{linker_name} @#{tmpfile}" ]
         end
@@ -384,16 +385,16 @@ module  Mxx_ru
         def setup_vc_specific_debug_options( target )
           full_name =
             case target.target_type.name
-              when Exe_target_type::TYPE:
+              when ExeTargetType::TYPE:
                 make_exe_name( target.mxx_target_name, target ).full_name
-              when Dll_target_type::TYPE:
+              when DllTargetType::TYPE:
                 make_dll_name( target.mxx_target_name, target ).full_name
-              when Lib_target_type::TYPE:
+              when LibTargetType::TYPE:
                 make_lib_name( target.mxx_target_name, target ).full_name
               else nil
             end
           if full_name
-            pdb_file = Mxx_ru::Util::change_file_ext( full_name, ".pdb" )
+            pdb_file = MxxRu::Util::change_file_ext( full_name, ".pdb" )
             target.compiler_option( "/Fd#{pdb_file}" )
             target.linker_option( "/PDB:#{pdb_file}" )
           end
@@ -405,24 +406,43 @@ module  Mxx_ru
         # If something exported from executable: *.exp, *.lib (only if
         # *.exp file exists).
         def clean_vc_specific_garbage( full_name )
-          Mxx_ru::Util::delete_file(
-            Mxx_ru::Util::change_file_ext( full_name, ".ilk" ) )
-          Mxx_ru::Util::delete_file(
-            Mxx_ru::Util::change_file_ext( full_name, ".pdb" ) )
+          MxxRu::Util::delete_file(
+            MxxRu::Util::change_file_ext( full_name, ".ilk" ) )
+          MxxRu::Util::delete_file(
+            MxxRu::Util::change_file_ext( full_name, ".pdb" ) )
 
-          exp_file_name = Mxx_ru::Util::change_file_ext( full_name, ".exp" )
+          exp_file_name = MxxRu::Util::change_file_ext( full_name, ".exp" )
           if File.exists?( exp_file_name )
-            Mxx_ru::Util::delete_file( exp_file_name )
+            MxxRu::Util::delete_file( exp_file_name )
             # Import library for this export-file must be removed too.
-            Mxx_ru::Util::delete_file(
-              Mxx_ru::Util::change_file_ext( full_name, ".lib" ) )
+            MxxRu::Util::delete_file(
+              MxxRu::Util::change_file_ext( full_name, ".lib" ) )
           end
         end
 
-      end # class Vc_family
+      protected
+        # Checks and correct name of library. For Visual C++ library
+        # name must always contain extension '.lib'. If this extension
+        # is ommitted in project files than extension must be added.
+        def check_library_name( name )
+          return name if /.lib$/i =~ name
+          return name + '.lib'
+        end
+
+        # Checks, correct and concatenate names of libraries for linker.
+        def make_libraries_list_for_linker( libraries )
+          libraries.inject( '' ) { |r, l|
+              r << check_library_name( l.name ) << ' '
+          }
+        end
+
+      end # class VcFamily
 
+      # For compatibility with previous versions.
+      Vc_family = VcFamily
     end # module Toolsets
 
   end # module Cpp
 
-end # module Mxx_ru
+end # module MxxRu
+

data/lib/mxx_ru/cpp.rb

@@ -32,5 +32,7 @@ require 'mxx_ru/cpp/detect_toolset'
 require 'mxx_ru/cpp/target'
 require 'mxx_ru/cpp/composite'
 
+require 'mxx_ru/cpp/obj_placements/custom_subdir'
+
 # Determining which toolset should be used.
-Mxx_ru::Cpp::detect_toolset
+MxxRu::Cpp::detect_toolset