autoproj 1.7.18 → 1.7.19.rc1

data/History.txt

@@ -1,3 +1,8 @@
+= Version 1.7.19
+ * use different colors for remote-only and local-only commits
+ * fix some issues with handling of osdeps vs. exclusion/ignore handling
+ * fix handling of optional dependencies osdeps
+
 = Version 1.7.18
  * properly detect and report circular dependencies
 

data/bin/autoproj_bootstrap

@@ -612,12 +612,13 @@ fi
         def availability_of(name)
             osdeps, gemdeps = partition_packages([name].to_set)
             if !osdeps.empty?
-                status = resolve_package(name)
-                if status.respond_to?(:to_ary) || status == IGNORE
-                    AVAILABLE
-                else
-                    status
+                osdeps.each do |dep_name|
+                    status = resolve_package(dep_name)
+                    if !status.respond_to?(:to_ary) && status != IGNORE
+                        return status
+                    end
                 end
+                AVAILABLE
             elsif !gemdeps.empty?
                 AVAILABLE
             else

data/lib/autoproj/autobuild.rb

@@ -101,14 +101,11 @@ module Autobuild
             end
 
             @os_packages ||= Set.new
-            Autoproj.manifest.resolve_package_name(name).each do |type, pkg|
-                if type == :osdeps
-                    @os_packages << pkg
-                elsif type == :package
-                    __depends_on__(pkg)
-                else raise Autoproj::InternalError, "expected package type to be either :osdeps or :package, got #{type.inspect}"
-                end
+            pkg_autobuild, pkg_os = partition_package(name)
+            pkg_autobuild.each do |pkg|
+                __depends_on__(pkg)
             end
+            @os_packages |= pkg_os.to_set
         end
 
         def depends_on_os_package(name)
@@ -123,17 +120,48 @@ module Autobuild
             optional_dependencies << name
         end
 
-        def resolve_optional_dependencies
+        def partition_package(pkg_name)
+            pkg_autobuild, pkg_osdeps = [], []
+            Autoproj.manifest.resolve_package_name(pkg_name).each do |type, dep_name|
+                if type == :osdeps
+                    pkg_osdeps << dep_name
+                elsif type == :package
+                    pkg_autobuild << dep_name
+                else raise Autoproj::InternalError, "expected package type to be either :osdeps or :package, got #{type.inspect}"
+                end
+            end
+            return pkg_autobuild, pkg_osdeps
+        end
+
+        def partition_optional_dependencies
+            packages, osdeps, disabled = [], [], []
             optional_dependencies.each do |name|
-                if Autobuild::Package[name] && Autoproj.manifest.package_enabled?(name)
-                    if Autoproj.verbose
-                        STDERR.puts "adding optional dependency #{self.name} => #{name}"
-                    end
-                    depends_on(name)
-                elsif Autoproj.verbose
-                    STDERR.puts "NOT adding optional dependency #{self.name} => #{name}"
+                if !Autoproj.manifest.package_enabled?(name)
+                    disabled << name
+                    next
+                end
+
+                pkg_autobuild, pkg_osdeps = partition_package(name)
+                valid = pkg_autobuild.any? { |pkg| !Autoproj.manifest.package_enabled?(pkg) } ||
+                    pkg_osdeps.any? { |pkg| !Autoproj.manifest.package_enabled?(pkg) }
+
+                if valid
+                    packages.concat(pkg_autobuild)
+                    osdeps.concat(pkg_osdeps)
+                else
+                    disabled << name
                 end
             end
+            return packages, osdeps, disabled
+        end
+
+        def resolve_optional_dependencies
+            if !Autoproj::CmdLine.ignore_dependencies?
+                packages, osdeps, disabled = partition_optional_dependencies
+                packages.each { |pkg| depends_on(packages) }
+                @os_packages ||= Set.new
+                @os_packages |= osdeps.to_set
+            end
         end
 
         def optional_dependencies

data/lib/autoproj/cmdline.rb

@@ -1180,9 +1180,9 @@ where 'mode' is one of:
                         end
                     when Autobuild::Importer::Status::ADVANCED
                         result.local = true
-                        lines << Autoproj.color("  local contains #{status.local_commits.size} commit that remote does not have:", :magenta)
+                        lines << Autoproj.color("  local contains #{status.local_commits.size} commit that remote does not have:", :blue)
                         status.local_commits.each do |line|
-                            lines << Autoproj.color("    #{line}", :magenta)
+                            lines << Autoproj.color("    #{line}", :blue)
                         end
                     when Autobuild::Importer::Status::SIMPLE_UPDATE
                         result.remote = true

data/lib/autoproj/manifest.rb

@@ -1845,7 +1845,7 @@ module Autoproj
         # If it is false, the method will simply return false on non-defined
         # packages 
         def package_enabled?(name, validate = true)
-            if !Autobuild::Package[name]
+            if !Autobuild::Package[name] && !Autoproj.osdeps.has?(name)
                 if validate
                     raise ArgumentError, "package #{name} does not exist"
                 end
@@ -2047,6 +2047,12 @@ module Autoproj
             @osdeps_overrides[osdeps_name.to_s] = options
         end
 
+        # Remove any OSDeps override that has previously been added with
+        # #add_osdeps_overrides
+        def remove_osdeps_overrides(osdep_name)
+            @osdeps_overrides.delete(osdeps_name.to_s)
+        end
+
         # Package selection can be done in three ways:
         #  * as a subdirectory in the layout
         #  * as a on-disk directory

data/lib/autoproj/osdeps.rb

@@ -513,12 +513,13 @@ fi
         def availability_of(name)
             osdeps, gemdeps = partition_packages([name].to_set)
             if !osdeps.empty?
-                status = resolve_package(name)
-                if status.respond_to?(:to_ary) || status == IGNORE
-                    AVAILABLE
-                else
-                    status
+                osdeps.each do |dep_name|
+                    status = resolve_package(dep_name)
+                    if !status.respond_to?(:to_ary) && status != IGNORE
+                        return status
+                    end
                 end
+                AVAILABLE
             elsif !gemdeps.empty?
                 AVAILABLE
             else

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.18"
+    VERSION = "1.7.19.rc1"
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  hash: 15424223
+  prerelease: 7
   segments: 
   - 1
   - 7
-  - 18
-  version: 1.7.18
+  - 19
+  - rc
+  - 1
+  version: 1.7.19.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -186,12 +188,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