Mxx_ru 1.4.8 → 1.4.9

data/THANKS

@@ -2,3 +2,4 @@ Konstantine Nazarov (rut at user dot sourceforge dot net)
 Igor Mironchick (imironchick at gmail dot com)
 Mikhail Pustovalov (mpustovalov at gmail dot com)
 Oleg Nabiullin (nabiullin at tecomgroup dot ru)
+Timur Hairulin (timurhai at gmail dot com)

data/lib/mxx_ru/cpp/qt4details.rb

@@ -206,6 +206,22 @@ module Cpp
     # More exact: a.qrc -> a.rcc
     attr_reader :qt_qrc2rcc_files
 
+    # File list for translations.
+    #
+    attr_reader :qt_ts_files
+
+    # List of options for lupdate utility.
+    #
+    # Default value: [ '-noobsolete', '-silent' ]
+    #
+    attr_accessor :lupdate_options
+
+    # Name of lupdate tool.
+    #
+    # Default value: lupdate.
+    #
+    attr_accessor :lupdate_name
+
     # Target, generator is created for.
     attr  :target
 
@@ -220,6 +236,8 @@ module Cpp
       @moc_result_subdir = nil
       @uic_result_subdir = nil
       @qrc_result_subdir = nil
+      @lupdate_name = 'lupdate'
+      @lupdate_options = [ '-noobsolete', '-silent' ]
 
       # If uic_result_subdir not nil than we must add
       # uic_result_subdir into
@@ -231,6 +249,7 @@ module Cpp
       @qt_ui_files = []
       @qt_qrc2cpp_files = []
       @qt_qrc2rcc_files = []
+      @qt_ts_files = []
 
       defines_to_set = a_defines.flatten
       defines_to_set.each { |d| a_target.define( d ) }
@@ -293,6 +312,14 @@ module Cpp
       a_modules.each { |m| use_module( m ) }
     end
 
+    # Add translation file.
+    #
+    # a_file -- name of .ts-file.
+    #
+    def ts( a_name )
+      @qt_ts_files << a_name
+    end
+
     # Perform files generation.
     def build( a_target )
       build_from_ui( a_target )
@@ -300,6 +327,7 @@ module Cpp
       build_from_qrc2rcc( a_target )
       build_from_h( a_target )
       build_from_cpp( a_target )
+      build_translations( a_target )
     end
 
     # Perform generated files cleanup.
@@ -519,6 +547,24 @@ module Cpp
       }
     end
 
+    # Perform .ts-files building.
+    #
+    def build_translations( a_target )
+      return if 0 == @qt_ts_files.size
+
+      project_path = File.dirname( a_target.prj_alias )
+      @qt_ts_files.each do |ts_file|
+        full_ts_file_name = File.join( project_path, ts_file )
+        MxxRu::Util::ensure_path_exists( File.dirname( full_ts_file_name ) )
+
+        MxxRu::AbstractTarget::run(
+            [ "#{lupdate_name} #{lupdate_options.join(' ')} " +
+                "#{project_path} -ts #{full_ts_file_name}" ],
+            [ full_ts_file_name ],
+            "building translation file #{full_ts_file_name}" )
+      end
+    end
+
     # Formatting file name, which is generated from cpp file by moc tool
     def moc_from_cpp( a_cpp_file, a_target )
       path = make_moc_result_path_for( File.dirname( a_cpp_file ) )

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

@@ -0,0 +1,72 @@
+#--
+# Copyright (c) 1996-2004, Yauheni Akhotnikau
+# Copyright (c) 2004-2006, JSC Intervale
+# Copyright (c) 2006-2009, 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.
+#++
+
+require 'mxx_ru/cpp/toolsets/gcc_unix_family'
+
+module  MxxRu
+  module  Cpp
+    module Toolsets
+
+      # Toolset implemetation for GCC compiler for MacOS X (Darwin).
+      class GccDarwin < GccFamily
+      public
+        def initialize( a_name = "gcc" )
+          super( a_name )
+
+          setup_tag( GCC_PORT_TAG, GCC_PORT_UNIX )
+          setup_tag( "host_os", "unix" )
+          setup_tag( "target_os", "unix" )
+          setup_tag( "unix_port", "darwin" )
+        end
+
+        def setup_mandatory_options( target )
+          super( target )
+
+          if target.target_type.name == DllTargetType::TYPE
+            target.linker_option( "-prebind" )
+            target.linker_option( "-dynamiclib" )
+            target.linker_option( "-single_module" )
+          elsif target.target_type.name == ExeTargetType::TYPE
+            target.linker_option( "-prebind" )
+          end
+        end
+
+        # There ins't any bracket on MacOS X.
+        def enclose_linker_include_lib_options_into_brackes( options )
+          options
+        end
+      end # class GccDarwin
+
+    end # module Toolsets
+
+  end # module Cpp
+
+end # module MxxRu
+
+MxxRu::Cpp::setup_toolset( MxxRu::Cpp::Toolsets::GccDarwin.new )
+

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-2008, The Mxx_ru Project
+# Copyright (c) 2006-2009, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -279,7 +279,16 @@ module  MxxRu
           all_libs = libs.inject( '' ) { |r, l|
               r << '-l' << port_specific_lib_name_checker( l.name ) << ' '
           }
-          "-Wl,--start-group #{all_libs} -Wl,--end-group "
+          enclose_linker_include_lib_options_into_brackes( all_libs )
+        end
+
+        # Enclose library list into brackets if necessary.
+        #
+        # For example, on Linux -Wl,--start-group and -Wl,--end-group
+        # should be used around library list.
+        #
+        def enclose_linker_include_lib_options_into_brackes( options )
+          "-Wl,--start-group #{options} -Wl,--end-group "
         end
 
         # Return string containing port-specific linker option for DLL linking.

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

@@ -61,7 +61,7 @@ class GccUnixFamily < GccFamily
         r << '-l' << port_specific_lib_name_checker( l.name ) << ' '
     }
     all_libs << switch_to_default_lib_mode_if_needed( current_lib_type )
-    "-Wl,--start-group #{all_libs} -Wl,--end-group "
+    enclose_linker_include_lib_options_into_brackes( all_libs )
   end
 
   # Return default library linking mode for current platform.

data/lib/mxx_ru/version.rb

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

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/cpp/lib_from_lib_dependecies/a.rb

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

data/tests/cpp/lib_from_lib_dependecies/b.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'b'
+  target 'MyB'
 
   required_prj 'a.rb'
 

data/tests/mxx_ru/lib_collection/a.rb

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

data/tests/mxx_ru/lib_collection/b.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'B'
+  target 'MyB'
 
   cpp_source 'b.cpp'
 }

data/tests/mxx_ru/lib_collection/c.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'C'
+  target 'MyC'
 
   cpp_source 'c.cpp'
 }

data/tests/mxx_ru/lib_collection/d.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'D'
+  target 'MyD'
 
   cpp_source 'd.cpp'
 }

data/tests/mxx_ru/lib_collection/e.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'E'
+  target 'MyE'
 
   cpp_source 'e.cpp'
 }

data/tests/mxx_ru/lib_collection/f.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'F'
+  target 'MyF'
 
   cpp_source 'f.cpp'
 }

data/tests/mxx_ru/lib_collection/g.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'G'
+  target 'MyG'
 
   cpp_source 'g.cpp'
 }

data/tests/unix/lib_order/a.rb

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

data/tests/unix/lib_order/b.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'B'
+  target 'MyB'
 
   cpp_source 'b.cpp'
 }

data/tests/unix/lib_order/c.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'C'
+  target 'MyC'
 
   cpp_source 'c.cpp'
 }

data/tests/unix/lib_order/d.rb

@@ -1,7 +1,7 @@
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::lib_target {
-  target 'D'
+  target 'MyD'
 
   cpp_source 'd.cpp'
 }

data/tests/unix/lib_order/main.rb

@@ -4,11 +4,10 @@ MxxRu::Cpp::exe_target {
   target 'main'
 
   lib_path '.'
-  lib_static 'A'
-  lib_static 'B'
-  lib 'C'
-  lib_static 'D'
+  lib_static 'MyA'
+  lib_static 'MyB'
+  lib 'MyC'
+  lib_static 'MyD'
 
   cpp_source 'main.cpp'
 }
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 +03:00
+date: 2009-03-06 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -348,6 +348,7 @@ files:
 - lib/mxx_ru/cpp/toolsets/c89_nsk.rb
 - lib/mxx_ru/cpp/toolsets/c89_nsk_family.rb
 - lib/mxx_ru/cpp/toolsets/gcc_cygwin.rb
+- lib/mxx_ru/cpp/toolsets/gcc_darwin.rb
 - lib/mxx_ru/cpp/toolsets/gcc_family.rb
 - lib/mxx_ru/cpp/toolsets/gcc_linux.rb
 - lib/mxx_ru/cpp/toolsets/gcc_mingw.rb