autoproj 1.9.3.rc5 → 1.9.3.rc6

data/History.txt

@@ -1,3 +1,58 @@
+= Version 1.9.3
+ * close #245: wrong local variable name
+ * close #218: fix error generated when a metapackage is empty
+ * close #239: metapackages are now back to having "hard" dependencies, i.e. the 
+   build will fail if any of the metapackage's dependencies (or their
+   dependencies) cannot be built for any reason. Individual metapackages (e.g. the
+   rock metapackage) can be marked as using "weak" dependencies to retain the
+   behaviour of "build as much as you can"
+ * Ruby 2.0 / RubyGems 2.0 compatibility fix
+ * re-add 'default' in the osdep OS names. This allows to fall back to
+   os-independent handlers (e.g. 'gem') when not on a known OS
+ * fixes for the MacPort OSdep handler
+
+= Version 1.9.2
+ * quickfix release for issues on systems where the system-wide encoding cannot
+   be resolved by libc
+= Version 1.9.1
+ * fix issues with bootstrapping and building on MacOS
+ * better error messages w.r.t. exclusions
+ * don't rescue interrupts even if -k is given
+ * fix some corner-cases in the debian osdep handler
+ * fix some Ruby autodetection problems
+
+= Version 1.9.0
+ * fixed bad generation of env.sh. The (very annoying) problem of having
+    a partial env.sh file generated should now be fixed for good.
+ * much improved progress output for heavily parallel builds
+ * autoproj update and aup properly update the configuration if given
+     the autoproj/ folder. I.e.,
+        autoproj update autoproj/
+     is equivalent to autoproj update-config
+ * experimental support for Windows
+ * experimental support for MacOSX. The osdep system is using MacPorts
+ * autoproj now validates that you are using always the same ruby
+     version. It avoids potential issues in cases where both ruby 1.9 and
+     1.8 are used on the same system
+ * fix some issue with auto-adding packages. Autoproj would always
+     auto-add package X if e.g. amake is used, which works fine in most
+     but not all cases.
+ * host of fixes related to ignore_packages. In general, this should
+     really work well now
+ * fix Autoproj.set_initial_env. The details of this forgotten feature
+     is going to be in a blog post.
+ * fixed supurious log/ directory created in new bootstrapped
+     installations
+ * the osdep: keyword can be used to trigger recursive resolution. I.e.,
+    one can do the following to avoid repeating a complete osdep
+    definition:
+
+      nokogiri:
+    gem: nokogiri
+          osdep: libxslt-dev
+      libxslt-dev:
+    ubuntu: libxslt-dev
+
 = Version 1.8.5
  * osdeps: the apt-dpkg was interpreting removed-but-not-purged as installed.
    Fix.

data/Manifest.txt

@@ -7,9 +7,11 @@ bin/amake
 bin/aup
 bin/autolocate
 bin/autoproj
+bin/autoproj-bootstrap
 bin/autoproj-clean
 bin/autoproj-create-set
 bin/autoproj-envsh
+bin/autoproj-inspect
 bin/autoproj-list
 bin/autoproj-locate
 bin/autoproj-query

data/bin/autoproj-bootstrap

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+require 'autoproj'
+
+Autoproj::CmdLine.report do
+    begin
+        Autoproj::CmdLine.bootstrap(*ARGV)
+
+    rescue RuntimeError => e
+        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
+
+        raise
+    end
+end

data/bin/autoproj-inspect

@@ -0,0 +1,104 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+Autoproj.silent = true
+Autoproj::CmdLine.initialize_root_directory
+Autoproj::CmdLine.initialize_and_load(ARGV)
+
+require 'pp'
+default_packages = Autoproj.manifest.default_packages
+revdeps = Autoproj.manifest.compute_revdeps
+
+user_selection = ARGV.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+end
+resolved_selection = Autoproj::CmdLine.resolve_user_selection(user_selection, :filter => false)
+packages = resolved_selection.selection.keys
+
+def find_selection_path(from, to)
+    path = [from]
+    if from == to
+        return path
+    end
+
+    Autoproj.manifest.resolve_package_set(from).each do |pkg_name|
+        Autobuild::Package[pkg_name].dependencies.each do |dep_pkg_name|
+            if result = find_selection_path(dep_pkg_name, to)
+                return path + result
+            end
+        end
+    end
+    nil
+end
+
+packages.each do |name|
+    result = Autoproj.manifest.resolve_package_name(name, :filter => false)
+    packages, osdeps = result.partition { |type, name| type == :package }
+    packages = packages.map(&:last)
+    osdeps   = osdeps.map(&:last)
+
+    packages.each do |pkg_name|
+        puts "source package #{pkg_name}"
+        if default_packages.include?(pkg_name)
+            selection = default_packages.selection[pkg_name]
+            if selection.include?(pkg_name) && selection.size == 1
+                puts "  is directly selected by the manifest"
+            else
+                selection = selection.dup
+                selection.delete(pkg_name)
+                puts "  is directly selected by the manifest via #{selection.to_a.join(", ")}"
+            end
+        else
+            puts "  is not directly selected by the manifest"
+        end
+        if Autoproj.manifest.ignored?(pkg_name)
+            puts "  is ignored"
+        end
+        if Autoproj.manifest.excluded?(pkg_name)
+            puts "  is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
+        end
+
+        all_reverse_dependencies = Set.new
+        pkg_revdeps = revdeps[pkg_name].dup.to_a
+        while !pkg_revdeps.empty?
+            parent_name = pkg_revdeps.shift
+            next if all_reverse_dependencies.include?(parent_name)
+            all_reverse_dependencies << parent_name
+            pkg_revdeps.concat(revdeps[parent_name].to_a)
+        end
+        if all_reverse_dependencies.empty?
+            puts "  no reverse dependencies"
+        else
+            puts "  reverse dependencies: #{all_reverse_dependencies.sort.join(", ")}"
+        end
+
+        selections = Set.new
+        all_reverse_dependencies = all_reverse_dependencies.to_a.sort
+        all_reverse_dependencies.each do |parent_name|
+            if default_packages.include?(parent_name)
+                selections |= default_packages.selection[parent_name]
+            end
+        end
+
+        if !selections.empty?
+            puts "  selected by way of"
+            selections.each do |root_pkg|
+                path = find_selection_path(root_pkg, pkg_name)
+                puts "    #{path.join(">")}"
+            end
+        end
+        puts "  directly depends on: #{Autobuild::Package[pkg_name].dependencies.sort.join(", ")}"
+    end
+
+    osdeps.each do |pkg_name|
+        puts "the osdep '#{pkg_name}'"
+        Autoproj.osdeps.resolve_os_dependencies(pkg_name).each do |manager, packages|
+            puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+        end
+    end
+end
+

data/bin/autoproj_bootstrap

@@ -54,6 +54,7 @@ if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
         RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 
         ENV['GEM_HOME'] = needed_gem_home
+        ENV.delete 'GEM_PATH'
         exec RUBY, __FILE__, *ARGV
     end
 end
@@ -523,7 +524,7 @@ fi
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep).map(&:first)
+                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :prerelease
                                        else :complete

data/bin/autoproj_bootstrap.in

@@ -54,6 +54,7 @@ if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
         RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 
         ENV['GEM_HOME'] = needed_gem_home
+        ENV.delete 'GEM_PATH'
         exec RUBY, __FILE__, *ARGV
     end
 end

data/lib/autoproj/cmdline.rb

@@ -1546,10 +1546,20 @@ where 'mode' is one of:
             # We don't use Autoproj.gem_home there as we might not be in an
             # autoproj directory at all
             gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, ".gems")
-            if ENV['GEM_HOME'] || ENV['GEM_PATH']
-                ENV.delete('GEM_HOME')
+            if ENV['GEM_HOME'] && Autoproj.in_autoproj_installation?(ENV['GEM_HOME']) && ENV['GEM_HOME'] != gem_home
+                Autoproj::OSDependencies.define_osdeps_mode_option
+                osdeps = Autoproj::OSDependencies.load_default
+                if osdeps_forced_mode
+                    osdeps.osdeps_mode = osdeps_forced_mode
+                end
+                osdeps.osdeps_mode
+
+                Autoproj.message "autoproj: bootstrapping using another installation's autoproj gem"
+                ENV['GEM_HOME'] = gem_home
                 ENV.delete('GEM_PATH')
-                Autoproj.message "reset the RubyGems environment, restarting bootstrapping from #{Dir.pwd}"
+                Autoproj.message "installing autoproj in #{ENV['GEM_HOME']} and restarting"
+                osdeps.install ['autoproj']
+                Autoproj.message "restarting bootstrapping from #{Dir.pwd}"
 
                 require 'rbconfig'
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']

data/lib/autoproj/manifest.rb

@@ -1854,7 +1854,7 @@ module Autoproj
                 result.filter_excluded_and_ignored_packages(self)
             rescue ExcludedSelection => e
                 if validate
-                    raise
+                    raise e, "#{e.selection}, which is selected in the layout, cannot be built: #{e.message}", e.backtrace
                 end
             end
             result

data/lib/autoproj/osdeps.rb

@@ -406,7 +406,7 @@ fi
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep).map(&:first)
+                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :prerelease
                                        else :complete

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.3.rc5"
+    VERSION = "1.9.3.rc6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.3.rc5
+  version: 1.9.3.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &15028720 !ruby/object:Gem::Requirement
+  requirement: &21146660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *15028720
+  version_requirements: *21146660
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &15027120 !ruby/object:Gem::Requirement
+  requirement: &21145780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *15027120
+  version_requirements: *21145780
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &15025720 !ruby/object:Gem::Requirement
+  requirement: &21144920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *15025720
+  version_requirements: *21144920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15042520 !ruby/object:Gem::Requirement
+  requirement: &21142980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *15042520
+  version_requirements: *21142980
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &15041600 !ruby/object:Gem::Requirement
+  requirement: &21142100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: *15041600
+  version_requirements: *21142100
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
@@ -76,9 +76,11 @@ executables:
 - aup
 - autolocate
 - autoproj
+- autoproj-bootstrap
 - autoproj-clean
 - autoproj-create-set
 - autoproj-envsh
+- autoproj-inspect
 - autoproj-list
 - autoproj-locate
 - autoproj-query
@@ -102,9 +104,11 @@ files:
 - bin/aup
 - bin/autolocate
 - bin/autoproj
+- bin/autoproj-bootstrap
 - bin/autoproj-clean
 - bin/autoproj-create-set
 - bin/autoproj-envsh
+- bin/autoproj-inspect
 - bin/autoproj-list
 - bin/autoproj-locate
 - bin/autoproj-query