Mxx_ru 1.4.10 → 1.5.0

data/lib/mxx_ru/abstract_target.rb

@@ -256,7 +256,7 @@ module MxxRu
     #
     # Returns target object, which is defined in subordinated project.
     def required_prj( a_prj )
-      # If project is not loaded yet, loding it.
+      # If project is not loaded yet, loading it.
       # Then adding created target object to the list ofd subordinated projects.
       # If no target will be created, exception would be thrown.
       if !MxxRu::target_defined_for?( a_prj )

data/lib/mxx_ru/compat.rb

@@ -30,4 +30,4 @@ module MxxRu
 end
 
 # For compatibility with previous versions.
-Mxx_ru = MxxRu unless Module.constants.member?('Mxx_ru')
+Mxx_ru = MxxRu unless Module.constants.member?(:Mxx_ru)

data/lib/mxx_ru/cpp/rucodegen.rb

@@ -137,7 +137,7 @@ class RuCodeGen < AbstractGenerator
   def build( target )
     @scripts.each do |s|
       AbstractTarget.run(
-          s.build_cmd( :build ),
+          [ s.build_cmd( :build ) ],
           [],
           "running code generation script #{s} (build mode)" )
     end
@@ -147,7 +147,7 @@ class RuCodeGen < AbstractGenerator
   def clean( target )
     @scripts.each do |s|
       AbstractTarget.run(
-          s.build_cmd( :clean ),
+          [ s.build_cmd( :clean ) ],
           [],
           "running code generation script #{s} (clean mode)" )
     end

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

@@ -325,12 +325,14 @@ module  MxxRu
               digital_resource_id =
                 if desc.mt
                   case desc.resource_id
-                    when :default: 
+                    when :default
                       # Resource ID must be caclulated based on
                       # target type.
                       ExeTargetType::TYPE == target.target_type.name ? 1 : 2
-                    when :process_manifest: 1
-                    when :isolationaware_manifest: 2
+                    when :process_manifest
+                      1
+                    when :isolationaware_manifest
+                      2
                     else
                       # :isolationaware_nostaticimport_manifest
                       3

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

@@ -385,11 +385,11 @@ module  MxxRu
         def setup_vc_specific_debug_options( target )
           full_name =
             case target.target_type.name
-              when ExeTargetType::TYPE:
+              when ExeTargetType::TYPE
                 make_exe_name( target.mxx_target_name, target ).full_name
-              when DllTargetType::TYPE:
+              when DllTargetType::TYPE
                 make_dll_name( target.mxx_target_name, target ).full_name
-              when LibTargetType::TYPE:
+              when LibTargetType::TYPE
                 make_lib_name( target.mxx_target_name, target ).full_name
               else nil
             end

data/lib/mxx_ru/util.rb

@@ -28,6 +28,7 @@
 
 require 'rbconfig'
 require 'singleton'
+require 'pathname'
 
 require 'mxx_ru/ex'
 require 'mxx_ru/cmd_line_option_processor'
@@ -387,11 +388,18 @@ module MxxRu
       r = CALLER_ENTRY_REGEX.match( caller_result[ 0 ] )[ 1 ]
       # Name can starts with './' ('./some/module/prj.rb'). That name
       # must be transformed to 'some/module/prj.rb'.
-      if r[ 0..1 ] == './'
-        r[ 2...r.size ]
-      else
-        r
+      r = if r[ 0..1 ] == './'
+          r[ 2...r.size ]
+        else
+          r
+        end
+      # Path could be absolute. We should extract current path name from it.
+      p = Pathname.new( r )
+      if p.absolute?
+        p = p.relative_path_from( Pathname.pwd )
       end
+
+      p.to_s
     end
 
   end # module Util

data/lib/mxx_ru/version.rb

@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.4.10'
+MXX_RU_VERSION = '1.5.0'
 

data/tests/cpp/textfile_unittest/build.rb

@@ -1,8 +1,6 @@
 require 'mxx_ru/cpp'
 
-Mxx_ru::setup_target(
-	Mxx_ru::Cpp::Composite_target.new( Mxx_ru::BUILD_ROOT ) {
+MxxRu::Cpp::composite_target( Mxx_ru::BUILD_ROOT ) {
 
-		required_prj( "prj.ut.rb" )
-	}
-)
+	required_prjs [ "prj.ut.rb" ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.10
+  version: 1.5.0
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 +03:00
+date: 2009-05-22 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -80,6 +80,7 @@ files:
 - 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/o/dll.o
 - tests/cpp/mswin_res_dll/res
 - tests/cpp/mswin_res_dll/res/tree_fol.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_1.bmp
@@ -98,6 +99,7 @@ files:
 - 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/src/o/main.o
 - tests/cpp/mswin_res_exe/tc_mswin_res_exe.rb
 - tests/cpp/o
 - tests/cpp/rucodegen
@@ -464,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool