Mxx_ru 1.4.9 → 1.4.10

data/Rakefile

@@ -49,6 +49,10 @@ test = Rake::TestTask.new do |t|
   test_files = test_files.delete_if { |n| /unix/ =~ n } if
       /^mswin/ =~ Config::CONFIG[ 'host_os' ]
 
+  # Darwin specific files must be excluded if not MacOS platform.
+  test_files = test_files.delete_if { |n| /darwin/ =~ n } unless 
+      /^darwin/ =~ Config::CONFIG[ 'host_os' ]
+
   t.test_files = test_files
   t.verbose = true
 end

data/lib/mxx_ru/cpp/target.rb

@@ -392,6 +392,21 @@ module MxxRu
     # For compatibility with previous versions.
     Dll_target_type = DllTargetType
 
+    # Target type is MacOS bundle (.bundle is a kind of dll on MacOS).
+    #
+    # Since v.1.4.10
+    #
+    class MacOSBundleTargetType < TargetType
+      TYPE = "macos_bundle"
+
+      def name
+        return TYPE
+      end
+    end
+
+    # For compatibility with previous versions.
+    Macos_bundle_target_type = MacOSBundleTargetType
+
     # Base class for all targets of C/C++ projects.
     class Target < MxxRu::BinaryTarget
       # Description of obj_placement object installed.
@@ -961,6 +976,7 @@ module MxxRu
         do_target_type_depending_actions(
             :lib => lambda { |toolset| toolset.full_lib_name( self ) },
             :dll => lambda { |toolset| toolset.full_dll_name( self ) },
+            :macos_bundle => lambda { |toolset| toolset.full_dll_name( self ) },
             :exe => lambda { |toolset| toolset.full_exe_name( self ) } )
       end
 
@@ -1124,6 +1140,8 @@ module MxxRu
                 toolset.make_lib( self, rebuilding_needed ) },
             :dll => lambda { |toolset|
                 toolset.make_dll( self, rebuilding_needed ) },
+            :macos_bundle => lambda { |toolset|
+                toolset.make_dll( self, rebuilding_needed ) },
             :exe => lambda { |toolset|
                 toolset.make_exe( self, rebuilding_needed ) } )
 
@@ -1148,6 +1166,7 @@ module MxxRu
         do_target_type_depending_actions(
           :lib => lambda { |toolset| toolset.clean_lib( self ) },
           :dll => lambda { |toolset| toolset.clean_dll( self ) },
+          :macos_bundle => lambda { |toolset| toolset.clean_dll( self ) },
           :exe => lambda { |toolset| toolset.clean_exe( self ) } )
       end
 
@@ -1162,6 +1181,7 @@ module MxxRu
       #   do_target_type_depending_actions(
       #     :lib => lambda { |toolset| toolset.clean_lib(self) },
       #     :dll => lambda { |toolset| toolset.clean_dll(self) },
+      #     :macos_bundle => lambda { |toolset| toolset.clean_dll(self) },
       #     :exe => lambda { |toolset| toolset.clean_exe(self) }
       #   )
       #
@@ -1174,6 +1194,8 @@ module MxxRu
           a_type_actions[ :lib ].call( toolset )
         elsif target_type.name == DllTargetType::TYPE
           a_type_actions[ :dll ].call( toolset )
+        elsif target_type.name == MacOSBundleTargetType::TYPE
+          a_type_actions[ :macos_bundle ].call( toolset )
         elsif target_type.name == ExeTargetType::TYPE
           a_type_actions[ :exe ].call( toolset )
         else
@@ -1190,7 +1212,7 @@ module MxxRu
 
     end # class Target
 
-    # Base class for targets that may be lib or dll.
+    # Base class for targets that may be lib or dll, or MacOS bundle.
     #
     # In that cases for a project should be defined special target class.
     # The class constructor should define two blocks:
@@ -1199,6 +1221,9 @@ module MxxRu
     # * second is called if developer wants to build target
     #   as a shared library. Block is run during as_dll method call;
     #
+    # Starting from version 1.4.10 this approach could also be used for
+    # bulding MacOS bundles.
+    #
     # For example:
     #
     #  class Prj < MxxRu::Cpp::LibOrDllTarget
@@ -1216,6 +1241,12 @@ module MxxRu
     #          implib_path( "lib" )
     #          define( "THREADS_1__DLL", OPT_UPSPREAD )
     #        })
+    #      # This is avaliable from v.1.4.10
+    #      init_macos_bundle_block(
+    #        Proc.new {
+    #          rtl_mode( MxxRu::Cpp::RTL_SHARED )
+    #        }
+    #      )
     # 
     #      cpp_source( "threads.cpp" )
     #      cpp_source( "micro_time.cpp" )
@@ -1234,11 +1265,11 @@ module MxxRu
     # After definition of such class for the target, project may allow
     # to use itself by the other projects using two methods.
     #
-    # == Manual execution of as_lib, as_dll methods
+    # == Manual execution of as_lib, as_dll, as_macos_bundle methods
     #
     # If project defines one class only, inherited from LibOrDllTarget,
-    # then all clients of that project should explicitly call as_lib or as_dll
-    # method during a reference to required_prj:
+    # then all clients of that project should explicitly call as_lib or as_dll,
+    # or as_macos_bundle method during a reference to required_prj:
     #
     #  class MyPrj < MxxRu::Cpp::ExeTarget
     #    def initialize( a_alias = "my_prj.rb" )
@@ -1255,8 +1286,8 @@ module MxxRu
     # == Definition of auxiliary target classes
     #
     # To make usage of target that may be lib or dll easier, project may
-    # define two auxiliary classes, which would call methods as_lib and as_dll
-    # inside their constructors:
+    # define two auxiliary classes, which would call methods as_lib, as_dll
+    # and as_macos_bundle inside their constructors:
     #
     #  class Prj < MxxRu::Cpp::LibOrDllTarget
     #    def initialize( a_alias = "threads_1/prj.rb" )
@@ -1276,6 +1307,12 @@ module MxxRu
     #      as_dll
     #    end
     #  end
+    #  class MacOSBundle < Prj
+    #    def super( a_alias = "threads_1/macos_bundle.rb" )
+    #      super( a_alias )
+    #      as_macos_bundle
+    #    end
+    #  end
     #
     # Then for using the target it would be enough to do that:
     #  class MyPrj < MxxRu::Cpp::ExeTarget
@@ -1323,6 +1360,7 @@ module MxxRu
       #  class Prj < MxxRu::Cpp::LibOrDllTarget ... end
       #  class Lib < Prj ... end
       #  class Dll < Prj ... end
+      #  class MacOSBundle < Prj ... end
       #  class MyExe < MxxRu::Cpp::ExeTarget
       #    def initialize( a_alias = "my_exe.rb" )
       #      super( a_alias )
@@ -1346,7 +1384,10 @@ module MxxRu
         @mxx_init_lib_block = nil
         # Block, which is run if dll is a target.
         @mxx_init_dll_block = nil
-        # Target type should be defined or by as_lib method, or by as_dll method.
+        # Block, which is run if MacOS bundle is a target.
+        @mxx_init_macos_bundle_block = nil
+        # Target type should be defined or by as_lib method, or by as_dll method,
+        # or by as_macos_bundle.
         @mxx_target_type = nil
 
       end
@@ -1371,6 +1412,16 @@ module MxxRu
         end
       end
 
+      # Set MacOS bundle as target type.
+      def as_macos_bundle
+        if ensure_type_not_set_yet( MacOSBundleTargetType::TYPE )
+          @mxx_target_type = MacOSBundleTargetType.new
+          if nil != @mxx_init_macos_bundle_block
+            @mxx_init_macos_bundle_block.call
+          end
+        end
+      end
+
       # Return current value of mxx_target_type.
       def target_type
         if nil == @mxx_target_type
@@ -1393,6 +1444,12 @@ module MxxRu
         @mxx_init_dll_block = a_block
       end
 
+      # Set initialization block for MacOS bundle.
+      # This block will be executed in as_macos_bundle method.
+      def init_macos_bundle_block( a_block )
+        @mxx_init_macos_bundle_block = a_block
+      end
+
     private
       # If someone already defined other target type, exception is thrown.
       # If already defined target type is the same, false returned.
@@ -1443,6 +1500,20 @@ module MxxRu
     # For compatibility with previous versions.
     Dll_target = DllTarget
 
+    # MacOS bundle is a target type.
+    class MacOSBundleTarget < LibOrDllTarget
+      def initialize( a_prj_alias, &block )
+        super( a_prj_alias, a_prj_alias )
+
+        as_macos_bundle
+
+        instance_eval( &block ) if block
+      end
+    end
+
+    # For compatibility with previous versions.
+    Macos_bundle_target = MacOSBundleTarget
+
     # Exe is a target type.
     class ExeTarget < Target
 
@@ -1473,6 +1544,7 @@ module MxxRu
 
     generate_simple_target_method :lib_target
     generate_simple_target_method :dll_target
+    generate_simple_target_method :macos_bundle_target
     generate_simple_target_method :exe_target
 
   end # module Cpp

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

@@ -51,6 +51,10 @@ module  MxxRu
             target.linker_option( "-prebind" )
             target.linker_option( "-dynamiclib" )
             target.linker_option( "-single_module" )
+          elsif target.target_type.name == MacOSBundleTargetType::TYPE
+            target.linker_option( "-prebind" )
+            target.linker_option( "-bundle" )
+            target.linker_option( "-single_module" )
           elsif target.target_type.name == ExeTargetType::TYPE
             target.linker_option( "-prebind" )
           end
@@ -60,6 +64,17 @@ module  MxxRu
         def enclose_linker_include_lib_options_into_brackes( options )
           options
         end
+
+        # See description at MxxRu::Cpp::Toolset#dll_file_name.
+        #
+        # If we are building bundle then extension should be '.bundle'
+        def dll_file_name( source_name, target )
+          if target.target_type.name == MacOSBundleTargetType::TYPE
+            construct_target_name( source_name, 'lib', '.bundle', target )
+          else
+            super
+          end
+        end
       end # class GccDarwin
 
     end # module Toolsets

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

@@ -96,7 +96,8 @@ module  MxxRu
           end
 
 # This is not required on mswin platform.
-          if target.target_type.name == DllTargetType::TYPE
+          if target.target_type.name == DllTargetType::TYPE ||
+              target.target_type.name == MacOSBundleTargetType::TYPE
             target.compiler_option( "-fPIC" )
           end
 
@@ -229,7 +230,7 @@ module  MxxRu
 
           # This library, as a first one.
           result.add_libs( [
-			 		BinaryLibrary.new( a_dll_info.link_name, BinaryLibrary::SHARED ) ] )
+            BinaryLibrary.new( a_dll_info.link_name, BinaryLibrary::SHARED ) ] )
           result.add_lib_paths( [ a_dll_info.link_path ] )
 
           # And all required libraries.

data/lib/mxx_ru/version.rb

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

data/tests/cpp/lib_from_lib_dependecies/a.cpp

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

data/tests/darwin/bundle_target_type/my_test_bundle.c

@@ -0,0 +1,5 @@
+#include <stdio.h>
+
+void hello_world() {
+  printf( "Hello, World!\n" );
+}

data/tests/darwin/bundle_target_type/my_test_bundle.rb

@@ -0,0 +1,6 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::macos_bundle_target {
+  target 'my_test_bundle'
+  c_source 'my_test_bundle.c'
+}

data/tests/darwin/bundle_target_type/tc_normal_build.rb

@@ -0,0 +1,15 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_Darwin_BundleTargetType_NormalBuild < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/darwin/bundle_target_type'
+
+  test_case :successful_build do
+    tests = [ 'my_test_bundle.rb' ]
+    build *tests
+    clean *tests
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-06 00:00:00 +03:00
+date: 2009-03-24 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -154,6 +154,11 @@ files:
 - tests/cpp/vc_cleanup/prj_lib_with_simple_target_root.rb
 - tests/cpp/vc_cleanup/simple_target_root
 - tests/cpp/vc_cleanup/tc_vc_cleanup.rb
+- tests/darwin
+- tests/darwin/bundle_target_type
+- tests/darwin/bundle_target_type/my_test_bundle.c
+- tests/darwin/bundle_target_type/my_test_bundle.rb
+- tests/darwin/bundle_target_type/tc_normal_build.rb
 - tests/mxx_ru
 - tests/mxx_ru/binary_library
 - tests/mxx_ru/binary_library/tc_binary_library.rb