Mxx_ru 1.4.6 → 1.4.7

data/lib/mxx_ru/cpp/rucodegen.rb

@@ -99,7 +99,7 @@ class RuCodeGen < AbstractGenerator
 
     # Returns command line for run code generation.
     def build_cmd( mode )
-      "ruby -e\"require 'rubygems'; gem 'RuCodeGen'; require 'rucodegen';\" " +
+      "ruby -e\"require 'rubygems'; gem 'RuCodeGen'; require 'rucodegen'; " +
         "process_embedded_rucodegen('#{@name}',:#{mode})\""
     end
   end

data/lib/mxx_ru/cpp/target.rb

@@ -953,6 +953,17 @@ module MxxRu
         end
       end
 
+      # Creation of complete result target file name.
+      #
+      # Result target file name depends on ObjPlacement and Toolset.
+      #
+      def create_full_result_target_file_name
+        do_target_type_depending_actions(
+            :lib => lambda { |toolset| toolset.full_lib_name( self ) },
+            :dll => lambda { |toolset| toolset.full_dll_name( self ) },
+            :exe => lambda { |toolset| toolset.full_exe_name( self ) } )
+      end
+
     protected
       # Checks value of @mxx_all_options_defined and initiate
       # options setup if it is nil.
@@ -1108,23 +1119,15 @@ module MxxRu
             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, rebuilding_needed )
-        elsif target_type.name == DllTargetType::TYPE
-          state = toolset.make_dll( self, rebuilding_needed )
-        elsif target_type.name == ExeTargetType::TYPE
-          state = toolset.make_exe( self, rebuilding_needed )
-        else
-          raise MxxRu::UnsupportedTargetTypeEx.new(
-            self.class.name, target_type.name )
-        end
+        state = do_target_type_depending_actions(
+            :lib => lambda { |toolset|
+                toolset.make_lib( self, rebuilding_needed ) },
+            :dll => lambda { |toolset|
+                toolset.make_dll( self, rebuilding_needed ) },
+            :exe => lambda { |toolset|
+                toolset.make_exe( self, rebuilding_needed ) } )
 
-        return state
+        state
       end
 
       def clean_generators
@@ -1142,56 +1145,43 @@ module MxxRu
       end
 
       def clean_target
+        do_target_type_depending_actions(
+          :lib => lambda { |toolset| toolset.clean_lib( self ) },
+          :dll => lambda { |toolset| toolset.clean_dll( self ) },
+          :exe => lambda { |toolset| toolset.clean_exe( self ) } )
+      end
+
+      # Do action with toolset depending on target type.
+      #
+      # Since v.1.4.7
+      #
+      # [_a_type_actions_] Hash with keys :lib, :dll and :exe.
+      #                    Values should be Proc instances.
+      #
+      # Usage:
+      #   do_target_type_depending_actions(
+      #     :lib => lambda { |toolset| toolset.clean_lib(self) },
+      #     :dll => lambda { |toolset| toolset.clean_dll(self) },
+      #     :exe => lambda { |toolset| toolset.clean_exe(self) }
+      #   )
+      #
+      def do_target_type_depending_actions( a_type_actions )
         toolset = MxxRu::Cpp::toolset
         if nil == target_type
           raise MxxRu::UnsupportedTargetTypeEx.new(
             self.class.name, "nil" )
         elsif target_type.name == LibTargetType::TYPE
-          state = toolset.clean_lib( self )
+          a_type_actions[ :lib ].call( toolset )
         elsif target_type.name == DllTargetType::TYPE
-          state = toolset.clean_dll( self )
+          a_type_actions[ :dll ].call( toolset )
         elsif target_type.name == ExeTargetType::TYPE
-          state = toolset.clean_exe( self )
+          a_type_actions[ :exe ].call( toolset )
         else
           raise MxxRu::UnsupportedTargetTypeEx.new(
             self.class.name, target_type.name )
         end
       end
 
-      # Create the necessary description of an option, 
-      # which can have global, local and upspreadable value.
-      #
-      # [_a_option_desc_] The main component of a name of absent methods.
-=begin :nodoc:
-      def add_spreadable_option(
-        a_option_desc )
-
-        globals = @@mxx_globals[ a_option_desc ]
-        if nil == globals
-          @@mxx_globals[ a_option_desc ] = globals = Array.new
-        end
-
-        locals = SpreadableOption.new( a_option_desc )
-        @mxx_locals[ a_option_desc ] = locals
-
-        meth_global = "global_#{a_option_desc}"
-        meth_local = a_option_desc
-        meth_all = "mxx_all_#{a_option_desc}s"
-        meth_upspreads = "mxx_upspread_#{a_option_desc}s"
-
-        @mxx_missing_actions[ meth_global ] =
-          GlobalOptionInserter.new( a_option_desc, globals )
-        @mxx_missing_actions[ meth_local ] =
-          SpreadableOptionInserter.new( locals )
-        @mxx_missing_actions[ meth_all ] =
-          SpreadableOptionAllExtractor.new( locals,
-            globals, self, meth_upspreads )
-        @mxx_missing_actions[ meth_upspreads ] =
-          SpreadableOptionUpspreadExtractor.new(
-            locals, self, meth_upspreads )
-      end
-=end
-
       def add_unique_to( what, to )
         if !to.include?( what )
           to.push( what )

data/lib/mxx_ru/cpp/toolset.rb

@@ -950,6 +950,30 @@ module  MxxRu
         return @name
       end
 
+      # Create full exe file name.
+      #
+      # Since v.1.4.7
+      #
+      def full_exe_name( target )
+        make_exe_name( target.mxx_target_name, target ).full_name
+      end
+
+      # Create full dll file name.
+      #
+      # Since v.1.4.7
+      #
+      def full_dll_name( target )
+        make_dll_name( target.mxx_target_name, target ).full_name
+      end
+
+      # Create full lib file name
+      #
+      # Since v.1.4.7
+      #
+      def full_lib_name( target )
+        make_lib_name( target.mxx_target_name, target ).full_name
+      end
+
     protected
       # Creating object file names.
       # Returns array of ObjInfo objects.

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

@@ -311,13 +311,9 @@ module  MxxRu
                 if :default == desc.manifest_file
                   # We must create name for manifest.
                   if ExeTargetType::TYPE == target.target_type.name
-                    make_exe_name(
-                      target.mxx_target_name,
-                      target ).full_name
+                    full_exe_name( target )
                   else
-                    make_dll_name(
-                      target.mxx_target_name,
-                      target ).full_name
+                    full_dll_name( target )
                   end + ".manifest"
                 else
                   # Manifest filename already specified.

data/lib/mxx_ru/version.rb

@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.4.6'
+MXX_RU_VERSION = '1.4.7'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-23 00:00:00 +04:00
+date: 2008-12-09 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -27,26 +27,6 @@ extra_rdoc_files:
 files: 
 - bin/mxxrugen
 - tests/c
-- tests/c/pcre
-- tests/c/pcre/chartables.c
-- tests/c/pcre/config.h
-- tests/c/pcre/dftables.c
-- tests/c/pcre/get.c
-- tests/c/pcre/internal.h
-- tests/c/pcre/lib
-- tests/c/pcre/maketables.c
-- tests/c/pcre/o
-- tests/c/pcre/pcre.c
-- tests/c/pcre/pcre.h
-- tests/c/pcre/pcre.rb
-- tests/c/pcre/pcredemo.c
-- tests/c/pcre/pcregrep.c
-- tests/c/pcre/pcreposix.c
-- tests/c/pcre/pcreposix.h
-- tests/c/pcre/pcretest.c
-- tests/c/pcre/perltest
-- tests/c/pcre/printint.c
-- tests/c/pcre/study.c
 - tests/cpp
 - tests/cpp/cpp_sources_glob
 - tests/cpp/cpp_sources_glob/build.rb
@@ -354,6 +334,8 @@ files:
 - lib/mxx_ru/cpp/obj_placements
 - lib/mxx_ru/cpp/obj_placements/custom_subdir.rb
 - lib/mxx_ru/cpp/qt.rb
+- lib/mxx_ru/cpp/qt4.rb
+- lib/mxx_ru/cpp/qt4details.rb
 - lib/mxx_ru/cpp/rucodegen.rb
 - lib/mxx_ru/cpp/source_file.rb
 - lib/mxx_ru/cpp/target.rb

data/tests/c/pcre/chartables.c

@@ -1,183 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* This file is automatically written by the dftables auxiliary 
-program. If you edit it by hand, you might like to edit the Makefile to 
-prevent its ever being regenerated.
-
-This file is #included in the compilation of pcre.c to build the default
-character tables which are used when no tables are passed to the compile
-function. */
-
-static unsigned char pcre_default_tables[] = {
-
-/* This table is a lower casing table. */
-
-    0,  1,  2,  3,  4,  5,  6,  7,
-    8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55,
-   56, 57, 58, 59, 60, 61, 62, 63,
-   64, 97, 98, 99,100,101,102,103,
-  104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,
-  120,121,122, 91, 92, 93, 94, 95,
-   96, 97, 98, 99,100,101,102,103,
-  104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,
-  120,121,122,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,
-  136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,
-  152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,
-  168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,
-  184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,
-  200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,
-  216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,
-  232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,
-  248,249,250,251,252,253,254,255,
-
-/* This table is a case flipping table. */
-
-    0,  1,  2,  3,  4,  5,  6,  7,
-    8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39,
-   40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55,
-   56, 57, 58, 59, 60, 61, 62, 63,
-   64, 97, 98, 99,100,101,102,103,
-  104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,
-  120,121,122, 91, 92, 93, 94, 95,
-   96, 65, 66, 67, 68, 69, 70, 71,
-   72, 73, 74, 75, 76, 77, 78, 79,
-   80, 81, 82, 83, 84, 85, 86, 87,
-   88, 89, 90,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,
-  136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,
-  152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,
-  168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,
-  184,185,186,187,188,189,190,191,
-  192,193,194,195,196,197,198,199,
-  200,201,202,203,204,205,206,207,
-  208,209,210,211,212,213,214,215,
-  216,217,218,219,220,221,222,223,
-  224,225,226,227,228,229,230,231,
-  232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,
-  248,249,250,251,252,253,254,255,
-
-/* This table contains bit maps for various character classes.
-Each map is 32 bytes long and the bits run from the least
-significant end of each byte. The classes that have their own
-maps are: space, xdigit, digit, upper, lower, word, graph
-print, punct, and cntrl. Other classes are built from combinations. */
-
-  0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
-  0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03,
-  0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff,
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc,
-  0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
-/* This table identifies various classes of character by individual bits:
-  0x01   white space character
-  0x02   letter
-  0x04   decimal digit
-  0x08   hexadecimal digit
-  0x10   alphanumeric or '_'
-  0x80   regular expression metacharacter or binary zero
-*/
-
-  0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*   0-  7 */
-  0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /*   8- 15 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  16- 23 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /*  24- 31 */
-  0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /*    - '  */
-  0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /*  ( - /  */
-  0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /*  0 - 7  */
-  0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /*  8 - ?  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  @ - G  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  H - O  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  P - W  */
-  0x12,0x12,0x12,0x80,0x00,0x00,0x80,0x10, /*  X - _  */
-  0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /*  ` - g  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  h - o  */
-  0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /*  p - w  */
-  0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /*  x -127 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */
-  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
-
-/* End of chartables.c */

data/tests/c/pcre/config.h

@@ -1,99 +0,0 @@
-
-/* On Unix systems config.in is converted by configure into config.h. PCRE is
-written in Standard C, but there are a few non-standard things it can cope
-with, allowing it to run on SunOS4 and other "close to standard" systems.
-
-On a non-Unix system you should just copy this file into config.h, and set up
-the macros the way you need them. You should normally change the definitions of
-HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because of the way autoconf
-works, these cannot be made the defaults. If your system has bcopy() and not
-memmove(), change the definition of HAVE_BCOPY instead of HAVE_MEMMOVE. If your
-system has neither bcopy() nor memmove(), leave them both as 0; an emulation
-function will be used. */
-
-/* If you are compiling for a system that uses EBCDIC instead of ASCII
-character codes, define this macro as 1. On systems that can use "configure",
-this can be done via --enable-ebcdic. */
-
-#ifndef EBCDIC
-#define EBCDIC 0
-#endif
-
-/* If you are compiling for a system that needs some magic to be inserted
-before the definition of an exported function, define this macro to contain the
-relevant magic. It apears at the start of every exported function. */
-
-#define EXPORT
-
-/* The following two definitions are mainly for the benefit of SunOS4, which
-doesn't have the strerror() or memmove() functions that should be present in
-all Standard C libraries. The macros HAVE_STRERROR and HAVE_MEMMOVE should
-normally be defined with the value 1 for other systems, but unfortunately we
-can't make this the default because "configure" files generated by autoconf
-will only change 0 to 1; they won't change 1 to 0 if the functions are not
-found. */
-
-#define HAVE_STRERROR 1
-#define HAVE_MEMMOVE  1
-
-/* There are some non-Unix systems that don't even have bcopy(). If this macro
-is false, an emulation is used. If HAVE_MEMMOVE is set to 1, the value of
-HAVE_BCOPY is not relevant. */
-
-#define HAVE_BCOPY    0
-
-/* The value of NEWLINE determines the newline character. The default is to
-leave it up to the compiler, but some sites want to force a particular value.
-On Unix systems, "configure" can be used to override this default. */
-
-#ifndef NEWLINE
-#define NEWLINE '\n'
-#endif
-
-/* The value of LINK_SIZE determines the number of bytes used to store
-links as offsets within the compiled regex. The default is 2, which allows for
-compiled patterns up to 64K long. This covers the vast majority of cases.
-However, PCRE can also be compiled to use 3 or 4 bytes instead. This allows for
-longer patterns in extreme cases. On Unix systems, "configure" can be used to
-override this default. */
-
-#ifndef LINK_SIZE
-#define LINK_SIZE   2
-#endif
-
-/* The value of MATCH_LIMIT determines the default number of times the match()
-function can be called during a single execution of pcre_exec(). (There is a
-runtime method of setting a different limit.) The limit exists in order to
-catch runaway regular expressions that take for ever to determine that they do
-not match. The default is set very large so that it does not accidentally catch
-legitimate cases. On Unix systems, "configure" can be used to override this
-default default. */
-
-#ifndef MATCH_LIMIT
-#define MATCH_LIMIT 10000000
-#endif
-
-/* When calling PCRE via the POSIX interface, additional working storage is
-required for holding the pointers to capturing substrings because PCRE requires
-three integers per substring, whereas the POSIX interface provides only two. If
-the number of expected substrings is small, the wrapper function uses space on
-the stack, because this is faster than using malloc() for each call. The
-threshold above which the stack is no longer use is defined by POSIX_MALLOC_
-THRESHOLD. On Unix systems, "configure" can be used to override this default.
-*/
-
-#ifndef POSIX_MALLOC_THRESHOLD
-#define POSIX_MALLOC_THRESHOLD 10
-#endif
-
-/* PCRE uses recursive function calls to handle backtracking while matching.
-This can sometimes be a problem on systems that have stacks of limited size.
-Define NO_RECURSE to get a version that doesn't use recursion in the match()
-function; instead it creates its own stack by steam using pcre_recurse_malloc
-to get memory. For more detail, see comments and other stuff just above the
-match() function. On Unix systems, "configure" can be used to set this in the
-Makefile (use --disable-recursion). */
-
-/* #define NO_RECURSE */
-
-/* End */