build-tool 0.3.3 → 0.4.0

data/lib/build-tool/cfg/parser.y

@@ -78,8 +78,6 @@ rule
         : LOG_DIRECTORY STRING       { result = LogDirectoryNode.new( val[1] ); }
         | DISABLE FEATURE identifier { result = DisableFeatureNode.new( val[2] ); }
         | ENABLE  FEATURE identifier { result = EnableFeatureNode.new( val[2] ); }
-        | DISABLE MODULE  identifier { result = DisableModuleNode.new( val[2] ); }
-        | ENABLE  MODULE  identifier { result = EnableModuleNode.new( val[2] ); }
         | statement                  { result = val[0]; }
         ;
 
@@ -96,6 +94,8 @@ rule
         | ssh_key_declaration      { result = val[0]; }
         | include_directive        { result = val[0]; }
         | feature_declaration      { result = val[0]; }
+        | DISABLE MODULE  identifier { result = DisableModuleNode.new( val[2] ); }
+        | ENABLE  MODULE  identifier { result = EnableModuleNode.new( val[2] ); }
         ;
 
     vcs_declaration
@@ -133,7 +133,10 @@ rule
         ;
 
     build_system_statement
-        : OPTION identifier  STRING { result = BuildSystemOptionNode.new( val[1,2] ); }
+        : OPTION identifier         STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
+        | OPTION identifier SET     STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
+        | OPTION identifier PREPEND STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
+        | OPTION identifier APPEND  STRING { result = BuildSystemOptionNode.new( val[1..-1] ); }
         | INPLACE { result = BuildSystemInplaceNode.new(); }
         ;
 
@@ -151,7 +154,8 @@ rule
         ;
 
     environment_statement
-        : VAR TOKEN SET     STRING { result = EnvironmentVariableNode.new( val[1..-1] ); }
+        : VAR TOKEN         STRING { result = EnvironmentVariableNode.new( val[1..-1] ); }
+        | VAR TOKEN SET     STRING { result = EnvironmentVariableNode.new( val[1..-1] ); }
         | VAR TOKEN PREPEND STRING { result = EnvironmentVariableNode.new( val[1..-1] ); }
         | VAR TOKEN APPEND  STRING { result = EnvironmentVariableNode.new( val[1..-1] ); }
         ;

data/lib/build-tool/cfg/visitor.rb

@@ -52,16 +52,12 @@ class BuildSystemDeclarationNodeVisitor < ListVisitor
 
         # Initialize a build system. If no build system is provided we will
         # create a new one. Which is not registered with the configuration.
-        def initialize( configuration, build_system = nil )
+        def initialize( configuration, build_system )
             super( configuration )
             @build_system = build_system
         end
 
         def visit_BuildSystemDeclarationNode( node )
-            if @build_system.nil?
-                name = node.values[0]
-                @build_system = configuration.build_system( name ).dup
-            end
             visit_nodes( node.values[1] )
             return @build_system
         end
@@ -71,7 +67,19 @@ def visit_BuildSystemInplaceNode( node )
         end
 
         def visit_BuildSystemOptionNode( node )
-            @build_system[ node.value[0] ] = node.value[1]
+            case node.values.length
+            when 3
+                case node.values[1]
+                when 'append';  @build_system.append( node.values[0], node.values[2] )
+                when 'prepend'; @build_system.prepend( node.values[0], node.values[2] )
+                when 'set';     @build_system.set( node.values[0], node.values[2] )
+                else raise StandardError, "Unexpected token #{node.values[1]}!"
+                end
+            when 2
+                @build_system.set( node.values[0], node.values[1] )
+            else
+                raise StandardError, "Unexpected number of tokens #{node.values.length} #{node.values.join(', ')}"
+            end
         end
 
     end
@@ -82,8 +90,11 @@ class StatementVisitor < ListVisitor
         def visit_BuildSystemDeclarationNode( node )
             raise ArgumentsError if node.values.length != 2
             name  = node.values[0]
-            visitor = BuildSystemDeclarationNodeVisitor.new( configuration, configuration.build_system(name) )
-            configuration.add_build_system( node.accept( visitor ) )
+            bs = configuration.build_system_defaults( name )
+            visitor = BuildSystemDeclarationNodeVisitor.new(
+                configuration,
+                bs )
+            node.accept( visitor )
         end
 
         def visit_ConfigurationFileList( node )
@@ -104,15 +115,6 @@ def visit_EnableFeatureNode( node )
             feat.active = true
         end
 
-        def visit_EnableModuleNode( node )
-            modName = node.value
-            mod = configuration.module( modName )
-            if mod.nil?
-                raise ConfigurationError, "Attempt to enable unknown module '%s'!" % modName
-            end
-            mod.active = true
-        end
-
         def visit_DisableFeatureNode( node )
             featureName = node.value
             feat = configuration.feature( featureName )
@@ -122,6 +124,15 @@ def visit_DisableFeatureNode( node )
             feat.active = false
         end
 
+        def visit_EnableModuleNode( node )
+            modName = node.value
+            mod = configuration.module( modName )
+            if mod.nil?
+                raise ConfigurationError, "Attempt to enable unknown module '%s'!" % modName
+            end
+            mod.active = true
+        end
+
         def visit_DisableModuleNode( node )
             modName = node.value
             mod = configuration.module( modName )
@@ -220,11 +231,18 @@ def visit_EnvironmentDeclarationNode( node )
         end
 
         def visit_EnvironmentVariableNode( node )
-            case node.values[1]
-            when 'append';  @environment.append( node.values[0], node.values[2] )
-            when 'prepend'; @environment.prepend( node.values[0], node.values[2] )
-            when 'set';     @environment.set( node.values[0], node.values[2] )
-            else raise StandardError, "Unexpected token #{node.values[1]}!"
+            case node.values.length
+            when 3
+                case node.values[1]
+                when 'append';  @environment.append( node.values[0], node.values[2] )
+                when 'prepend'; @environment.prepend( node.values[0], node.values[2] )
+                when 'set';     @environment.set( node.values[0], node.values[2] )
+                else raise StandardError, "Unexpected token #{node.values[1]}!"
+                end
+            when 2
+                @environment.set( node.values[0], node.values[1] )
+            else
+                raise StandardError, "Unexpected number of tokens #{node.values.length} #{node.values.join(', ')}"
             end
         end
 
@@ -353,14 +371,26 @@ def visit_ArchiveDeclarationNode( node )
         def visit_BuildSystemDeclarationNode( node )
             raise ArgumentsError if node.values.length != 2
             name  = node.values[0]
-            if @module.build_system and @module.build_system.name == name
-                build_system = @module.build_system.dup
+            # We have to create a build-system. There are some possibilities:
+            #   1. The module has a build-system. Inherit from that one (Overloading)
+            #   2. The module has a parent but no build-system: Create the build-system parentless
+            #      so it forwards to the parent module
+            #   3. The module has no parent and no build-system. Inherit from the build-system
+            #      standard module.
+            if @module.our_build_system
+                # puts "Inherit from previous build-system for #{@module.name}"
+                build_system = configuration.build_system_adjust( name, @module.our_build_system )
+            elsif @module.parent
+                # puts "Inherit without parent for #{@module.name}"
+                build_system = configuration.build_system_adjust( name, nil )
             else
-                build_system = nil
+                # puts "Inherit from #{name} for #{@module.name}"
+                build_system = configuration.build_system_adjust( name, configuration.build_system_defaults( name ) )
             end
             visitor = BuildSystemDeclarationNodeVisitor.new( configuration, build_system )
             @module.build_system = node.accept( visitor )
             @module.build_system.module = @module
+            @module.build_system.feature = configuration.active_feature
         end
 
         def visit_LongDescriptionNode( node )
@@ -481,7 +511,10 @@ def visit_SvnDeclarationNode( node )
         end
 
         def visit_UseBuildSystemNode( node )
-            @module.build_system = configuration.build_system( node.value ).dup
+            # puts "Inherit from build-system #{node.value} for #{@module.name}"
+            @module.build_system = configuration.build_system_adjust(
+                node.value,
+                configuration.build_system_defaults( node.value ) )
             @module.build_system.module = @module
         end
 

data/lib/build-tool/command_actions.rb

@@ -1,7 +1,64 @@
+require 'ansi'
+require 'logging'
 require 'ftools'
 
 module BuildTool
 
+    class Progressbar < Logging::Appender
+
+        def initialize( title, &block )
+            super( 'Progressbar', :level => :DEBUG )
+            @pbar = nil
+            @oldlogger = nil
+            if Logging.appenders['stdout'].level >= ::Logging::level_num(:INFO)
+                # We only do the progressbar thing if there is no verbose output active.
+                begin
+                    # Remove the old stdout logger.
+                    @oldlogger = Logging.appenders[ 'stdout' ]
+                    Logging.logger[ 'root' ].remove_appenders( 'stdout' )
+                    Logging.logger[ 'root' ].add_appenders( self )
+                    # Add the progressbar logger
+                    @pbar = ANSI::Progressbar.new( title, 100 )
+                    yield
+                ensure
+                    @pbar.finish
+                    # Reset the logger
+                    Logging.logger[ 'root' ].remove_appenders( 'Progressbar' )
+                    Logging.logger[ 'root' ].add_appenders( @oldlogger )
+                end
+            else
+                # If there is verbose output just print the text
+                logger.info( title )
+                yield
+            end
+
+        end
+
+        def write( event )
+            message = event.data
+            return if message.empty?
+
+            case event.level
+            when ::Logging::level_num( :ERROR )
+            when ::Logging::level_num( :WARN )
+                # This should never happen. In case of errors an exception is thrown which should
+                # be catched in the initialize() method above. And this logger is removed there.
+                raise NotImplementedError
+
+            else
+                match = /^\[ *(\d+)%\]/.match( message )
+                if match
+                    # puts match[ 1 ]
+                    @pbar.set( match[ 1 ].to_i )
+                end
+            end
+            self
+        end
+
+    end # class ProgressLayout
+
+
+
     module ModuleActions
 
         class Base
@@ -176,8 +233,9 @@ def initialize( command, mod, target = nil )
             end
 
             def execute()
-                logger.info "Building"
-                @module.build_system_required.make( @target )
+                pb = Progressbar.new( "Make #{@target}" ) do
+                    @module.build_system_required.make( @target )
+                end
             end
 
         end
@@ -190,8 +248,9 @@ def initialize( command, mod, fast = false )
             end
 
             def execute()
-                logger.info "Installing"
-                @module.build_system_required.install( @fast )
+                pb = Progressbar.new( "Install #{@fast ? 'fast' : '' }" ) do
+                    @module.build_system_required.install( @fast )
+                end
             end
 
         end

data/lib/build-tool/commands.rb

@@ -365,7 +365,9 @@ def complete_modules( name, include_templates = false )
                 end
             end
             # Raise an error if the module was not found
-            raise UsageError, "Unknown module/package #{name}" if !found
+            if !found
+                raise UsageError, "Unknown module/package #{name}"
+            end
             # Give a warning if all modules where 
             logger.warn "All modules for #{name} are inactive! Will ignore it." if res.empty?
             return res

data/lib/build-tool/commands/environments/list.rb

@@ -24,20 +24,35 @@ def initialize_options
         end
 
         def do_execute( args )
-            if args.length != 0
-                return usage( "To many arguments." )
-            end
+            if args.length == 0
+
+                say "%-15s (%s)" % [ "Environment", "Inherits" ]
+                say "------------------------------------------------------------"
+                configuration.environments.keys.sort.each do |name|
+                    env = configuration.environment(name)
+                    next if !env.active? && !@all
+                    if env.parent
+                        say "%-15s %s" % [ name, env.parent.name ]
+                    else
+                        say name
+                    end
+                end
+
+            elsif args.length == 1
 
-            say "%-15s (%s)" % [ "Environment", "Inherits" ]
-            say "------------------------------------------------------------"
-            configuration.environments.keys.sort.each do |name|
-                env = configuration.environment(name)
-                next if !env.active? && !@all
+                say "Environment:"
+                env = configuration.environment( args[ 0 ] )
                 if env.parent
-                    say "%-15s %s" % [ name, env.parent.name ]
-                else
-                    say name
+                    say "%-15s %s" % [ "Parent", env.parent.name ]
                 end
+                env.vars.sort.each do |var|
+                    say "  %-20s %s" % [ var + ":", env[var] ]
+                end
+
+            else
+
+                return usage( "To many arguments" )
+
             end
 
             return 0

data/lib/build-tool/commands/modules/info.rb

@@ -77,8 +77,8 @@ def do_execute_module( mod )
             if bs
                 say "Build System:               #{bs.name}"
                 say "  Out Of Source Build       #{bs.out_of_source}"
-                bs.options.sort.each do |var|
-                    say "  %-25s %s" % [ var + ":", bs[var] ]
+                bs.option_names.sort.each do |var|
+                    say "  %-28s %s" % [ var + ":", bs[var] ]
                 end
             else
                 say "Build System:               Not configured"
@@ -89,6 +89,9 @@ def do_execute_module( mod )
 
         def initialize_options
             @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULES..."
+            options.on( "--all", "Include inactive modules." ) {
+                @all = true
+                }
             super
         end
 

data/lib/build-tool/configuration.rb

@@ -111,30 +111,40 @@ def vcs( name )
             end
         end
 
-        def build_system( name )
+        def create_build_system( name, parent = nil, *args )
+            return case name
+                when "none"
+                    BuildTool::BuildSystem::None.new( parent, *args )
+                when "cmake"
+                    BuildTool::BuildSystem::CMake.new( parent, *args )
+                when "kdel10n"
+                    BuildTool::BuildSystem::KdeL10n.new( parent, *args )
+                when "qt"
+                    BuildTool::BuildSystem::Qt.new( parent, *args )
+                when "qmake"
+                    BuildTool::BuildSystem::QMake.new( parent, *args )
+                when "custom"
+                    BuildTool::BuildSystem::Custom.new( parent, *args )
+                when "autoconf"
+                    BuildTool::BuildSystem::AutoConf.new( parent, *args )
+                else
+                    raise StandardError, "Unknown Version Control System #{name}"
+                end
+        end
+
+        def build_system_adjust( name, parent = nil, *args )
+            bs = create_build_system( name )
+            bs.defaults = build_system_defaults( name )
+            return bs
+        end
+
+        def build_system_defaults( name, *args )
             return @build_system[name] if @build_system[name]
-            case name
-            when "none"
-                return BuildTool::BuildSystem::None.new
-            when "cmake"
-                return BuildTool::BuildSystem::CMake.new
-            when "kdel10n"
-                return BuildTool::BuildSystem::KdeL10n.new
-            when "qt"
-                return BuildTool::BuildSystem::Qt.new
-            when "qmake"
-                return BuildTool::BuildSystem::QMake.new
-            when "custom"
-                return BuildTool::BuildSystem::Custom.new
-            when "autoconf"
-                return BuildTool::BuildSystem::AutoConf.new
-            else
-                raise StandardError, "Unknown Version Control System #{name}"
-            end
+            add_build_system( create_build_system( name ) )
         end
 
         def add_build_system( bs )
-            @build_system[bs.name] = bs
+            return @build_system[bs.name] = bs
         end
 
     end # Configuration

data/lib/build-tool/module.rb

@@ -38,6 +38,7 @@ def initialize( name, parent = nil )
         attr_writer :feature
         attr_writer :active
         attr_reader :patches
+        attr_reader :parent
 
         def active?
             # If the module is activated that wins
@@ -96,6 +97,10 @@ def build_system
             nil
         end
 
+        def our_build_system
+            @build_system
+        end
+
         # Will throw a exception if build_system is not set
         def build_system_required
             return self.build_system if self.build_system
@@ -343,6 +348,10 @@ def prepare_for_installation
             return true
         end
 
+        def to_s
+            "#{object_id}: #{name}"
+        end
+
     end # Module