autoproj 1.0.0 → 1.1.0

data/History.txt

@@ -1,2 +1,9 @@
+= Version 1.1
+ * added some sanity checks, especially w.r.t. an already existing GEM
+   installation
+ * improved the bootstrap
+ * autoproj is now able to track a configuration repository (i.e. a VCS that
+   stores both the installation's manifest and the package sets)
+
 = Version 1.0
  * initial release

data/Rakefile

@@ -6,6 +6,8 @@ begin
         config = Hoe.spec 'autoproj' do
             self.developer "Sylvain Joyeux", "sylvain.joyeux@dfki.de"
 
+            self.url = ["http://doudou.github.com/autoproj",
+                "git://github.com/doudou/autoproj.git"]
             self.rubyforge_name = 'autobuild'
             self.summary = 'Easy installation and management of robotics software'
             self.description = paragraphs_of('README.txt', 0..1).join("\n\n")

data/bin/autoproj

@@ -37,15 +37,15 @@ where 'mode' is one of:
   bootstrap: starts a new autoproj installation. Usage:
     autoproj bootstrap [manifest_url|source_vcs source_url opt1=value1 opt2=value2 ...]
   
-  list-sources:   list all available sources
-  update-sources: update all remote sources, but do not build
+  list-sets:   list all available sources
+  update-sets: update all remote sources, but do not build
 
 Additional options:
     EOBANNER
     opts.on("--reconfigure", "re-ask all configuration options (build mode only)") do
         Autoproj.reconfigure = true
     end
-    opts.on("--no-update", "do not update already checked-out sources (build mode only)") do
+    opts.on("--no-update", "do not update already checked-out packages (build mode only)") do
         Autobuild.do_update = false
     end
 
@@ -95,6 +95,7 @@ args = ARGV.dup
 parser.parse!(args)
 mode     = args.shift
 selected_packages = args.dup
+all_env_sh = Array.new
 
 def color(*args)
     Autoproj.console.color(*args)
@@ -177,88 +178,130 @@ end
 
 
 def do_bootstrap(*args)
+    if File.exists?(File.join("autoproj", "manifest"))
+        raise ConfigError, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
+    end
+
     if args.empty? # no argument, simply add a manifest template
         sample_dir = File.expand_path(File.join("..", "samples"), File.dirname(__FILE__))
-        FileUtils.mkdir_p "autoproj"
         manifest_data = File.read(File.join(sample_dir, "manifest"))
+        FileUtils.mkdir_p "autoproj"
+        File.open(File.join(Autoproj.config_dir, "manifest"), "w") do |io|
+            io.write(manifest_data)
+        end
 
     elsif args.size == 1 # must be a manifest file
         manifest_url = args.first
         STDERR.puts color("autoproj: downloading manifest file #{manifest_url}", :bold)
-        manifest_data = open(manifest_url) { |file| file.read }
-
-    else # must be a source definition
-        manifest_data = <<-EOF
-sources:
-    - type: #{args.shift}
-      url: #{args.shift}
-        EOF
+        manifest_data =
+            begin open(manifest_url) { |file| file.read }
+            rescue
+                raise ConfigError, "cannot read #{manifest_url}, did you mean 'autoproj bootstrap VCSTYPE #{manifest_url}' ?"
+            end
+
+        FileUtils.mkdir_p "autoproj"
+        File.open(File.join(Autoproj.config_dir, "manifest"), "w") do |io|
+            io.write(manifest_data)
+        end
+
+    else # is a VCS definition for the manifest itself ...
+        vcs_def = Hash.new
+        vcs_def[:type] = args.shift
+        vcs_def[:url]  = args.shift
         while !args.empty?
             name, value = args.shift.split("=")
-            manifest_data << "      #{name}: #{value}\n"
+            vcs_def[name] = value
+        end
+        vcs = Autoproj.normalize_vcs_definition(vcs_def)
+        Autoproj::Manifest.import_whole_installation(vcs, File.join(Dir.pwd, "autoproj"))
+
+        # Now write it in the config file
+        File.open(File.join(Autoproj.config_dir, "config.yml"), "a") do |io|
+            io.puts <<-EOTEXT
+manifest_source:
+    type: #{vcs_def.delete(:type)}
+    url: #{vcs_def.delete(:url)}
+    #{vcs_def.map { |k, v| "#{k}: #{v}" }.join("\n    ")}
+            EOTEXT
         end
-
     end
+end
+
+# Find the autoproj root dir
+begin
+    case mode
+    when "bootstrap"
+        # If there is no argument, We need one more argument. It is either a VCS type or a path to a
+        # manifest.
+        #
+        # In the first case, we create a new manifest and add the source given on
+        # the command line to it. In the second case, we simply use it as a
+        # manifest.
+        do_bootstrap(*args)
+        if args.empty?
+            # no package sets defined, we're done
+            exit(0)
+        end
+        only_update_sources = true
 
-    File.open(File.join(Autoproj.config_dir, "manifest"), "w") do |io|
-        io.write(manifest_data)
+    when "build"
+    when "update"
+        Autobuild.do_build  = false
+    when "status"
+        only_do_status      = true
+        Autobuild.do_update = false
+        no_os_deps = true
+    when "update-sets"
+        only_update_sources = true
+    when "list-sets"
+        only_update_sources = true
+        Autobuild.do_update = false
+        
+    when "doc"
+        Autobuild.do_update = false
+        Autobuild.do_doc    = true
+        Autobuild.only_doc  = true
+    else
+        puts parser
+        exit(1)
     end
-end
 
-case mode
-when "bootstrap"
-    # If there is no argument, We need one more argument. It is either a VCS type or a path to a
-    # manifest.
-    #
-    # In the first case, we create a new manifest and add the source given on
-    # the command line to it. In the second case, we simply use it as a
-    # manifest.
-    do_bootstrap(*args)
-    only_update_sources = true
-
-when "build"
-when "update"
-    Autobuild.do_build  = false
-when "status"
-    only_do_status      = true
-    Autobuild.do_update = false
-    no_os_deps = true
-when "update-sources"
-    only_update_sources = true
-when "list-sources"
-    only_update_sources = true
-    Autobuild.do_update = false
-    
-when "doc"
-    Autobuild.do_update = false
-    Autobuild.do_doc    = true
-    Autobuild.only_doc  = true
-else
-    puts parser
-    exit(1)
-end
+    root_dir = Autoproj.root_dir
+    Dir.chdir(root_dir)
 
-# Find the autoproj root dir
-root_dir = Autoproj.root_dir
-# Load user configuration
-Autoproj.load_config
-# Set the initial environment
-Autoproj.set_initial_env
-# Set up some important autobuild parameters
-Autobuild.prefix  = Autoproj.build_dir
-Autobuild.srcdir  = root_dir
-Autobuild.doc_errors = false
-Autobuild.do_doc = false
-Autobuild::Reporting << Autoproj::Reporter.new
-if mail_config[:to]
-    Autobuild::Reporting << MailReporter.new(mail_config)
-end
+    # Load user configuration
+    Autoproj.load_config
+    # If we are under rubygems, check that the GEM_HOME is right ...
+    if $LOADED_FEATURES.any? { |l| l =~ /rubygems/ }
+        if ENV['GEM_HOME'] != Autoproj.gem_home
+            raise ConfigError, "RubyGems is already loaded with a different GEM_HOME"
+        end
+    end
+    # Set the initial environment
+    Autoproj.set_initial_env
+    # Set up some important autobuild parameters
+    Autobuild.prefix  = Autoproj.build_dir
+    Autobuild.srcdir  = root_dir
+    Autobuild.doc_errors = false
+    Autobuild.do_doc = false
+    Autobuild::Reporting << Autoproj::Reporter.new
+    if mail_config[:to]
+        Autobuild::Reporting << MailReporter.new(mail_config)
+    end
 
+    manifest_path = File.join(Autoproj.config_dir, 'manifest')
+    # 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
+    # installed (i.e. that the user did not remove it)
+    manifest = Manifest.load(manifest_path)
+    if manifest.vcs && mode != "bootstrap"
+        Autobuild::Reporting.report do
+            manifest.update_yourself
+        end
+        manifest = Manifest.load(manifest_path)
+    end
+    Autoproj.manifest = manifest
 
-Dir.chdir(root_dir)
-begin
-    # Load the installation's manifest
-    manifest = Autoproj.manifest = Manifest.load(File.join('autoproj', 'manifest'))
     source_os_dependencies = manifest.each_remote_source(false).
         inject(Set.new) do |set, source|
             set << source.vcs.type if !source.local?
@@ -273,47 +316,23 @@ begin
 
     # Update the remote sources if there are any
     if manifest.has_remote_sources?
-        STDERR.puts color("autoproj: updating remote sources", :bold)
+        STDERR.puts color("autoproj: updating remote definitions of package sets", :bold)
         Autobuild::Reporting.report do
             manifest.update_remote_sources
         end
         STDERR.puts
     end
 
-    # If in verbose mode, or if we only update sources, list the sources
-    #
-    # Note that we can't have the Manifest class load the source.yml file, as it
-    # cannot resolve all constants. So we need to do it ourselves to get the
-    # name ...
-    if Autoproj.verbose || only_update_sources
-        sources = manifest.each_source(false).to_a
-
-        if sources.empty?
-            STDERR.puts color("autoproj: no sources defined in autoproj/manifest", :bold, :red)
-        else
-            STDERR.puts color("autoproj: available sources", :bold)
-            manifest.each_source(false) do |source|
-                source_yml = source.raw_description_file
-                STDERR.puts "  #{source_yml['name']}"
-                if source.local?
-                    STDERR.puts "    local source in #{source.local_dir}"
-                else
-                    STDERR.puts "    vcs:   #{source.vcs}, #{source.vcs.options.inspect}"
-                    STDERR.puts "    local: #{source.local_dir}"
-                end
-            end
-        end
-    end
-    if only_update_sources
-        exit(0)
-    end
-
     # Load init.rb files. each_source must not load the source.yml file, as
     # init.rb may define configuration options that are used there
     manifest.each_source(false) do |source|
         init_rb = File.join(source.local_dir, "init.rb")
         if File.exists?(init_rb)
-            load init_rb
+            begin
+                load init_rb
+            rescue Exception => e
+                Autoproj.filter_load_exception(e, source, init_rb)
+            end
         end
     end
 
@@ -341,6 +360,41 @@ begin
         end
     end
 
+    # If in verbose mode, or if we only update sources, list the sources
+    #
+    # Note that we can't have the Manifest class load the source.yml file, as it
+    # cannot resolve all constants. So we need to do it ourselves to get the
+    # name ...
+    if Autoproj.verbose || only_update_sources
+        sources = manifest.each_source(false).to_a
+
+        if sources.empty?
+            STDERR.puts color("autoproj: no package sets defined in autoproj/manifest", :bold, :red)
+        else
+            STDERR.puts color("autoproj: available package sets", :bold)
+            manifest.each_source(false) do |source|
+                source_yml = source.raw_description_file
+                STDERR.puts "  #{source_yml['name']}"
+                if source.local?
+                    STDERR.puts "    local source in #{source.local_dir}"
+                else
+                    STDERR.puts "    vcs:   #{source.vcs}, #{source.vcs.options.inspect}"
+                    STDERR.puts "    local: #{source.local_dir}"
+                end
+
+                source.each_package.
+                    map { |pkg| pkg.name }.
+                    sort.
+                    each do |name|
+                        STDERR.puts "    #{name}"
+                    end
+            end
+        end
+    end
+    if only_update_sources
+        exit(0)
+    end
+
     # Create the build target from the manifest if the user did not provide an
     # explicit one
     if selected_packages.empty?
@@ -446,9 +500,22 @@ begin
             Autobuild.do_update = old_update_flag
         end
 
+        all_env_sh << name
         Autoproj.export_env_sh(name)
     end
 
+STDERR.puts <<EOTEXT
+
+
+add the following lines at the bottom of your .bashrc:
+  #{all_env_sh.map { |name| "source #{Dir.pwd}#{name}env.sh" }.join("\n  ")}
+
+WARNING: autoproj will not work until your restart all
+your consoles, or run the following in them:
+  #{all_env_sh.map { |name| "$ source #{Dir.pwd}#{name}env.sh" }.join("\n  ")}
+
+EOTEXT
+
 rescue ConfigError => e
     STDERR.puts
     STDERR.puts color(e.message, :red, :bold)

data/doc/guide/src/autoproj_bootstrap

@@ -1,5 +1,14 @@
 #! /usr/bin/ruby
 
+ENV['GEM_HOME'] = "#{Dir.pwd}/.gems"
+ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
+if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
+    ENV['RUBYOPT']  = ""
+    exec "ruby", __FILE__
+end
+
+ENV['RUBYOPT']  = "-rubygems"
+
 require 'yaml'
 require 'set'
 require 'rubygems'
@@ -134,8 +143,11 @@ module Autoproj
             File.open('osdeps.sh', 'w') do |file|
                 file.write shell_script
             end
-            Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
-            FileUtils.rm_f 'osdeps.sh'
+            begin
+                Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
+            ensure
+                FileUtils.rm_f 'osdeps.sh'
+            end
 
             # Don't install gems that are already there ...
             gems.delete_if do |name|
@@ -190,16 +202,13 @@ STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a
 osdeps_management.install(packages)
 
 if ARGV.first != "dev"
-    ENV['RUBYOPT']  = "-rubygems"
-    ENV['GEM_HOME'] = "#{Dir.pwd}/autoproj/gems"
-    ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:$PATH"
     Autobuild::Subprocess.run('bootstrap', 'post', 'autoproj', 'bootstrap')
 end
 
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
-export GEM_HOME=#{Dir.pwd}/autoproj/gems
+export GEM_HOME=#{Dir.pwd}/.gems
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL
 end

data/doc/guide/src/structure.page

@@ -14,7 +14,7 @@ autoproj-related configuration is saved. The contained files are as follows:
 
  * autoproj/manifest: list of available package sets, layout of the
    installation. See "Management" below.
- * autoproj/remotes/\*: package sets that are imported from a remote version
+ * .remotes/\*: package sets that are imported from a remote version
    control system
  * autoproj/\*/: local sets, i.e. sets that have not been imported from a remote
    version control system.
@@ -100,7 +100,7 @@ autoproj will still have to checkout new packages, though:
 autoproj build --no-update
 {.commandline}
 
-If, on the other hand, you only want to update the sources, do
+If, on the other hand, you only want to update the source code, do
 
 autoproj update
 {.commandline}

data/lib/autoproj/autobuild.rb

@@ -44,11 +44,27 @@ module Autoproj
     end
 
     @loaded_autobuild_files = Set.new
+    def self.filter_load_exception(error, source, path)
+        raise error if Autoproj.verbose
+        rx_path = Regexp.quote(path)
+        error_line = error.backtrace.find { |l| l =~ /#{rx_path}/ }
+        line_number = Integer(/#{rx_path}:(\d+)/.match(error_line)[1])
+        if source.local?
+            raise ConfigError, "#{path}:#{line_number}: #{error.message}", error.backtrace
+        else
+            raise ConfigError, "#{File.basename(path)}(source=#{source.name}):#{line_number}: #{error.message}", error.backtrace
+        end
+    end
+
     def self.import_autobuild_file(source, path)
         return if @loaded_autobuild_files.include?(path)
 
         @file_stack.push([source, File.basename(path)])
-        load path
+        begin
+            load path
+        rescue Exception => e
+            filter_load_exception(e, source, path)
+        end
         @loaded_autobuild_files << path
 
     ensure
@@ -119,7 +135,7 @@ def ruby_common(pkg)
     end
 
     pkg.post_install do
-        Autobuild.progress "  setting up Ruby package #{pkg.name}"
+        Autobuild.progress "setting up Ruby package #{pkg.name}"
         Autobuild.update_environment pkg.srcdir
         if File.file?('Rakefile')
             if File.directory?('ext')

data/lib/autoproj/manifest.rb

@@ -144,7 +144,7 @@ module Autoproj
     # dependencies that are provided by the operating system (.osdeps file).
     class Source
         # The VCSDefinition object that defines the version control holding
-        # information for this source. Local sources (i.e. the ones that are not
+        # information for this source. Local package sets (i.e. the ones that are not
         # under version control) use the 'local' version control name. For them,
         # local? returns true.
         attr_accessor :vcs
@@ -166,7 +166,7 @@ module Autoproj
             if local?
                 vcs.url
             else
-                File.join(Autoproj.config_dir, "remotes", automatic_name)
+                File.join(Autoproj.remotes_dir, automatic_name)
             end
         end
 
@@ -179,6 +179,8 @@ module Autoproj
         def name
             if @source_definition then
                 @source_definition['name'] || automatic_name
+            elsif @name
+                @name
             else
                 automatic_name
             end
@@ -207,6 +209,12 @@ module Autoproj
             source_definition
         end
 
+        def load_name
+            definition = raw_description_file
+            @name = definition['name']
+        rescue InternalError
+        end
+
         # Load the source.yml file that describes this source, and resolve the
         # $BLABLA values that are in there. Use #raw_description_file to avoid
         # resolving those values
@@ -242,7 +250,7 @@ module Autoproj
                 end
 
             rescue ConfigError => e
-                raise ConfigError, "#{e.message} in #{File.join(local_dir, "source.yml")}", e.backtrace
+                raise ConfigError, "#{File.join(local_dir, "source.yml")}: #{e.message}", e.backtrace
             end
         end
 
@@ -314,6 +322,18 @@ module Autoproj
         rescue ConfigError => e
             raise ConfigError, "#{e.message} in the source.yml file of #{name} (#{File.join(local_dir, "source.yml")})", e.backtrace
         end
+
+        def each_package
+            if !block_given?
+                return enum_for(:each_package)
+            end
+
+            Autoproj.manifest.packages.each do |pkg_name, (pkg, source, file)|
+                if source.name == name
+                    yield(pkg)
+                end
+            end
+        end
     end
 
     class Manifest
@@ -321,6 +341,8 @@ module Autoproj
 	def self.load(file)
             begin
                 data = YAML.load(File.read(file))
+            rescue Errno::ENOENT
+                raise ConfigError, "expected an autoproj configuration in #{File.expand_path(File.dirname(file))}, but #{file} does not exist"
             rescue ArgumentError => e
                 raise ConfigError, "error in #{file}: #{e.message}"
             end
@@ -344,20 +366,23 @@ module Autoproj
 	    @data = data
             @packages = Hash.new
             @package_manifests = Hash.new
+
+            if Autoproj.has_config_key?('manifest_source')
+                @vcs = Autoproj.normalize_vcs_definition(Autoproj.user_config('manifest_source'))
+            end
 	end
 
-        # Lists the autobuild files that are part of the sources listed in this
-        # manifest
+        # Lists the autobuild files that are in the package sets we know of
 	def each_autobuild_file(source_name = nil, &block)
             if !block_given?
                 return enum_for(:each_source_file, source_name)
             end
 
-            # This looks very inefficient, but it is because source names
-            # are contained in the source definition file (source.yml) and
-            # we must therefore load that file to check the source name ...
+            # This looks very inefficient, but it is because source names are
+            # contained in source.yml and we must therefore load that file to
+            # check the package set name ...
             #
-            # And honestly I don't think someone will have 20 000 sources
+            # And honestly I don't think someone will have 20 000 package sets
             done_something = false
             each_source do |source| 
                 next if source_name && source.name != source_name
@@ -389,7 +414,7 @@ module Autoproj
             each_remote_source(false).any? { true }
         end
 
-        # Like #each_source, but filters out local sources
+        # Like #each_source, but filters out local package sets
         def each_remote_source(load_description = true)
             if !block_given?
                 enum_for(:each_remote_source, load_description)
@@ -405,16 +430,16 @@ module Autoproj
         # call-seq:
         #   each_source { |source_description| ... }
         #
-        # Lists all sources defined in this manifest, by yielding a Source
-        # object that describes the source.
+        # Lists all package sets defined in this manifest, by yielding a Source
+        # object that describes it.
         def each_source(load_description = true)
             if !block_given?
-                return enum_for(:each_source)
+                return enum_for(:each_source, load_description)
             end
 
-            return if !data['sources']
+            return if !data['package_sets']
 
-	    data['sources'].each do |spec|
+	    data['package_sets'].each do |spec|
                 # Look up for short notation (i.e. not an explicit hash). It is
                 # either vcs_type:url or just url. In the latter case, we expect
                 # 'url' to be a path to a local directory
@@ -427,6 +452,9 @@ module Autoproj
                 source = Source.new(vcs_def)
                 if source.present? && load_description
                     source.load_description_file
+                else
+                    # Try to load just the name from the source.yml file
+                    source.load_name
                 end
 
                 yield(source)
@@ -458,6 +486,21 @@ module Autoproj
             fake_package = FakePackage.new(source.automatic_name, source.local_dir)
 
             importer.import(fake_package)
+        rescue Autobuild::ConfigException => e
+            raise ConfigError, e.message, e.backtrace
+        end
+
+        attr_reader :vcs
+        def self.import_whole_installation(vcs, into)
+            importer     = vcs.create_autobuild_importer
+            fake_package = FakePackage.new('autoproj main configuration', into)
+            importer.import(fake_package)
+        rescue Autobuild::ConfigException => e
+            raise ConfigError, "cannot import autoproj configuration: #{e.message}", e.backtrace
+        end
+
+        def update_yourself
+            Manifest.import_whole_installation(vcs, Autoproj.config_dir)
         end
 
         def update_remote_sources
@@ -471,10 +514,10 @@ module Autoproj
         # Sets up the package importers based on the information listed in
         # the source's source.yml 
         #
-        # The priority logic is that we take the sources one by one in the order
-        # listed in the autoproj main manifest, and first come first used.
+        # The priority logic is that we take the package sets one by one in the
+        # order listed in the autoproj main manifest, and first come first used.
         #
-        # A source that defines a particular package in its autobuild file
+        # A set that defines a particular package in its autobuild file
         # *must* provide the corresponding VCS line in its source.yml file.
         # However, it is possible for a source that does *not* define a package
         # to override the VCS

data/lib/autoproj/options.rb

@@ -23,8 +23,8 @@ module Autoproj
         end
 
         def ask(current_value)
-            default_value = if current_value then current_value
-                            else options[:default]
+            default_value = if current_value then current_value.to_s
+                            else options[:default].to_str
                             end
 
             STDERR.print "  #{doc} [#{default_value}] "
@@ -82,7 +82,7 @@ module Autoproj
         if value.nil? || (!seen && Autoproj.reconfigure?)
             value = configure(key)
         else
-            if !seen
+            if !seen && @declared_options[key]
                 STDERR.puts "  #{@declared_options[key].doc}: #{value}"
                 @user_config[key] = [value, true]
             end
@@ -119,6 +119,10 @@ module Autoproj
         end
     end
 
+    def self.has_config_key?(name)
+        @user_config.has_key?(name)
+    end
+
     def self.load_config
         config_file = File.join(Autoproj.config_dir, "config.yml")
         if File.exists?(config_file)

data/lib/autoproj/osdeps.rb

@@ -110,8 +110,11 @@ module Autoproj
             File.open('osdeps.sh', 'w') do |file|
                 file.write shell_script
             end
-            Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
-            FileUtils.rm_f 'osdeps.sh'
+            begin
+                Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
+            ensure
+                FileUtils.rm_f 'osdeps.sh'
+            end
 
             # Don't install gems that are already there ...
             gems.delete_if do |name|

data/lib/autoproj/system.rb

@@ -37,11 +37,17 @@ module Autoproj
         end
     end
 
+    def self.remotes_dir
+        File.join(root_dir, ".remotes")
+    end
+    def self.gem_home
+        File.join(root_dir, ".gems")
+    end
+
     def self.set_initial_env
-        gem_home = File.join(Autoproj.config_dir, "gems")
         Autoproj.env_set 'RUBYOPT', "-rubygems"
-        Autoproj.env_set 'GEM_HOME', gem_home
-        Autoproj.env_set_path 'PATH', "#{gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
+        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_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB'

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
 end

data/samples/manifest

@@ -1,4 +1,4 @@
-sources:
+package_sets:
 # Example source from a git repository
 #   - type: git
 #     url: git://github.com/doudou/autoproj.orocos.git

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 +02:00
+date: 2009-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -166,7 +166,7 @@ files:
 - test/test_debian.rb
 - test/test_manifest.rb
 has_rdoc: true
-homepage: 
+homepage: http://doudou.github.com/autoproj
 licenses: []
 
 post_install_message: