Mxx_ru 1.4.3 → 1.4.4

data/lib/mxx_ru/abstract_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,
@@ -83,6 +83,33 @@ module MxxRu
       return TargetState.new( state )
     end
 
+    # Checks collection of statuses.
+    #
+    # Returns true if at least one of statuses have value REBUILT or ABSENT.
+    #
+    # Typical usage is:
+    #   subprojects_status = build_subprojects
+    #   self_files_status = build_self_files
+    #
+    #   if TargetState.rebuilding_needed?(
+    #       subprojects_status, self_files_status )
+    #     do_rebuild
+    #   end
+    #
+    # Since v.1.4.4
+    #
+    def TargetState.rebuilding_needed?( *statuses )
+      nil != statuses.find { |s| EXISTS != s.state }
+    end
+
+    # Creates and returns objects of state ABSENT
+    #
+    # Since v.1.4.4
+    #
+    def TargetState.make_absent
+      TargetState.new( ABSENT )
+    end
+
   end # Class TargetState
 
   # For compatibility with previous versions.

data/lib/mxx_ru/cpp/target.rb

@@ -1103,17 +1103,22 @@ module MxxRu
         objs_state,
         res_state )
 
+        rebuilding_needed = TargetState.rebuilding_needed?(
+            required_prjs_state,
+            objs_state,
+            res_state )
+
         state = nil
         toolset = MxxRu::Cpp::toolset
         if nil == target_type
           raise MxxRu::UnsupportedTargetTypeEx.new(
             self.class.name, "nil" )
         elsif target_type.name == LibTargetType::TYPE
-          state = toolset.make_lib( self )
+          state = toolset.make_lib( self, rebuilding_needed )
         elsif target_type.name == DllTargetType::TYPE
-          state = toolset.make_dll( self )
+          state = toolset.make_dll( self, rebuilding_needed )
         elsif target_type.name == ExeTargetType::TYPE
-          state = toolset.make_exe( self )
+          state = toolset.make_exe( self, rebuilding_needed )
         else
           raise MxxRu::UnsupportedTargetTypeEx.new(
             self.class.name, target_type.name )

data/lib/mxx_ru/cpp/toolset.rb

@@ -428,9 +428,8 @@ module  MxxRu
         cpp_objs.each { |o| target.obj_file( o.name ) }
 
         # Also informing if some object files were rebuilt.
-        state = TargetState::EXISTS
-        state = TargetState::REBUILT if ( c_objs_to_build.size() ||
-          cpp_objs_to_build.size() )
+        state = (c_objs_to_build.empty? && cpp_objs_to_build.empty?) ?
+            TargetState::EXISTS : TargetState::REBUILT
 
         return TargetState.new( state )
       end
@@ -505,7 +504,11 @@ module  MxxRu
       # Perform static library build.
       # Target parameter should be an object of a class, inherited from
       # MxxRu::Cpp::Target.
-      def make_lib( target )
+      #
+      # If force_rebuilding is true then library will be rebuilt whitout
+      # checking its dependecies.
+      #
+      def make_lib( target, force_rebuilding = false )
         # Creating result file name. Also determining in which folder
         # lib should be. The name of that folder should be included in
         # libraries search paths of given target.
@@ -514,8 +517,8 @@ module  MxxRu
         # Determining target status.
         lib_file = lib_info.full_name
 
-        lib_state = MxxRu::TargetState::detect(
-          lib_file, target.mxx_obj_files )
+        lib_state = force_rebuilding ? MxxRu::TargetState.make_absent :
+            MxxRu::TargetState::detect( lib_file, target.mxx_obj_files )
         if MxxRu::TargetState::EXISTS != lib_state.state
           # File should be rebuilt.
           cmd_lines = make_lib_command_lines(
@@ -582,24 +585,26 @@ module  MxxRu
       # Perform dynamic library build.
       # Target parameter should be an object of a class, inherited from
       # MxxRu::Cpp::Target.
-      def make_dll( target )
+      #
+      # If force_rebuilding is true then DLL will be rebuilt whitout
+      # checking its dependecies.
+      #
+      def make_dll( target, force_rebuilding = false )
         # Creating result file name.
         dll_info = make_dll_name( target.mxx_target_name, target )
-
-        # Creating dependencies list.
-        all_depend_files = create_executable_depend_list( target )
-
-        # This values will be required later during a calculation of
-        # dependencies of that DLL.
-        link_lists = prepare_linker_lists( target )
-
         dll_file = dll_info.full_name
 
-        dll_state = MxxRu::TargetState::detect(
-          dll_file, all_depend_files )
+        dll_state = if force_rebuilding
+            MxxRu::TargetState.make_absent
+          else
+            MxxRu::TargetState::detect(
+                dll_file,
+                create_executable_depend_list( target ) )
+          end
+
         if MxxRu::TargetState::EXISTS != dll_state.state
           # Target should be rebuilt.
-
+          link_lists = prepare_linker_lists( target )
           cmd_lines = make_dll_command_lines(
             dll_file, dll_info, link_lists, target )
 
@@ -655,17 +660,23 @@ module  MxxRu
       # Perform executable file build.
       # Target parameter should be an object of a class, inherited from
       # MxxRu::Cpp::Target.
-      def make_exe( target )
+      #
+      # If force_rebuilding is true then EXE will be rebuilt whitout
+      # checking its dependecies.
+      #
+      def make_exe( target, force_rebuilding = false )
         # Creating result file name.
         exe_info = make_exe_name( target.mxx_target_name, target )
-
-        # Creating dependencies list.
-        all_depend_files = create_executable_depend_list( target )
-
         exe_file = exe_info.full_name
 
-        exe_state = MxxRu::TargetState::detect(
-          exe_file, all_depend_files )
+        exe_state = if force_rebuilding
+            MxxRu::TargetState.make_absent
+          else
+            MxxRu::TargetState::detect(
+              exe_file,
+              create_executable_depend_list( target ) )
+          end
+
         if MxxRu::TargetState::EXISTS != exe_state.state
           # Target should be rebuilt.
 

data/lib/mxx_ru/version.rb

@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.4.3'
+MXX_RU_VERSION = '1.4.4'
 

data/tests/cpp/lib_from_lib_dependecies/a.cpp

@@ -0,0 +1,3 @@
+#include <cstdio>
+
+void A() { std::printf( "A2\n" ); }

data/tests/cpp/lib_from_lib_dependecies/a.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'a'
+
+  cpp_source 'a.cpp'
+}
+

data/tests/cpp/lib_from_lib_dependecies/b.cpp

@@ -0,0 +1,6 @@
+#include <cstdio>
+
+void B() {
+  std::printf( "B\n" );
+}
+

data/tests/cpp/lib_from_lib_dependecies/b.rb

@@ -0,0 +1,10 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::lib_target {
+  target 'b'
+
+  required_prj 'a.rb'
+
+  cpp_source 'b.cpp'
+}
+

data/tests/cpp/lib_from_lib_dependecies/checker.cpp

@@ -0,0 +1,10 @@
+void A();
+void B();
+
+int main() {
+  A();
+  B();
+
+  return 0;
+}
+

data/tests/cpp/lib_from_lib_dependecies/checker.rb

@@ -0,0 +1,12 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::exe_target {
+  target 'checker'
+
+  MxxRu::enable_show_brief
+
+  required_prj 'b.rb'
+
+  cpp_source 'checker.cpp'
+}
+

data/tests/cpp/lib_from_lib_dependecies/etalon/first.txt

@@ -0,0 +1,2 @@
+A
+B

data/tests/cpp/lib_from_lib_dependecies/etalon/second.txt

@@ -0,0 +1,2 @@
+A2
+B

data/tests/cpp/lib_from_lib_dependecies/first.ut.rb

@@ -0,0 +1,11 @@
+require 'mxx_ru/cpp'
+require 'mxx_ru/textfile_unittest'
+
+MxxRu::setup_target( MxxRu::TextfileUnittestTarget.new(
+    'first.ut.rb',
+    'checker.rb' ) {
+
+  launch ' > out/first.txt',
+      [ pair( 'out/first.txt', 'etalon/first.txt' ) ]
+})
+

data/tests/cpp/lib_from_lib_dependecies/second.ut.rb

@@ -0,0 +1,11 @@
+require 'mxx_ru/cpp'
+require 'mxx_ru/textfile_unittest'
+
+MxxRu::setup_target( MxxRu::TextfileUnittestTarget.new(
+    'second.ut.rb',
+    'checker.rb' ) {
+
+  launch ' > out/second.txt',
+      [ pair( 'out/second.txt', 'etalon/second.txt' ) ]
+})
+

data/tests/cpp/lib_from_lib_dependecies/tc_checker.rb

@@ -0,0 +1,47 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_NormalBuild < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/cpp/lib_from_lib_dependecies'
+
+  FIRST = 'first.ut.rb'
+  SECOND = 'second.ut.rb'
+
+  test_case :first_and_second_builds do
+    write_first_content
+    clean FIRST
+    clean SECOND
+    build FIRST
+
+    puts "sleeping for several seconds..."
+    sleep( 2 )
+    write_second_content
+    build SECOND
+
+    clean FIRST, SECOND
+  end
+
+  def write_first_content
+    File.open( 'a.cpp', 'w' ) do |file|
+      file << <<EOS
+#include <cstdio>
+
+void A() { std::printf( "A\\n" ); }
+EOS
+    end
+  end
+
+  def write_second_content
+    File.open( 'a.cpp', 'w' ) do |file|
+      file << <<EOS
+#include <cstdio>
+
+void A() { std::printf( "A2\\n" ); }
+EOS
+    end
+  end
+end
+

data/tests/cpp/rucodegen/host_config.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
-require_gem 'RuCodeGen'
+gem 'RuCodeGen'
+
+require 'rucodegen'
 
 cpp_value_incapsulator :host_config_t do |c|
 	c.decl_file :script_relative => "h/host_config.impl.hpp"

data/tests/cpp/rucodegen/impl/conn_params.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
-require_gem 'RuCodeGen'
+gem 'RuCodeGen'
+
+require 'rucodegen'
 
 cpp_value_incapsulator :conn_params_t do |c|
 	c.decl_file :script_relative => "h/conn_params.impl.hpp"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-26 00:00:00 +03:00
+date: 2008-04-03 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -72,7 +72,24 @@ files:
 - tests/cpp/custom_target_prefix
 - tests/cpp/custom_target_prefix/dll.cpp
 - tests/cpp/custom_target_prefix/dll.rb
+- tests/cpp/custom_target_prefix/o
 - tests/cpp/custom_target_prefix/tc_custom_target_prefix.rb
+- tests/cpp/lib_from_lib_dependecies
+- tests/cpp/lib_from_lib_dependecies/a.cpp
+- tests/cpp/lib_from_lib_dependecies/a.rb
+- tests/cpp/lib_from_lib_dependecies/b.cpp
+- tests/cpp/lib_from_lib_dependecies/b.rb
+- tests/cpp/lib_from_lib_dependecies/checker.cpp
+- tests/cpp/lib_from_lib_dependecies/checker.rb
+- tests/cpp/lib_from_lib_dependecies/etalon
+- tests/cpp/lib_from_lib_dependecies/etalon/first.txt
+- tests/cpp/lib_from_lib_dependecies/etalon/second.txt
+- tests/cpp/lib_from_lib_dependecies/first.ut.rb
+- tests/cpp/lib_from_lib_dependecies/o
+- tests/cpp/lib_from_lib_dependecies/o/main.obj
+- tests/cpp/lib_from_lib_dependecies/out
+- tests/cpp/lib_from_lib_dependecies/second.ut.rb
+- tests/cpp/lib_from_lib_dependecies/tc_checker.rb
 - tests/cpp/mswin_res_dll
 - tests/cpp/mswin_res_dll/build.rb
 - tests/cpp/mswin_res_dll/dll.cpp