autoproj 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,19 @@
+= Version 1.2.1
+ * accept two layouts for version control description:
+   
+   - package_name:
+       type: git
+       url: blablabla
+
+   and
+
+   - package_name:
+     type: git
+     url: blablabla
+
+   Even though the second one is not the proper YAML data structure,
+   it is actually quite intuitively written by humans, so accept it.
+
 = Version 1.2.0
  * added the rebuild and force-build modes
  * added a local source that allows to override imported package sets and so on.

data/Rakefile

@@ -88,7 +88,7 @@ if do_doc
         task 'guide' => 'dist:bootstrap'
         RDoc::Task.new("api") do |rdoc|
             rdoc.rdoc_dir = 'doc/html/api'
-            rdoc.title    = "oroGen"
+            rdoc.title    = "autoproj"
             rdoc.options << '--show-hash'
             rdoc.rdoc_files.include('lib/**/*.rb')
         end

data/doc/guide/src/customization.page

@@ -43,6 +43,18 @@ layout:
   - orocos/
 {coderay}
 
+Configuration files like <tt>autoproj/manifest</tt> are YAML file. As such, they
+aresensible to indentation. The snippet above should be read as: in the layout, there is first a "lib" part and second the packages whose names start with "orocos/" _(first level of indentation)_. In the "lib" part, the packages are "typelib", "utilmm"
+ and "utilrb" _(second level of indentation)_. 
+{.warning}
+
+Alternatively, the example above could be written:
+{coderay:: yaml}
+layout:
+  - lib: [typelib, utilmm, utilrb]
+  - orocos/
+{coderay}
+
 Finally, names of sublayouts can be used as arguments in the autoproj command
 line, instead of package names:
 
@@ -111,7 +123,7 @@ You can list local packages that are not in an imported package set by placing
 the definitions in autoproj/, in a file ending with <tt>.autobuild</tt>. See [this
 page](source_yml.html) for information on how to write autobuild files.
 
-Setting up the path to specific commands (make, parallel_builds)
+Setting up the path to specific commands (make, parallel builds)
 ----------------------------------------------------------------
 
 The autobuild API allows to specify what specific installed command to use for
@@ -132,6 +144,21 @@ Autobuild API directly in the <tt>autoproj/init.rb</tt> and
 files. The former is loaded before all source files and the latter is loaded
 after all source files.
 
+Some examples:
+
+ * fixing dependencies: if a dependency is not listed in a package's manifest,
+   then you can fix it by adding the following in <tt>autoproj/overrides.rb</tt>
+   {coderay:: ruby}
+   a = Autobuild::Package['a_package']
+   a.depends_on "other_package"
+   {coderay}
+
+ * changing the configuration of some cmake package:
+   {coderay:: ruby}
+   a = Autobuild::Package['a_package']
+   a.define "CONFIG_VAR", "CONFIG_VALUE"
+   {coderay}
+
 Building packages selectively on the command line
 -------------------------------------------------
 

data/lib/autoproj/manifest.rb

@@ -307,7 +307,20 @@ module Autoproj
 
             if all_vcs
                 all_vcs.each do |spec|
-                    name, spec = spec.to_a.first
+                    if spec.values.size != 1
+                        # Maybe the user wrote the spec like
+                        #   - 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)
+                    else
+                        name, spec = spec.to_a.first
+                    end
+
                     if Regexp.new(name) =~ package_name
                         vcs_spec = vcs_spec.merge(spec)
                     end

data/lib/autoproj/version.rb

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

metadata

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