autobuild 1.4.2 → 1.4.3

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.4.3
+* minor changes in how the shell environment is managed
+* update LD_LIBRARY_PATH when applicable
+* fix parsing of genom 'require' statements (fix from Matthieu Gallien)
+* fix issues with tracking tags and commits (fix from Matthieu Gallien)
+
 == Version 1.4.2
 * call subversion with the --non-interactive option, otherwise the build will
   block indefinitely. Note that git "questions" are properly passed to the user.

data/lib/autobuild.rb

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

data/lib/autobuild/environment.rb

@@ -1,22 +1,35 @@
 module Autobuild
+    @inherited_environment = Hash.new
     @environment = Hash.new
     class << self
+        attr_reader :inherited_environment
         attr_reader :environment
     end
 
+    def self.env_clear(name)
+        environment[name] = nil
+        inherited_environment[name] = nil
+    end
+
     # Set a new environment variable
     def self.env_set(name, *values)
-        environment[name] = nil
+        env_clear(name)
         env_add(name, *values)
     end
     # Adds a new value to an environment variable
     def self.env_add(name, *values)
         set = if environment.has_key?(name)
                   environment[name]
-              elsif ENV[name]
-                  ENV[name].split(':')
               end
 
+        if !inherited_environment.has_key?(name)
+            if parent_env = ENV[name]
+                inherited_environment[name] = parent_env.split(':')
+            else
+                inherited_environment[name] = Array.new
+            end
+        end
+
         if !set
             set = Array.new
         elsif !set.respond_to?(:to_ary)
@@ -25,7 +38,9 @@ module Autobuild
 
         values.concat(set)
         @environment[name] = values
-        ENV[name] = values.join(":")
+
+        inherited = inherited_environment[name] || Array.new
+        ENV[name] = (values + inherited).join(":")
     end
 
     def self.env_add_path(name, path, *paths)
@@ -57,6 +72,9 @@ module Autobuild
     def self.update_environment(newprefix)
         env_add_path('PATH', "#{newprefix}/bin")
         env_add_path('PKG_CONFIG_PATH', "#{newprefix}/lib/pkgconfig")
+        if File.directory?("#{newprefix}/lib") && !Dir.glob("#{newprefix}/lib/*.so").empty?
+            env_add_path('LD_LIBRARY_PATH', "#{newprefix}/lib")
+        end
 
         # Validate the new rubylib path
         new_rubylib = "#{newprefix}/lib"

data/lib/autobuild/import/git.rb

@@ -32,15 +32,16 @@ module Autobuild
             if gitopts[:branch] && branch
                 raise ConfigException, "git branch specified with both the option hash and the explicit parameter"
             end
-            branch = gitopts[:branch] || branch || 'master'
+            branch = gitopts[:branch] || branch
             tag    = gitopts[:tag]
             commit = gitopts[:commit]
 
-            if (branch && commit) || (branch && commit) || (tag && commit)
+            if (branch && commit) || (branch && tag) || (tag && commit)
                 raise ConfigException, "you can specify only a branch, tag or commit but not two or three at the same time"
             end
-            @branch = branch
-            @commit = tag || commit
+            @branch = branch || 'master'
+            @tag    = tag
+            @commit = commit
             super(common)
         end
 
@@ -48,12 +49,17 @@ module Autobuild
 
         # The branch this importer is tracking
         #
-        # If set, tag has to be nil.
+        # If set, both commit and tag have to be nil.
         attr_accessor :branch
-        # The commit we are pointing to. It can be either a commit ID or a tag
-        # name. 
+
+        # The tag we are pointing to. It is a tag name.
+        #
+        # If set, both branch and commit have to be nil.
+        attr_reader :tag
+
+        # The commit we are pointing to. It is a commit ID.
         #
-        # If set, branch has to be nil.
+        # If set, both branch and tag have to be nil.
         attr_reader :commit
 
         # True if it is allowed to merge remote updates automatically. If false
@@ -78,7 +84,11 @@ module Autobuild
         def fetch_remote(package)
             validate_srcdir(package)
             Dir.chdir(package.srcdir) do
-                Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository, branch)
+                if commit # we are checking out a specific commit. We just call git fetch
+                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository)
+                else
+                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository, branch || tag)
+                end
                 if File.readable?( File.join('.git', 'FETCH_HEAD') )
                     fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
                         delete_if { |l| l =~ /not-for-merge/ }
@@ -174,8 +184,8 @@ module Autobuild
                 end
 
                 # If we are tracking a commit/tag, just check it out and return
-                if commit
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', commit)
+                if commit || tag
+                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', commit || tag)
                     return
                 end
 
@@ -211,9 +221,9 @@ module Autobuild
 
             Dir.chdir(package.srcdir) do
                 # If we are tracking a commit/tag, just check it out
-                if commit
+                if commit || tag
                     Subprocess.run(package.name, :import, Autobuild.tool('git'),
-                        'checkout', commit)
+                        'checkout', commit || tag)
                     return
                 end
 

data/lib/autobuild/package.rb

@@ -255,6 +255,7 @@ module Autobuild
         # and installed.
 	def depends_on(*packages)
 	    packages.each do |p|
+                raise ConfigException, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name
 		unless Package[p]
@@ -271,6 +272,7 @@ module Autobuild
         # listed in +packages+ are aliases for this package.
 	def provides(*packages)
 	    packages.each do |p|
+                raise ConfigException, "#{p.inspect} should be a string" if !p.respond_to? :to_str
 		p = p.to_str
 		next if p == name
 		@@provides[p] = self 

data/lib/autobuild/packages/genom.rb

@@ -46,9 +46,10 @@ module Autobuild
             currentBuffer = nil
             Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{name}.gen") do |cin, out, err|
                 out.each_line do |line|
-                    if line =~ /^\s*(codels_)?requires\s*:.*,$/
-                        currentBuffer = line
-                    elsif currentBuffer
+                    if line =~ /^\s*(codels_)?requires\s*:.*$/
+                        currentBuffer = ""
+                    end
+                    if currentBuffer
                         currentBuffer += line
                         if currentBuffer =~ /^\s*(codels_)?requires\s*:\s*(\"?\s*[\w\-=><0-9.\s]+\s*\"?(?:\s*,\s*\"?\s*[\w\-=><0-9.\s]+\s*\"?)*);/
                             # Remove the codels_requires lines if -a is given to genom

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 +01:00
+date: 2009-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency