autoproj 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,14 @@
+= Version 1.2.2
+ * added support for Gentoo
+ * added support for Ubuntu 9.10 [Karmic Koala]
+ * add the 'fast-build' mode which is equivalent to 
+   "build --no-update --no-osdeps"
+ * add a quick bootstrap method [still experimental]
+   If an autoproj installation is already present, one can simply run autoproj
+   bootstrap [options]. It speeds up the bootstrapping as the gems are taken
+   from the other installation.
+ * minor bugfixes and improvements
+
 = Version 1.2.1
  * accept two layouts for version control description:
    

data/bin/autoproj

@@ -1,5 +1,10 @@
 #! /usr/bin/env ruby
 
+if RUBY_VERSION < "1.8.7"
+    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+    exit 1
+end
+
 require 'autoproj'
 require 'autoproj/autobuild'
 require 'open-uri'
@@ -32,6 +37,7 @@ autoproj mode [options]
 where 'mode' is one of:
   build:  import, build and install all selected packages
   force-build: triggers all build commands, i.e. don't be lazy like in "build"
+  fast-build: builds without updating and installing OS dependencies
   rebuild: remove all build products, thus triggering a full rebuild
   doc:    generate and install documentation for packages that have some
   update: only import/update packages, do not build them
@@ -193,8 +199,11 @@ def do_bootstrap(*args)
     # Check if we are being called from another GEM_HOME. If it is the case,
     # assume that we are bootstrapping from another installation directory and
     # start by copying the .gems directory
-    if ENV['GEM_HOME'] && ENV['GEM_HOME'] != File.join(Dir.pwd, ".gems")
+    if ENV['GEM_HOME'] && ENV['GEM_HOME'] =~ /\.gems\/?$/ && ENV['GEM_HOME'] != File.join(Dir.pwd, ".gems")
+        STDERR.puts "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
         FileUtils.cp_r ENV['GEM_HOME'], ".gems"
+        ENV['GEM_HOME'] = File.join(Dir.pwd, ".gems")
+        exec $0, *ARGV
     end
 
     # If we are not getting the installation setup from a VCS, copy the template
@@ -290,6 +299,9 @@ begin
         Autobuild.do_forced_build = true
     when "rebuild"
         Autobuild.do_rebuild = true
+    when "fast-build"
+        Autobuild.do_update = false
+        no_os_deps = true
     when "update"
         Autobuild.do_build  = false
     when "status"
@@ -325,6 +337,7 @@ begin
     # Set up some important autobuild parameters
     Autoproj.env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB'
     Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
+    Autoproj.env_set 'RUBYOPT', "-rubygems"
     Autobuild.prefix  = Autoproj.build_dir
     Autobuild.srcdir  = root_dir
     Autobuild.logdir = File.join(Autobuild.prefix, 'log')
@@ -511,6 +524,7 @@ begin
         all_enabled_packages  = Set.new
         STDERR.puts
         if only_do_status
+            STDERR.puts color("autoproj: status of packages in #{name}", :bold)
             do_status(enabled_packages)
         elsif !enabled_packages.empty?
             Autobuild::Reporting.report do
@@ -581,7 +595,9 @@ begin
         begin
             Autobuild.do_update = false
             Autobuild::Reporting.report do
-                prepare_targets = (packages - enabled_packages).map { |pkg_name| "#{pkg_name}-prepare" }
+                prepare_targets = (packages - enabled_packages).
+                    find_all { |pkg_name| File.directory?(Autobuild::Package[pkg_name].srcdir) }.
+                    map { |pkg_name| "#{pkg_name}-prepare" }
                 task "autoproj-#{name}-prepare" => prepare_targets
                 Rake::Task["autoproj-#{name}-prepare"].invoke
             end
@@ -589,9 +605,13 @@ begin
             Autobuild.do_update = old_update_flag
         end
 
-        if mode == "build"
-            all_env_sh << name
-            Autoproj.export_env_sh(name)
+        if (mode == "build" || mode == "fast-build")
+            if packages.all? { |pkg_name| File.directory?(Autobuild::Package[pkg_name].srcdir) }
+                all_env_sh << name
+                Autoproj.export_env_sh(name)
+            else
+                STDERR.puts color("WARN: #{name} has not been completely built, #{name}env.sh is not updated", :magenta)
+            end
         end
     end
 

data/doc/guide/src/autoproj_bootstrap

@@ -1,5 +1,10 @@
 #! /usr/bin/ruby
 
+if RUBY_VERSION < "1.8.7"
+    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+    exit 1
+end
+
 ENV['GEM_HOME'] = "#{Dir.pwd}/.gems"
 ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
 if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
@@ -29,9 +34,10 @@ module Autobuild
     end
     module Subprocess
         def self.run(name, phase, *cmd)
-            `#{cmd.join(" ")}`
+            output = `#{cmd.join(" ")}`
             if $?.exitstatus != 0
                 STDERR.puts "ERROR: failed to run #{cmd.join(" ")}"
+                STDERR.puts "ERROR: command output is: #{output}"
                 exit 1
             end
         end
@@ -82,6 +88,11 @@ module Autoproj
                     if File.exists?('/etc/debian_version')
                         codename = File.read('/etc/debian_version').chomp
                         ['debian', [codename]]
+                    elsif File.exists?('/etc/gentoo-release')
+                        release_string = File.read('/etc/gentoo-release').chomp
+                        release_string =~ /^.*([^\s]+)$/
+                            version = $1
+                        ['gentoo', [version]]
                     else
                         raise ConfigError, "Unknown operating system"
                     end
@@ -115,7 +126,8 @@ module Autoproj
 
         OS_PACKAGE_INSTALL = {
             'debian' => 'apt-get install -y %s',
-            'ubuntu' => 'apt-get install -y %s'
+            'ubuntu' => 'apt-get install -y %s',
+            'gentoo' => 'emerge --noreplace %s'
         }
 
         def generate_os_script(dependencies)
@@ -144,6 +156,9 @@ module Autoproj
                 end
 
                 data = os_entry.last
+                # This package does not need to be installed on this operating system (example: build tools on Gentoo)
+                next if !data
+
                 if data.kind_of?(Hash)
                     version_entry = data.find do |version_list, data|
                         version_list.to_s.split(',').
@@ -265,21 +280,22 @@ DEFS = <<EODEFS
 # The following definitions are needed to bootstrap autoproj
 ruby:
     debian,ubuntu:
-        9.04,squeeze/sid:
-            - ruby1.8-dev
-            - ruby1.8
-            - libopenssl-ruby1.8
+        - ruby1.8-dev
+        - ruby1.8
+        - libopenssl-ruby1.8
+    gentoo:
+        - dev-lang/ruby:1.8
 
 build-essential:
-    debian,ubuntu:
-        9.04,squeeze/sid: build-essential
+    debian,ubuntu: build-essential
+    gentoo:
 
 libxml2:
-    debian,ubuntu:
-        9.04,squeeze/sid: libxml2-dev
+    debian,ubuntu: libxml2-dev
+    gentoo: dev-libs/libxml2
 libxslt:
-    debian,ubuntu:
-        9.04,squeeze/sid: libxslt1-dev
+    debian,ubuntu: libxslt1-dev
+    gentoo: dev-libs/libxslt
 
 autobuild: gem
 autoproj: gem
@@ -287,19 +303,25 @@ autoproj: gem
 # The following definitions are for the VCS and build systems
 git:
     debian,ubuntu: git-core
+    gentoo: dev-util/git
 
 svn:
     debian,ubuntu: svn
+    gentoo: dev-util/subversion
 
 cmake:
     debian,ubuntu: cmake
+    gentoo: dev-util/cmake
 
 autotools:
     debian,ubuntu: [automake1.9, autoconf]
+    gentoo: [sys-devel/automake:1.9, sys-devel/autoconf]
 
 lsb_release:
     debian,ubuntu: lsb-release
+    gentoo: sys-apps/lsb-release
     
+# vim: expandtab
 
 
 EODEFS

data/lib/autoproj/default.osdeps

@@ -1,21 +1,22 @@
 # The following definitions are needed to bootstrap autoproj
 ruby:
     debian,ubuntu:
-        9.04,squeeze/sid:
-            - ruby1.8-dev
-            - ruby1.8
-            - libopenssl-ruby1.8
+        - ruby1.8-dev
+        - ruby1.8
+        - libopenssl-ruby1.8
+    gentoo:
+        - dev-lang/ruby:1.8
 
 build-essential:
-    debian,ubuntu:
-        9.04,squeeze/sid: build-essential
+    debian,ubuntu: build-essential
+    gentoo:
 
 libxml2:
-    debian,ubuntu:
-        9.04,squeeze/sid: libxml2-dev
+    debian,ubuntu: libxml2-dev
+    gentoo: dev-libs/libxml2
 libxslt:
-    debian,ubuntu:
-        9.04,squeeze/sid: libxslt1-dev
+    debian,ubuntu: libxslt1-dev
+    gentoo: dev-libs/libxslt
 
 autobuild: gem
 autoproj: gem
@@ -23,17 +24,23 @@ autoproj: gem
 # The following definitions are for the VCS and build systems
 git:
     debian,ubuntu: git-core
+    gentoo: dev-util/git
 
 svn:
     debian,ubuntu: svn
+    gentoo: dev-util/subversion
 
 cmake:
     debian,ubuntu: cmake
+    gentoo: dev-util/cmake
 
 autotools:
     debian,ubuntu: [automake1.9, autoconf]
+    gentoo: [sys-devel/automake:1.9, sys-devel/autoconf]
 
 lsb_release:
     debian,ubuntu: lsb-release
+    gentoo: sys-apps/lsb-release
     
+# vim: expandtab
 

data/lib/autoproj/manifest.rb

@@ -313,12 +313,28 @@ module Autoproj
                         #     type: git
                         #     url: blah
                         #
+                        # or as
+                        #   - package_name
+                        #     type: git
+                        #     url: blah
+                        #
                         # In that case, we should have the package name as
                         # "name => nil". Check that.
                         name, _ = spec.find { |n, v| v.nil? }
-                        spec.delete(name)
+                        if name
+                            spec.delete(name)
+                        else
+                            name, _ = spec.find { |n, v| n =~ / \w+$/ }
+                            name =~ / (\w+)$/
+                            spec[$1] = spec.delete(name)
+                            name = name.gsub(/ \w+$/, '')
+                        end
                     else
                         name, spec = spec.to_a.first
+                        if name =~ / (\w+)/
+                            spec = { $1 => spec }
+                            name = name.gsub(/ \w+$/, '')
+                        end
                     end
 
                     if Regexp.new(name) =~ package_name

data/lib/autoproj/osdeps.rb

@@ -42,6 +42,11 @@ module Autoproj
                     if File.exists?('/etc/debian_version')
                         codename = File.read('/etc/debian_version').chomp
                         ['debian', [codename]]
+                    elsif File.exists?('/etc/gentoo-release')
+                        release_string = File.read('/etc/gentoo-release').chomp
+                        release_string =~ /^.*([^\s]+)$/
+                            version = $1
+                        ['gentoo', [version]]
                     else
                         raise ConfigError, "Unknown operating system"
                     end
@@ -75,7 +80,8 @@ module Autoproj
 
         OS_PACKAGE_INSTALL = {
             'debian' => 'apt-get install -y %s',
-            'ubuntu' => 'apt-get install -y %s'
+            'ubuntu' => 'apt-get install -y %s',
+            'gentoo' => 'emerge --noreplace %s'
         }
 
         def generate_os_script(dependencies)
@@ -104,6 +110,9 @@ module Autoproj
                 end
 
                 data = os_entry.last
+                # This package does not need to be installed on this operating system (example: build tools on Gentoo)
+                next if !data
+
                 if data.kind_of?(Hash)
                     version_entry = data.find do |version_list, data|
                         version_list.to_s.split(',').

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 +01:00
+date: 2009-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency