autoproj 1.6.2.rc9 → 1.6.2

data/History.txt

@@ -10,7 +10,7 @@
    errors are properly presented at the end of the run.
  * when boostrapping, check that the current directory is empty and warn the
    user if it is not.
- * a few more minor bugfixes
+ * a few minor bugfixes
 
 = Version 1.6.1
  * fix a limitation of giving directories on the command line. Before, only

data/Manifest.txt

@@ -7,6 +7,7 @@ doc/guide/config.yaml
 doc/guide/ext/init.rb
 doc/guide/ext/previous_next.rb
 doc/guide/ext/rdoc_links.rb
+doc/guide/src/adding_packages.page
 doc/guide/src/autoproj_bootstrap
 doc/guide/src/customization.page
 doc/guide/src/default.css
@@ -41,6 +42,7 @@ lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
 lib/autoproj/system.rb
 lib/autoproj/version.rb
+samples/autoproj/README.txt
 samples/autoproj/init.rb
 samples/autoproj/manifest
 samples/autoproj/overrides.rb

data/Rakefile

@@ -14,7 +14,7 @@ begin
             self.changes     = paragraphs_of('History.txt', 0..1).join("\n\n")
 
             extra_deps << 
-                ['autobuild',   '>= 1.5.9'] <<
+                ['autobuild',   '>= 1.5.23'] <<
                 ['rmail',   '>= 1.0.0'] <<
                 ['utilrb', '>= 1.3.3'] <<
                 ['nokogiri', '>= 1.3.3'] <<

data/doc/guide/src/adding_packages.page

@@ -0,0 +1,40 @@
+---
+title: Adding packages (for the impatient)
+sort_info: 50
+---
+
+To register a package in autoproj, you need to basically do two things
+
+ * declare it in an autobuild file
+ * add VCS information for it (i.e. "where to get it")
+
+A first step
+------------
+
+A quick thing that can be done to register a new package in your autoproj
+installation is to add it to the local package set.
+
+ * [register it](package_sets/autobuild.html) in
+   <tt>autoproj/local.autobuild</tt>
+ * [give version control information](package_sets/importers.html) for it in
+   <tt>autoproj/overrides.yml</tt>
+
+Alternatively to the last point, you can register it under the "type: none"
+importer in autoproj/overrides.yml to make autoproj not care about updating that
+package.
+
+Sharing package definitions with the rest of the world
+------------------------------------------------------
+
+To do that, you will either have to move the package definition to a separate
+package set (usually one of those that are in autoproj/remotes/), or to create
+your own package set]
+
+For the first solution, you will have to move the package definition from
+autoproj/local.autobuild to an autobuild file in the package set directory (name
+does not matter as long as it ends with .autobuild). Moreover, you will have to
+move the importer definition from autoproj/overrides.yml to the package set's
+source.yml file.
+
+For the second solution, [read on](package_sets/index.html)
+

data/doc/guide/src/autoproj_bootstrap

@@ -218,11 +218,11 @@ module Autoproj
         # system on which we are installed
         def self.supported_operating_system?
             if @supported_operating_system.nil?
-                osdef = operating_system
+                os_names, _ = operating_system
                 @supported_operating_system =
-                    if !osdef then false
+                    if !os_names then false
                     else
-                        OS_AUTO_PACKAGE_INSTALL.has_key?(osdef[0])
+                        os_names.any? { |os_name| OS_AUTO_PACKAGE_INSTALL.has_key?(os_name) }
                     end
             end
             return @supported_operating_system
@@ -242,15 +242,21 @@ module Autoproj
             if @operating_system
                 return @operating_system
             elsif Autoproj.has_config_key?('operating_system')
-                return (@operating_system = Autoproj.user_config('operating_system'))
+                os = Autoproj.user_config('operating_system')
+                if !os.respond_to?(:to_ary) # upgrade from previous format
+                    @operating_system = nil
+                end
             end
 
             Autoproj.progress "  autodetecting the operating system"
-            if data = os_from_lsb
-                if data[0] != "debian"
-                    # if on Debian proper, fall back to reading debian_version,
-                    # as sid is listed as lenny by lsb-release
-                    @operating_system = data
+            name, versions = os_from_lsb
+            if name
+                if name != "debian"
+                    if File.exists?("/etc/debian_version")
+                        @operating_system = [[name, "debian"], versions]
+                    else
+                        @operating_system = [[name], versions]
+                    end
                 end
             end
 
@@ -258,18 +264,18 @@ module Autoproj
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
-                        codename = [File.read('/etc/debian_version').strip]
-                        if codename.first =~ /sid/
-                            codename << "unstable" << "sid"
+                        codenames = [File.read('/etc/debian_version').strip]
+                        if codenames.first =~ /sid/
+                            codenames << "unstable" << "sid"
                         end
-                        ['debian', codename]
+                        [['debian'], codenames]
                     elsif File.exists?('/etc/gentoo-release')
                         release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
                             version = $1
-                        ['gentoo', [version]]
+                        [['gentoo'], [version]]
                     elsif File.exists?('/etc/arch-release')
-                        ['arch', []]
+                        [['arch'], []]
                     end
             end
 
@@ -279,8 +285,8 @@ module Autoproj
 
             # Normalize the names to lowercase
             @operating_system =
-                [@operating_system[0].downcase,
-                 @operating_system[1].map(&:downcase)]
+                 [@operating_system[0].map(&:downcase),
+                 [@operating_system[1].map(&:downcase) + ["default"]]]
             Autoproj.change_option('operating_system', @operating_system, true)
             @operating_system
         end
@@ -372,28 +378,30 @@ fi
         #   +definition+ is an array of package names that this OS's package
         #   manager can understand
         def resolve_package(name)
-            os_name, os_version = OSDependencies.operating_system
+            os_names, os_versions = OSDependencies.operating_system
 
             dep_def = definitions[name]
             if !dep_def
                 return NO_PACKAGE
             end
 
-            if !os_name
+            if !os_names
                 return UNKNOWN_OS
             end
 
             # Find a matching entry for the OS name
-            os_entry = dep_def.find do |name_list, data|
-                name_list.split(',').
-                    map(&:downcase).
-                    any? { |n| n == os_name }
+            os_entry = nil
+            os_names.find do |os_name|
+                os_entry = dep_def.find do |name_list, data|
+                    name_list.split(',').
+                        map(&:downcase).
+                        any? { |n| n == os_name }
+                end
             end
 
             if !os_entry
                 return WRONG_OS
             end
-
             data = os_entry.last
 
             # This package does not need to be installed on this operating system (example: build tools on Gentoo)
@@ -402,12 +410,17 @@ fi
             end
 
             if data.kind_of?(Hash)
-                version_entry = data.find do |version_list, data|
-                    version_list.to_s.split(',').
-                        map(&:downcase).
-                        any? do |v|
-                            os_version.any? { |osv| Regexp.new(v) =~ osv }
+                version_entry = nil
+                os_versions.each do |os_version|
+                    version_entry =
+                        data.find do |version_list, data|
+                            version_list.to_s.split(',').
+                                map(&:downcase).
+                                any? do |v|
+                                    os_version.any? { |osv| Regexp.new(v) =~ osv }
+                                end
                         end
+                    break if version_entry
                 end
 
                 if !version_entry
@@ -418,7 +431,7 @@ fi
 
             if data.respond_to?(:to_ary)
                 return [PACKAGES, data]
-            elsif data.to_str =~ /\w+/
+            elsif data.respond_to?(:to_str)
                 return [PACKAGES, [data.to_str]]
             else
                 raise ConfigError, "invalid package specificiation #{data} in #{source_of(name)}"
@@ -430,7 +443,7 @@ fi
         #
         # Raises ConfigError if some packages can't be found
         def resolve_os_dependencies(dependencies)
-            os_name, os_version = OSDependencies.operating_system
+            os_names, _ = OSDependencies.operating_system
 
             os_packages    = []
             dependencies.each do |name|
@@ -448,22 +461,30 @@ fi
                 end
             end
 
-            if !OS_AUTO_PACKAGE_INSTALL.has_key?(os_name)
-                raise ConfigError, "I don't know how to install packages on #{os_name}"
+            if !os_names.any? { |os_name| OS_AUTO_PACKAGE_INSTALL.has_key?(os_name) }
+                raise ConfigError, "I don't know how to install packages on #{os_names.first}"
             end
 
             return os_packages
         end
 
 
-        def generate_user_os_script(os_name, os_packages)
-            if OS_USER_PACKAGE_INSTALL[os_name]
-                (OS_USER_PACKAGE_INSTALL[os_name] % [os_packages.join("' '")])
-            else generate_auto_os_script(os_name, os_packages)
+        def generate_user_os_script(os_names, os_packages)
+            user_package_install = nil
+            os_names.find do |os_name|
+                user_package_install = OS_USER_PACKAGE_INSTALL[os_name]
+            end
+            if user_package_install
+                (user_package_install % [os_packages.join("' '")])
+            else generate_auto_os_script(os_names, os_packages)
             end
         end
-        def generate_auto_os_script(os_name, os_packages)
-            (OS_AUTO_PACKAGE_INSTALL[os_name] % [os_packages.join("' '")])
+        def generate_auto_os_script(os_names, os_packages)
+            auto_package_install = nil
+            os_names.find do |os_name|
+                auto_package_install = OS_AUTO_PACKAGE_INSTALL[os_name]
+            end
+            (auto_package_install % [os_packages.join("' '")])
         end
 
         # Returns true if +name+ is an acceptable OS package for this OS and
@@ -557,14 +578,17 @@ fi
         # Returns true if the osdeps system knows how to remove uptodate
         # packages from the needs-to-be-installed package list on this OS
         def can_filter_uptodate_packages?
-            os_name, _ = OSDependencies.operating_system
-            !!OS_PACKAGE_CHECK[os_name]
+            os_names, _ = OSDependencies.operating_system
+            !!os_names.any? { |os_name| OS_PACKAGE_CHECK[os_name] }
         end
 
         # Returns the set of packages in +packages+ that are not already
         # installed on this OS, if it is supported
-        def filter_uptodate_os_packages(packages, os_name)
-            check_method = OS_PACKAGE_CHECK[os_name]
+        def filter_uptodate_os_packages(packages, os_names)
+            check_method = nil
+            os_names.find do |os_name|
+                check_method = OS_PACKAGE_CHECK[os_name]
+            end
             return packages.dup if !check_method
 
             packages.find_all { |pkg| !check_method[pkg] }
@@ -851,10 +875,10 @@ with the corresponding option (--all, --ruby, --os or --none).
 
             osdeps, gems = partition_packages(packages, package_osdeps)
             if handled_os
-                os_name, os_version = OSDependencies.operating_system
+                os_names, os_versions = OSDependencies.operating_system
                 os_packages = resolve_os_dependencies(osdeps)
                 if filter_uptodate_packages
-                    os_packages = filter_uptodate_os_packages(os_packages, os_name)
+                    os_packages = filter_uptodate_os_packages(os_packages, os_names)
                 end
             end
             if filter_uptodate_packages
@@ -865,8 +889,8 @@ with the corresponding option (--all, --ruby, --os or --none).
 
             if !osdeps.empty? && (!os_packages || !os_packages.empty?)
                 if handled_os
-                    shell_script = generate_auto_os_script(os_name, os_packages)
-                    user_shell_script = generate_user_os_script(os_name, os_packages)
+                    shell_script = generate_auto_os_script(os_names, os_packages)
+                    user_shell_script = generate_user_os_script(os_names, os_packages)
                 end
                 if osdeps_interaction(osdeps, os_packages, user_shell_script, silent?)
                     Autoproj.progress "  installing OS packages: #{os_packages.sort.join(", ")}"
@@ -1291,83 +1315,85 @@ 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: 
-    stable,squeeze,sid: 
-    - ruby1.9.1
-    - ruby1.9.1-dev
-    - rubygems1.9.1
-  arch: 
-  - ruby
-  gentoo: 
-  - dev-lang/ruby:1.9
+  - ruby1.9.1
+  - ruby1.9.1-dev
+  - rubygems1.9.1
   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: 
-  arch: git
+  debian: 
+    lenny: git
+    default: git-core
+  ubuntu: git-core
   gentoo: dev-vcs/git
-  debian,ubuntu: git-core
+  arch: git
+svn: 
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch: subversion
 cmake: 
-  arch: cmake
-  gentoo: dev-util/cmake
   debian,ubuntu: cmake
-build-essential: 
+  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
   arch: 
+archive: 
+  debian,ubuntu: 
+  - tar
+  - unzip
   gentoo: 
-  debian,ubuntu: build-essential
-libxslt: 
-  arch: libxslt
-  gentoo: dev-libs/libxslt
-  debian,ubuntu: libxslt1-dev
-rdoc: gem
+  - app-arch/tar
+  - app-arch/unzip
+  arch: 
+  - tar
+  - unzip
 
 EODEFS
 

data/lib/autoproj/manifest.rb

@@ -1282,7 +1282,6 @@ module Autoproj
                     if pkg_name =~ match_pkg_name || pkg.srcdir =~ match_dir
                         # Check-out packages that are not in the manifest only
                         # if they are explicitely selected
-                        puts "#{pkg_name} #{pkg.srcdir} #{sel} #{pkg_name != sel} #{pkg.srcdir != sel}"
                         if pkg_name != sel && pkg.srcdir != sel && !all_layout_packages.include?(pkg.name)
                             next
                         end

data/lib/autoproj/options.rb

@@ -87,9 +87,12 @@ module Autoproj
             if possible_values = options[:possible_values]
                 if options[:lowercase]
                     value = value.downcase
+                elsif options[:uppercase]
+                    value = value.upcase
                 end
+
                 if !possible_values.include?(value)
-                    raise InputError, "invalid value '#{value}', accepted values are '#{possible_values.join(", ")}'"
+                    raise InputError, "invalid value '#{value}', accepted values are '#{possible_values.join("', '")}' (without the quotes)"
                 end
             end
             value

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.2.rc9"
+    VERSION = "1.6.2"
 end

data/samples/autoproj/README.txt

@@ -0,0 +1,52 @@
+
+             Configuration of your autoproj build
+
+- CMake
+Since everything is CMake based, environment variables such as
+CMAKE_PREFIX_PATH are always picked up. You can set them
+in init.rb too, which will copy them to your env.sh script.
+
+Because of cmake's aggressive caching behaviour, manual options
+given to cmake will be overriden by autoproj later on. To make
+such options permanent, add
+
+  package('package_name').define "OPTION", "VALUE"
+
+in overrides.rb. For instance, to set CMAKE_BUILD_TYPE for the rtt
+package, do
+
+  package('rtt').define "CMAKE_BUILD_TYPE", "Debug"
+
+- Config files
+There are various file that influence your build:
+
+*.yml files: are simple 'key: value' pairs in the YAML format to set
+             config options. This list is limited to what autoproj
+	     knows.
+
+*.rb  files: are ruby scripts that can influence any part of the 
+             autoproj program, without modifying autoproj itself.
+             This is only for advanced users that understand ruby
+	     and the internals of autoproj.
+
+- Configuration options
+
+config.yml:  Save build configuration. You should not change it
+             manually. If you need to change an option, run an
+             autoproj operation with --reconfigure, as for
+             instance
+                  autoproj build --reconfigure
+
+overrides.yml:
+	     Override branch information for specific packages.
+	     Most people leave this to the default, unless they
+	     want to use a feature from an experimental branch.
+
+- Influencing Autoproj ruby code:
+
+init.rb:     Write in this file customization code that will get executed
+	     before autoproj is loaded.
+
+overrides.rb: 
+	     Write in this file customization code that will get
+	     executed after autoproj loaded.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 11
+  prerelease: false
   segments: 
   - 1
   - 6
   - 2
-  - rc9
-  version: 1.6.2.rc9
+  version: 1.6.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 45
         segments: 
         - 1
         - 5
-        - 9
-        version: 1.5.9
+        - 23
+        version: 1.5.23
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -56,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -71,6 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -86,6 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -101,6 +106,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -116,6 +122,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 5
@@ -131,6 +138,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
@@ -146,6 +154,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
@@ -188,6 +197,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
+- samples/autoproj/README.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -198,6 +208,7 @@ files:
 - doc/guide/ext/init.rb
 - doc/guide/ext/previous_next.rb
 - doc/guide/ext/rdoc_links.rb
+- doc/guide/src/adding_packages.page
 - doc/guide/src/autoproj_bootstrap
 - doc/guide/src/customization.page
 - doc/guide/src/default.css
@@ -232,6 +243,7 @@ files:
 - lib/autoproj/osdeps.rb
 - lib/autoproj/system.rb
 - lib/autoproj/version.rb
+- samples/autoproj/README.txt
 - samples/autoproj/init.rb
 - samples/autoproj/manifest
 - samples/autoproj/overrides.rb
@@ -257,19 +269,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: autobuild