autoproj 1.8.2 → 1.8.3.rc1

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.8.3
+ * fix broken env.sh when amake <package> or aup <package> are called
+
 = Version 1.8.0
  * fix issues with 1.9.3
  * significantly refactor the osdeps handling. It should make the addition of

data/bin/autoproj_bootstrap

@@ -1733,6 +1733,11 @@ module Autoproj
 
     # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
     def self.export_env_sh(subdir = nil)
+        # Make sure that we have the environment of all selected packages
+        Autoproj.manifest.all_selected_packages.each do |pkg_name|
+            Autobuild::Package[pkg_name].update_environment
+        end
+
         filename = if subdir
                        File.join(Autoproj.root_dir, subdir, "env.sh")
                    else
@@ -1975,6 +1980,7 @@ if ARGV.first != "localdev"
         ARGV.shift
     end
     begin
+        osdeps_management.install(['build-essential'])
         osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])
     rescue Autoproj::ConfigError => e

data/lib/autoproj/autobuild.rb

@@ -437,9 +437,7 @@ module Autoproj::RubyPackage
         end
     end
 
-    def import
-        super
-
+    def update_environment
         Autobuild.update_environment srcdir
         libdir = File.join(srcdir, 'lib')
         if File.directory?(libdir)

data/lib/autoproj/cmdline.rb

@@ -335,6 +335,11 @@ module Autoproj
             # Resolve optional dependencies
             manifest.resolve_optional_dependencies
 
+            # Make sure that we have the environment of all selected packages
+            manifest.all_selected_packages.each do |pkg_name|
+                Autobuild::Package[pkg_name].update_environment
+            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/system.rb

@@ -125,6 +125,11 @@ module Autoproj
 
     # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
     def self.export_env_sh(subdir = nil)
+        # Make sure that we have the environment of all selected packages
+        Autoproj.manifest.all_selected_packages.each do |pkg_name|
+            Autobuild::Package[pkg_name].update_environment
+        end
+
         filename = if subdir
                        File.join(Autoproj.root_dir, subdir, "env.sh")
                    else

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2"
+    VERSION = "1.8.3.rc1"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2
-  prerelease: 
+  version: 1.8.3.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &20293000 !ruby/object:Gem::Requirement
+  requirement: &10008480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *20293000
+  version_requirements: *10008480
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &20292240 !ruby/object:Gem::Requirement
+  requirement: &10007440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *20292240
+  version_requirements: *10007440
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &20291220 !ruby/object:Gem::Requirement
+  requirement: &10021920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *20291220
+  version_requirements: *10021920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20289640 !ruby/object:Gem::Requirement
+  requirement: &10021140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *20289640
+  version_requirements: *10021140
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20288800 !ruby/object:Gem::Requirement
+  requirement: &10020260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *20288800
+  version_requirements: *10020260
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
@@ -157,9 +157,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: autobuild
 rubygems_version: 1.8.11