autoproj 1.8.0.rc4 → 1.8.0.rc5

data/bin/autoproj_bootstrap

@@ -737,7 +737,9 @@ fi
                     options.dup
                 end
 
-            if !options[:force]
+            if options[:force]
+                @operating_system = nil
+            else
                 if !@operating_system.nil?
                     return @operating_system
                 elsif Autoproj.has_config_key?('operating_system')
@@ -1734,61 +1736,18 @@ end
 
 DEFS = <<EODEFS
 --- 
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-  arch: 
-  - tar
-  - unzip
-none: ignore
-cvs: 
-  debian,ubuntu: cvs
-build-essential: 
-  debian,ubuntu: build-essential
-  gentoo: ignore
-  arch: ignore
-autotools: 
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  arch: automake autoconf
-cmake: 
-  debian,ubuntu: cmake
-  gentoo: dev-util/cmake
-  arch: cmake
 lsb_release: 
   debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
   arch: ignore
-zlib: 
-  debian,ubuntu: zlib1g-dev
-svn: 
-  debian,ubuntu: subversion
-  gentoo: dev-util/subversion
-  arch: subversion
-libxml2: 
-  debian,ubuntu: libxml2-dev
-  gentoo: dev-libs/libxml2
-  arch: libxml2
-autobuild: gem
-libxslt: 
-  debian,ubuntu: libxslt1-dev
-  gentoo: dev-libs/libxslt
-  arch: libxslt
+  gentoo: sys-apps/lsb-release
+autoproj: gem
 ruby19: 
-  gentoo: 
-  - dev-lang/ruby:1.9
-  - rake
   arch: 
   - ruby
   - rake
+  gentoo: 
+  - dev-lang/ruby:1.9
+  - rake
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
@@ -1812,14 +1771,57 @@ ruby18:
   gentoo: 
   - dev-lang/ruby:1.8
   - rake
+cvs: 
+  debian,ubuntu: cvs
+autobuild: gem
+cmake: 
+  debian,ubuntu: cmake
+  arch: cmake
+  gentoo: dev-util/cmake
+libxml2: 
+  debian,ubuntu: libxml2-dev
+  arch: libxml2
+  gentoo: dev-libs/libxml2
 git: 
-  gentoo: dev-vcs/git
   arch: git
+  gentoo: dev-vcs/git
   ubuntu: git-core
   debian: 
     lenny: git
     default: git-core
-autoproj: gem
+libxslt: 
+  debian,ubuntu: libxslt1-dev
+  arch: libxslt
+  gentoo: dev-libs/libxslt
+svn: 
+  debian,ubuntu: subversion
+  arch: subversion
+  gentoo: dev-util/subversion
+archive: 
+  debian,ubuntu: 
+  - tar
+  - unzip
+  arch: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+none: ignore
+build-essential: 
+  debian,ubuntu: build-essential
+  arch: ignore
+  gentoo: ignore
+autotools: 
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+zlib: 
+  debian,ubuntu: zlib1g-dev
 
 EODEFS
 

data/lib/autoproj/osdeps.rb

@@ -638,7 +638,9 @@ fi
                     options.dup
                 end
 
-            if !options[:force]
+            if options[:force]
+                @operating_system = nil
+            else
                 if !@operating_system.nil?
                     return @operating_system
                 elsif Autoproj.has_config_key?('operating_system')

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.0.rc4"
+    VERSION = "1.8.0.rc5"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: -3630589162
+  hash: -1441156394
   prerelease: 6
   segments: 
   - 1
   - 8
   - 0
   - rc
-  - 4
-  version: 1.8.0.rc4
+  - 5
+  version: 1.8.0.rc5
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -27,7 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3630588932
+        hash: -1441156546
         segments: 
         - 1
         - 6