autoproj 1.10.2 → 1.11.0.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a840434e06242556cb58e8b6c31c19f7a0bb1df
-  data.tar.gz: 4133e112675520bad959d89e9bdf08e75db32567
+  metadata.gz: a6d9f944537d588d5d919fd531860f93dea6f072
+  data.tar.gz: 899edc4f1296f7b0b57e94005b713d6f0f8b05e2
 SHA512:
-  metadata.gz: 141ae467ba7ecb832f5b59e9ab64c929b602031c118626e66917dfea3c7782e488288ac0671d4896dc64cff519f5f1eb8d6ebc60bd069bd0b56ce88946d41894
-  data.tar.gz: 500bd6468d4bda5982f8cb4330ca070c5e0adca764ab9f3a54311fb464420419e394bf4518449cc9e7e4d77bd2a074216921b67f573914c39b498a6fda3534a7
+  metadata.gz: 2509de689250e5d00dfb76fa57617c558a793db9f0d81b75c94e1eb31ff9e0f9a55a9dd4aff8b9f5d5ed23ab1491eaded5b7ba2912ed66174599e442d0d709a8
+  data.tar.gz: db15a52b8ea0e89aa58e64586b4e39c6079a290e8d4f583ed91991c567bad18a9f4f35ecbf934bdc410af894de5aaca74d1c5b88857fd1015851d08261d7e883

data/Manifest.txt

@@ -18,6 +18,7 @@ bin/autoproj-locate
 bin/autoproj-query
 bin/autoproj-show
 bin/autoproj-snapshot
+bin/autoproj-switch-config
 bin/autoproj-test
 bin/autoproj_bootstrap
 bin/autoproj_bootstrap.in
@@ -25,13 +26,21 @@ bin/autoproj_stress_test
 lib/autoproj.rb
 lib/autoproj/autobuild.rb
 lib/autoproj/base.rb
+lib/autoproj/build_option.rb
 lib/autoproj/cmdline.rb
+lib/autoproj/configuration.rb
 lib/autoproj/default.osdeps
 lib/autoproj/environment.rb
 lib/autoproj/gitorious.rb
 lib/autoproj/installation_manifest.rb
 lib/autoproj/manifest.rb
 lib/autoproj/metapackage.rb
+lib/autoproj/ops/main_config_switcher.rb
+lib/autoproj/ops/build.rb
+lib/autoproj/ops/cache.rb
+lib/autoproj/ops/configuration.rb
+lib/autoproj/ops/loader.rb
+lib/autoproj/ops/tools.rb
 lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
 lib/autoproj/package_definition.rb

data/Rakefile

@@ -29,6 +29,8 @@ namespace 'dist' do
     desc "generate the bootstrap script"
     task 'bootstrap' do
         require 'yaml'
+        build_option_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'build_option.rb'))
+        config_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'configuration.rb'))
         osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))
         options_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'options.rb'))
         system_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'system.rb'))
@@ -54,6 +56,8 @@ namespace 'dist' do
         end
 
         bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
+            gsub('BUILD_OPTION_CODE', build_option_code).
+            gsub('CONFIG_CODE', config_code).
             gsub('OSDEPS_CODE', osdeps_code).
             gsub('OPTIONS_CODE', options_code).
             gsub('SYSTEM_CODE', system_code).

data/bin/aup

@@ -1,7 +1,8 @@
 #! /usr/bin/env ruby
 require 'optparse'
+require 'autoproj'
 
-build_all = false
+build_all = (Dir.pwd == Autoproj.root_dir)
 parser = OptionParser.new do |opt|
     opt.banner = "aup [options] [dir_or_package]
 Runs autoproj update for the given directory or package name.
@@ -34,8 +35,11 @@ while !options.empty?
     end
 end
 
+
 # If --all is not given *and* there is no non-option argument (i.e. no directory
 # / package name), add the current directory to the command line
+#
+# BUT make running 'aup' in the root directory the equivalent of aup --all
 if remaining.grep(/^-/).size == remaining.size && !build_all
     remaining.push '.'
 end

data/bin/autolocate

@@ -1,84 +1,3 @@
 #! /usr/bin/env ruby
-
-require 'autoproj'
-require 'autoproj/cmdline'
-
-Autoproj.silent = true
-root_dir  = Autoproj::CmdLine.initialize_root_directory
-selection = Autoproj::CmdLine.initialize_and_load(ARGV)
-if selection.empty?
-    puts root_dir
-    exit 0
-elsif selection.size > 1
-    STDERR.puts Autoproj.console.color("more than one name given on the command line", :red)
-    exit 1
-end
-selection = selection.first
-
-selection_rx = Regexp.new(Regexp.quote(selection))
-candidates = []
-Autoproj.manifest.each_package do |pkg|
-    name = pkg.name
-    next if !Autoproj.manifest.package_enabled?(name)
-
-    srcdir = Autobuild::Package[name].srcdir
-    if name == selection
-        puts srcdir
-        exit(0)
-    elsif name =~ selection_rx
-        candidates << srcdir
-    end
-end
-
-if candidates.empty?
-    # Try harder. Match directory prefixes
-    directories = selection.split('/')
-    rx = directories.
-        map { |d| "#{Regexp.quote(d)}\\w*" }.
-        join("/")
-    rx = Regexp.new(rx)
-
-    rx_strict = directories[0..-2].
-        map { |d| "#{Regexp.quote(d)}\\w*" }.
-        join("/")
-    rx_strict = Regexp.new("#{rx_strict}/#{Regexp.quote(directories.last)}$")
-
-    candidates_strict = []
-    Autoproj.manifest.each_package do |pkg|
-        name = pkg.name
-        next if !Autoproj.manifest.package_enabled?(name)
-
-        srcdir = Autobuild::Package[name].srcdir
-        if name =~ rx
-            candidates << srcdir
-        end
-        if name =~ rx_strict
-            candidates_strict << srcdir
-        end
-    end
-
-    if candidates.size > 1 && candidates_strict.size == 1
-        candidates = candidates_strict
-    end
-end
-
-if candidates.size > 1
-    # If there is more than one candidate, check if there are some that are not
-    # present on disk
-    present = candidates.find_all { |dir| File.directory?(dir) }
-    if present.size == 1
-        candidates = present
-    end
-end
-
-if candidates.empty?
-    STDERR.puts Autoproj.console.color("cannot find #{selection} in the current autoproj installation", :bold, :red)
-    exit 1
-elsif candidates.size > 1
-    STDERR.puts Autoproj.console.color("multiple packages match #{selection} in the current autoproj installation: #{candidates.join(", ")}", :bold, :red)
-    exit 1
-else
-    puts candidates.first
-    exit(0)
-end
+load File.expand_path('autoproj-locate', File.dirname(__FILE__))
 

data/bin/autoproj

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 
-if RUBY_VERSION < "1.8.7"
-    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+if RUBY_VERSION < "1.9.2"
+    STDERR.puts "autoproj requires Ruby >= 1.9.2"
     exit 1
 end
 
@@ -18,15 +18,9 @@ def color(*args)
     Autoproj.color(*args)
 end
 
-if defined? Encoding # This is a 1.9-only thing
-    Encoding.default_internal = Encoding::UTF_8
-    Encoding.default_external = Encoding::UTF_8
-end
+Encoding.default_internal = Encoding::UTF_8
+Encoding.default_external = Encoding::UTF_8
 Autoproj::OSDependencies.autodetect_ruby
-if defined? Encoding # This is a 1.9-only thing
-    Encoding.default_internal = Encoding::UTF_8
-    Encoding.default_external = Encoding::UTF_8
-end
 
 # Check the first element of ARGV. If a tool called autoproj-VALUE exists, just
 # pass the hand to it
@@ -47,27 +41,7 @@ end
 
 # Find the autoproj root dir
 Autoproj::CmdLine.report do
-    selected_packages =
-        begin Autoproj::CmdLine.parse_arguments(ARGV.dup)
-        rescue RuntimeError => e
-            if Autoproj::CmdLine.bootstrap? && !Autoproj.in_autoproj_installation?(Dir.pwd)
-                STDERR.puts <<EOTEXT
-
-
-#{color('autoproj bootstrap failed', :red, :bold)}
-To retry, first source the #{Autoproj::ENV_FILENAME} script with
-  source #{Dir.pwd}/#{Autoproj::ENV_FILENAME}
-and then re-run autoproj bootstrap with
-  autoproj bootstrap <vcs_type> <vcs_url> <vcs_options>
-
-where
-  'vcs_type' is git, svn, darcs, cvs
-  'vcs_url' is the vcs-specific URL to the repository, and
-  'vcs_options' are optional values that can be given to the chosen VCS
-EOTEXT
-            end
-            raise
-        end
+    selected_packages = Autoproj::CmdLine.parse_arguments(ARGV.dup)
 
     # Expand directories in the selected_packages set, before we chdir to the
     # autoproj root
@@ -166,30 +140,6 @@ EOTEXT
         Autoproj::CmdLine.display_configuration(manifest, selected_packages.packages)
     end
     
-    if Autoproj::CmdLine.bootstrap?
-        STDERR.puts <<EOTEXT
-
-
-#{color('autoproj bootstrap successfully finished', :green, :bold)}
-
-#{color('To further use autoproj and the installed software', :bold)}, you
-must add the following line at the bottom of your .bashrc:
-  source #{Dir.pwd}/#{Autoproj::ENV_FILENAME}
-
-WARNING: autoproj will not work until your restart all
-your consoles, or run the following in them:
-  $ source #{Dir.pwd}/#{Autoproj::ENV_FILENAME}
-
-#{color('To import and build the packages', :bold)}, you can now run
-  autoproj update
-  autoproj build
-
-The resulting software is installed in
-  #{Dir.pwd}/install
-
-EOTEXT
-    end
-
     if Autoproj::CmdLine.only_config? || Autoproj::CmdLine.reconfigure?
         exit(0)
     end
@@ -284,7 +234,7 @@ EOTEXT
         Autoproj.message
         Autoproj.message "statistics about the build", :bold
 
-        Autoproj.manifest.each_package.sort_by(&:name).each do |pkg|
+        Autoproj.manifest.each_autobuild_package.sort_by(&:name).each do |pkg|
             next if pkg.statistics.empty?
 
             if per_phase.empty?

data/bin/autoproj-bootstrap

@@ -1,15 +1,43 @@
 #! /usr/bin/env ruby
 require 'autoproj'
+require 'autoproj/ops/main_config_switcher'
 
+root_dir = Dir.pwd
 Autoproj::CmdLine.report do
+    switcher = Autoproj::Ops::MainConfigSwitcher.new(root_dir)
     begin
-        Autoproj::CmdLine.bootstrap(*ARGV)
+        switcher.bootstrap(*ARGV)
+        manifest = Autoproj::Manifest.load(File.join(Autoproj.config_dir, 'manifest'))
+        update = Autoproj::Ops::Configuration.new(manifest, Autoproj::Ops.loader)
+        update.update_configuration
 
-    rescue RuntimeError => e
+        STDERR.puts <<EOTEXT
+
+
+#{color('autoproj bootstrap successfully finished', :green, :bold)}
+
+#{color('To further use autoproj and the installed software', :bold)}, you
+must add the following line at the bottom of your .bashrc:
+  source #{root_dir}/#{Autoproj::ENV_FILENAME}
+
+WARNING: autoproj will not work until your restart all
+your consoles, or run the following in them:
+  $ source #{root_dir}/#{Autoproj::ENV_FILENAME}
+
+#{color('To import and build the packages', :bold)}, you can now run
+  autoproj update
+  autoproj build
+
+The resulting software is installed in
+  #{root_dir}/install
+
+EOTEXT
+
+    rescue RuntimeError
         STDERR.puts <<-EOTEXT
 #{color('autoproj bootstrap failed', :red, :bold)}
 To retry, first source the #{Autoproj::ENV_FILENAME} script with
-  source #{Dir.pwd}/#{Autoproj::ENV_FILENAME}
+  source #{root_dir}/#{Autoproj::ENV_FILENAME}
 and then re-run autoproj bootstrap with
   autoproj bootstrap <vcs_type> <vcs_url> <vcs_options>
 

data/bin/autoproj-cache

@@ -1,75 +1,18 @@
 #! /usr/bin/env ruby
 
 require 'autoproj'
+require 'autoproj/ops/cache'
 
 root_dir = Autoproj::CmdLine.initialize_root_directory
 
-def with_retry(count)
-    (count + 1).times do |i|
-        begin
-            break yield
-        rescue Autobuild::SubcommandFailed
-            if i == count
-                raise
-            else
-                Autobuild.message "  failed, retrying (#{i}/#{count})"
-            end
-        end
-    end
-end
-
 Autoproj::CmdLine.report do
     cache_dir, *_ =
         Autoproj.silent do
             Autoproj::CmdLine.initialize_and_load(ARGV)
         end
-    manifest = Autoproj.manifest
-
     cache_dir = File.expand_path(cache_dir, root_dir)
-    if !File.exists?(cache_dir)
-        Autoproj.message "  creating autoproj cache in #{cache_dir}"
-        FileUtils.mkdir_p cache_dir
-    else
-        Autoproj.message "  updating already existing cache repository in #{cache_dir}"
-    end
-    archive_cache_dir = File.join(cache_dir, 'archives')
-    if !File.directory?(archive_cache_dir)
-        Autoproj.message "    creating archive cache in #{archive_cache_dir}"
-        FileUtils.mkdir_p archive_cache_dir
-    else
-        Autoproj.message "    updating already existing archive cache in #{archive_cache_dir}"
-    end
-    git_cache_dir = File.join(cache_dir, 'git')
-    if !File.directory?(git_cache_dir)
-        Autoproj.message "    creating git cache in #{git_cache_dir}"
-        FileUtils.mkdir_p git_cache_dir
-        Autobuild::Subprocess.run("autoproj-cache", "import", Autobuild.tool(:git), "--git-dir", git_cache_dir, 'init', "--bare")
-    else
-        Autoproj.message "    updating already existing git cache in #{git_cache_dir}"
-    end
-
-    manifest.each_package do |pkg|
-        if pkg.importer.kind_of?(Autobuild::Git)
-            Autoproj.message "  caching #{pkg.name} (git)"
-            pkg.importdir = git_cache_dir
-            pkg.importer.local_branch = nil
-            pkg.importer.remote_branch = nil
-            remote_name = pkg.name.gsub(/[^\w]/, '_')
-            pkg.importer.remote_name = remote_name
-            pkg.importer.update_remotes_configuration(pkg, 'autoproj-cache')
-
-            with_retry(10) do
-                Autobuild::Subprocess.run('autoproj-cache', :import, Autobuild.tool('git'), '--git-dir', git_cache_dir, 'remote', 'update', remote_name)
-            end
-        elsif pkg.importer.kind_of?(Autobuild::ArchiveImporter)
-            Autoproj.message "  caching #{pkg.name} (archive)"
-            pkg.importer.cachedir = archive_cache_dir
-            with_retry(10) do
-                pkg.importer.update_cache(pkg)
-            end
-        end
-    end
 
-    Autobuild::Subprocess.run('autoproj-cache', :import, Autobuild.tool('git'), '--git-dir', git_cache_dir, 'gc', '--aggressive', '--prune=all')
+    cache_op = Autoproj::Ops::Cache.new(cache_dir, Autoproj.manifest)
+    cache_op.create_or_update
 end
 

data/bin/autoproj-clean

@@ -7,7 +7,7 @@ Autoproj.silent = true
 root_dir  = Autoproj::CmdLine.initialize_root_directory
 Autoproj::CmdLine.initialize_and_load(ARGV)
 
-Autoproj.manifest.each_package do |pkg|
+Autoproj.manifest.each_autobuild_package do |pkg|
     pkg.prepare_for_rebuild
 end
 

data/bin/autoproj-doc

@@ -23,6 +23,6 @@ Autoproj::CmdLine.report do
     # This calls #prepare, which is required to run build_packages
     packages = Autoproj::CmdLine.import_packages(resolved_selection)
     packages.each { |pkg| Autobuild::Package[pkg].disable_phases('import', 'prepare', 'install') }
-    Autoproj::CmdLine.build_packages(resolved_selection, packages, ['doc'])
+    Autobuild.apply(packages, "autoproj-doc", ['doc'])
 end
 

data/bin/autoproj-list

@@ -20,7 +20,7 @@ end
 all_packages = Hash.new
 package_sets = manifest.each_package_set.to_a
 package_sets.each do |pkg_set|
-    pkg_set.each_package.each do |pkg|
+    pkg_set.each_autobuild_package.each do |pkg|
         all_packages[pkg.name] = [pkg, pkg_set.name]
     end
 end

data/bin/autoproj-locate

@@ -3,25 +3,28 @@
 require 'autoproj'
 require 'autoproj/cmdline'
 
-Autoproj.silent = true
 root_dir  = Autoproj::CmdLine.initialize_root_directory
-selection = Autoproj::CmdLine.initialize_and_load(ARGV)
-if selection.empty?
+
+manifest = Autoproj::InstallationManifest.new(root_dir)
+if !File.file?(manifest.default_manifest_path)
+    Autoproj.error "the installation manifest is not present, please run autoproj envsh to generate it"
+end
+manifest.load
+
+if ARGV.empty?
     puts root_dir
     exit 0
-elsif selection.size > 1
-    STDERR.puts Autoproj.console.color("more than one name given on the command line", :red)
+elsif ARGV.size > 1
+    Autoproj.error "more than one name given on the command line"
     exit 1
 end
-selection = selection.first
+selection = ARGV.first
 
 selection_rx = Regexp.new(Regexp.quote(selection))
 candidates = []
-Autoproj.manifest.each_package do |pkg|
+manifest.each do |pkg|
     name = pkg.name
-    next if !Autoproj.manifest.package_enabled?(name)
-
-    srcdir = Autobuild::Package[name].srcdir
+    srcdir = pkg.srcdir
     if name == selection
         puts srcdir
         exit(0)
@@ -44,11 +47,9 @@ if candidates.empty?
     rx_strict = Regexp.new("#{rx_strict}/#{Regexp.quote(directories.last)}$")
 
     candidates_strict = []
-    Autoproj.manifest.each_package do |pkg|
+    manifest.each do |pkg|
         name = pkg.name
-        next if !Autoproj.manifest.package_enabled?(name)
-
-        srcdir = Autobuild::Package[name].srcdir
+        srcdir = pkg.srcdir
         if name =~ rx
             candidates << srcdir
         end
@@ -72,10 +73,10 @@ if candidates.size > 1
 end
 
 if candidates.empty?
-    STDERR.puts Autoproj.console.color("cannot find #{selection} in the current autoproj installation", :bold, :red)
+    Autoproj.error "cannot find #{selection} in the current autoproj installation"
     exit 1
 elsif candidates.size > 1
-    STDERR.puts Autoproj.console.color("multiple packages match #{selection} in the current autoproj installation: #{candidates.join(", ")}", :bold, :red)
+    Autoproj.error "multiple packages match #{selection} in the current autoproj installation: #{candidates.join(", ")}"
     exit 1
 else
     puts candidates.first