Mxx_ru 1.4.7 → 1.4.8

data/COPYING

@@ -1,6 +1,6 @@
 Copyright (c) 1996-2004, Yauheni Akhotnikau
 Copyright (c) 2004-2006, JSC Intervale
-Copyright (c) 2006 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,

data/README

@@ -2,7 +2,7 @@ Copyright (c) 1996-2005, Yauheni Akhotnikau
 
 Copyright (c) 2004-2006, JSC Intervale
 
-Copyright (c) 2006 The Mxx_ru Project
+Copyright (c) 2006-2009 The Mxx_ru Project
 
 All rights reserved.
 

data/lib/mxx_ru/cpp/qt4_via_pkg_config.rb

@@ -0,0 +1,68 @@
+#--
+# 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 'pathname'
+require 'rexml/document'
+require 'set'
+
+require 'mxx_ru/cpp/qt4'
+
+module MxxRu
+module Cpp
+
+begin
+  IO.popen( 'pkg-config --version' ) do |file|
+    # A special modification for the case when configuration of Qt4
+    # is detected via 'pkg-config' command. For example on Debian Linux.
+    # (This case is detected and used by Mikhail Lyossin).
+    #
+    # Method use_module is redefined to make two calls to pkg-config:
+    # - the first call with argument '--cflags' to detect include path and
+    #   necessary defines;
+    # - the second call with argument '--libs' to detect libraries path and
+    #   names of necessry libraries.
+    #
+    class Qt4
+      def use_module( a_module )
+        @target.define a_module.define
+        
+        IO.popen( "pkg-config #{a_module.library} --cflags" ) { |file|
+          @target.compiler_option( file.gets.chop )
+        }
+        IO.popen( "pkg-config #{a_module.library} --libs" ) { |file|
+          @target.linker_option( file.gets.chop )
+        }
+      end
+    end
+  end
+rescue 
+end
+
+end # module Cpp
+end # module MxxRu
+

data/lib/mxx_ru/cpp/qt4details.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,
@@ -38,65 +38,78 @@ module Cpp
   # Auxilary module with classes and constants for Qt4 modules support
   #
   module Qt4Modules
-    # Class for objects whose purpose is setting up an appropriate
-    # define and a library for target.
+    # Description of Qt4 module.
     #
     # Usage:
-    #   QT_GUI = ModuleBinder.new( 'QT_GUI_LIB', 'QtGui4' )
+    #   QT_GUI = ModuleDescription.new( 'QT_GUI_LIB', 'QtGui' )
     #   ...
-    #   QT_GUI.setup( target )
     #
-    class ModuleBinder
-      def initialize( a_define, a_library )
-        @define = a_define
-        @library = a_library
-      end
-
-      def setup( a_target )
-        a_target.define @define
-        a_target.lib @library
-      end
-    end
+    ModuleDescription = Struct.new( :define, :library )
 
     # Qt3Support component.
-    QT_QT3SUPPORT = ModuleBinder.new( 'QT_QT3SUPPORT_LIB', 'Qt3Support4' )
+    QT_QT3SUPPORT = ModuleDescription.new(
+        'QT_QT3SUPPORT_LIB',
+        'Qt3Support' )
     # QtCore component.
-    QT_CORE = ModuleBinder.new( 'QT_CORE_LIB', 'QtCore4' )
+    QT_CORE = ModuleDescription.new(
+        'QT_CORE_LIB',
+        'QtCore' )
     # QtDesigner component.
-    QT_DESIGNER = ModuleBinder.new( 'QT_DESIGNER_LIB', 'QtDesigner4' )
+    QT_DESIGNER = ModuleDescription.new(
+        'QT_DESIGNER_LIB',
+        'QtDesigner' )
     # QtDesignerComponents component.
-    QT_DESIGNER_COMPONENTS = ModuleBinder.new(
-          'QT_DESIGNERCOMPONENTS_LIB', 'QtDesignerComponents4' )
+    QT_DESIGNER_COMPONENTS = ModuleDescription.new(
+        'QT_DESIGNERCOMPONENTS_LIB',
+        'QtDesignerComponents' )
     # QtGui component.
-    QT_GUI = ModuleBinder.new( 'QT_GUI_LIB', 'QtGui4' )
+    QT_GUI = ModuleDescription.new(
+        'QT_GUI_LIB',
+        'QtGui' )
     # QtHelp component.
-    QT_HELP = ModuleBinder.new( 'QT_HELP_LIB', 'QtHelp4' )
+    QT_HELP = ModuleDescription.new(
+        'QT_HELP_LIB',
+        'QtHelp' )
     # Network component.
-    QT_NETWORK = ModuleBinder.new( 'QT_NETWORK_LIB', 'QtNetwork4' )
+    QT_NETWORK = ModuleDescription.new(
+        'QT_NETWORK_LIB',
+        'QtNetwork' )
     # QtOpenGL component.
-    QT_OPENGL = ModuleBinder.new( 'QT_OPENGL_LIB', 'QtOpenGL4' )
+    QT_OPENGL = ModuleDescription.new(
+        'QT_OPENGL_LIB',
+        'QtOpenGL' )
     # QtScript component.
-    QT_SCRIPT = ModuleBinder.new( 'QT_SCRIPT_LIB', 'QtScript4' )
+    QT_SCRIPT = ModuleDescription.new(
+        'QT_SCRIPT_LIB',
+        'QtScript' )
     # QtSql component.
-    QT_SQL = ModuleBinder.new( 'QT_SQL_LIB', 'QtSql4' )
+    QT_SQL = ModuleDescription.new(
+        'QT_SQL_LIB',
+        'QtSql' )
     # QtSvg component.
-    QT_SVG = ModuleBinder.new( 'QT_SVG_LIB', 'QtSvg4' )
+    QT_SVG = ModuleDescription.new(
+        'QT_SVG_LIB',
+        'QtSvg' )
     # QtTest component.
-    QT_TEST = ModuleBinder.new( 'QT_TEST_LIB', 'QtTest4' )
+    QT_TEST = ModuleDescription.new(
+        'QT_TEST_LIB',
+        'QtTest' )
     # QtXml component.
-    QT_XML = ModuleBinder.new( 'QT_XML_LIB', 'QtXml4' )
+    QT_XML = ModuleDescription.new(
+        'QT_XML_LIB',
+        'QtXml' )
     # QtXmlPatterns component.
-    QT_XML_PATTERNS = ModuleBinder.new(
-          'QT_XMLPATTERNS_LIB',
-          'QtXmlPatterns4' )
+    QT_XML_PATTERNS = ModuleDescription.new(
+        'QT_XMLPATTERNS_LIB',
+        'QtXmlPatterns' )
     # QtWebKit component.
-    QT_WEB_KIT = ModuleBinder.new(
-          'QT_WEBKIT_LIB',
-          'QtWebKit4' )
+    QT_WEB_KIT = ModuleDescription.new(
+        'QT_WEBKIT_LIB',
+        'QtWebKit' )
     # Phonon component.
-    QT_PHONON = ModuleBinder.new(
-          'QT_PHONON_LIB',
-          'phonon4' )
+    QT_PHONON = ModuleDescription.new(
+        'QT_PHONON_LIB',
+        'phonon' )
   end
 
   # Files generator for Qt4 class.
@@ -266,14 +279,15 @@ module Cpp
 
     # Add a Qt4 module to target.
     #
-    # a_module -- an instance of Qt4Modules::ModuleBinder.
+    # a_module -- an instance of Qt4Modules::ModuleDescription.
     def use_module( a_module )
-      a_module.setup( @target )
+      @target.define a_module.define
+      @target.lib a_module.library + '4'
     end
 
     # Add some Qt4 modules to target.
     #
-    # a_modules -- an enumeration of Qt4Modules::ModuleBinder instances.
+    # a_modules -- an enumeration of Qt4Modules::ModuleDescription instances.
     #
     def use_modules( *a_modules )
       a_modules.each { |m| use_module( m ) }

data/lib/mxx_ru/version.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,
@@ -34,5 +34,5 @@
 #
 #   puts 'Mxx_ru version is: ' + MXX_RU_VERSION
 #
-MXX_RU_VERSION = '1.4.7'
+MXX_RU_VERSION = '1.4.8'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Mxx_ru
 version: !ruby/object:Gem::Version 
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors: 
 - The Mxx_ru Project
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 +03:00
+date: 2009-02-15 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -336,6 +336,7 @@ files:
 - lib/mxx_ru/cpp/qt.rb
 - lib/mxx_ru/cpp/qt4.rb
 - lib/mxx_ru/cpp/qt4details.rb
+- lib/mxx_ru/cpp/qt4_via_pkg_config.rb
 - lib/mxx_ru/cpp/rucodegen.rb
 - lib/mxx_ru/cpp/source_file.rb
 - lib/mxx_ru/cpp/target.rb