Mxx_ru 1.5.5 → 1.5.6

data/NEWS

@@ -1,5 +1,15 @@
 Changes in Mxx_ru
 
+1.5.6 version (2012.09.10)
+  
+  Method Cpp::Target#source_encoding for setting default encoding source files was added.
+  
+  Method Cpp::Toolset#force_cpp0x_std for setting a flag includes "-std=c++0x" compiler option was added.
+  
+  Fixes at cpp-build-root generator.
+  
+  Fixes at Gcc_family toolsets build options.
+  
 1.3.0 version (2006.05.15)
 
   New command line argument --mxx-rebuild.

data/Rakefile

@@ -58,5 +58,5 @@ test = Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => [ gem.package_dir + "/" + gem.name + "-" + gem.version.version + ".gem" ]
+task :default => [ gem.package_dir + "/" + gem.name + ".gem" ]
 

data/bin/mxxrugen

@@ -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-2011, The Mxx_ru Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/mxx_ru/cpp/analyzer.rb

@@ -87,7 +87,6 @@ module  MxxRu
         # Add paths to header files.
         # [_a_paths_] Should be Array of Strings.
         def add_include_paths( a_paths )
-
           a_paths.each { |p|
               if !@include_paths.include?( p )
                 @include_paths << p
@@ -96,17 +95,17 @@ module  MxxRu
         end
 
         # Perform file analisys.
-        def analyze
+        def analyze ( a_encoding )
           # Current list of keys should be taken to avoid 
           # dynamic growth of file list.
-          # Repeat iterations until source file list changes stop
+          # Repeat iterations until source file list changes stop      
           old_size = 0
           files = @sources.keys
           while old_size != files.size
             files.each { |file_name|
                 current = @sources[ file_name ]
                 if !current.is_processed
-                  process_file( file_name, current )
+                  process_file( file_name, current, a_encoding )
                 end
               }
 
@@ -146,12 +145,12 @@ module  MxxRu
         # Process next file.
         # [_a_file_name_] File name.
         # [_a_file_obj_] Corresponding object.
-        def process_file( a_file_name, a_file_obj )
+        def process_file( a_file_name, a_file_obj, a_encoding )
 
           # Gather file names list from include directives.
           std_path_included = Array.new
           local_path_included = Array.new
-          IO.foreach( a_file_name ) { |line|
+          IO.foreach( a_file_name , encoding: a_encoding ) { |line|
               r = @@include_regex.match( line )
               if nil != r
                 if "<" == r[ 1 ]

data/lib/mxx_ru/cpp/target.rb

@@ -508,6 +508,8 @@ module MxxRu
       attr_reader :mxx_target_name
       # Optimization mode. By default, speed optimization is used.
       attr_reader :mxx_optimization
+      # Default encoding source files.
+      attr_reader :mxx_encoding
 
       # Generator for methods to manipulation with 'runtime_mode',
       # 'rtti_mode', 'rtl_mode', 'threading_mode' and so on.
@@ -662,6 +664,8 @@ module MxxRu
         # True if toolset has completely defined all compiler and linker options required.
         @mxx_all_options_defined = false
 
+        @mxx_encoding = Encoding.find("Binary")
+
         Target::initialize_spreadable_option_instance_variables( self )
       end
 
@@ -893,6 +897,11 @@ module MxxRu
         end
       end
 
+      # Set encoding source files.
+      def source_encoding( a_encoding )
+        @mxx_encoding = Encoding.find("#{a_encoding}")
+      end
+
       # Perform build of the target.
       def build
         if nil == @mxx_last_build_result
@@ -1083,7 +1092,7 @@ module MxxRu
         analyzer.add_include_paths( mxx_all_include_paths )
 
         # Performing analisys.
-        analyzer.analyze
+        analyzer.analyze mxx_encoding
 
         # Getting results of analysis.
         mxx_c_files.each { |s|

data/lib/mxx_ru/cpp/toolset.rb

@@ -1210,6 +1210,13 @@ module  MxxRu
         p + source_name + s
       end
 
+    public
+
+      # Sets a flag includes "-std=c++0x" compiler option. 
+      # Using at gnu-compilers.
+      def force_cpp0x_std
+      end
+
     end # class Toolset
 
     # Current toolset.

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

@@ -47,6 +47,7 @@ module  MxxRu
 
         def initialize( a_name )
           super( a_name )
+          @is_cpp0x_std = false
         end
 
         # Returns C compiler name.
@@ -90,16 +91,12 @@ module  MxxRu
           end
 
           if RTL_STATIC == target.mxx_rtl_mode
-            target.linker_option( "--static-libgcc" )
+            target.linker_option( "-static-libgcc" )
           else
-            target.linker_option( "--shared-libgcc" )
+            target.linker_option( "-shared-libgcc" )
           end
 
-# This is not required on mswin platform.
-          if target.target_type.name == DllTargetType::TYPE ||
-              target.target_type.name == MacOSBundleTargetType::TYPE
-            target.compiler_option( "-fPIC" )
-          end
+          target.compiler_option( "-fPIC" )
 
           # If C++ files are exist, linker should use stdc++ library.
           if target.mxx_cpp_files.size
@@ -113,6 +110,10 @@ module  MxxRu
           target.mxx_all_include_paths.each { |p|
             target.compiler_option( "-I" + p )
           }
+
+          if true == @is_cpp0x_std
+            target.cpp_compiler_option( "-std=c++0x" )
+          end
         end
 
         # See description at MxxRu::Cpp::Toolset#obj_file_ext.
@@ -317,6 +318,10 @@ module  MxxRu
           library_name
         end
 
+        # Sets a flag includes "-std=c++0x" compiler option. 
+        def force_cpp0x_std
+          @is_cpp0x_std = true
+        end
       end # class GccFamily
 
       # For compatibility with previous versions.

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

@@ -5,7 +5,7 @@ gem 'Mxx_ru', '>= 1.3.0'
 require 'mxx_ru/cpp'
 
 MxxRu::Cpp::composite_target( MxxRu::BUILD_ROOT ) {
-  global_inclide_path '.'
+  global_include_path '.'
   default_runtime_mode MxxRu::Cpp::RUNTIME_RELEASE
   MxxRu::enable_show_brief
 

data/lib/mxx_ru/version.rb

@@ -34,4 +34,4 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.5.5'
+MXX_RU_VERSION = '1.5.6'

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" ); }

metadata

@@ -1,35 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: Mxx_ru
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 5
-  version: 1.5.5
+version: !ruby/object:Gem::Version
+  version: 1.5.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-22 00:00:00 +04:00
-default_executable: 
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: eao197@yahoo.com
-executables: 
+executables:
 - mxxrugen
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - Rakefile
 - COPYING
 - NEWS
-files: 
+files:
 - bin/mxxrugen
 - tests/cpp/cpp_sources_glob/build.rb
 - tests/cpp/cpp_sources_glob/some/module/1/f1.cpp
@@ -62,7 +54,6 @@ files:
 - tests/cpp/mswin_res_dll/h/res.h
 - tests/cpp/mswin_res_dll/main.cpp
 - tests/cpp/mswin_res_dll/main.rb
-- tests/cpp/mswin_res_dll/o/dll.o
 - tests/cpp/mswin_res_dll/res/tree_fol.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_1.bmp
 - tests/cpp/mswin_res_dll/res/tree_state_2.bmp
@@ -74,7 +65,6 @@ files:
 - tests/cpp/mswin_res_exe/res/tree_state_2.bmp
 - tests/cpp/mswin_res_exe/src/main.cpp
 - tests/cpp/mswin_res_exe/src/main.rc
-- tests/cpp/mswin_res_exe/src/o/main.o
 - tests/cpp/mswin_res_exe/tc_mswin_res_exe.rb
 - tests/cpp/rucodegen/host_config.cpp
 - tests/cpp/rucodegen/host_config.rb
@@ -331,39 +321,31 @@ files:
 - Rakefile
 - COPYING
 - NEWS
-has_rdoc: true
 homepage: http://www.rubyforge.com/projects/mxx-ru
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -S
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mxx_ru (Make++ on Ruby) is a cross-platform build tool
 test_files: []
-