autoproj 1.5.8 → 1.6.0.rc1

data/lib/autoproj/system.rb

@@ -24,12 +24,29 @@ module Autoproj
         File.join(root_dir, "autoproj")
     end
 
+    class << self
+        # The directory in which packages will be installed.
+        #
+        # If it is a relative path, it is relative to the root dir of the
+        # installation.
+        #
+        # The default is "install"
+        attr_reader :prefix
+
+        # Change the value of 'prefix'
+        def prefix=(new_path)
+            @prefix = new_path
+            Autoproj.change_option('prefix', new_path, true)
+        end
+    end
+    @prefix = "install"
+
     # Returns the build directory (prefix) for this autoproj installation.
     #
     # If the current directory is not in an autoproj installation, raises
     # UserError.
     def self.build_dir
-	File.join(root_dir, "build")
+        File.expand_path(Autoproj.prefix, root_dir)
     end
 
     # Returns the path to the provided configuration file.
@@ -97,8 +114,10 @@ module Autoproj
                    end
 
         File.open(filename, "w") do |io|
+            variables = []
             Autobuild.environment.each do |name, value|
-                shell_line = "export #{name}=#{value.join(":")}"
+                variables << name
+                shell_line = "#{name}=#{value.join(":")}"
                 if Autoproj.env_inherit?(name)
                     if value.empty?
                         next
@@ -108,6 +127,9 @@ module Autoproj
                 end
                 io.puts shell_line
             end
+            variables.each do |var|
+                io.puts "export #{var}"
+            end
         end
     end
 

data/lib/autoproj/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
-  - 5
-  - 8
-  version: 1.5.8
+  - 6
+  - 0
+  - rc1
+  version: 1.6.0.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -251,11 +252,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild