autoproj 1.8.5 → 1.9.0.rc1

data/lib/autoproj/autobuild.rb

@@ -342,11 +342,6 @@ def package_common(package_type, spec, &block) # :nodoc:
         return Autobuild::Package[package_name]
     end
 
-    # Check if this package is ignored
-    if Autoproj.manifest.ignored?(package_name) || Autoproj.manifest.ignored?(Autoproj.current_file[0].name)
-        return Autoproj.define(:dummy, spec)
-    end
-
     pkg = Autoproj.define(package_type, spec, &block)
     pkg.srcdir = pkg.name
     pkg
@@ -484,7 +479,7 @@ def ruby_package(options)
 
         # Set up code
         pkg.post_install do
-            pkg.progress_start "setting up Ruby package %s" do
+            pkg.progress_start "setting up Ruby package %s", :done_message => 'set up Ruby package %s' do
                 Autobuild.update_environment pkg.srcdir
                 # Add lib/ unconditionally, as we know that it is a ruby package.
                 # Autobuild will add it only if there is a .rb file in the directory
@@ -507,7 +502,7 @@ def ruby_package(options)
         # rake_doc_task to nil
         if !pkg.has_doc? && pkg.rake_doc_task
             pkg.doc_task do
-                pkg.progress_start "generating documentation for %s" do
+                pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
                     Autobuild::Subprocess.run pkg, 'doc', 'rake', pkg.rake_doc_task, :working_directory => pkg.srcdir
                 end
             end

data/lib/autoproj/cmdline.rb

@@ -13,6 +13,11 @@ module Autoproj
     end
     @verbose = false
     @console = HighLine.new
+    ENV_FILENAME =
+        if Autobuild.windows? then "env.bat"
+        else "env.sh"
+        end
+	
 
     def self.silent(&block)
         Autobuild.silent(&block)
@@ -49,6 +54,15 @@ module Autoproj
             Autoproj.loaded_autobuild_files.clear
             Autoproj.load_config
 
+            ruby_executable = Autoproj.find_in_path(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+            if Autoproj.has_config_key?('ruby_executable')
+                expected = Autoproj.user_config('ruby_executable')
+                if expected != ruby_executable
+                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{ruby_executable}. This is usually caused by calling a wrong gem program (for instance, gem1.8 instead of gem1.9.1)"
+                end
+            end
+            Autoproj.change_option('ruby_executable', ruby_executable, true)
+
             if Autoproj.has_config_key?('autobuild')
                 params = Autoproj.user_config('autobuild')
                 if params.kind_of?(Hash)
@@ -69,13 +83,14 @@ module Autoproj
             # If we are under rubygems, check that the GEM_HOME is right ...
             if $LOADED_FEATURES.any? { |l| l =~ /rubygems/ }
                 if ENV['GEM_HOME'] != Autoproj.gem_home
-                    raise ConfigError.new, "RubyGems is already loaded with a different GEM_HOME, make sure you are loading the right env.sh script !"
+                    raise ConfigError.new, "RubyGems is already loaded with a different GEM_HOME, make sure you are loading the right #{ENV_FILENAME} script !"
                 end
             end
 
             # Set up some important autobuild parameters
-            Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', 'LD_LIBRARY_PATH'
+            Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', 'LD_LIBRARY_PATH', 'GEM_PATH', 'CMAKE_PREFIX_PATH', 'PYTHONPATH'
             Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
+            Autoproj.env_add 'GEM_PATH', Autoproj.gem_home
             Autoproj.env_add 'PATH', File.join(Autoproj.gem_home, 'bin')
             Autoproj.env_set 'RUBYOPT', "-rubygems"
             Autobuild.prefix  = Autoproj.build_dir
@@ -335,6 +350,11 @@ module Autoproj
             # Resolve optional dependencies
             manifest.resolve_optional_dependencies
 
+            # And, finally, disable all ignored packages on the autobuild side
+            manifest.each_ignored_package do |pkg_name|
+                Autobuild::Package[pkg_name].disable
+            end
+
             # Make sure that we have the environment of all selected packages
             manifest.all_selected_packages.each do |pkg_name|
                 Autobuild::Package[pkg_name].update_environment
@@ -494,7 +514,7 @@ module Autoproj
 
         # Returns the set of packages that are actually selected based on what
         # the user gave on the command line
-        def self.resolve_user_selection(selected_packages)
+        def self.resolve_user_selection(selected_packages, options = Hash.new)
             manifest = Autoproj.manifest
 
             if selected_packages.empty?
@@ -503,7 +523,7 @@ module Autoproj
             selected_packages = selected_packages.to_set
 
             selected_packages, nonresolved = manifest.
-                expand_package_selection(selected_packages)
+                expand_package_selection(selected_packages, options)
 
             # Try to auto-add stuff if nonresolved
             nonresolved.delete_if do |sel|
@@ -526,15 +546,21 @@ module Autoproj
                 end
             end
 
-            if !nonresolved.empty?
-                Autoproj.message("autoproj: wrong package selection on command line, cannot find a match for #{nonresolved.to_a.join(", ")}", :red)
-                exit 1
-            elsif Autoproj.verbose
-                Autoproj.message "will install #{selected_packages.packages.keys.to_a.sort.join(", ")}"
+            if Autoproj.verbose
+                Autoproj.message "will install #{selected_packages.packages.to_a.sort.join(", ")}"
             end
             selected_packages
         end
 
+        def self.validate_user_selection(user_selection, resolved_selection)
+            not_matched = user_selection.find_all do |pkg_name|
+                !resolved_selection.has_match_for?(pkg_name)
+            end
+            if !not_matched.empty?
+                Autoproj.message("autoproj: wrong package selection on command line, cannot find a match for #{not_matched.to_a.sort.join(", ")}", :red)
+            end
+        end
+
         def self.mark_exclusion_along_revdeps(pkg_name, revdeps, chain = [], reason = nil)
             root = !reason
             chain.unshift pkg_name
@@ -629,6 +655,8 @@ module Autoproj
                     if Autoproj.manifest.excluded?(pkg.name)
                         mark_exclusion_along_revdeps(pkg.name, reverse_dependencies)
                         true
+                    elsif Autoproj.manifest.ignored?(pkg.name)
+                        true
                     end
                 end
                 package_queue.concat(new_packages.sort_by(&:name))
@@ -649,7 +677,7 @@ module Autoproj
 		pkg = Autobuild::Package[pkg_name]
 		pkg.resolve_optional_dependencies
 
-                pkg.prepare
+                pkg.prepare if !pkg.disabled?
                 Rake::Task["#{pkg.name}-prepare"].instance_variable_set(:@already_invoked, true)
 
 		package_queue.concat(pkg.dependencies)
@@ -815,7 +843,7 @@ where 'mode' is one of:
   doc:    generate and install documentation for packages that have some
 
 -- Status & Update
-  envsh:         update the env.sh script
+  envsh:         update the #{ENV_FILENAME} script
   osdeps:        install the OS-provided packages
   status:        displays the state of the packages w.r.t. their source VCS
   list-config:   list all available packages
@@ -1147,6 +1175,7 @@ where 'mode' is one of:
             last_was_in_sync = false
             result = StatusResult.new
 
+            sync_packages = ""
             packages.each do |pkg|
                 lines = []
 
@@ -1172,12 +1201,17 @@ where 'mode' is one of:
                     case status.status
                     when Autobuild::Importer::Status::UP_TO_DATE
                         if !status.uncommitted_code
-                            if last_was_in_sync
-                                STDERR.print ", #{pkg_name}"
-                            else
-                                STDERR.print pkg_name
+                            if sync_packages.size > 80
+                                Autoproj.message "#{sync_packages},"
+                                sync_packages = ""
                             end
-                            last_was_in_sync = true
+                            msg = if sync_packages.empty?
+                                      pkg_name
+                                  else
+                                      ", #{pkg_name}"
+                                  end
+                            STDERR.print msg
+                            sync_packages = "#{sync_packages}#{msg}"
                             next
                         else
                             lines << Autoproj.color("  local and remote are in sync", :green)
@@ -1209,22 +1243,25 @@ where 'mode' is one of:
                     end
                 end
 
-                if last_was_in_sync
-                    Autoproj.message(": local and remote are in sync", :green)
+                if !sync_packages.empty?
+                    Autoproj.message("#{sync_packages}: #{color("local and remote are in sync", :green)}")
+                    sync_packages = ""
                 end
 
-                last_was_in_sync = false
-                STDERR.print "#{pkg_name}:"
+                STDERR.print 
 
                 if lines.size == 1
-                    Autoproj.message lines.first
+                    Autoproj.message "#{pkg_name}: #{lines.first}"
                 else
-                    Autoproj.message
-                    Autoproj.message lines.join("\n")
+                    Autoproj.message "#{pkg_name}:"
+                    lines.each do |l|
+                        Autoproj.message l
+                    end
                 end
             end
-            if last_was_in_sync
-                Autoproj.message(": local and remote are in sync", :green)
+            if !sync_packages.empty?
+                Autoproj.message("#{sync_packages}: #{color("local and remote are in sync", :green)}")
+                sync_packages = ""
             end
             return result
         end
@@ -1373,7 +1410,7 @@ where 'mode' is one of:
             end
 
             require 'set'
-            curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", 'env.sh'].to_set
+            curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", @env].to_set
             if !curdir_entries.empty? && ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1'
                 while true
                     print "The current directory is not empty, continue bootstrapping anyway ? [yes] "
@@ -1447,14 +1484,13 @@ where 'mode' is one of:
 
             Autoproj.save_config
 
-            # Finally, generate an env.sh script
-            File.open('env.sh', 'w') do |io|
-                io.write <<-EOSHELL
-export RUBYOPT=-rubygems
-export GEM_HOME=#{Autoproj.gem_home}
-export PATH=$GEM_HOME/bin:$PATH
-                EOSHELL
-            end
+            Autobuild.env_set 'RUBYOPT', '-rubygems'
+            Autobuild.env_set 'GEM_HOME', Autoproj.gem_home
+            Autobuild.env_add_path 'PATH', File.join(Autoproj.gem_home, 'bin')
+            Autobuild.env_inherit 'PATH'
+            Autobuild.env_add_path 'GEM_PATH', Autoproj.gem_home
+            Autobuild.env_inherit 'GEM_PATH'
+            Autoproj.export_env_sh
         end
 
         def self.missing_dependencies(pkg)

data/lib/autoproj/default.osdeps

@@ -16,7 +16,11 @@ ruby18:
       "15,16":
         - ruby
         - rubygems
-      default: nonexistent
+    darwin:
+        - ruby
+        - rb-rake
+    default: nonexistent
+    
 ruby19:
     debian:
         - ruby1.9.1
@@ -42,13 +46,17 @@ ruby19:
       "17":
       - ruby
       - rubygems
-      default: nonexistent
+    darwin:
+        - ruby19
+        - rake
+    default: nonexistent
 
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
   arch: ignore
   fedora: ignore
+  darwin: ignore
 
 autobuild: gem
 autoproj: gem
@@ -62,16 +70,22 @@ git:
   gentoo: dev-vcs/git
   arch: git
   fedora: git
+  darwin: git-core
+
 svn:
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
   arch: subversion
   fedora: subversion
+  darwin: subversion
+
 cmake:
   debian,ubuntu: cmake
   gentoo: dev-util/cmake
   arch: cmake
   fedora: cmake
+  darwin: cmake
+
 autotools:
   debian,ubuntu:
   - "automake1.9"
@@ -83,12 +97,16 @@ autotools:
   fedora:
   - automake
   - autoconf
+  darwin:
+  - automake
+  - autoconf
 
 lsb_release:
   debian,ubuntu: lsb-release
   gentoo: sys-apps/lsb-release
   arch: ignore
   fedora: redhat-lsb
+  darwin: ignore
     
 archive:
   debian,ubuntu:
@@ -103,9 +121,14 @@ archive:
   fedora:
   - tar
   - unzip
+  darwin:
+  - gnutar
+  - unzip
+
 cvs:
   debian,ubuntu: cvs
   fedora: cvs
+  darwin: cvs
 
 # vim: expandtab
 

data/lib/autoproj/manifest.rb

@@ -3,6 +3,8 @@ require 'utilrb/kernel/options'
 require 'set'
 require 'rexml/document'
 
+require 'win32/dir' if RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)! 
+
 module Autoproj
     @build_system_dependencies = Set.new
 
@@ -44,22 +46,6 @@ module Autoproj
         value
     end
 
-    @env_inherit = Set.new
-    # Returns true if the given environment variable must not be reset by the
-    # env.sh script, but that new values should simply be prepended to it.
-    #
-    # See Autoproj.env_inherit
-    def self.env_inherit?(name)
-        @env_inherit.include?(name)
-    end
-    # Declare that the given environment variable must not be reset by the
-    # env.sh script, but that new values should simply be prepended to it.
-    #
-    # See Autoproj.env_inherit?
-    def self.env_inherit(*names)
-        @env_inherit |= names
-    end
-
     # Sets an environment variable
     #
     # This sets (or resets) the environment variable +name+ to the given value.
@@ -1037,6 +1023,8 @@ module Autoproj
 
             @file = file
             @data = data
+            data['ignore_packages'] ||= Set.new
+            data['exclude_packages'] ||= Set.new
 
             if data['constants']
                 @constant_definitions = Autoproj.resolve_constant_definitions(data['constants'])
@@ -1098,8 +1086,7 @@ module Autoproj
         # Call this method to ignore a specific package. It must not be used in
         # init.rb, as the manifest is not yet loaded then
         def ignore_package(package_name)
-            list = (data['ignore_packages'] ||= Array.new)
-            list << package_name
+            data['ignore_packages'] << package_name
         end
 
         # True if the given package should not be built, with the packages that
@@ -1107,40 +1094,45 @@ module Autoproj
         #
         # This is useful if the packages are already installed on this system.
         def ignored?(package_name)
-            if data['ignore_packages']
-                data['ignore_packages'].any? do |l|
-                    if package_name == l
-                        true
-                    elsif (pkg_set = metapackages[l]) && pkg_set.include?(package_name)
-                        true
-                    else
-                        false
+            data['ignore_packages'].any? do |l|
+                if package_name == l
+                    true
+                elsif (pkg_set = metapackages[l]) && pkg_set.include?(package_name)
+                    true
+                else
+                    false
+                end
+            end
+        end
+
+        # Enumerates the package names of all ignored packages
+        def each_ignored_package
+            data['ignore_packages'].each do |l|
+                if pkg_set = metapackages[l]
+                    pkg_set.each_package do |pkg|
+                        yield(pkg.name)
                     end
+                else
+                    yield(l)
                 end
-            else
-                false
             end
         end
 
         # Removes all registered exclusions
         def clear_exclusions
             automatic_exclusions.clear
-            if excl = data['exclude_packages']
-                excl.clear
-            end
+            data['exclude_packages'].clear
         end
 
         # Removes all registered ignored packages
         def clear_ignored
-            if ignored = data['ignore_packages']
-                ignored.clear
-            end
+            data['ignore_packages'].clear
         end
 
         # The set of package names that are listed in the excluded_packages
         # section of the manifest
         def manifest_exclusions
-            data['exclude_packages'] || Set.new
+            data['exclude_packages']
         end
 
         # A package_name => reason map of the exclusions added with #add_exclusion.
@@ -1468,11 +1460,11 @@ module Autoproj
                     dest = File.readlink(symlink_dest)
                     if dest != pkg_set.raw_local_dir
                         FileUtils.rm_f symlink_dest
-                        FileUtils.ln_sf pkg_set.raw_local_dir, symlink_dest
+                        Autoproj.create_symlink(pkg_set.raw_local_dir, symlink_dest)
                     end
                 else
                     FileUtils.rm_f symlink_dest
-                    FileUtils.ln_sf pkg_set.raw_local_dir, symlink_dest
+                    Autoproj.create_symlink(pkg_set.raw_local_dir, symlink_dest)
                 end
 
                 symlink_dest
@@ -1643,7 +1635,7 @@ module Autoproj
         # where +type+ can either be :package or :osdeps (as symbols)
         #
         # The returned array can be empty if +name+ is an ignored package
-        def resolve_package_name(name)
+        def resolve_package_name(name, options = Hash.new)
             if pkg_set = find_metapackage(name)
                 if !pkg_set
                     raise ConfigError.new, "#{name} is neither a package nor a package set name. Packages in autoproj must be declared in an autobuild file."
@@ -1655,7 +1647,7 @@ module Autoproj
 
             result = []
             pkg_names.each do |pkg|
-                result.concat(resolve_single_package_name(pkg))
+                result.concat(resolve_single_package_name(pkg, options))
             end
             result
         end
@@ -1686,10 +1678,8 @@ module Autoproj
         #
         # This is a helper method for #resolve_package_name. Do not use
         # directly
-        def resolve_single_package_name(name) # :nodoc:
-            if ignored?(name)
-                return []
-            end
+        def resolve_single_package_name(name, options = Hash.new) # :nodoc:
+            options = Kernel.validate_options options, :filter => true
 
             explicit_selection  = explicitly_selected_package?(name)
 	    osdeps_availability = Autoproj.osdeps.availability_of(name)
@@ -1733,9 +1723,15 @@ module Autoproj
                     end
                 end
 
-                # No source, no osdeps. Call osdeps again, but this time to get
+                # No source, no osdeps.
+                # If the package is ignored by the manifest, just return empty.
+                # Otherwise, generate a proper error message
+                # Call osdeps again, but this time to get
                 # a proper error message.
                 if !available_as_source
+                    if ignored?(name)
+                        return []
+                    end
                     begin
                         Autoproj.osdeps.resolve_os_dependencies([name].to_set)
                     rescue Autoproj::ConfigError => e
@@ -2146,6 +2142,10 @@ module Autoproj
                 end
             end
 
+            def has_match_for?(sel)
+                matches.has_key?(sel)
+            end
+
             # Remove packages that are explicitely excluded and/or ignored
             #
             # Raise an error if an explicit selection expands only to an
@@ -2176,20 +2176,22 @@ module Autoproj
                     end
 
                     excluded = excluded.to_set
+                    ignored = ignored.to_set
                     expansion.delete_if do |pkg_name|
-                        excluded.include?(pkg_name)
+                        ignored.include?(pkg_name) || excluded.include?(pkg_name)
                     end
                 end
 
                 selection.keys.sort.each do |pkg_name|
                     if manifest.excluded?(pkg_name)
-                        Autoproj.warn "#{pkg_name} was selected for #{selection[pkg_name].to_a.sort.join(", ")}, but it is excluded from the build: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
                         selection.delete(pkg_name)
                     elsif manifest.ignored?(pkg_name)
-                        Autoproj.warn "#{pkg_name} was selected for #{selection[pkg_name].to_a.sort.join(", ")}, but it is ignored in this build"
                         selection.delete(pkg_name)
                     end
                 end
+                matches.delete_if do |key, sel|
+                    sel.empty?
+                end
             end
         end
 
@@ -2199,7 +2201,8 @@ module Autoproj
         #  * as a package name
         #
         # This method converts the first two directories into the third one
-        def expand_package_selection(selection)
+        def expand_package_selection(selection, options = Hash.new)
+            options = Kernel.validate_options options, :filter => true
             base_dir = Autoproj.root_dir
 
             result = PackageSelection.new
@@ -2227,6 +2230,8 @@ module Autoproj
                 end
             end
 
+            pending_selections = Hash.new
+
             # Finally, check for package source directories
             all_packages = self.all_package_names
             selection.each do |sel|
@@ -2235,9 +2240,13 @@ module Autoproj
                     pkg = Autobuild::Package[pkg_name]
                     if pkg_name =~ match_pkg_name || "#{sel}/" =~ Regexp.new("^#{Regexp.quote(pkg.srcdir)}/") || pkg.srcdir =~ Regexp.new("^#{Regexp.quote(sel)}")
                         # Check-out packages that are not in the manifest only
-                        # if they are explicitely selected
+                        # if they are explicitely selected. However, we do store
+                        # them as "possible resolutions" for the user selection,
+                        # and add them if -- at the end of the method -- nothing
+                        # has been found for this particular selection
                         if !all_layout_packages.include?(pkg.name)
                             if pkg_name != sel && pkg.srcdir != sel
+                                pending_selections[sel] = pkg_name
                                 next
                             end
                         end
@@ -2247,8 +2256,18 @@ module Autoproj
                 end
             end
 
-            result.filter_excluded_and_ignored_packages(self)
-            return result, (selection - result.matches.keys)
+            if options[:filter]
+                result.filter_excluded_and_ignored_packages(self)
+            end
+            nonresolved = selection - result.matches.keys
+            nonresolved.delete_if do |sel|
+                if pkg_name = pending_selections[sel]
+                    result.select(sel, pkg_name)
+                    true
+                end
+            end
+
+            return result, nonresolved
         end
 
         attr_reader :moved_packages