Mxx_ru 1.4.1 → 1.4.2

data/THANKS

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

data/lib/mxx_ru/cpp/rucodegen.rb

@@ -127,10 +127,12 @@ class RuCodeGen < AbstractGenerator
   alias_method :add, :<<
 
   # Adding a name of next embeded code generation script.
-  def add_embeded( script )
+  def add_embedded( script )
     @scripts << Embedded.new( @target.create_full_src_file_name( script ) )
   end
 
+  alias_method :add_embeded, :add_embedded
+
   # Perform code generation.
   def build( target )
     @scripts.each do |s|

data/lib/mxx_ru/cpp/target.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -457,6 +457,11 @@ module MxxRu
       # Otherwise the value of mxx_target_root is concatenated with a given
       # target name.
       attr_reader :mxx_target_root
+      # Custom prefix for target.
+      # NIL, if custom prefix not defined.
+      #
+      # Since v.1.4.2
+      attr_reader :mxx_target_prefix
       # Custom extension for target.
       # NIL, if custom extension not defined.
       attr_reader :mxx_target_ext
@@ -743,10 +748,16 @@ module MxxRu
         @mxx_target_name = create_full_target_file_name( a_target )
       end
 
+      # Set a custom prefix for target.
+      def target_prefix( ext )
+        @mxx_target_prefix = ext
+      end
+
       # Set a custom extension for target.
       def target_ext( ext )
         @mxx_target_ext = ext
       end
+      alias_method :target_suffix, :target_ext
 
       # Change source files path.
       # If empty string is set, then full file names are required.

data/lib/mxx_ru/cpp/toolset.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -267,7 +267,7 @@ module  MxxRu
       # There are possible situations where non-standard tool must be run
       # instead of standard one. For example, a patched compiler that has name
       # 'gcc-patched' instead of 'gcc'. It isn't appropriate to create new
-      # toolset for this. More easy to set thename of a custom tool in
+      # toolset for this. More easy to set the name of a custom tool in
       # MXX_RU_CPP_TOOLSET environment variable:
       #
       #   export MXX_RU_CPP_TOOLSET=gcc_linux compiler_name=gcc-patched
@@ -788,7 +788,7 @@ module  MxxRu
       #
       # AbstractMethodEx exception is thrown in a base class.
       #
-      def lib_file_name( source_name )
+      def lib_file_name( source_name, target )
         raise AbstractMethodEx.new(
           "MxxRu::Cpp::Toolset::lib_file_name" )
       end
@@ -797,7 +797,7 @@ module  MxxRu
       #
       # AbstractMethodEx exception is thrown in a base class.
       #
-      def lib_link_name( source_name )
+      def lib_link_name( source_name, target )
         raise AbstractMethodEx.new(
           "MxxRu::Cpp::Toolset::lib_link_name" )
       end
@@ -826,7 +826,7 @@ module  MxxRu
       #
       # AbstractMethodEx exception is thrown in a base class.
       #
-      def dll_file_name( source_name )
+      def dll_file_name( source_name, target )
         raise AbstractMethodEx.new(
           "MxxRu::Cpp::Toolset::dll_file_name" )
       end
@@ -909,7 +909,7 @@ module  MxxRu
       #
       # AbstractMethodEx exception is thrown in a base class.
       #
-      def exe_file_name( source_name )
+      def exe_file_name( source_name, target )
         raise AbstractMethodEx.new(
           "MxxRu::Cpp::Toolset::exe_file_name" )
       end
@@ -1043,10 +1043,8 @@ module  MxxRu
         source_name = File::basename( lib_name )
         source_path = File::dirname( lib_name )
 
-        real_name = setup_custom_target_ext(
-            lib_file_name( source_name ),
-            target )
-        link_name = lib_link_name( source_name )
+        real_name = lib_file_name( source_name, target )
+        link_name = lib_link_name( source_name, target )
         dest_path = target.mxx_obj_placement.get_lib(
           source_path, self, target )
 
@@ -1060,9 +1058,7 @@ module  MxxRu
         source_name = File::basename( dll_name )
         source_path = File::dirname( dll_name )
 
-        dll_real_name = setup_custom_target_ext(
-            dll_file_name( source_name ),
-            target )
+        dll_real_name = dll_file_name( source_name, target )
         dll_dest_path = target.mxx_obj_placement.get_dll(
           source_path, self, target )
 
@@ -1083,9 +1079,7 @@ module  MxxRu
         source_name = File::basename( exe_name )
         source_path = File::dirname( exe_name )
 
-        real_name = setup_custom_target_ext(
-            exe_file_name( source_name ),
-            target )
+        real_name = exe_file_name( source_name, target )
         dest_path = target.mxx_obj_placement.get_exe(
           source_path, self, target )
 
@@ -1139,14 +1133,46 @@ module  MxxRu
       end
 
     protected
-      # Setup custom target extension if that extension defined.
-      def setup_custom_target_ext( target_file_name, target )
-        if target.mxx_target_ext
-          return Util::remove_file_ext( target_file_name ) +
-              target.mxx_target_ext
-        end
+      # There isn't a prefix for target name
+      #
+      # Since v.1.4.2
+      NO_PREFIX = nil
+
+      # There isn't a suffix for target name
+      #
+      # Since v.1.4.2
+      NO_SUFFIX = nil
 
-        target_file_name
+      # Helper method for creating name of target with consideration
+      # of target's custom prefix and/or suffix.
+      #
+      # Should be used in derived classes. Example of usage:
+      #
+      #   # For GCC family on Unix.
+      #   def lib_file_name( source_name, target )
+      #     construct_target_name( source_name, 'lib', '.a', target )
+      #   end
+      #   # For Visual C++ family on Windows.
+      #   def lib_file_name( source_name, target )
+      #     construct_target_name( source_name, NO_PREFIX, '.lib', target )
+      #   end
+      #
+      # Since v.1.4.2
+      #
+      def construct_target_name(
+          # Base name for target name construction.
+          source_name,
+          # Default prefix for target. nil if there isn't such prefix.
+          default_prefix,
+          # Default suffix for target. nil if there isn't such suffix.
+          default_suffix,
+          # Target for which resulting name is being constructed.
+          target )
+        p = target.mxx_target_prefix
+        p = ( default_prefix.nil? ? '' : default_prefix ) unless p
+        s = target.mxx_target_ext
+        s = ( default_suffix.nil? ? '' : default_suffix ) unless s
+        p + source_name + s
       end
 
     end # class Toolset

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

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -244,13 +244,13 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_file_name.
-        def lib_file_name( source_name )
-          return source_name + ".lib"
+        def lib_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".lib", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_link_name.
-        def lib_link_name( source_name )
-          return lib_file_name( source_name )
+        def lib_link_name( source_name, target )
+          return lib_file_name( source_name, target )
         end
 
         # See description at MxxRu::Cpp::Toolset#make_lib_command_lines.
@@ -274,8 +274,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#dll_file_name.
-        def dll_file_name( source_name )
-          return source_name + ".dll"
+        def dll_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".dll", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#implib_link_name.
@@ -285,7 +285,7 @@ module  MxxRu
 
           # Import library name should be defined explicitly for Visual C++
           if nil != target.mxx_implib_path
-            return lib_file_name( target.mxx_target_name )
+            return lib_file_name( target.mxx_target_name, target )
           end
 
           return nil
@@ -351,8 +351,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#exe_file_name.
-        def exe_file_name( source_name )
-          return source_name + ".exe"
+        def exe_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".exe", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#make_exe_command_lines.

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

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -145,12 +145,12 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_file_name.
-        def lib_file_name( source_name )
-          return "lib" + source_name + ".a"
+        def lib_file_name( source_name, target )
+          return construct_target_name( source_name, "lib", ".a", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_link_name.
-        def lib_link_name( source_name )
+        def lib_link_name( source_name, target )
           return source_name
         end
 
@@ -168,8 +168,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#dll_file_name.
-        def dll_file_name( source_name )
-          return "lib" + source_name + ".so"
+        def dll_file_name( source_name, target )
+          return construct_target_name( source_name, 'lib', '.so', target )
         end
 
         # See description at MxxRu::Cpp::Toolset#implib_link_name.
@@ -179,7 +179,7 @@ module  MxxRu
 
           # Target name should be passed to linker on UNIX platform
           return lib_link_name(
-            File.basename( target.mxx_target_name ) )
+            File.basename( target.mxx_target_name ), target )
         end
 
         # See description at MxxRu::Cpp::Toolset#implib_link_path.
@@ -240,8 +240,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#exe_file_name.
-        def exe_file_name( source_name )
-          return source_name
+        def exe_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, NO_SUFFIX, target )
         end
 
         # See description at MxxRu::Cpp::Toolset#make_exe_command_lines.

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

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -146,12 +146,12 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_file_name.
-        def lib_file_name( source_name )
-          return "lib" + source_name + ".a"
+        def lib_file_name( source_name, target )
+          return construct_target_name( source_name, 'lib', '.a', target )
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_link_name.
-        def lib_link_name( source_name )
+        def lib_link_name( source_name, target )
           return source_name
         end
 
@@ -169,8 +169,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#dll_file_name.
-        def dll_file_name( source_name )
-          return "lib" + source_name + ".so"
+        def dll_file_name( source_name, target )
+          return construct_target_name( source_name, 'lib', '.so', target )
         end
 
         # See description at MxxRu::Cpp::Toolset#implib_link_name.
@@ -180,7 +180,7 @@ module  MxxRu
 
           # Target name should be passed to linker on UNIX platform
           return lib_link_name(
-            File.basename( target.mxx_target_name ) )
+            File.basename( target.mxx_target_name ), target )
         end
 
         # See description at MxxRu::Cpp::Toolset#implib_link_path.
@@ -244,8 +244,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#exe_file_name.
-        def exe_file_name( source_name )
-          return source_name
+        def exe_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, NO_SUFFIX, target )
         end
 
         # See description at MxxRu::Cpp::Toolset#make_exe_command_lines.
@@ -318,8 +318,8 @@ module  MxxRu
       public
 
         # See description at MxxRu::Cpp::Toolset#exe_file_name.
-        def exe_file_name( source_name )
-          return source_name + ".exe"
+        def exe_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".exe", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#clean_dll_specific_files.
@@ -333,7 +333,7 @@ module  MxxRu
           # Delete import library if exists.
           if nil != a_dll_info.link_name
             implib_name = File.join( [ a_dll_info.link_path,
-              lib_file_name( a_dll_info.link_name ) ] )
+              lib_file_name( a_dll_info.link_name, a_target ) ] )
             MxxRu::Util::delete_file( implib_name )
           end
         end
@@ -345,7 +345,7 @@ module  MxxRu
 
           # It's required to pass import library name to linker on mswin platform
           if nil != target.mxx_implib_path
-            return lib_link_name( target.mxx_target_name )
+            return lib_link_name( target.mxx_target_name, target )
           end
 
           return nil
@@ -388,7 +388,7 @@ module  MxxRu
           # Build import library if it's required.
           if nil != a_dll_info.link_name
             full_lib_name = File.join( [ a_dll_info.link_path,
-              lib_file_name( a_dll_info.link_name ) ] )
+              lib_file_name( a_dll_info.link_name, a_target ) ] )
 
             return "-Wl,--out-implib=#{full_lib_name}" +
               ",--export-all-symbols"

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

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -244,13 +244,13 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_file_name.
-        def lib_file_name( source_name )
-          return source_name + ".lib"
+        def lib_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, '.lib', target )
         end
 
         # See description at MxxRu::Cpp::Toolset#lib_link_name.
-        def lib_link_name( source_name )
-          return lib_file_name( source_name )
+        def lib_link_name( source_name, target )
+          return lib_file_name( source_name, target )
         end
 
         # See description at MxxRu::Cpp::Toolset#make_lib_command_lines.
@@ -268,8 +268,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#dll_file_name.
-        def dll_file_name( source_name )
-          return source_name + ".dll"
+        def dll_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".dll", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#implib_link_name.
@@ -279,7 +279,7 @@ module  MxxRu
 
           # Import library should be defined explicitly for Visual C++.
           if nil != target.mxx_implib_path
-            return lib_file_name( target.mxx_target_name )
+            return lib_file_name( target.mxx_target_name, target )
           end
 
           return nil
@@ -348,8 +348,8 @@ module  MxxRu
         end
 
         # See description at MxxRu::Cpp::Toolset#exe_file_name.
-        def exe_file_name( source_name )
-          return source_name + ".exe"
+        def exe_file_name( source_name, target )
+          return construct_target_name( source_name, NO_PREFIX, ".exe", target )
         end
 
         # See description at MxxRu::Cpp::Toolset#make_exe_command_lines.

data/lib/mxx_ru/generators/cpp-build-root/g.rb

@@ -0,0 +1,173 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006-2008, The Mxx_ru Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#++
+
+# Since v.1.4.2
+#
+# Implementation of project's stabs generation for C++ build.rb root project file.
+
+require 'erb'
+require 'optparse'
+
+require 'mxx_ru/generators/impl/std_receiver'
+
+module MxxRu
+
+module Generators
+
+module CppBuildRoot
+
+# Class for storing command-line arguments as options.
+#
+# Usage:
+#   options = Options.parse( args, banner )
+#
+class Options
+  # Name of output file (-o, --output-file). nil if missing.
+  attr_accessor :output_file
+
+  # Parsing command-line arguments and returning Options instance.
+  #
+  # Calls exit(1) if --help present in _args_.
+  #
+  def Options.parse( args, banner )
+    parser = OptionParser.new
+
+    result = Options.new
+
+    parser.banner = banner
+
+    parser.on( '-o', '--output-file FILE', 'Output file name' ) do |p|
+      result.output_file = p
+    end
+
+    parser.on_tail( '-h', '--help', 'Show this message' ) do
+      puts parser
+      exit(1)
+    end
+
+    parser.parse!( args )
+    result
+  end
+end # class Options
+
+# Class to be used in ERb template generation.
+#
+# Usage:
+#   template_params = TemplateParams.new( target_type, options )
+#   template = ERb.new( IO.read( some_template_file ) )
+#   result = template.generate( template.get_binding )
+#
+class TemplateParams
+  # For a case when output_file is undetectable.
+  DEFAULT_BUILD_ROOT = 'build.rb'
+
+  # Name of build root file.
+  attr_reader :build_root_project
+
+  # Param target_type must be present in @@setup_target_functions.
+  def initialize( options )
+    @build_root_project = try_detect_build_root_project( options )
+  end
+
+  # Returns binding to use in ERb generation.
+  def get_binding
+    binding
+  end
+
+private
+  # Try to setup name of build root project file.
+  #
+  # If --output-file specified then its value used.
+  # Otherwise value 'build.rb' is used.
+  #
+  def try_detect_build_root_project( options )
+    options.output_file ?
+        File.basename( options.output_file ) :
+        DEFAULT_BUILD_ROOT
+  end
+
+end # class TemplateParams
+
+# Main class for code generation of binary unit test projects.
+#
+# Usage:
+#   receiver = StdReceiver.new
+#   generator = Generator.new( args, receiver )
+#   generator.run
+#
+class Generator
+  def initialize( args, receiver )
+    @args = args
+    @receiver = receiver
+  end
+
+  def run
+    options = Options.parse( @args,
+        "Stubs for C++ build root file generator\n\n" +
+        "Usage:\n" +
+        "mxxrugen [<mxxrugen-options>] cpp-build-root [<options>]\n\n" )
+    result = do_generation( options )
+    @receiver.receive( result, options.output_file )
+  end
+
+private
+  # Performs main generation actions.
+  #
+  # Returns generation result as String.
+  def do_generation( options )
+    template = IO.read( File.join( File.dirname( __FILE__ ), 'template.erb' ) )
+    generator = ERB.new( template )
+
+    params = TemplateParams.new( options )
+    generator.result( params.get_binding ).gsub( /\n\n\n+/, "\n\n" )
+  end
+end
+
+# Helper method for generation.
+#
+# Usage:
+#   # For using StdReceiver.
+#   generate_for( ARGV )
+#
+#   # For using custom Receiver.
+#   generate_for( ARGV, CustomReceiver.new )
+#
+def CppBuildRoot.generate_for( args, receiver = nil )
+  generator = Generator.new( args,
+      receiver ? receiver : MxxRu::Generators::Impl::StdReceiver.new )
+  generator.run
+end
+
+end # module BinaryUnittest
+
+end # module Generators
+
+end # module MxxRu
+
+MxxRu::Generators::CppBuildRoot::generate_for( ARGV )
+

data/lib/mxx_ru/generators/cpp-build-root/template.erb

@@ -0,0 +1,15 @@
+require 'rubygems'
+
+gem 'Mxx_ru', '>= 1.3.0'
+
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::composite_target( MxxRu::BUILD_ROOT ) {
+  global_inclide_path '.'
+  default_runtime_mode MxxRu::Cpp::RUNTIME_RELEASE
+  MxxRu::enable_show_brief
+
+# Include your projects here:
+#  require_prj 'your-project.rb'
+}
+

data/lib/mxx_ru/version.rb

@@ -1,7 +1,7 @@
 #--
 # Copyright (c) 1996-2004, Yauheni Akhotnikau
 # Copyright (c) 2004-2006, JSC Intervale
-# Copyright (c) 2006, The Mxx_ru Project
+# Copyright (c) 2006-2008, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.4.1'
+MXX_RU_VERSION = '1.4.2'
 

data/tests/cpp/custom_target_prefix/dll.cpp

@@ -0,0 +1,8 @@
+#include <iostream>
+
+void
+dummy()
+  {
+    std::cout << "hello, world!" << std::endl;
+  }
+

data/tests/cpp/custom_target_prefix/dll.rb

@@ -0,0 +1,13 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::dll_target {
+
+  Mxx_ru::enable_show_brief
+
+  target( 'dll' )
+  target_prefix( 'p-' )
+  target_suffix( '.s' )
+
+  cpp_source 'dll.cpp'
+}
+

data/tests/cpp/custom_target_prefix/tc_custom_target_prefix.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_CustomTargetPrefix < Test::Unit::TestCase
+  include TestWithCompilation
+
+  EXPECTED_NAME = 'p-dll.s'
+
+  test_path 'tests/cpp/custom_target_prefix'
+
+  test_case :build_and_clean do
+    build( 'dll.rb' )
+
+    assert( File.exists?( EXPECTED_NAME ),
+        "Expected name is '#{EXPECTED_NAME}'" )
+
+    clean( 'dll.rb' )
+  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.4.1
-date: 2007-06-25 00:00:00 +04:00
+  version: 1.4.2
+date: 2008-02-15 00:00:00 +03:00
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool
 require_paths: 
 - lib
@@ -58,16 +58,25 @@ files:
 - 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/1/o
 - 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/2/o
 - 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/3/o
 - 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/4/o
 - 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/tc_cpp_sources_glob.rb
+- tests/cpp/custom_target_prefix
+- tests/cpp/custom_target_prefix/dll.cpp
+- tests/cpp/custom_target_prefix/dll.rb
+- tests/cpp/custom_target_prefix/tc_custom_target_prefix.rb
 - tests/cpp/mswin_res_dll
 - tests/cpp/mswin_res_dll/build.rb
 - tests/cpp/mswin_res_dll/dll.cpp
@@ -96,6 +105,7 @@ files:
 - 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/src/o
 - tests/cpp/mswin_res_exe/tc_mswin_res_exe.rb
 - tests/cpp/o
 - tests/cpp/rucodegen
@@ -204,6 +214,7 @@ files:
 - 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/o
 - tests/mxx_ru/lib_collection/tc_lib_collection.rb
 - tests/mxx_ru/lib_path
 - tests/mxx_ru/lib_path/build.rb
@@ -215,6 +226,7 @@ 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
 - tests/mxx_ru/obj_placements/tc_custom_subdir.rb
@@ -224,6 +236,7 @@ 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
@@ -235,6 +248,7 @@ 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
@@ -353,6 +367,9 @@ files:
 - lib/mxx_ru/generators/bin-unittest
 - lib/mxx_ru/generators/bin-unittest/g.rb
 - lib/mxx_ru/generators/bin-unittest/template.erb
+- lib/mxx_ru/generators/cpp-build-root
+- lib/mxx_ru/generators/cpp-build-root/g.rb
+- lib/mxx_ru/generators/cpp-build-root/template.erb
 - lib/mxx_ru/generators/cpp-composite
 - lib/mxx_ru/generators/cpp-composite/g.rb
 - lib/mxx_ru/generators/cpp-dll
@@ -388,6 +405,8 @@ files:
 - examples/exe_dll_lib/say.hpp
 - examples/exe_dll_lib/say.rb
 - examples/exe_dll_lib_2
+- examples/exe_dll_lib_2/bin
+- examples/exe_dll_lib_2/bin/lib
 - examples/exe_dll_lib_2/build.rb
 - examples/exe_dll_lib_2/inout
 - examples/exe_dll_lib_2/inout/inout.cpp
@@ -404,6 +423,11 @@ files:
 - 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/exe_dll_lib_2/tmp
+- examples/exe_dll_lib_2/tmp/output
+- examples/exe_dll_lib_2/tmp/output/inout
+- examples/exe_dll_lib_2/tmp/output/main
+- examples/exe_dll_lib_2/tmp/output/say
 - examples/simple_exe
 - examples/simple_exe/main.cpp
 - examples/simple_exe/prj.rb