autobuild 1.3.1 → 1.3.2

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.3.2
+* fix stupid issues with the genom package
+* import caller's environment instead of erasing it.
+
 == Version 1.3.1
 * 1.3.* now depend on utilrb, add it to the gem dependency list
 

data/Rakefile

@@ -7,7 +7,7 @@ Hoe.spec 'autobuild' do
     self.summary = 'Rake-based utility to build and install multiple packages with dependencies'
     self.description = self.paragraphs_of('README.txt', 2..5).join("\n\n")
     self.url         = self.paragraphs_of('README.txt', 1).first.split(/\n/)[1..-1].map { |s| s.gsub('* ', '') }
-    self.changes     = self.paragraphs_of('Changes.txt', 0..1).join("\n\n")
+    self.changes     = self.paragraphs_of('Changes.txt', 0..2).join("\n\n")
 
     self.extra_deps <<
         ['rake', '>= 0.7.0'] <<

data/bin/autobuild

@@ -15,10 +15,6 @@ DEFAULT_HTTP_PORT = 2000
 conffile, *packages = Autobuild.commandline(ARGV)
 Autobuild.packages = packages
 
-Autobuild.env_set 'PATH', *(ENV['PATH'].split(":"))
-Autobuild.env_set 'RUBYLIB', *(ENV['PATH'].split(":"))
-Autobuild.env_set 'PKG_CONFIG_PATH', *(ENV['PATH'].split(":"))
-
 # make conffile an absolute path since daemonize mode makes
 # / the current directory
 conffile = File.expand_path(conffile, Dir.pwd)

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.3.1" unless defined? Autobuild::VERSION
+    VERSION = "1.3.2" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/environment.rb

@@ -6,12 +6,17 @@ module Autobuild
 
     # Set a new environment variable
     def self.env_set(name, *values)
-        environment.delete(name)
+        environment[name] = nil
         env_add(name, *values)
     end
     # Adds a new value to an environment variable
     def self.env_add(name, *values)
-        set = environment[name]
+        set = if environment.has_key?(name)
+                  environment[name]
+              else
+                  ENV[name].split(':')
+              end
+
         if !set
             set = Array.new
         elsif !set.respond_to?(:to_ary)

data/lib/autobuild/import/git.rb

@@ -66,8 +66,8 @@ module Autobuild
 
         # Raises ConfigException if the current directory is not a git
         # repository
-        def validates_git_repository
-            if !File.directory?('.git')
+        def validate_srcdir(package)
+            if !File.directory?(File.join(package.srcdir, '.git'))
                 raise ConfigException, "#{Dir.pwd} is not a git repository"
             end
         end
@@ -76,9 +76,8 @@ module Autobuild
         # ID on success, nil on failure. Expects the current directory to be the
         # package's source directory.
         def fetch_remote(package)
+            validate_srcdir(package)
             Dir.chdir(package.srcdir) do
-                validates_git_repository
-
                 Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository, branch)
                 if File.readable?( File.join('.git', 'FETCH_HEAD') )
                     fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
@@ -93,6 +92,7 @@ module Autobuild
         # Returns a Importer::Status object that represents the status of this
         # package w.r.t. the root repository
         def status(package)
+            validate_srcdir(package)
             Dir.chdir(package.srcdir) do
                 remote_commit = fetch_remote(package)
                 if !remote_commit
@@ -166,8 +166,8 @@ module Autobuild
         end
 
         def update(package)
+            validate_srcdir(package)
             Dir.chdir(package.srcdir) do
-                validates_git_repository
                 fetch_commit = fetch_remote(package)
                 if !fetch_commit
                     return

data/lib/autobuild/packages/genom.rb

@@ -121,7 +121,7 @@ module Autobuild
 	    file genomstamp => genom_dependencies
             file genomstamp => srcdir do
                 Dir.chdir(srcdir) do
-                    Autobuild.progress "generating GenoM files for #{package.name}"
+                    Autobuild.progress "generating GenoM files for #{name}"
                     Subprocess.run(name, 'genom', *cmdline)
 		end
             end
@@ -131,7 +131,7 @@ module Autobuild
                 # configure does not depend on the .gen file
                 # since the generation takes care of rebuilding configure
                 # if .gen has changed
-                Autobuild.progress "generating build system for #{package.name}"
+                Autobuild.progress "generating build system for #{name}"
                 Dir.chdir(srcdir) { Subprocess.run(name, 'genom', File.expand_path('autogen')) }
             end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 +02:00
+date: 2009-10-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency