build-tool 0.2 → 0.3

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

@@ -9,12 +9,18 @@ module BuildTool; module Commands; module Modules
 
         name        "list"
         description "list modules"
+        long_description [ "Shows a list of modules. Without a parameter all modules are show. With",
+                           "parameters list all modules matching them." ]
         cmdalias    "lsmods"
 
         def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} [MODULE|GROUP]..."
+
             @template = false
             @all = false
 
+            @options.separator "Options:"
+
             options.on( "--all", "Include inactive modules." ) {
                 @all = true
                 }
@@ -24,7 +30,6 @@ module BuildTool; module Commands; module Modules
                 }
 
             super
-
         end
 
         def do_execute( args )
@@ -32,7 +37,7 @@ module BuildTool; module Commands; module Modules
             if args.length == 0
                 configuration.modules.each do |mod|
                     if @template or not mod.is_template?
-                        say "%-30s : %s" % [ mod.name, mod.description ] if ( mod.active? || @all )
+                        say "%-30s : %s" % [ mod.name, mod.description || "No description specified" ] if ( mod.active? || @all )
                     end
                 end
             else
@@ -40,7 +45,7 @@ module BuildTool; module Commands; module Modules
                     mods = complete_modules( arg, @template )
                     next if !mods
                     mods.each do |mod|
-                        say "%-30s : %s" % [ mod.name, mod.description ] if ( mod.active? || @all )
+                        say "%-30s : %s" % [ mod.name, mod.description || "No description specified" ] if ( mod.active? || @all )
                     end
                 end
             end

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

@@ -10,9 +10,9 @@ module BuildTool; module Commands; module Modules
         include MJ::Tools::SubProcess
 
         name        "shell"
-        description "open a shell having the modules environment."
 
         def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULE"
             super
         end
 

data/lib/build-tool/commands/rebase.rb

@@ -13,6 +13,7 @@ module BuildTool; module Commands;
 
         name        "rebase"
         description "rebase local checkout against previously fetched remote changes."
+        long_description [ "Invokes the rebase phase for the specified modules." ]
 
         # Log this command if $noop is not active
         def log?
@@ -23,6 +24,11 @@ module BuildTool; module Commands;
             BuildTool::Application.instance.name != "build-tool"
         end
 
+        def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} MODULES..."
+            super
+        end
+
         def is_module_ready?( mod )
             isready = true
             if !mod.checkedout?

data/lib/build-tool/commands/recipes.rb

@@ -14,10 +14,6 @@ module BuildTool; module Commands;
             super
         end
 
-        def applicable?
-            BuildTool::Application.instance.name == "build-tool"
-        end
-
         def do_execute
             raise NotImplementedError
         end

data/lib/build-tool/commands/recipes/add.rb

@@ -0,0 +1,45 @@
+require 'build-tool/commands'
+require 'build-tool/recipe'
+require 'mj/vcs/git'
+
+module BuildTool; module Commands; module Recipes
+
+    #
+    # BuildCommand
+    #
+    class Add < Standard
+
+        name        "add"
+        description "Add a recipe to build-tool."
+        long_description "Add a new recipe to build-tool from URL with NAME."
+
+        def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} URL NAME"
+            super
+        end
+
+        def do_execute( args )
+            if ( args.length < 2 )
+                return usage( "Not enough arguments" )
+            elsif (args.length > 2 )
+                return usage( "To many arguments" )
+            end
+
+            path = BuildTool::Application::instance.local_configuration_dir.join( "recipes" )
+            if ! path.exist? && ! $noop
+                FileUtils.mkdir_p( path )
+            end
+
+            repo = MJ::VCS::Git::Repository.new(path.join(args[1]), $noop)
+            repo.clone(args[0])
+            return 0
+        end
+
+    end # class
+
+end; end # module Commands::Recipes
+
+end; # module BuildTool
+
+
+

data/lib/build-tool/commands/recipes/incoming.rb

@@ -0,0 +1,66 @@
+require 'build-tool/commands'
+require 'build-tool/recipe'
+require 'mj/vcs/git'
+
+module BuildTool; module Commands; module Recipes
+
+    #
+    # BuildCommand
+    #
+    class Fetch < Standard
+
+        name        "incoming"
+        description "Show the incoming changes to the recipe from the repository."
+
+        def applicable?
+            BuildTool::Application.instance.name != "build-tool"
+        end
+
+        def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname}"
+
+            @options.separator "Options:"
+            @rebase = false
+            @fetch = false
+            options.on( "-f", "--[no-]fetch", "Fetch from origin." ) { |t|
+                @fetch = t
+                }
+            options.on( "-r", "--[no-]rebase", "Rebase against master." ) { |t|
+                @rebase = t
+                }
+            super
+        end
+
+        def do_execute( args )
+            if ( args.length != 0 )
+                return usage("No arguments expected")
+            end
+
+            recipe = BuildTool::Application::instance.recipe
+            repo = MJ::VCS::Git::Repository.new(recipe.global_path, $noop)
+
+            if @fetch
+                say "Fetching"
+                repo.fetch()
+            end
+
+            repo.log("HEAD..origin/master").each do |line|
+                say line
+            end
+
+            if @rebase
+                say "Rebasing"
+                repo.rebase("master")
+            end
+            return 0
+        end
+
+    end # class
+
+end; end # module Commands::Recipes
+
+end; # module BuildTool
+
+
+
+

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

@@ -1,6 +1,8 @@
 require 'build-tool/commands'
 require 'build-tool/recipe'
 
+require 'ftools'
+
 module BuildTool; module Commands; module Recipes
 
     #
@@ -10,8 +12,10 @@ module BuildTool; module Commands; module Recipes
 
         name        "info"
         description "show information about a module."
+        long_description [ "Show detailed information about RECIPE." ]
 
         def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} RECIPE"
             super
         end
 

data/lib/build-tool/commands/recipes/install.rb

@@ -11,8 +11,11 @@ module BuildTool; module Commands; module Recipes
 
         name        "install"
         description "install a build recipe"
+        long_description [ "Prepare a recipe for usage. If SCRIPTNAME is provided the recipe is",
+                           "installed as SCRIPTNAME-build instead of RECIPE-build" ]
 
         def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname} RECIPE [SCRIPTNAME]"
             super
         end
 
@@ -114,7 +117,14 @@ EOS
             if conffile.exist?
                 say "The config file already exists. I will not copy the file."
             else
-                File.copy(recipe.join("settings.yaml"), conffile)
+                from = File.new(recipe.join("settings.yaml"), "r")
+                to = File.new(conffile, "w")
+                to.write("RECIPE:       #{recipename}\n\n")
+                from.each_line do |line|
+                    to.write line
+                end
+                to.close
+                from.close
             end
 
             say <<EOS

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

@@ -10,8 +10,10 @@ module BuildTool; module Commands; module Recipes
 
         name        "list"
         description "list build recipes"
+        long_description [ "Shows the list of recipes." ]
 
         def initialize_options
+            @options.banner = "Usage: #{Pathname.new($0).basename} #{self.fullname}"
             super
         end
 

data/lib/build-tool/configuration.rb

@@ -2,6 +2,7 @@ require 'build-tool/vcs/git'
 require 'build-tool/vcs/git-svn'
 require 'build-tool/vcs/svn'
 require 'build-tool/vcs/archive'
+require 'build-tool/vcs/mercurial'
 
 require 'build-tool/build-system/cmake'
 require 'build-tool/build-system/qt'
@@ -102,6 +103,8 @@ module BuildTool
                 return BuildTool::VCS::SvnConfiguration.new
             when "archive"
                 return BuildTool::VCS::ArchiveConfiguration.new
+            when "mercurial"
+                return BuildTool::VCS::MercurialConfiguration.new
             else
                 raise StandardError, "Unknown Version Control System #{name}"
             end

data/lib/build-tool/module.rb

@@ -14,6 +14,7 @@ module BuildTool
                 raise StandardError, "Module name is required!"
             end
             @active = nil
+            @patches = Array.new
             @name = name
             @parent = parent
             @local_path = nil
@@ -26,6 +27,9 @@ module BuildTool
             @is_template = false
             @vcs_configuration = nil
             @feature = nil
+
+            @long_description = nil
+            @description = nil
         end
 
         #
@@ -33,6 +37,7 @@ module BuildTool
         #
         attr_writer :feature
         attr_writer :active
+        attr_reader :patches
 
         def active?
             # If the module is activated that wins
@@ -49,7 +54,7 @@ module BuildTool
 
         # not inherited
         def build_directory
-            "#{build_prefix_required}/bld/#{local_path}"
+            build_prefix_required.join("bld", local_path)
         end
 
         def build_prefix=( path )
@@ -110,8 +115,9 @@ module BuildTool
             end
         end
 
+        attr_writer :description
         def description
-            @description || "no description"
+            @description
         end
 
         # Environment
@@ -175,6 +181,11 @@ module BuildTool
             @local_path || @name
         end
 
+        attr_writer :long_description
+        def long_description
+            @long_description
+        end
+
         # The module name
         attr_reader :name
 
@@ -205,7 +216,7 @@ module BuildTool
         end
 
         def source_directory
-            "#{build_prefix_required}/src/#{local_path}"
+            build_prefix_required.join("src", local_path)
         end
         alias source_directory_required source_directory
 
@@ -265,6 +276,12 @@ module BuildTool
         # Clone the repository.
         def clone
             vcs_required.clone
+            if !patches.empty?
+                if !vcs.patches_supported?
+                    raise NotImplementedError, "Patch support not implemented for vcs #{vcs.name}"
+                end
+                vcs_required.apply_patches( patches )
+            end
         end
 
         # Fetch changes from the remote repository. Do not change the local
@@ -277,6 +294,13 @@ module BuildTool
         # from the remote repository.
         def rebase
             vcs_required.rebase
+            if !patches.empty?
+                if !vcs.patches_supported?
+                    raise NotImplementedError, "Patch support not implemented for vcs #{vcs.name}"
+                end
+                vcs_required.apply_patches( patches )
+            end
+            build_system_required.after_rebase
         end
 
         def configure

data/lib/build-tool/vcs/archive.rb

@@ -19,10 +19,10 @@ module BuildTool; module VCS
 
     end # class ArchiveConfiguration
 
-
     class Archive < Base
 
         class ArchiveError < BuildTool::Error; end
+        class FileNotFoundError < BuildTool::Error; end
 
         #
         ### Attributes
@@ -35,6 +35,14 @@ module BuildTool; module VCS
             true
         end
 
+        def patches_supported?
+            true
+        end
+
+        def apply_patches_after_rebase?
+            true
+        end
+
         def archive_local_path
             "#{File.dirname( local_path )}/#{archive_name}"
         end
@@ -55,7 +63,25 @@ module BuildTool; module VCS
             File.exist? archive_local_path
         end
 
+        def apply_patches( patches )
+            patches.each do |patch|
+                full_path = self.recipe.find_first_config_file( "custom/#{config.module.name}/patches/#{patch}.patch" )
+                if full_path.nil?
+                    raise FileNotFoundError, "Patch '#{patch}' not found from module #{config.module.name}."
+                end
+                logger.info "Applying patch #{patch}"
+                self.class.execute( "patch -p1 -i #{full_path}", local_path )
+            end
+
+        end
+
         def clone
+            fetch()
+            rebase()
+            0
+        end
+
+        def fetch()
             # Check if the archive is already downloaded
             if File.exist? archive_local_path
                 logger.debug "Archive already fetched. Skipping."
@@ -83,33 +109,7 @@ module BuildTool; module VCS
                 }
                 target.close()
             end
-
-            # Determine if the archive has a top level directory
-            topdir = guess_top_level_directory()
-
-            if archive_name =~ /(\.tgz|\.tar\.gz)$/
-                if self.class.execute( "gunzip -c #{archive_local_path} | tar xf -", File.dirname(local_path) ) != 0
-                    raise StandardError, "Failed to unpack the archive: $?"
-                end
-            else
-                raise NotImplementedError, "No idea how to unpack the archive"
-            end
-
-            # Rename the top level directory to our desired path
-            logger.trace "mv #{File.dirname(local_path)}/#{topdir}  #{local_path}"
-            if !$noop
-                FileUtils.move( "#{File.dirname(local_path)}/#{topdir}", local_path )
-            end
-            0
-        end
-
-        def fetch()
-            if !checkedout?
-               clone
-            else
-                # No update for archives
-            end
-            return true
+            return 0
         end
 
         def guess_top_level_directory
@@ -123,15 +123,43 @@ module BuildTool; module VCS
                     end
                     topdir = rc[1]
                 } != 0 
-                    raise StandardError, "Failed to unpack the archive: $?"
+                    # No topdir
+                    return nil
                 end
             else
-                raise NotImplementedError, "No idea how to unpack the archive"
+                raise NotImplementedError, "No idea how to unpack the archive '#{archive_name}'."
             end
             return topdir
         end
 
         def rebase
+
+            # Check if the archive is already downloaded
+            if !File.exist? archive_local_path
+                logger.debug "Archive not fetched. Skipping."
+                return 0
+            end
+
+            if local_path_exist?
+                return 0
+            end
+
+            # Create the directory we want to use to checkout
+            FileUtils.mkdir_p local_path if !$noop
+
+            if archive_name =~ /(\.tgz|\.tar\.gz)$/
+                if guess_top_level_directory()
+                    cmd = "gunzip -c #{archive_local_path} | tar --strip-components=1 --extract --file=- --directory=#{local_path}"
+                else
+                    cmd = "gunzip -c #{archive_local_path} | tar --strip-components=0 --extract --file=- --directory=#{local_path}"
+                end
+                if self.class.execute( cmd ) != 0
+                    raise StandardError, "Failed to unpack the archive: $?"
+                end
+            else
+                raise NotImplementedError, "No idea how to unpack the archive"
+            end
+
             0
         end