autoproj 1.9.6 → 1.9.7.rc1

data/lib/autoproj.rb

@@ -2,7 +2,16 @@ require "enumerator"
 require 'autobuild'
 require 'autoproj/base'
 require 'autoproj/version'
+require 'autoproj/environment'
+require 'autoproj/variable_expansion'
+require 'autoproj/vcs_definition'
+require 'autoproj/package_set'
+require 'autoproj/package_definition'
+require 'autoproj/package_selection'
+require 'autoproj/metapackage'
 require 'autoproj/manifest'
+require 'autoproj/package_manifest'
+require 'autoproj/installation_manifest'
 require 'autoproj/osdeps'
 require 'autoproj/system'
 require 'autoproj/options'

data/lib/autoproj/autobuild.rb

@@ -327,14 +327,14 @@ module Autoproj
         if !Dir.enum_for(:glob, File.join(full_path, "*.orogen")).to_a.empty?
             return "orogen_package", full_path
         elsif File.file?(File.join(full_path, "CMakeLists.txt"))
-            dir = find_topmost_directory_containing(full_path) do |dir|
+            toplevel_dir = find_topmost_directory_containing(full_path) do |dir|
                 cmakelists = File.join(dir, 'CMakeLists.txt')
                 File.file?(cmakelists) &&
                     (File.read(cmakelists) =~ /PROJECT/i)
             end
-            dir ||= find_topmost_directory_containing(full_path, 'CMakeLists.txt')
+            toplevel_dir ||= find_topmost_directory_containing(full_path, 'CMakeLists.txt')
 
-            return "cmake_package", dir
+            return "cmake_package", toplevel_dir
         elsif dir = find_topmost_directory_containing(full_path, "Rakefile") ||
             find_topmost_directory_containing(full_path, "lib/*.rb")
 
@@ -386,6 +386,29 @@ def import_package(options, &block)
     package_common(:import, options, &block)
 end
 
+def common_make_based_package_setup(pkg)
+    unless pkg.has_doc? && pkg.doc_dir
+        pkg.with_doc do
+            doc_html = File.join(pkg.builddir, 'doc', 'html')
+            if File.directory?(doc_html)
+                pkg.doc_dir = doc_html
+            end
+        end
+    end
+    if !pkg.test_utility.has_task?
+        if !pkg.test_utility.source_dir
+            test_dir = File.join(pkg.srcdir, 'test')
+            if File.directory?(test_dir)
+                pkg.test_utility.source_dir = test_dir
+            end
+        end
+
+        if pkg.test_utility.source_dir
+            pkg.with_tests
+        end
+    end
+end
+
 # Define a cmake package
 #
 # Example:
@@ -400,14 +423,7 @@ 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? && pkg.doc_dir
-            pkg.with_doc do
-                doc_html = File.join(pkg.builddir, 'doc', 'html')
-                if File.directory?(doc_html)
-                    pkg.doc_dir = doc_html
-                end
-            end
-        end
+        common_make_based_package_setup(pkg)
     end
 end
 
@@ -424,65 +440,10 @@ 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? && pkg.doc_dir
-            pkg.with_doc do
-                doc_html = File.join(pkg.builddir, 'doc', 'html')
-                if File.directory? doc_html
-                    pkg.doc_dir = doc_html
-                end
-            end
-        end
+        common_make_based_package_setup(pkg)
     end
 end
 
-# This module is used to extend importer packages to handle ruby packages
-# properly
-module Autoproj::RubyPackage
-    def prepare_for_forced_build # :nodoc:
-        super
-        extdir = File.join(srcdir, 'ext')
-        if File.directory?(extdir)
-            Find.find(extdir) do |file|
-                next if file !~ /\<Makefile\>|\<CMakeCache.txt\>$/
-                FileUtils.rm_rf file
-            end
-        end
-    end
-
-    def prepare_for_rebuild # :nodoc:
-        super
-        extdir = File.join(srcdir, 'ext')
-        if File.directory?(extdir)
-            Find.find(extdir) do |file|
-                if File.directory?(file) && File.basename(file) == "build"
-                    FileUtils.rm_rf file
-                    Find.prune
-                end
-            end
-            Find.find(extdir) do |file|
-                if File.basename(file) == "Makefile"
-                    Autobuild::Subprocess.run self, 'build', Autobuild.tool("make"), "-C", File.dirname(file), "clean"
-                end
-            end
-        end
-    end
-
-    def update_environment
-        Autobuild.update_environment srcdir
-        libdir = File.join(srcdir, 'lib')
-        if File.directory?(libdir)
-            Autobuild.env_add_path 'RUBYLIB', libdir
-        end
-    end
-
-    # The Rake task that is used to set up the package. Defaults to "default".
-    # Set to nil to disable setup altogether
-    attr_accessor :rake_setup_task
-    # The Rake task that is used to generate documentation. Defaults to "doc".
-    # Set to nil to disable documentation generation
-    attr_accessor :rake_doc_task
-end
-
 def env_set(name, value)
     Autoproj.env_set(name, value)
 end
@@ -502,46 +463,26 @@ end
 # +pkg+ is an Autobuild::Importer instance. See the Autobuild API for more
 # information.
 def ruby_package(options)
-    package_common(:import, options) do |pkg|
-        pkg.exclude << /\.so$/
-        pkg.exclude << /Makefile$/
-        pkg.exclude << /mkmf.log$/
-        pkg.exclude << /\.o$/
-        pkg.exclude << /doc$/
-
-        pkg.extend Autoproj::RubyPackage
-        pkg.rake_setup_task = "default"
-        pkg.rake_doc_task   = "redocs"
-
-        # Set up code
-        pkg.post_install 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
-                libdir = File.join(pkg.srcdir, 'lib')
-                if File.directory?(libdir)
-                    Autobuild.env_add_path 'RUBYLIB', libdir
-                end
-
-                if pkg.rake_setup_task && File.file?(File.join(pkg.srcdir, 'Rakefile'))
-                    Autobuild::Subprocess.run pkg, 'post-install',
-                        Autoproj::CmdLine.ruby_executable, Autoproj.find_in_path('rake'), pkg.rake_setup_task, :working_directory => pkg.srcdir
-                end
-            end
-        end
-
+    package_common(:ruby, options) do |pkg|
         yield(pkg) if block_given?
 
         # Documentation code. Ignore if the user provided its own documentation
         # task, or disabled the documentation generation altogether by setting
         # rake_doc_task to nil
         if !pkg.has_doc? && pkg.rake_doc_task
-            pkg.doc_task do
-                pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
-                    Autobuild::Subprocess.run pkg, 'doc', Autoproj::CmdLine.ruby_executable, Autoproj.find_in_path('rake'), pkg.rake_doc_task, :working_directory => pkg.srcdir
+            pkg.with_doc
+        end
+        if !pkg.test_utility.has_task?
+            if !pkg.test_utility.source_dir
+                test_dir = File.join(pkg.srcdir, 'test')
+                if File.directory?(test_dir)
+                    pkg.test_utility.source_dir = test_dir
                 end
             end
+
+            if pkg.test_utility.source_dir
+                pkg.with_tests
+            end
         end
     end
 end

data/lib/autoproj/cmdline.rb

@@ -58,6 +58,7 @@ module Autoproj
                 end
             end
             Autoproj.change_option('ruby_executable', ruby_executable, true)
+            Autobuild.programs['ruby'] = ruby_executable
 
             install_suffix = ""
             if match = /ruby(.*)$/.match(ruby)
@@ -74,7 +75,7 @@ module Autoproj
             end
             FileUtils.chmod 0755, File.join(bindir, 'ruby')
 
-            subprograms = ['gem', 'irb', 'testrb'].each do |name|
+            ['gem', 'irb', 'testrb'].each do |name|
                 # Look for the corresponding gem program
                 prg_name = "#{name}#{install_suffix}"
                 if File.file?(prg_path = File.join(ruby_bindir, prg_name))
@@ -306,6 +307,7 @@ module Autoproj
 
         def self.update_configuration
             manifest = Autoproj.manifest
+            Autoproj::Manifest.only_local_updates = @only_local
 
             # Load the installation's manifest a first time, to check if we should
             # update it ... We assume that the OS dependencies for this VCS is already
@@ -706,7 +708,7 @@ module Autoproj
                 # packages is not important BUT the ordering of import vs.
                 # prepare in one package IS important: prepare is the method
                 # that takes into account dependencies.
-                pkg.import
+                pkg.import(@only_local)
                 Rake::Task["#{pkg.name}-import"].instance_variable_set(:@already_invoked, true)
                 manifest.load_package_manifest(pkg.name)
 
@@ -809,14 +811,7 @@ module Autoproj
             return all_enabled_packages
         end
 
-        def self.build_packages(selected_packages, all_enabled_packages)
-            if Autoproj::CmdLine.doc?
-                Autobuild.only_doc = true
-                Autoproj.message("autoproj: building and installing documentation", :bold)
-            else
-                Autoproj.message("autoproj: building and installing packages", :bold)
-            end
-
+        def self.build_packages(selected_packages, all_enabled_packages, phases = [])
             if Autoproj::CmdLine.update_os_dependencies?
                 manifest.install_os_dependencies(all_enabled_packages)
             end
@@ -829,6 +824,16 @@ module Autoproj
                 if !opt.ask(false)
                     raise Interrupt
                 end
+                if Autoproj::CmdLine.update_os_dependencies?
+                    # We also reinstall the osdeps that provide the
+                    # functionality
+                    managers = Autoproj.osdeps.setup_package_handlers
+                    managers.each do |mng|
+                        if mng.respond_to?(:reinstall)
+                            mng.reinstall
+                        end
+                    end
+                end
 
             elsif !selected_packages.empty? && !force_re_build_with_depends?
                 if Autobuild.do_rebuild
@@ -844,7 +849,7 @@ module Autoproj
                 end
             end
 
-            Autobuild.apply(all_enabled_packages, "autoproj-build")
+            Autobuild.apply(all_enabled_packages, "autoproj-build", phases)
         end
 
         def self.manifest; Autoproj.manifest end
@@ -921,9 +926,6 @@ module Autoproj
             @partial_build = false
             @color = true
             Autobuild.color = true
-            Autobuild.doc_errors = false
-            Autobuild.do_doc = false
-            Autobuild.only_doc = false
             Autobuild.do_update = nil
             do_update = nil
 
@@ -1225,14 +1227,6 @@ where 'mode' is one of:
                 Autobuild.do_update = true
                 Autobuild.do_build  = true
                 @update_os_dependencies = true
-            when "snapshot"
-                @snapshot_dir = remaining_args.shift
-                if !snapshot_dir
-                    raise ConfigError.new, "target directory missing\nusage: autoproj snapshot target_dir"
-                end
-                Autobuild.do_update = false
-                Autobuild.do_build  = false
-                @update_os_dependencies = false
             when "update"
                 Autobuild.do_update = true
                 Autobuild.do_build  = false
@@ -1710,18 +1704,49 @@ where 'mode' is one of:
             end
         end
 
-        def self.snapshot(target_dir, packages)
+        def self.snapshot(manifest, target_dir, packages)
             # First, copy the configuration directory to create target_dir
             if File.exists?(target_dir)
                 raise ArgumentError, "#{target_dir} already exists"
             end
             FileUtils.cp_r Autoproj.config_dir, target_dir
+            # Finally, remove the remotes/ directory from the generated
+            # buildconf, it is obsolete now
+            FileUtils.rm_rf File.join(target_dir, 'remotes')
+
+            # Pin package sets
+            package_sets = Array.new
+            manifest.each_package_set do |pkg_set|
+                next if pkg_set.name == 'local'
+                if pkg_set.local?
+                    package_sets << Pathname.new(pkg_set.local_dir).
+                        relative_path_from(Pathname.new(manifest.file).dirname).
+                        to_s
+                else
+                    vcs_info = pkg_set.vcs.to_hash
+                    if pin_info = pkg_set.snapshot(target_dir)
+                        vcs_info = vcs_info.merge(pin_info)
+                    end
+                    package_sets << vcs_info
+                end
+            end
+            manifest_path = File.join(target_dir, 'manifest')
+            manifest_data = YAML.load(File.read(manifest_path))
+            manifest_data['package_sets'] = package_sets
+            File.open(manifest_path, 'w') do |io|
+                YAML.dump(manifest_data, io)
+            end
 
             # Now, create snapshot information for each of the packages
-            version_control = []
+            version_control_info = []
+            overrides_info = []
             packages.each do |package_name|
-                package  = Autobuild::Package[package_name]
-                importer = package.importer
+                package  = manifest.packages[package_name]
+                if !package
+                    raise ArgumentError, "#{package_name} is not a known package"
+                end
+                package_set = package.package_set
+                importer = package.autobuild.importer
                 if !importer
                     Autoproj.message "cannot snapshot #{package_name} as it has no importer"
                     next
@@ -1730,9 +1755,13 @@ where 'mode' is one of:
                     next
                 end
 
-                vcs_info = importer.snapshot(package, target_dir)
+                vcs_info = importer.snapshot(package.autobuild, target_dir)
                 if vcs_info
-                    version_control << Hash[package_name, vcs_info]
+                    if package_set.name == 'local'
+                        version_control_info << Hash[package_name, vcs_info]
+                    else
+                        overrides_info << Hash[package_name, vcs_info]
+                    end
                 end
             end
 
@@ -1742,12 +1771,10 @@ where 'mode' is one of:
             end
             # In Ruby 1.9, an empty file results in YAML.load returning false
             overrides ||= Hash.new
-
-            if overrides['overrides']
-                overrides['overrides'].concat(version_control)
-            else
-                overrides['overrides'] = version_control
-            end
+            (overrides['version_control'] ||= Array.new).
+                concat(version_control_info)
+            (overrides['overrides'] ||= Array.new).
+                concat(overrides_info)
 
             File.open(overrides_path, 'w') do |io|
                 io.write YAML.dump(overrides)
@@ -1943,12 +1970,12 @@ where 'mode' is one of:
 
         rescue ConfigError => e
             STDERR.puts
-            STDERR.puts color(e.message, :red, :bold)
+            STDERR.puts Autoproj.color(e.message, :red, :bold)
             if Autoproj.in_autoproj_installation?(Dir.pwd)
                 root_dir = /#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
                 e.backtrace.find_all { |path| path =~ root_dir }.
                     each do |path|
-                        STDERR.puts color("  in #{path}", :red, :bold)
+                        STDERR.puts Autoproj.color("  in #{path}", :red, :bold)
                     end
             end
             if Autobuild.debug then raise
@@ -1956,7 +1983,7 @@ where 'mode' is one of:
             end
         rescue Interrupt
             STDERR.puts
-            STDERR.puts color("Interrupted by user", :red, :bold)
+            STDERR.puts Autoproj.color("Interrupted by user", :red, :bold)
             if Autobuild.debug then raise
             else exit 1
             end

data/lib/autoproj/default.osdeps

@@ -49,8 +49,23 @@ ruby19:
         - ruby19
         - rake
     default: nonexistent
+    opensuse: ruby19-devel
 
-ruby20: ignore
+ruby20:
+    debian:
+        - ruby2.0
+        - ruby2.0-dev
+        - rake
+        - rubygems-integration
+    default: ignore
+
+ruby21:
+    debian:
+        - ruby2.1
+        - ruby2.1-dev
+        - rake
+        - rubygems-integration
+    default: ignore
 
 build-essential:
   debian,ubuntu: build-essential
@@ -58,6 +73,7 @@ build-essential:
   arch,manjarolinux: base-dev
   fedora: ignore
   darwin: ignore
+  opensuse: ignore #Toto add scemata
 
 autobuild: gem
 autoproj: gem
@@ -72,6 +88,7 @@ git:
   arch,manjarolinux: git
   fedora: git
   darwin: git-core
+  opensuse: git
 
 hg:
   debian,ubuntu: mercurial
@@ -79,6 +96,7 @@ hg:
   arch,manjarolinux: mercurial
   fedora: mercurial
   darwin: mercurial
+  opensuse: mercurial
 
 svn:
   debian,ubuntu: subversion
@@ -86,6 +104,7 @@ svn:
   arch,manjarolinux: subversion
   fedora: subversion
   darwin: subversion
+  opensuse: subversion
 
 cmake:
   debian,ubuntu: cmake
@@ -93,6 +112,7 @@ cmake:
   arch,manjarolinux: cmake
   fedora: cmake
   darwin: cmake
+  opensuse: cmake
 
 autotools:
   debian,ubuntu:
@@ -110,6 +130,9 @@ autotools:
   darwin:
   - automake
   - autoconf
+  opensuse:
+  - automake
+  - autoconf
 
 lsb_release:
   debian,ubuntu: lsb-release
@@ -117,6 +140,7 @@ lsb_release:
   arch,manjarolinux: lsb-release
   fedora: redhat-lsb
   darwin: ignore
+  opensuse: ignore
     
 archive:
   debian,ubuntu:
@@ -134,16 +158,21 @@ archive:
   darwin:
   - gnutar
   - unzip
+  opensuse:
+  - tar
+  - unzip
 
 cvs:
   debian,ubuntu: cvs
   fedora: cvs
   darwin: cvs
   arch,manjarolinux: cvs
+  opensuse: cvs
 
 pip:
   debian,ubuntu: python-pip
   arch,manjarolinux: python2-pip
+  opensuse: python-pip
 
 # vim: expandtab