autoproj 1.6.0 → 1.6.1.b1

data/History.txt

@@ -1,3 +1,10 @@
+= Version 1.6.1
+ * fix a limitation of giving directories on the command line. Before, only
+   packages that were explicitely listed in the layout would be selected. Now,
+   all packages are looked for -- even
+ * fix Fedora and other flavors of Linux being (wrongly) detected as being
+   supported.
+
 = Version 1.6.0
  * starting this version, autoproj becomes the official build system for the
    Orocos Toolchain project

data/lib/autoproj/cmdline.rb

@@ -972,13 +972,16 @@ manifest_source:
             #
             # 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'] && Autoproj.in_autoproj_installation?(ENV['GEM_HOME']) &&
-                ENV['GEM_HOME'] != ENV['AUTOPROJ_GEM_HOME']
-                Autoproj.progress "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
-                FileUtils.cp_r ENV['GEM_HOME'], ".gems"
-                ENV['GEM_HOME'] = File.join(Dir.pwd, ".gems")
+                ENV['GEM_HOME'] != gem_home
+                if !File.exists?(gem_home)
+                    Autoproj.progress "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
+                    FileUtils.cp_r ENV['GEM_HOME'], gem_home
+                end
+                ENV['GEM_HOME'] = gem_home
 
-                Autoproj.save_config
+                Autoproj.progress "restarting bootstrapping from #{Dir.pwd}"
 
                 require 'rbconfig'
                 ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']

data/lib/autoproj/manifest.rb

@@ -1093,13 +1093,17 @@ module Autoproj
             end
         end
 
-        # Returns the set of package names that are available for installation.
-        # It is the set of packages listed in the layout minus the exluded and
-        # ignred ones
-        def all_package_names
+        # Returns the set of package names that are explicitely listed in the
+        # layout, minus the excluded and ignored ones
+        def all_layout_packages
             default_packages
         end
 
+        # Returns all defined package names, minus the excluded and ignored ones
+        def all_package_names
+            Autobuild::Package.each.map { |name, _| name }.to_set
+        end
+
         # Returns the set of packages that should be built if the user does not
         # specify any on the command line
         def default_packages
@@ -1196,14 +1200,14 @@ module Autoproj
             # The expanded selection
             expanded_packages = Set.new
             # All the packages that are available on this installation
-            all_package_names = self.all_package_names
+            all_layout_packages = self.all_layout_packages
 
             # First, remove packages that are directly referenced by name or by
             # package set names
             selected_packages.delete_if do |sel|
                 sel = Regexp.new(Regexp.quote(sel))
 
-                packages = all_package_names.
+                packages = all_layout_packages.
                     find_all { |pkg_name| pkg_name =~ sel }.
                     to_set
                 expanded_packages |= packages
@@ -1211,7 +1215,7 @@ module Autoproj
                 sources = each_source.find_all { |source| source.name =~ sel }
                 sources.each do |source|
                     packages = resolve_package_set(source.name).to_set
-                    expanded_packages |= (packages & all_package_names)
+                    expanded_packages |= (packages & all_layout_packages)
                 end
 
                 !packages.empty? && !sources.empty?
@@ -1221,23 +1225,31 @@ module Autoproj
                 return expanded_packages
             end
 
-            # Now, expand sublayout and directory names 
+            # Now, search for layout names
             each_package_set(nil) do |layout_name, packages, _|
                 selected_packages.delete_if do |sel|
                     if layout_name[0..-1] =~ Regexp.new("#{sel}\/?$")
                         expanded_packages |= packages.to_set
-                    else
-                        match = Regexp.new("^#{Regexp.quote(sel)}")
-                        all_package_names.each do |pkg_name|
-                            pkg = Autobuild::Package[pkg_name]
-                            if pkg.srcdir =~ match
-                                expanded_packages << pkg_name
-                            end
-                        end
                     end
                 end
             end
 
+            # Finally, check for package source directories
+            all_packages = self.all_package_names
+            selected_packages.delete_if do |sel|
+                match = Regexp.new("^#{Regexp.quote(sel)}")
+                all_packages.each do |pkg_name|
+                    pkg = Autobuild::Package[pkg_name]
+                    if pkg.srcdir =~ match
+                        expanded_packages << pkg_name
+                    end
+                end
+            end
+
+            # Some packages might be there even though they are not listed in
+            # the layout (either un-defined or depended-upon by other packages).
+            # Check for those by looking for root_dir/package_name
+
             # Finally, remove packages that are explicitely excluded and/or
             # ignored
             expanded_packages.delete_if { |pkg_name| excluded?(pkg_name) || ignored?(pkg_name) }

data/lib/autoproj/osdeps.rb

@@ -105,6 +105,15 @@ module Autoproj
             end
         end
 
+        # Returns true if it is possible to install packages for the operating
+        # system on which we are installed
+        def self.supported_operating_system?
+            osdef = operating_system
+            return false if !osdef
+
+            OS_PACKAGE_INSTALL.has_key?(osdef[0])
+        end
+
         # Autodetects the operating system name and version
         #
         # +osname+ is the operating system name, all in lowercase (e.g. ubuntu,
@@ -447,14 +456,14 @@ module Autoproj
 
         # Requests the installation of the given set of packages
         def install(packages, package_osdeps = Hash.new)
-            os_def = OSDependencies.operating_system
+            handled_os = OSDependencies.supported_operating_system?
             osdeps, gems = partition_packages(packages, package_osdeps)
             gems = filter_uptodate_gems(gems)
             if osdeps.empty? && gems.empty?
                 return
             end
 
-            if automatic_osdeps_mode == AUTOMATIC && !os_def && !osdeps.empty?
+            if automatic_osdeps_mode == AUTOMATIC && !handled_os && !osdeps.empty?
                 puts
                 puts Autoproj.color("==============================", :bold)
                 puts Autoproj.color("The packages that will be built require some other software to be installed", :bold)
@@ -480,7 +489,7 @@ module Autoproj
                 end
 
                 if automatic_osdeps_mode == ASK
-                    if !os_def
+                    if !handled_os
                         if gems.empty?
                             # Nothing we can do, but the users required "ASK".
                             # So, at least, let him press enter
@@ -532,7 +541,7 @@ module Autoproj
 
             did_something = false
 
-            if os_def && !osdeps.empty?
+            if handled_os && !osdeps.empty?
                 shell_script = generate_os_script(osdeps)
                 if Autoproj.verbose
                     Autoproj.progress "Installing non-ruby OS dependencies with"

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.0"
+    VERSION = "1.6.1.b1"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 6629755
+  prerelease: true
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  - b1
+  version: 1.6.1.b1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -273,12 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild