autoproj 1.6.0.rc6 → 1.6.0

data/History.txt

@@ -1,7 +1,12 @@
 = Version 1.6.0
- * version that will be used in the Orocos project
- * the osdeps management is now fully configurable. What is means is that you
-   can ask autoproj to *not* install osdeps packages at all
+ * starting this version, autoproj becomes the official build system for the
+   Orocos Toolchain project
+ * the osdeps management is now configurable: one can request autoproj to not
+   install osdeps, to ask each time and/or to simply wait when osdeps should
+   be installed
+ * autoproj stops bailing out on OSes that it does not know. It simply does
+   not offer to install OS dependencies on these operating systems
+ * quite a few small bugfixes
 
 = Version 1.5.8
  * add a way to add some ignore regexp to the dependency tracking. Updated user

data/doc/guide/src/autoproj_bootstrap

@@ -669,16 +669,50 @@ end
 
 DEFS = <<EODEFS
 --- 
+svn: 
+  arch: subversion
+  gentoo: dev-util/subversion
+  debian,ubuntu: subversion
+autobuild: gem
+zlib: 
+  debian,ubuntu: zlib1g-dev
+libxml2: 
+  arch: libxml2
+  gentoo: dev-libs/libxml2
+  debian,ubuntu: libxml2-dev
 none: ignore
+autotools: 
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+autoproj: gem
+archive: 
+  arch: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
+lsb_release: 
+  arch: 
+  gentoo: sys-apps/lsb-release
+  debian,ubuntu: lsb-release
 ruby18: 
+  gentoo: 
+  - dev-lang/ruby:1.8
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
   - rubygems1.8
   - ri1.8
   - libopenssl-ruby1.8
-  gentoo: 
-  - dev-lang/ruby:1.8
 ruby19: 
   debian: 
     squeeze,sid: 
@@ -689,67 +723,33 @@ ruby19:
     - ruby1.9.1
     - ruby1.9.1-dev
     - rubygems1.9.1
+  arch: 
+  - ruby
+  gentoo: 
+  - dev-lang/ruby:1.9
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
-  gentoo: 
-  - dev-lang/ruby:1.9
-  arch: 
-  - ruby
-rdoc: gem
-build-essential: 
-  debian,ubuntu: build-essential
-  gentoo: 
-  arch: 
-libxml2: 
-  debian,ubuntu: libxml2-dev
-  gentoo: dev-libs/libxml2
-  arch: libxml2
-libxslt: 
-  debian,ubuntu: libxslt1-dev
-  gentoo: dev-libs/libxslt
-  arch: libxslt
-zlib: 
-  debian,ubuntu: zlib1g-dev
-autobuild: gem
-autoproj: gem
 git: 
-  debian,ubuntu: git-core
-  gentoo: dev-vcs/git
   arch: git
-svn: 
-  debian,ubuntu: subversion
-  gentoo: dev-util/subversion
-  arch: subversion
+  gentoo: dev-vcs/git
+  debian,ubuntu: git-core
 cmake: 
-  debian,ubuntu: cmake
-  gentoo: dev-util/cmake
   arch: cmake
-autotools: 
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  arch: automake autoconf
-lsb_release: 
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
+  gentoo: dev-util/cmake
+  debian,ubuntu: cmake
+build-essential: 
   arch: 
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
   gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-  arch: 
-  - tar
-  - unzip
+  debian,ubuntu: build-essential
+libxslt: 
+  arch: libxslt
+  gentoo: dev-libs/libxslt
+  debian,ubuntu: libxslt1-dev
+rdoc: gem
 
 EODEFS
 

data/lib/autoproj/autobuild.rb

@@ -109,6 +109,10 @@ module Autoproj
         end
     end
 
+    # Returns the information about the file that is currently being loaded
+    #
+    # The return value is [source, path], where +source+ is the Source instance
+    # and +path+ is the path of the file w.r.t. the autoproj root directory
     def self.current_file
         @file_stack.last
     end
@@ -141,7 +145,7 @@ module Autoproj
     def self.import_autobuild_file(source, path)
         return if @loaded_autobuild_files.include?(path)
 
-        @file_stack.push([source, File.basename(path)])
+        @file_stack.push([source, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')])
         begin
             Kernel.load path
         rescue ConfigError => e
@@ -166,11 +170,11 @@ end
 def package_common(package_type, spec, &block) # :nodoc:
     package_name = Autoproj.package_name_from_options(spec)
 
-    begin
-        Rake::Task[package_name]
-        Autoproj.warn "#{package_name} from #{Autoproj.current_file[0]} is overriden by the definition in #{Autoproj.definition_source(package_name)}"
+    if Autobuild::Package[package_name]
+        current_file = Autoproj.current_file[1]
+        old_file     = Autoproj.manifest.definition_file(package_name)
+        Autoproj.warn "#{package_name} from #{current_file} is overriden by the definition in #{old_file}"
         return
-    rescue
     end
 
     # Check if this package is ignored

data/lib/autoproj/cmdline.rb

@@ -185,13 +185,6 @@ OS dependencies through autoproj.
                 Autoproj.import_autobuild_file source, name
             end
 
-            # Load the package's override 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).to_a.reverse.each do |source|
-                Autoproj.load_if_present(source, source.local_dir, "overrides.rb")
-            end
-
             # Now, load the package's importer configurations (from the various
             # source.yml files)
             manifest.load_importers
@@ -269,6 +262,13 @@ OS dependencies through autoproj.
                 end
             end
 
+            # Load the package's override 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).to_a.reverse.each do |source|
+                Autoproj.load_if_present(source, source.local_dir, "overrides.rb")
+            end
+
             # We now have processed the process setup blocks. All configuration
             # should be done and we can save the configuration data.
             Autoproj.save_config

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.0.rc6"
+    VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 977940587
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 1
   - 6
   - 0
-  - rc6
-  version: 1.6.0.rc6
+  version: 1.6.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +02:00
+date: 2010-08-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -274,14 +273,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild