autoproj 1.6.2.rc3 → 1.6.2.rc4

data/History.txt

@@ -1,3 +1,17 @@
+= Version 1.6.2
+ * overhauled osdeps fine-grained configuration. See
+   http://orocos.org/dfki/autoproj/osdeps.html
+   for more information
+ * fix too-aggressive caching of operating system characteristics,
+   which breaks on OS upgrades.
+ * on Debian-like systems, filter out packages that are already installed
+ * on all systems, filter packages that have already been handled by the osdeps
+ * add a -k option that continues operation even after errors. The sum of all
+   errors are properly presented at the end of the run.
+ * when boostrapping, check that the current directory is empty and warn the
+   user if it is not.
+ * a few minor bugfixes
+
 = 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,

data/Rakefile

@@ -52,6 +52,7 @@ namespace 'dist' do
         require 'yaml'
         osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))
         options_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'options.rb'))
+        system_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'system.rb'))
         osdeps_defaults = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'default.osdeps'))
         # Filter rubygems dependencies from the OSdeps default. They will be
         # installed at first build
@@ -69,6 +70,7 @@ namespace 'dist' do
         bootstrap_code = File.read(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap.in')).
             gsub('OSDEPS_CODE', osdeps_code).
             gsub('OPTIONS_CODE', options_code).
+            gsub('SYSTEM_CODE', system_code).
             gsub('OSDEPS_DEFAULTS', osdeps_defaults)
         File.open(File.join(Dir.pwd, 'doc', 'guide', 'src', 'autoproj_bootstrap'), 'w') do |io|
             io.write bootstrap_code

data/doc/guide/src/autoproj_bootstrap

@@ -739,6 +739,7 @@ with the corresponding option (--all, --ruby, --os or --none).
 
                 if mode
                     @osdeps_mode = mode
+                    Autoproj.change_option('osdeps_mode', mode_name, true)
                     return mode
                 end
 
@@ -943,11 +944,13 @@ module Autoproj
         def doc
             doc = (options[:doc] || "#{name} (no documentation for this option)")
             if doc.respond_to?(:to_ary) # multi-line
-                first_line = Autoproj.color(doc[0], :bold)
+                first_line = doc[0]
                 remaining = doc[1..-1]
-                if !remaining.empty?
+                if remaining.empty?
+                    first_line
+                else
                     remaining = remaining.join("\n").split("\n").join("\n    ")
-                    first_line + "\n    " + remaining
+                    Autoproj.color(first_line, :bold) + "\n    " + remaining
                 end
             else
                 doc
@@ -1096,6 +1099,195 @@ module Autoproj
 end
 
 
+module Autoproj
+    class UserError < RuntimeError; end
+
+    # Returns true if +path+ is part of an autoproj installation
+    def self.in_autoproj_installation?(path)
+        root_dir(File.expand_path(path))
+        true
+    rescue UserError
+        false
+    end
+
+    # Returns the root directory of the current autoproj installation.
+    #
+    # If the current directory is not in an autoproj installation,
+    # raises UserError.
+    def self.root_dir(dir = Dir.pwd)
+        while dir != "/" && !File.directory?(File.join(dir, "autoproj"))
+            dir = File.dirname(dir)
+        end
+        if dir == "/"
+            raise UserError, "not in a Autoproj installation"
+        end
+        dir
+    end
+
+    # Returns the configuration directory for this autoproj installation.
+    #
+    # If the current directory is not in an autoproj installation,
+    # raises UserError.
+    def self.config_dir
+        File.join(root_dir, "autoproj")
+    end
+
+    class << self
+        # The directory in which packages will be installed.
+        #
+        # If it is a relative path, it is relative to the root dir of the
+        # installation.
+        #
+        # The default is "install"
+        attr_reader :prefix
+
+        # Change the value of 'prefix'
+        def prefix=(new_path)
+            @prefix = new_path
+            Autoproj.change_option('prefix', new_path, true)
+        end
+    end
+    @prefix = "install"
+
+    # Returns the build directory (prefix) for this autoproj installation.
+    #
+    # If the current directory is not in an autoproj installation, raises
+    # UserError.
+    def self.build_dir
+        File.expand_path(Autoproj.prefix, root_dir)
+    end
+
+    # Returns the path to the provided configuration file.
+    #
+    # If the current directory is not in an autoproj installation, raises
+    # UserError.
+    def self.config_file(file)
+        File.join(config_dir, file)
+    end
+
+    # Run the provided command as user
+    def self.run_as_user(*args)
+        if !system(*args)
+            raise "failed to run #{args.join(" ")}"
+        end
+    end
+
+    # Run the provided command as root, using sudo to gain root access
+    def self.run_as_root(*args)
+        if !system('sudo', *args)
+            raise "failed to run #{args.join(" ")} as root"
+        end
+    end
+
+    # Return the directory in which remote package set definition should be
+    # checked out
+    def self.remotes_dir
+        File.join(root_dir, ".remotes")
+    end
+
+    # Return the directory in which RubyGems package should be installed
+    def self.gem_home
+        ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems")
+    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"
+        end
+        File.join(result, name)
+    end
+
+    # Initializes the environment variables to a "sane default"
+    #
+    # Use this in autoproj/init.rb to make sure that the environment will not
+    # get polluted during the build.
+    def self.set_initial_env
+        Autoproj.env_set 'RUBYOPT', "-rubygems"
+        Autoproj.env_set 'GEM_HOME', 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'
+    end
+
+    # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
+    def self.export_env_sh(subdir = nil)
+        filename = if subdir
+                       File.join(Autoproj.root_dir, subdir, "env.sh")
+                   else
+                       File.join(Autoproj.root_dir, "env.sh")
+                   end
+
+        File.open(filename, "w") do |io|
+            variables = []
+            Autobuild.environment.each do |name, value|
+                variables << name
+                shell_line = "#{name}=#{value.join(":")}"
+                if Autoproj.env_inherit?(name)
+                    if value.empty?
+                        next
+                    else
+                        shell_line << ":$#{name}"
+                    end
+                end
+                io.puts shell_line
+            end
+            variables.each do |var|
+                io.puts "export #{var}"
+            end
+        end
+    end
+
+    # Load a definition file given at +path+. +source+ is the package set from
+    # which the file is taken.
+    #
+    # If any error is detected, the backtrace will be filtered so that it is
+    # easier to understand by the user. Moreover, if +source+ is non-nil, the
+    # package set name will be mentionned.
+    def self.load(source, *path)
+        path = File.join(*path)
+        Kernel.load path
+    rescue Interrupt
+        raise
+    rescue Exception => e
+        Autoproj.filter_load_exception(e, source, path)
+    end
+
+    # Same as #load, but runs only if the file exists.
+    def self.load_if_present(source, *path)
+        path = File.join(*path)
+        if File.file?(path)
+            self.load(source, *path)
+        end
+    end
+
+    # Look into +dir+, searching for shared libraries. For each library, display
+    # a warning message if this library has undefined symbols.
+    def self.validate_solib_dependencies(dir, exclude_paths = [])
+        Find.find(File.expand_path(dir)) do |name|
+            next unless name =~ /\.so$/
+            next if exclude_paths.find { |p| name =~ p }
+
+            output = `ldd -r #{name} 2>&1`
+            if output =~ /undefined symbol/
+                Autoproj.progress("  WARN: #{name} has undefined symbols", :magenta)
+            end
+        end
+    end
+end
+
+
+
+# Override Autoproj.root_dir
+module Autoproj
+    def self.root_dir
+        @root_dir
+    end
+    @root_dir = Dir.pwd
+end
 
 DEFS = <<EODEFS
 --- 
@@ -1145,11 +1337,7 @@ ruby18:
   - libopenssl-ruby1.8
 ruby19: 
   debian: 
-    squeeze,sid: 
-    - ruby1.9.1
-    - ruby1.9.1-dev
-    - rubygems1.9.1
-    stable: 
+    stable,squeeze,sid: 
     - ruby1.9.1
     - ruby1.9.1-dev
     - rubygems1.9.1
@@ -1184,7 +1372,8 @@ rdoc: gem
 EODEFS
 
 Autoproj::OSDependencies.define_osdeps_mode_option
-ENV['AUTOPROJ_OSDEPS_MODE'] = Autoproj::OSDependencies.osdeps_mode
+osdeps_mode = Autoproj::OSDependencies.osdeps_mode
+ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
 
 # First thing we do is install a proper ruby environment. We make sure that we
 # aren't installing any gems for now (as we need to choose the right gem
@@ -1192,8 +1381,10 @@ ENV['AUTOPROJ_OSDEPS_MODE'] = Autoproj::OSDependencies.osdeps_mode
 Autobuild.programs['gem'] = nil
 Autoproj::OSDependencies.autodetect_ruby
 
+osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
+osdeps_management.silent = false
+
 begin
-    osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
     STDERR.puts "autoproj: installing a proper Ruby environment (this can take a long time)"
     osdeps_management.install(['ruby'])
 rescue Autoproj::ConfigError => e
@@ -1207,7 +1398,6 @@ PACKAGES      = %w{rdoc autobuild libxml2 libxslt zlib build-essential lsb_relea
 ENV['RUBYOPT']  = "-rubygems"
 require 'rubygems'
 
-osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
 STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
 # First install the dependencies of autoproj, as we don't want them to be
 # affected by the prerelease flag

data/lib/autoproj/osdeps.rb

@@ -640,6 +640,7 @@ with the corresponding option (--all, --ruby, --os or --none).
 
                 if mode
                     @osdeps_mode = mode
+                    Autoproj.change_option('osdeps_mode', mode_name, true)
                     return mode
                 end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.2.rc3"
+    VERSION = "1.6.2.rc4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 977940580
+  hash: 977940581
   prerelease: true
   segments: 
   - 1
   - 6
   - 2
-  - rc3
-  version: 1.6.2.rc3
+  - rc4
+  version: 1.6.2.rc4
 platform: ruby
 authors: 
 - Sylvain Joyeux