autoproj 1.5.1 → 1.5.2

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.5.2
+ * fix ignored_packages and exclude_packages
+
 = Version 1.5.1
  * --no-osdeps disables updating autobuild and autoproj, as it should
  * fixed checking out modules that are not yet checked out

data/bin/autoproj

@@ -110,6 +110,10 @@ report(Autobuild.debug) do
         all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
         Autoproj::CmdLine.manifest_update(all_enabled_packages)
         exit(0)
+    elsif Autoproj::CmdLine.snapshot?
+        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
+        Autoproj::CmdLine.snapshot(Autoproj::CmdLine.snapshot_dir, all_enabled_packages)
+        exit(0)
     end
 
     STDERR.puts

data/doc/guide/src/quick_start.page

@@ -44,6 +44,24 @@ Additional options can be given for the version control system. For instance,
    ruby autoproj\_bootstrap git git://github.com/doudou/rubim.all.git branch=stable
    {: .cmdline}
 
+Switching configuration after bootstrapping
+-------------------------------------------
+Let's assume that you want to switch what configuration autoproj is tracking,
+but without having to redo a complete bootstrap -- i.e. avoiding to rebuild
+stuff that is common between the configurations.
+
+autoproj provides the switch-config command for that. This command takes the
+same arguments than the bootstrap script, that is:
+
+autoproj switch-config \[vcs_type] \[vcs_url] \[vcs_options]
+{: .cmdline}
+
+As a shortcut, one can omit vcs_type and vcs_url if they don't change.
+This is especially useful when switching between branches:
+
+autoproj switch-config branch=experimental
+{: .cmdline}
+
 Management
 ----------
 

data/lib/autoproj/autobuild.rb

@@ -324,3 +324,36 @@ def user_config(key)
     Autoproj.user_config(key)
 end
 
+class Autobuild::Git
+    def snapshot(package, target_dir)
+        Dir.chdir(package.srcdir) do
+            head_commit   = `git rev-parse #{branch}`.chomp
+            {
+                'type' => 'git',
+                'url' => repository,
+                'commit' => head_commit,
+                'patches' => patches
+            }
+        end
+    end
+end
+
+class Autobuild::ArchiveImporter
+    def snapshot(package, target_dir)
+        archive_dir = File.join(target_dir, 'archives')
+        FileUtils.mkdir_p archive_dir
+        FileUtils.cp @cachefile, archive_dir
+
+        {
+            'type' => 'archive',
+            'url' =>  File.join('$AUTOPROJ_SOURCE_DIR', File.basename(@cachefile)),
+            'mode' => @mode,
+            'update_cached_file' => false,
+            'patches' => patches,
+            'no_subdirectory' => @options[:no_subdirectory],
+            'archive_dir' => archive_dir
+
+        }
+    end
+end
+

data/lib/autoproj/cmdline.rb

@@ -358,6 +358,7 @@ module Autoproj
         def self.update_os_dependencies?; !!@update_os_dependencies end
         class << self
             attr_accessor :update_os_dependencies
+            attr_accessor :snapshot_dir
         end
         def self.display_configuration?; !!@display_configuration end
         def self.force_re_build_with_depends?; !!@force_re_build_with_depends end
@@ -366,6 +367,7 @@ module Autoproj
         def self.update_packages?; @mode == "update" || @mode == "envsh" || build? end
         def self.build?; @mode =~ /build/ end
         def self.doc?; @mode == "doc" end
+        def self.snapshot?; @mode == "snapshot" end
         def self.parse_arguments(args)
             @only_status = false
             @check = false
@@ -530,6 +532,11 @@ where 'mode' is one of:
             when "fast-build"
                 Autobuild.do_update = false
                 @update_os_dependencies = false
+            when "snapshot"
+                @snapshot_dir = remaining_args.shift
+                Autobuild.do_update = false
+                Autobuild.do_build = false
+                @update_os_dependencies = false
             when "full-build"
                 Autobuild.do_update = true
                 @update_os_dependencies = true
@@ -910,6 +917,49 @@ EOTEXT
             end
         end
 
+        def self.snapshot(target_dir, packages)
+            # First, copy the configuration directory to create target_dir
+            if File.exists?(target_dir)
+                raise ArgumentError, "#{target_dir} already exists"
+            end
+            FileUtils.cp_r Autoproj.config_dir, target_dir
+
+            # Now, create snapshot information for each of the packages
+            version_control = []
+            packages.each do |package_name|
+                package  = Autobuild::Package[package_name]
+                importer = package.importer
+                if !importer
+                    STDERR.puts "cannot snapshot #{package_name} as it has no importer"
+                    next
+                elsif !importer.respond_to?(:snapshot)
+                    STDERR.puts "cannot snapshot #{package_name} as the #{importer.class} importer does not support it"
+                    next
+                end
+
+                vcs_info = importer.snapshot(package, target_dir)
+                if vcs_info
+                    version_control << Hash[package_name, vcs_info]
+                end
+            end
+
+            overrides_path = File.join(target_dir, 'overrides.yml')
+            overrides =
+                if File.exists?(overrides_path)
+                    YAML.load(File.read(overrides_path))
+                else Hash.new
+                end
+
+            if overrides['version_control']
+                overrides['version_control'].concat(version_control)
+            else
+                overrides['version_control'] = version_control
+            end
+
+            File.open(overrides_path, 'w') do |io|
+                io.write YAML.dump(overrides)
+            end
+        end
     end
 end
 

data/lib/autoproj/manifest.rb

@@ -555,8 +555,8 @@ module Autoproj
         #
         # This is useful if the packages are already installed on this system.
         def ignored?(package_name)
-            if data['ignored_packages']
-                data['ignored_packages'].any? { |l| Regexp.new(l) =~ package_name }
+            if data['ignore_packages']
+                data['ignore_packages'].any? { |l| Regexp.new(l) =~ package_name }
             else
                 false
             end
@@ -567,8 +567,8 @@ module Autoproj
         # This is useful to avoid building packages that are of no use for the
         # user.
         def excluded?(package_name)
-            if data['excluded_packages']
-                data['excluded_packages'].any? { |l| Regexp.new(l) =~ package_name }
+            if data['exclude_packages']
+                data['exclude_packages'].any? { |l| Regexp.new(l) =~ package_name }
             else
                 false
             end
@@ -944,7 +944,7 @@ module Autoproj
                         packages.values.
                             map { |pkg| pkg.autobuild.name }
                     end
-            names = names.delete_if { |pkg_name| excluded?(pkg_name) }
+            names.delete_if { |pkg_name| excluded?(pkg_name) || ignored?(pkg_name) }
             names.to_set
         end
 
@@ -1067,6 +1067,10 @@ module Autoproj
                     end
                 end
             end
+
+            # Finally, remove packages that are explicitely excluded and/or
+            # ignored
+            expanded_packages.delete_if { |pkg_name| excluded?(pkg_name) || ignored?(pkg_name) }
             expanded_packages.to_set
         end
     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 +02:00
+date: 2010-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency