autoproj 1.8.5 → 1.9.0.rc1

data/Rakefile

@@ -41,6 +41,11 @@ namespace 'dist' do
             end
         end
         osdeps_defaults = YAML.dump(osdeps)
+        # Since we are using gsub to replace the content in the bootstrap file,
+        # we have to quote all \
+        [osdeps_code, options_code, system_code, osdeps_defaults].each do |text|
+            text.gsub! /\\/, '\\\\\\\\'
+        end
 
         bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
             gsub('OSDEPS_CODE', osdeps_code).

data/bin/autoproj

@@ -74,8 +74,8 @@ report do
 
 
 #{color('autoproj bootstrap failed', :red, :bold)}
-To retry, first source the env.sh script with
-  source #{Dir.pwd}/env.sh
+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>
 
@@ -99,11 +99,24 @@ EOTEXT
         end
     end
 
+    needs_update_config = false
+    selected_packages.delete_if do |name|
+        if name =~ /^#{Regexp.quote(Autoproj.config_dir + File::SEPARATOR)}/ ||
+            name =~ /^#{Regexp.quote(Autoproj.remotes_dir + File::SEPARATOR)}/
+            needs_update_config = true
+        end
+    end
+
     Dir.chdir(root_dir)
 
     # Basic initialization
     Autoproj::CmdLine.initialize
-    if selected_packages.empty?
+    if needs_update_config
+        Autoproj::CmdLine.update_configuration
+        if selected_packages.empty?
+            exit 0
+        end
+    elsif selected_packages.empty?
         Autoproj::CmdLine.update_myself
         Autoproj::CmdLine.update_configuration
     else
@@ -143,6 +156,7 @@ EOTEXT
     Autoproj::CmdLine.finalize_package_setup
     # Finally, filter out exclusions
     resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    Autoproj::CmdLine.validate_user_selection(selected_packages, resolved_selected_packages)
 
     if !selected_packages.empty?
         command_line_selection = resolved_selected_packages.dup
@@ -165,11 +179,11 @@ EOTEXT
 
 #{color('To further use autoproj and the installed software', :bold)}, you
 must add the following line at the bottom of your .bashrc:
-  source #{Dir.pwd}/env.sh
+  source #{Dir.pwd}/#{Autoproj::ENV_FILENAME}
 
 WARNING: autoproj will not work until your restart all
 your consoles, or run the following in them:
-  $ source #{Dir.pwd}/env.sh
+  $ source #{Dir.pwd}/#{Autoproj::ENV_FILENAME}
 
 #{color('To import and build the packages', :bold)}, you can now run
   autoproj update
@@ -264,7 +278,7 @@ EOTEXT
 
     if Autoproj::CmdLine.update_envsh?
         Autoproj.export_env_sh
-        Autoproj.message "autoproj: updated #{Autoproj.root_dir}/env.sh", :green
+        Autoproj.message "autoproj: updated #{Autoproj.root_dir}/#{Autoproj::ENV_FILENAME}", :green
     end
 
     if Autoproj::CmdLine.show_statistics?

data/bin/autoproj-create-set

@@ -12,7 +12,8 @@ if !(new_set_path = File.expand_path(selection.shift, pwd))
     exit 1
 end
 new_set_name = File.basename(new_set_path)
-selection = Autoproj::CmdLine.resolve_user_selection(selection)
+selection = Autoproj::CmdLine.resolve_user_selection(user_selection)
+Autoproj::CmdLine.validate_user_selection(user_selection, selection)
 
 # Must re-load the package manifests, as the user selection might have triggered
 # some auto-add

data/bin/autoproj-inspect

@@ -10,16 +10,17 @@ require 'pp'
 default_packages = Autoproj.manifest.default_packages
 revdeps = Autoproj.manifest.compute_revdeps
 
-selected_packages = ARGV.map do |arg|
+user_selection = ARGV.map do |arg|
     if File.directory?(arg)
         File.expand_path(arg)
     else arg
     end
 end
-selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+resolved_selection = Autoproj::CmdLine.resolve_user_selection(user_selection, :filter => false)
+packages = resolved_selection.selection.keys
 
-selected_packages.selection.each_key do |name|
-    result = Autoproj.manifest.resolve_package_name(name)
+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)
@@ -28,15 +29,22 @@ selected_packages.selection.each_key do |name|
         puts "source package #{pkg_name}"
         if default_packages.include?(pkg_name)
             selection = default_packages.selection[pkg_name]
-            selection.delete(pkg_name)
-            if selection.empty?
+            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
@@ -46,6 +54,11 @@ selected_packages.selection.each_key do |name|
             all_reverse_dependencies << parent_name
             pkg_revdeps.concat(revdeps[parent_name].to_a)
         end
+        if pkg_revdeps.empty?
+            puts "  no reverse dependencies"
+        else
+            puts "  reverse dependencies: #{pkg_revdeps.map(&:name).sort.join(", ")}"
+        end
 
         selections = Set.new
         all_reverse_dependencies = all_reverse_dependencies.to_a.sort
@@ -57,6 +70,7 @@ selected_packages.selection.each_key do |name|
         if !selections.empty?
             puts "  selected by way of #{selections.to_a.join(", ")}"
         end
+        puts "  directly depends on: #{Autobuild::Package[pkg_name].dependencies.sort.join(", ")}"
     end
 
     osdeps.each do |pkg_name|

data/bin/autoproj_bootstrap

@@ -128,12 +128,17 @@ module Autoproj
         # Dummy package manager used for unknown OSes. It simply displays a
         # message to the user when packages are needed
         class UnknownOSManager < Manager
+            def initialize
+                super(['unknown'])
+                @installed_osdeps = Set.new
+            end
+
             def osdeps_interaction_unknown_os(osdeps)
                 puts <<-EOMSG
-                #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
-                #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
+  #{Autoproj.color("The build process requires some other software packages to be installed on our operating system", :bold)}
+  #{Autoproj.color("If they are already installed, simply ignore this message", :red)}
 
-                #{osdeps.join("\n    ")}
+    #{osdeps.to_a.sort.join("\n    ")}
 
                 EOMSG
                 print Autoproj.color("Press ENTER to continue", :bold)
@@ -143,12 +148,17 @@ module Autoproj
                 nil
             end
 
-
             def install(osdeps)
                 if silent?
                     return false
                 else
-                    return osdeps_interaction_unknown_os(osdeps)
+                    osdeps = osdeps.to_set
+                    osdeps -= @installed_osdeps
+                    if !osdeps.empty?
+                        result = osdeps_interaction_unknown_os(osdeps)
+                    end
+                    @installed_osdeps |= osdeps
+                    return result
                 end
             end
         end
@@ -266,6 +276,16 @@ fi
             end
         end
 
+        # Package manager interface for systems that use port (i.e. MacPorts/Darwin) as
+        # their package manager
+        class PortManager < ShellScriptManager
+            def initialize
+                super(['port'], true,
+                        "port '%s'",
+                        "port '%s'")
+            end
+        end
+
         # Package manager interface for systems that use pacman (i.e. arch) as
         # their package manager
         class PacmanManager < ShellScriptManager
@@ -629,12 +649,14 @@ fi
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
             PackageManagers::PacmanManager,
-            PackageManagers::YumManager]
+            PackageManagers::YumManager,
+            PackageManagers::PortManager]
         OS_PACKAGE_HANDLERS = {
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
             'arch' => 'pacman',
-            'fedora' => 'yum'
+            'fedora' => 'yum',
+            'darwin' => 'port'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -852,6 +874,11 @@ fi
                         [['gentoo'], [version]]
                     elsif File.exists?('/etc/arch-release')
                         [['arch'], []]
+                    elsif Autobuild.macos? 
+                        version=`sw_vers | head -2 | tail -1`.split(":")[1]
+                        [['darwin'], [version.strip]]
+                    elsif Autobuild.windows?
+                        [['windows'], []]
                     end
             end
 
@@ -873,8 +900,14 @@ fi
         end
 
         def self.os_from_lsb
-            has_lsb_release = `which lsb_release`
-            return unless $?.success?
+            has_lsb_release = nil
+            begin
+                has_lsb_release = `which lsb_release`
+                return unless $?.success?
+            rescue Exception => e
+                #seems which is not installes (e.g. on windows)
+                return
+            end
 
             distributor = `lsb_release -i -s`
             distributor = distributor.strip.downcase
@@ -940,6 +973,14 @@ fi
                 end
             end
 
+            # Recursive resolutions
+            found, pkg = partition_osdep_entry(name, dep_def, ['osdep'], [], os_names, os_versions)
+            if found
+                pkg.each do |pkg_name|
+                    result.concat(resolve_package(pkg_name))
+                end
+            end
+
             result.map do |handler, status, entries|
                 if handler.respond_to?(:parse_package_entry)
                     [handler, status, entries.map { |s| handler.parse_package_entry(s) }]
@@ -1108,19 +1149,24 @@ fi
                 result = resolve_package(name)
                 if !result
                     raise MissingOSDep.new, "there is no osdeps definition for #{name}"
-                elsif result.empty?
-                    os_names, os_versions = OSDependencies.operating_system
-                    raise MissingOSDep.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
-                else
-                    result.each do |handler, status, packages|
-                        if status == FOUND_NONEXISTENT
-                            raise MissingOSDep.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
-                        end
-                        if entry = all_packages.find { |h, _| h == handler }
-                            entry[1].concat(packages)
-                        else
-                            all_packages << [handler, packages]
-                        end
+                end
+
+                if result.empty?
+                    if OSDependencies.supported_operating_system?
+                        os_names, os_versions = OSDependencies.operating_system
+                        raise MissingOSDep.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
+                    end
+                    result = [[os_package_handler, FOUND_PACKAGES, [name]]]
+                end
+
+                result.each do |handler, status, packages|
+                    if status == FOUND_NONEXISTENT
+                        raise MissingOSDep.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
+                    end
+                    if entry = all_packages.find { |h, _| h == handler }
+                        entry[1].concat(packages)
+                    else
+                        all_packages << [handler, packages]
                     end
                 end
             end
@@ -1178,8 +1224,9 @@ fi
             if resolved.empty?
                 if !OSDependencies.operating_system
                     return UNKNOWN_OS
-                else
-                    return WRONG_OS
+                elsif !OSDependencies.supported_operating_system?
+                    return AVAILABLE
+                else return WRONG_OS
                 end
             end
 
@@ -1291,7 +1338,7 @@ So, what do you want ? (all, ruby, os or none)
         end
 
         def self.osdeps_mode_string_to_value(string)
-            string = string.downcase
+            string = string.to_s.downcase
             case string
             when 'all'  then HANDLE_ALL
             when 'ruby' then HANDLE_RUBY
@@ -1377,7 +1424,14 @@ So, what do you want ? (all, ruby, os or none)
 
         # Requests the installation of the given set of packages
         def install(packages, package_osdeps = Hash.new)
+            #not sure here, simply show that it is installed even we dont install anything,
+            #because this functions seems to called sometimes even --no-osdeps is given or the installs_os_packages? return false
+            #it seems its not checked everywhere, so add this sainty check here
+            return true if not installs_os_packages?
+			
+			
             os_package_handler.enabled = installs_os_packages?
+            os_package_handler.silent = self.silent?
             package_handlers['gem'].enabled = installs_ruby_packages?
             package_handlers.each_value do |v|
                 v.silent = self.silent?
@@ -1613,6 +1667,16 @@ end
 module Autoproj
     class UserError < RuntimeError; end
 
+    # OS-independent creation of symbolic links. Note that on windows, it only
+    # works for directories
+    def create_symlink(from, to)
+        if Autobuild.windows?
+            Dir.create_junction(to, from)
+        else
+            FileUtils.ln_sf from, to
+        end
+    end
+
     # Returns true if +path+ is part of an autoproj installation
     def self.in_autoproj_installation?(path)
         root_dir(File.expand_path(path))
@@ -1630,12 +1694,22 @@ module Autoproj
             return @root_dir
         end
 
-        while dir != "/" && !File.directory?(File.join(dir, "autoproj"))
+        root_dir_rx =
+            if Autobuild.windows? then /^[a-zA-Z]:\\\\$/
+            else /^\/$/
+            end
+
+        while root_dir_rx !~ dir && !File.directory?(File.join(dir, "autoproj"))
             dir = File.dirname(dir)
         end
-        if dir == "/"
+        if root_dir_rx =~ dir
             raise UserError, "not in a Autoproj installation"
         end
+
+        #Preventing backslashed in path, that might be confusing on some path compares
+        if Autobuild.windows?
+            dir = dir.gsub(/\\/,'/')
+        end
         dir
     end
 
@@ -1705,12 +1779,16 @@ module Autoproj
         ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems")
     end
 
+    def self.env_inherit(*names)
+        Autobuild.env_inherit(*names)
+    end
+
     # Find the given program in PATH. It raises ArgumentError if the program
     # can't be found
     def self.find_in_path(name)
         result = ENV['PATH'].split(':').find { |dir| File.file?(File.join(dir, name)) }
         if !result
-            raise ArgumentError, "#{name} can not be found in PATH"
+            raise ArgumentError, "#{name} can not be found in PATH (#{ENV['PATH']})"
         end
         File.join(result, name)
     end
@@ -1720,13 +1798,10 @@ module Autoproj
     # Use this in autoproj/init.rb to make sure that the environment will not
     # get polluted during the build.
     def self.set_initial_env
+        Autobuild.env_inherit = false
         Autoproj.env_set 'RUBYOPT', "-rubygems"
-        Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
-        Autoproj.env_add_path 'GEM_PATH', Autoproj.gem_home
-        Autoproj.env_set_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
-        Autoproj.env_set 'PKG_CONFIG_PATH'
-        Autoproj.env_set 'RUBYLIB'
-        Autoproj.env_set 'LD_LIBRARY_PATH'
+        Autobuild.env_push_path 'GEM_PATH', Autoproj.gem_home
+        Autobuild.env_push_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
     end
 
     class << self
@@ -1743,10 +1818,10 @@ module Autoproj
         end
 
         filename = if subdir
-                       File.join(Autoproj.root_dir, subdir, "env.sh")
-                   else
-                       File.join(Autoproj.root_dir, "env.sh")
-                   end
+               File.join(Autoproj.root_dir, subdir, ENV_FILENAME)
+           else
+               File.join(Autoproj.root_dir, ENV_FILENAME)
+           end
 
         shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
         if Autoproj.shell_helpers? && shell = ENV['SHELL']
@@ -1839,7 +1914,10 @@ ruby18:
     '15,16':
     - ruby
     - rubygems
-    default: nonexistent
+  darwin:
+  - ruby
+  - rb-rake
+  default: nonexistent
 ruby19:
   debian:
   - ruby1.9.1
@@ -1864,12 +1942,16 @@ 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
 git:
@@ -1880,16 +1962,19 @@ 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
@@ -1901,11 +1986,15 @@ 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:
   - tar
@@ -1919,9 +2008,13 @@ archive:
   fedora:
   - tar
   - unzip
+  darwin:
+  - gnutar
+  - unzip
 cvs:
   debian,ubuntu: cvs
   fedora: cvs
+  darwin: cvs
 
 EODEFS
 
@@ -1970,6 +2063,7 @@ end
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
+export GEM_PATH=#{needed_gem_home}:$GEM_PATH
 export GEM_HOME=#{needed_gem_home}
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL