autoproj 1.11.0.rc12 → 1.11.0.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9058233d769c69abb2b7268a778f40c048e40a11
-  data.tar.gz: 06e3fb0789c5aa42d5db2729659ca03a710ad2db
+  metadata.gz: fce0dd6f32d8bda1993c0bb0b99f05dfb794043e
+  data.tar.gz: b91bed9c6d505c6ba957b0c566bf55f44ff0c896
 SHA512:
-  metadata.gz: ce8b28fa3cf0ac43790c2afbc757053c1765c038bda470f3cb0556f0d88ee7d65f63c96909a854df43870a4603031ca84582bd9c42d04d5369a26575b081a194
-  data.tar.gz: 7f0a1d542df5a044009ef048914a93ddd1e5814c540feb4a2315562211410216018d7a1acdada80e98ed402920ef65cd5d5d509830125022fbdb39653eb046a7
+  metadata.gz: 880d54af1e680e49f80f70a3be4c05aac837c5f810cb0e8aabf5553530ca90b274c81409b853c5abcf8d73f8831804b9f6c0a4ef69589ec4689af2555bc07cc2
+  data.tar.gz: 96824090cfc7ce9862992f540763da086fa152a4447c338b1d3351f1f74b8c9ffafcccfc0ddd1e109014e81c79b3abe602853e5df339f0a8f043efdd8899912e

data/Manifest.txt

@@ -1,6 +1,6 @@
 History.txt
 Manifest.txt
-README.txt
+README.md
 Rakefile
 bin/alocate
 bin/amake

data/{README.txt → README.md}

@@ -7,13 +7,15 @@ version control repository (think "distributed version control"). It also
 provides an easy integration of the local operating system (Debian, Ubuntu,
 Fedora, maybe MacOSX at some point).
 
-This tool has been over the years. It is now maintained in the frame of the Rock
+This tool has been developed over the years. It is now maintained in the frame of the Rock
 robotics project (http://rock-robotics.org), to install robotics-related
-software -- that is often bleeding edge. Unlike [the ROS build
-system](http://ros.org), it is not bound to one build system, one VCS and one
-integration framework. The philosophy behind autoproj
-is:
-* supports both CMake and autotools, and can be adapted to other tools
+software -- that is often bleeding edge.
+
+One main design direction for autoproj is that packages can be built with
+autoproj without having been designed to be built with autoproj.
+
+The philosophy behind autoproj is:
+* supports any type of build system (CMake and autotools are built-in)
 * supports different VCS: cvs, svn, git, plain tarballs.
 * software packages are plain packages, meaning that they can be built and
   installed /outside/ an autoproj tree, and are not tied *at all* to the
@@ -23,11 +25,6 @@ is:
   access to.
 * handle code generation properly
 
-It tries as much as possible to follow the lead of Willow Garage on the package
-specification. More specifically, the package manifest files are common between
-ROS package management and autoproj (more details in the following of this
-document).
-
 Overview of an autoproj installation
 -------------------------------------
 
@@ -46,7 +43,6 @@ Each package definition includes:
 See this
 page[http://www.rock-robotics.org/stable/documentation/autoproj/writing_manifest.html] for more information.
 
-
 Software packages in Autoproj
 -----------------------------
 In the realm of autoproj, a software package should be a self-contained build

data/bin/autoproj-show

@@ -160,7 +160,7 @@ packages.each do |name|
 
     osdeps.each do |pkg_name|
         puts Autoproj.color("the osdep '#{pkg_name}'", :bold)
-        Autoproj.osdeps.resolve_os_dependencies(pkg_name).each do |manager, packages|
+        Autoproj.osdeps.resolve_os_dependencies([pkg_name]).each do |manager, packages|
             puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
         end
     end

data/bin/autoproj_bootstrap

@@ -83,6 +83,8 @@ module Autoproj
 end
 
 module Autobuild
+    class Exception < RuntimeError; end
+
     def self.do_update
         true
     end
@@ -1054,7 +1056,7 @@ fi
             end
 
             def reinstall
-                Autoproj.message "reinstalling all RubyGems"
+                Autoproj.message "  reinstalling all RubyGems"
                 base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem')]
                 Autobuild::Subprocess.run 'osdeps', 'reinstall', *base_cmdline,
                     'clean'

data/bin/autoproj_bootstrap.in

@@ -83,6 +83,8 @@ module Autoproj
 end
 
 module Autobuild
+    class Exception < RuntimeError; end
+
     def self.do_update
         true
     end

data/lib/autoproj/ops/configuration.rb

@@ -211,13 +211,18 @@ module Autoproj
                 vcs, options, imported_from = queue.shift
                 repository_id = repository_id_of(vcs)
                 if already_processed = by_repository_id[repository_id]
-                    already_processed_vcs, already_processed_from = *already_processed
+                    already_processed_vcs, already_processed_from, pkg_set = *already_processed
                     if already_processed_from && (already_processed_vcs != vcs)
                         Autoproj.warn "already loaded the package set from #{already_processed_vcs} from #{already_processed_from.name}, this overrides different settings (#{vcs}) found in #{imported_from.name}"
                     end
+
+                    if imported_from
+                        pkg_set.imported_from << imported_from
+                        imported_from.imports << pkg_set
+                    end
                     next
                 end
-                by_repository_id[repository_id] = vcs
+                by_repository_id[repository_id] = [vcs, imported_from]
 
                 if !vcs.local?
                     update_remote_package_set(vcs, only_local)
@@ -243,6 +248,7 @@ module Autoproj
                 end
 
                 pkg_set = load_package_set(vcs, options, imported_from)
+                by_repository_id[repository_id][2] = pkg_set
                 package_sets << pkg_set
 
                 by_name[pkg_set.name] = [pkg_set, vcs, options, imported_from]

data/lib/autoproj/osdeps.rb

@@ -593,7 +593,7 @@ fi
             end
 
             def reinstall
-                Autoproj.message "reinstalling all RubyGems"
+                Autoproj.message "  reinstalling all RubyGems"
                 base_cmdline = [Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('gem')]
                 Autobuild::Subprocess.run 'osdeps', 'reinstall', *base_cmdline,
                     'clean'

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc12"
+    VERSION = "1.11.0.rc13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc12
+  version: 1.11.0.rc13
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -110,13 +110,13 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
-- README.txt
+- README.md
 - samples/autoproj/README.txt
 files:
 - ".gemtest"
 - History.txt
 - Manifest.txt
-- README.txt
+- README.md
 - Rakefile
 - bin/alocate
 - bin/amake
@@ -206,7 +206,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.txt
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -226,9 +226,9 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files:
-- test/test_os_dependencies.rb
-- test/test_manifest.rb
 - test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
 - test/package_managers/test_pip.rb
+- test/test_manifest.rb
+- test/test_os_dependencies.rb
 - test/test_package_manifest.rb