autoproj 1.8.2.b16 → 1.8.2.b17

data/bin/autoproj_bootstrap

@@ -365,6 +365,14 @@ fi
                 end
             end
             
+            def install(packages)
+                if super
+                    # Invalidate caching of installed packages, as we just
+                    # installed new packages !
+                    @installed_packages = nil
+                end
+            end
+            
             def filter_uptodate_packages(packages)
                 packages.find_all do |package_name|
                     !installed?(package_name)
@@ -383,12 +391,16 @@ fi
 
             def initialize
                 super(['gem'])
+                @installed_gems = Set.new
             end
 
             # Used to override the Gem::SpecFetcher object used by this gem
             # manager. Useful mainly for testing
             attr_writer :gem_fetcher
 
+            # The set of gems installed during this autoproj session
+            attr_reader :installed_gems
+
             def gem_fetcher
                 if !@gem_fetcher
                     Autoproj.message "  looking for RubyGems updates"
@@ -437,6 +449,9 @@ fi
                     cmdlines.each do |c|
                         Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
                     end
+                    gems.each do |name, v|
+                        installed_gems << name
+                    end
                     did_something = true
                 end
             end
@@ -447,6 +462,8 @@ fi
                 # Don't install gems that are already there ...
                 gems = gems.dup
                 gems.delete_if do |name, version|
+                    next(true) if installed_gems.include?(name)
+
                     version_requirements = Gem::Requirement.new(version || '>= 0')
                     installed =
                         if Gem::Specification.respond_to?(:find_by_name)

data/lib/autoproj/autobuild.rb

@@ -107,7 +107,7 @@ module Autobuild
             end
             @os_packages |= pkg_os.to_set
         rescue Autoproj::OSDependencies::MissingOSDep
-            Autoproj.manifest.add_exclusion(name, "the #{name} osdep is not available on this operating system")
+            Autoproj.manifest.add_exclusion(self.name, "the #{name} osdep is not available on this operating system")
         end
 
         def depends_on_os_package(name)
@@ -370,10 +370,10 @@ def cmake_package(options, &block)
     package_common(:cmake, options) do |pkg|
         Autoproj.add_build_system_dependency 'cmake'
         yield(pkg) if block_given?
-        unless pkg.has_doc?
+        unless pkg.has_doc? && pkg.doc_dir
             pkg.with_doc do
-                doc_html = File.join('doc', 'html')
-                if File.directory? doc_html
+                doc_html = File.join(pkg.builddir, 'doc', 'html')
+                if File.directory?(doc_html)
                     pkg.doc_dir = doc_html
                 end
             end
@@ -394,9 +394,9 @@ def autotools_package(options, &block)
     package_common(:autotools, options) do |pkg|
         Autoproj.add_build_system_dependency 'autotools'
         yield(pkg) if block_given?
-        unless pkg.has_doc?
+        unless pkg.has_doc? && pkg.doc_dir
             pkg.with_doc do
-                doc_html = File.join('doc', 'html')
+                doc_html = File.join(pkg.builddir, 'doc', 'html')
                 if File.directory? doc_html
                     pkg.doc_dir = doc_html
                 end

data/lib/autoproj/osdeps.rb

@@ -266,6 +266,14 @@ fi
                 end
             end
             
+            def install(packages)
+                if super
+                    # Invalidate caching of installed packages, as we just
+                    # installed new packages !
+                    @installed_packages = nil
+                end
+            end
+            
             def filter_uptodate_packages(packages)
                 packages.find_all do |package_name|
                     !installed?(package_name)
@@ -284,12 +292,16 @@ fi
 
             def initialize
                 super(['gem'])
+                @installed_gems = Set.new
             end
 
             # Used to override the Gem::SpecFetcher object used by this gem
             # manager. Useful mainly for testing
             attr_writer :gem_fetcher
 
+            # The set of gems installed during this autoproj session
+            attr_reader :installed_gems
+
             def gem_fetcher
                 if !@gem_fetcher
                     Autoproj.message "  looking for RubyGems updates"
@@ -338,6 +350,9 @@ fi
                     cmdlines.each do |c|
                         Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
                     end
+                    gems.each do |name, v|
+                        installed_gems << name
+                    end
                     did_something = true
                 end
             end
@@ -348,6 +363,8 @@ fi
                 # Don't install gems that are already there ...
                 gems = gems.dup
                 gems.delete_if do |name, version|
+                    next(true) if installed_gems.include?(name)
+
                     version_requirements = Gem::Requirement.new(version || '>= 0')
                     installed =
                         if Gem::Specification.respond_to?(:find_by_name)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b16"
+    VERSION = "1.8.2.b17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b16
+  version: 1.8.2.b17
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &17073020 !ruby/object:Gem::Requirement
+  requirement: &16486980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *17073020
+  version_requirements: *16486980
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &17072460 !ruby/object:Gem::Requirement
+  requirement: &16484260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *17072460
+  version_requirements: *16484260
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &17071900 !ruby/object:Gem::Requirement
+  requirement: &16482140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *17071900
+  version_requirements: *16482140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17071040 !ruby/object:Gem::Requirement
+  requirement: &16480960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *17071040
+  version_requirements: *16480960
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17069660 !ruby/object:Gem::Requirement
+  requirement: &16480180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *17069660
+  version_requirements: *16480180
 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.