build-tool 0.3.3 → 0.4.0

data.tar.gz.sig

@@ -0,0 +1 @@
+k�#��Wg>��%��BA���l�Tq�4f����85V���52l�� �Ď����܆!�7B���9CH�09H[=]�K4��
��O��Aі���ͬ֔���^DS�0�;{@(0��74s��64IЏ�w��O?��L�f��xϗ$�4�u��!�m@�艢��Se&��02���hY�ْ�U?�4b�4ݔb�/�P��.��ָ���0�9��Cz7PPT�;���B(�7B"��q��<%`����\{�ܥ�

data/History.txt

@@ -1,3 +1,17 @@
+== 0.4.0
+- Feature
+  - Show a ansi terminal code based progressbar when compiling or installing in non verbose mode.
+    That feature is courtesy of the ansi rubygem from (http://github.com/rubyworks/ansi). The lib
+    has some shortcomings.
+  - Colorize output. Powered by the ansi module too. The lib has a shortcoming here. It does not
+    check if the terminal supports colors. You will get some escape codes then. I will send a
+    patch upstream.
+- Enhancements
+  - Rework the way build-systems are handled. This makes it possible to solve the cmake issue with
+    rpath handling by properly creating an inheritance between build-systems. It makes it possible
+    to alter or overwrite build-system options too.
+
+
 == 0.3.3
 - Feature
   - The history command now supports the -n --number [COUNT] option. Use it to specify how many

data/Rakefile

@@ -26,7 +26,8 @@ Hoe.spec( 'build-tool' ) do |build_tool|
   build_tool.extra_deps           = [
     ['logging', ">= 1.2.2"],
     ['sequel', ">= 3.8.0"],
-    ['sqlite3-ruby', ">= 1.2" ]
+    ['sqlite3-ruby', ">= 1.2" ],
+    ['ansi', '>= 1.2' ]
   ]
 
   build_tool.extra_dev_deps           = [

data/lib/build-tool.rb

@@ -2,6 +2,6 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BuildTool
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end
 

data/lib/build-tool/application.rb

@@ -135,7 +135,7 @@ def BuildTool.main(name, args, root_directory)
         # Special case for the configurationParser. It is very verbose if active.
         Logging.logger['BuildTool::Cfg::Parser'].level = :info
         Logging.logger['MJ::Logging::LoggerAdapter'].level = :warn
-        Logging.logger.root.appenders = Logging.appenders.stdout(
+        Logging.logger['root'].appenders = Logging.appenders.stdout(
             :layout => MJ::Logging::BasicLayout.new(),
             :level  => :info)
         # Create the application

data/lib/build-tool/build-system/autoconf.rb

@@ -12,6 +12,7 @@ class AutoConfError < BuildTool::Error; end
 
         def intitialize( *args )
             super( *args )
+            @supported_options << 'libdir'
         end
 
         #
@@ -30,26 +31,6 @@ def configured?
         ### METHODS
         #
 
-        def[]( var )
-            if @options.has_key? var
-                return @options[var]
-            end
-
-            case var
-
-            when 'libdir'
-                return ""
-
-            else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-            end
-        end
-
-        def[]=( var, val )
-            @options[var] = val
-        end
-
         # Configure the module
         def reconfigure()
             configure
@@ -126,7 +107,8 @@ def make( target = nil )
 
         def option_string
             arr = []
-            @options.each do |var, val|
+            option_names.each do |var|
+                val = self[var]
                 if val
                     arr << "--#{var}='#{val}'"
                 else

data/lib/build-tool/build-system/base.rb

@@ -2,52 +2,156 @@
 
 module BuildTool; module BuildSystem
 
+    class UnknownOptionError < BuildTool::Error; end
+
     #
     # Base class for all build system implementations
     #
     class Base
 
-        def initialize
+        def initialize ( parent = nil )
             @module  = nil
+            @default = nil
             @options = Hash.new
             @out_of_source = true
+            @supported_options = Array.new
+            @feature = nil
+            if parent and parent.name == name
+                @parent = parent
+            else
+                @parent = nil
+            end
         end
 
         #
         ### ATTRIBUTES
         #
         attr_accessor :module
+        attr_accessor :feature
         attr_accessor :out_of_source
+        attr_accessor :defaults
 
         def build_directory
             @module.build_directory
         end
 
         def dup
-            cp = self.clone
-            cp.instance_variable_set( "@options", Marshal.load( Marshal.dump( @options ) ) )
-            cp
+            self.class.new( self )
         end
 
         def env
             @module.environment.values
         end
 
-        def merge( other )
-            if name == other.name
-                @options.merge!( other.option_hash )
-                @out_of_source = other.out_of_source
+        def parent
+            if @parent
+                par = @parent
+            elsif @module && @module.parent && @module.parent.build_system && ( @module.parent.build_system.name == name )
+                par = @module.parent.build_system
+            elsif @module
+                par = defaults
             else
-                raise ConfigurationError, "Can't merge build system #{name} with #{other.name}"
+                par = nil
             end
+            return par
         end
 
         def option_hash
-            @options
+            # Check the parents names (if any)
+            par = parent
+            if par
+                parent_option_hash = par.option_hash
+            else
+                parent_option_hash = {}
+            end
+            # If this build-system declaration is not active we are done
+            if active?
+                return parent_option_hash.merge( @options )
+            else
+                return parent_option_hash
+            end
+        end
+
+        def option_names
+            # Check the parents names (if any)
+            par = parent
+            if par
+                parent_option_names = par.option_names
+            else
+                parent_option_names = []
+            end
+            # If this build-system declaration is not active we are done
+            if active?
+                return  ( @options.keys + parent_option_names ).uniq
+            else
+                return parent_option_names
+            end
+        end
+
+        def to_s
+            return "#{self.object_id} #{self.module} #{@options.keys.join( ', ')}"
+        end
+
+        def active?
+            if @feature.nil?
+                true
+            else
+                @feature.active?
+            end
         end
 
-        def options
-            @options.keys
+        def []( var )
+            # Get the parents value (if any)
+            par = parent
+            if par and par.option_set?( var )
+                parentval = par[var]
+            else
+                parentval = nil
+            end
+            # If this build-system declaration is not active we are done
+            if !active?
+                return parentval       if !parentval.nil?
+                raise UnknownOptionError, "#{self} Option #{var} is unknown for build-system #{name}"
+            end
+            # Now check our value and merge with parents
+            if @options.has_key?( var )
+                return @options[ var ].
+                    sub( '{{{}}} ', parentval.nil? ? "" : "#{parentval} " ).
+                    sub( ' {{{}}}', parentval.nil? ? "" : " #{parentval}" )
+            end
+            return parentval       if !parentval.nil?
+            return ""              if @supported_options.include?( var )
+            raise UnknownOptionError, "#{self} Option #{var} is unknown for build-system #{name}"
+        end
+
+        def []=( var, value )
+            @options[ var ] = value
+        end
+
+        def option_set?( var )
+            return true if active? && @options.has_key?( var )
+            return true if parent  && parent.option_set?( var )
+            return false
+        end
+
+        def set( var, value )
+            self[var]= value
+        end
+
+        def append( var, value )
+            if option_set?( var )
+                self[var]= self[var] + " " + value
+            else
+                self[var]= "{{{}}} " + value
+            end
+        end
+
+        def prepend( var, value )
+            if option_set?( var )
+                self[var]= value + " " + self[var]
+            else
+                self[var]= value + " {{{}}}"
+            end
         end
 
         def install_prefix
@@ -70,6 +174,7 @@ def after_rebase
         ### VIRTUAL FUNCTIONS
         #
         for method in [
+            :clone,
             :configure,
             :configured?,
             :make,

data/lib/build-tool/build-system/cmake.rb

@@ -16,6 +16,11 @@ class CMakeError < BuildTool::Error; end
 
         def initialize( *args )
             super( *args )
+            @supported_options <<
+                'CMAKE_BUILD_TYPE' <<
+                'CMAKE_CXXFLAGS' <<
+                'CMAKE_VERBOSE_MAKEFILE' <<
+                'LIB_SUFFIX'
         end
 
         #
@@ -35,27 +40,6 @@ def name
         ### METHODS
         #
 
-        def[]( var )
-            if @options.has_key? var
-                return @options[var]
-            end
-
-            case var
-
-            when 'CMAKE_BUILD_TYPE', 'CMAKE_CXXFLAGS', 'CMAKE_VERBOSE_MAKEFILE', 'LIB_SUFFIX'
-                return ""
-
-            else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-
-            end
-        end
-
-        def[]=( var, val )
-            @options[var] = val
-        end
-
         # Configure the module
         def reconfigure()
             if File.exist?( "#{build_directory}/CMakeCache.txt" )
@@ -107,7 +91,8 @@ def make( target = nil )
 
         def option_string
             arr = []
-            @options.each do |var, val|
+            option_names.each do |var|
+                val = self[var]
                 arr << "-D#{var}='#{val}'"
             end
             arr.join(" ")

data/lib/build-tool/build-system/custom.rb

@@ -35,17 +35,6 @@ def name
         ### METHODS
         #
 
-        def[]( var )
-            if @options.has_key? var
-                return @options[var]
-            end
-            raise NotImplementedError
-        end
-
-        def[]=( var, val )
-            @options[var] = val
-        end
-
         # Configure the module
         def reconfigure()
             raise NotImplementedError
@@ -69,7 +58,7 @@ def execute( script )
                 build_directory,
                 {
                     'INSTALL_PREFIX' => install_prefix.to_s,
-                }.merge(Hash[@options]))
+                }.merge(Hash[option_hash]))
         end
 
         def install( fast )
@@ -86,7 +75,8 @@ def make( target = nil )
 
         def option_string
             arr = []
-            @options.each do |var, val|
+            option_names.each do |var|
+                val = self[var]
                 arr << "-D#{var}='#{val}'"
             end
             arr.join(" ")

data/lib/build-tool/build-system/none.rb

@@ -32,24 +32,6 @@ def name
         ### METHODS
         #
 
-        def[]( var )
-            if @options.has_key? var
-                return @options[var]
-            end
-
-            # case var
-
-            # else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-
-            # end
-        end
-
-        def[]=( var, val )
-            @options[var] = val
-        end
-
         # Configure the module
         def reconfigure()
             0

data/lib/build-tool/build-system/qmake.rb

@@ -34,25 +34,6 @@ def name
         ### METHODS
         #
 
-        def[]( var )
-            if @options.has_key? var
-                return @options[var]
-            end
-
-            # case var
-
-
-            # else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-
-            # end
-        end
-
-        def[]=( var, val )
-            @options[var] = val
-        end
-
         # Configure the module
         def reconfigure()
             configure
@@ -97,7 +78,8 @@ def make( target = nil )
 
         def option_string
             arr = []
-            @options.each do |var, val|
+            option_names.each do |var|
+                val = self[var]
                 arr << "#{var}='#{val}'"
             end
             arr.join(" ")

data/lib/build-tool/build-system/qt.rb

@@ -32,35 +32,6 @@ def name
         ### METHODS
         #
 
-        def[]( var )
-            if @options.has_key? var
-                return @options[var]
-            end
-
-            case var
-
-            when 'flags'
-                return @options[var]
-
-            else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-            end
-        end
-
-        def[]=( var, val )
-            case var
-
-            when 'flags'
-                @options[var] = val
-
-            else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-            end
-
-        end
-
         # Execute a cmake command in the context of the build directory
         def _configure( command, wd = build_directory )
             rc = self.class.execute "#{source_directory}/configure #{command}", wd, env
@@ -80,7 +51,7 @@ def configure
             check_build_directory( true )
             opt = ""
             opt += " -prefix #{install_prefix.to_s} " if install_prefix
-            opt += @options['flags']
+            opt += self['flags']
             rc = _configure opt
             rc
         end