autoproj 1.7.21.b7 → 1.8.0.rc1

data/bin/autoproj_bootstrap

@@ -262,6 +262,26 @@ fi
             end
         end
 
+        # Package manager interface for systems that use pacman (i.e. arch) as
+        # their package manager
+        class PacmanManager < ShellScriptManager
+            def initialize
+                super(['pacman'], true,
+                        "pacman '%s'",
+                        "pacman -Sy --noconfirm '%s'")
+            end
+        end
+
+        # Package manager interface for systems that use emerge (i.e. gentoo) as
+        # their package manager
+        class EmergeManager < ShellScriptManager
+            def initialize
+                super(['emerge'], true,
+                        "emerge '%s'",
+                        "emerge --noreplace '%s'")
+            end
+        end
+
         # Package manager interface for systems that use APT and dpkg for
         # package management
         class AptDpkgManager < ShellScriptManager
@@ -491,7 +511,11 @@ fi
 
 	    candidates = [file]
 	    candidates.concat(suffixes.map { |s| "#{file}-#{s}" })
-	    
+
+            error_t = if defined? Psych::SyntaxError then [ArgumentError, Psych::SyntaxError]
+                      else ArgumentError
+                      end
+
 	    result = OSDependencies.new
 	    candidates.each do |file|
                 next if !File.file?(file)
@@ -499,7 +523,7 @@ fi
                 begin
                     data = YAML.load(File.read(file)) || Hash.new
                     verify_definitions(data)
-                rescue ArgumentError => e
+                rescue *error_t => e
                     raise ConfigError.new, "error in #{file}: #{e.message}", e.backtrace
                 end
 
@@ -543,9 +567,14 @@ fi
             OSDependencies.load(file)
         end
 
-        PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager, PackageManagers::GemManager]
+        PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager,
+            PackageManagers::GemManager,
+            PackageManagers::EmergeManager,
+            PackageManagers::PacmanManager]
         OS_PACKAGE_HANDLERS = {
-            'debian' => 'apt-dpkg'
+            'debian' => 'apt-dpkg',
+            'gentoo' => 'emerge',
+            'arch' => 'pacman'
         }
 
         # The information contained in the OSdeps files, as a hash

data/lib/autoproj/autobuild.rb

@@ -261,15 +261,47 @@ module Autoproj
         @loaded_autobuild_files << path
     end
 
+    def self.find_topmost_directory_containing(dir, glob_pattern = nil)
+        result = nil
+        while dir != "/"
+            match = false
+            if glob_pattern
+                if !Dir.glob(File.join(dir, glob_pattern)).empty?
+                    match = true
+                end
+            end
+
+            if !match && block_given? && yield(dir)
+                match = true
+            end
+            if !match && result
+                return result
+            elsif match
+                result = dir
+            end
+
+            dir = File.dirname(dir)
+        end
+    end
+
     # Tries to find a handler automatically for 'full_path'
     def self.package_handler_for(full_path)
         if !Dir.enum_for(:glob, File.join(full_path, "*.orogen")).to_a.empty?
             "orogen_package"
         elsif File.file?(File.join(full_path, "CMakeLists.txt"))
-            "cmake_package"
-        elsif File.directory?(File.join(full_path, "lib")) &&
-            Find.enum_for(:find, File.join(full_path, "lib")).any? { |path| path =~ /\.rb$/ }
-            "ruby_package"
+            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')
+
+            return "cmake_package", dir
+        elsif !Dir.glob('*.rb').empty?
+            dir = find_topmost_directory_containing(full_path, "Rakefile") ||
+                find_topmost_directory_containing(full_path, "lib/*.rb")
+
+            return "ruby_package", dir
         end
     end
 end

data/lib/autoproj/cmdline.rb

@@ -215,7 +215,8 @@ module Autoproj
                 full_path = File.expand_path(File.join(Autoproj.root_dir, layout_level, pkg_or_set))
                 next if !File.directory?(full_path)
 
-                if handler = Autoproj.package_handler_for(full_path)
+                handler, srcdir = Autoproj.package_handler_for(full_path)
+                if handler
                     Autoproj.message "  auto-adding #{pkg_or_set} #{"in #{layout_level} " if layout_level != "/"}using the #{handler.gsub(/_package/, '')} package handler"
                     Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
                         send(handler, pkg_or_set)
@@ -497,10 +498,11 @@ module Autoproj
             nonresolved.delete_if do |sel|
                 next if !File.directory?(sel)
                 while sel != '/'
-                    if handler = Autoproj.package_handler_for(sel)
-                        Autoproj.message "  auto-adding #{sel} using the #{handler.gsub(/_package/, '')} package handler"
-                        sel = File.expand_path(sel)
-                        relative_to_root = Pathname.new(sel).relative_path_from(Pathname.new(Autoproj.root_dir))
+                    handler, srcdir = Autoproj.package_handler_for(sel)
+                    if handler
+                        Autoproj.message "  auto-adding #{srcdir} using the #{handler.gsub(/_package/, '')} package handler"
+                        srcdir = File.expand_path(srcdir)
+                        relative_to_root = Pathname.new(srcdir).relative_path_from(Pathname.new(Autoproj.root_dir))
                         pkg = Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
                             send(handler, relative_to_root.to_s)
                         end
@@ -885,6 +887,9 @@ where 'mode' is one of:
                 opts.on('--stats', 'displays statistics about each of the phases in the package building process') do
                     @show_statistics = true
                 end
+                opts.on('-p LEVEL', '--parallel=LEVEL', Integer, "override the Autobuild.parallel_build_level level") do |value|
+                    Autobuild.parallel_build_level = value
+                end
 
                 opts.on("--with-depends", "apply rebuild and force-build to both packages selected on the command line and their dependencies") do
                     force_re_build_with_depends = true

data/lib/autoproj/default.osdeps

@@ -75,8 +75,8 @@ cmake:
     arch: cmake
 
 autotools:
-    debian,ubuntu: [automake1.9, autoconf]
-    gentoo: [sys-devel/automake:1.9, sys-devel/autoconf]
+    debian,ubuntu: ["automake1.9", autoconf]
+    gentoo: ["sys-devel/automake:1.9", sys-devel/autoconf]
     arch: automake autoconf
 
 lsb_release:

data/lib/autoproj/osdeps.rb

@@ -163,6 +163,26 @@ fi
             end
         end
 
+        # Package manager interface for systems that use pacman (i.e. arch) as
+        # their package manager
+        class PacmanManager < ShellScriptManager
+            def initialize
+                super(['pacman'], true,
+                        "pacman '%s'",
+                        "pacman -Sy --noconfirm '%s'")
+            end
+        end
+
+        # Package manager interface for systems that use emerge (i.e. gentoo) as
+        # their package manager
+        class EmergeManager < ShellScriptManager
+            def initialize
+                super(['emerge'], true,
+                        "emerge '%s'",
+                        "emerge --noreplace '%s'")
+            end
+        end
+
         # Package manager interface for systems that use APT and dpkg for
         # package management
         class AptDpkgManager < ShellScriptManager
@@ -392,7 +412,11 @@ fi
 
 	    candidates = [file]
 	    candidates.concat(suffixes.map { |s| "#{file}-#{s}" })
-	    
+
+            error_t = if defined? Psych::SyntaxError then [ArgumentError, Psych::SyntaxError]
+                      else ArgumentError
+                      end
+
 	    result = OSDependencies.new
 	    candidates.each do |file|
                 next if !File.file?(file)
@@ -400,7 +424,7 @@ fi
                 begin
                     data = YAML.load(File.read(file)) || Hash.new
                     verify_definitions(data)
-                rescue ArgumentError => e
+                rescue *error_t => e
                     raise ConfigError.new, "error in #{file}: #{e.message}", e.backtrace
                 end
 
@@ -444,9 +468,14 @@ fi
             OSDependencies.load(file)
         end
 
-        PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager, PackageManagers::GemManager]
+        PACKAGE_HANDLERS = [PackageManagers::AptDpkgManager,
+            PackageManagers::GemManager,
+            PackageManagers::EmergeManager,
+            PackageManagers::PacmanManager]
         OS_PACKAGE_HANDLERS = {
-            'debian' => 'apt-dpkg'
+            'debian' => 'apt-dpkg',
+            'gentoo' => 'emerge',
+            'arch' => 'pacman'
         }
 
         # The information contained in the OSdeps files, as a hash

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.21.b7"
+    VERSION = "1.8.0.rc1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 129
-  prerelease: 7
+  hash: 15424183
+  prerelease: 6
   segments: 
   - 1
-  - 7
-  - 21
-  - b
-  - 7
-  version: 1.7.21.b7
+  - 8
+  - 0
+  - rc
+  - 1
+  version: 1.8.0.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 Z
+date: 2012-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild