autobuild 1.9.2 → 1.9.3.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6091962c49f811cded44e5f054555f732e33ffc9
-  data.tar.gz: 1bacc77f147d5e195035cb395adc4c11f49112a4
+  metadata.gz: 7006a5ebfb5923ee682d7a6cb3917e0a8b86343f
+  data.tar.gz: ff78df5799be57cd850c64cb1eeb23f5f386968a
 SHA512:
-  metadata.gz: acf99d4e1f49fd393f71c6482b67c35283d68f95b1ae12326abd5ed139aa77c3e48965400e3333401494ae0d45a98dd61032987d2ee306890b3d9523e8e1cfcb
-  data.tar.gz: 314c0ba8e3e9ffac67f027b8176785f8ce345551f78f114d27c50634668fb230c678908d3a48f14af7e1cdfe8898a713e7e6b6c39b5157f3dfb191e4a3f10431
+  metadata.gz: e89ad92f96c77f244a8f8400cb7259d3ce2adce2f29641ebfeb3963b18488a27d23aaaea482ac5a35a564073d0ea6fdccfb846cdad825866a38598a33ef9db55
+  data.tar.gz: 70f6411149e3c389446bfb25aba4a5d089afca1ab6a79ffde0702486b730e4caeb53d60519d95e206d3d9e6151235dbc461ae82e14d006b555453a65703d58e7

data/Rakefile

@@ -15,7 +15,7 @@ Utilrb::Rake.hoe do
 
         self.extra_deps <<
             ['rake', '>= 0.9.0'] <<
-            ['utilrb', '>= 1.6.0'] <<
+            ['utilrb', '>= 2.0.0', '< 3.0.0'] <<
             ['highline', '>= 0']
 
         self.test_globs = ['test/suite.rb']

data/lib/autobuild/environment.rb

@@ -17,6 +17,15 @@ module Autobuild
         @macos
     end
 
+    @freebsd = RbConfig::CONFIG["host_os"].include?('freebsd') 
+    def self.freebsd?
+	@freebsd
+    end
+
+    def self.bsd?
+	@freebsd || @macos #can be extended to some other OSes liek NetBSD
+    end
+
     SYSTEM_ENV = Hash.new
     ORIGINAL_ENV = Hash.new
     ENV.each do |k, v|
@@ -46,7 +55,20 @@ module Autobuild
         if windows? then "%s"
         else ". \"%s\""
         end
-	
+
+    LIBRARY_PATH =
+        if macos? then 'DYLD_LIBRARY_PATH'
+        elsif windows? then 'PATH'
+        else 'LD_LIBRARY_PATH'
+        end
+
+    LIBRARY_SUFFIX =
+        if macos? then 'dylib'
+        elsif windows? then 'dll'
+        else 'so'
+        end
+
+
     class << self
         # List of the environment that should be set before calling a subcommand
         #
@@ -451,11 +473,11 @@ module Autobuild
             end
         end
 
-        if !includes || includes.include?('LD_LIBRARY_PATH')
+        if !includes || includes.include?(LIBRARY_PATH)
             ld_library_search = ['lib', 'lib/ARCH', 'libARCHSIZE']
             each_env_search_path(newprefix, ld_library_search) do |path|
-                if !Dir.glob(File.join(path, "lib*.so")).empty?
-                    env_add_path('LD_LIBRARY_PATH', path)
+                if !Dir.glob(File.join(path, "lib*.#{LIBRARY_SUFFIX}")).empty?
+                    env_add_path(LIBRARY_PATH, path)
                 end
             end
         end

data/lib/autobuild/import/archive.rb

@@ -186,6 +186,8 @@ module Autobuild
                 begin
                     if(WINDOWS)
                         get_url_on_windows(@url, "#{cachefile}.partial")
+                    elsif Autobuild.bsd?
+                        Subprocess.run(package, :import, Autobuild.tool('curl'), '-Lso',"#{cachefile}.partial", @url)
                     else
                         additional_options = []
                         if timeout = self.timeout

data/lib/autobuild/packages/cmake.rb

@@ -28,13 +28,24 @@ module Autobuild
             # It can be overriden on a per-package basis with CMake.generator=
             attr_accessor :generator
 
+            attr_reader :prefix_path
             attr_reader :module_path
         end
+        @prefix_path = []
         @module_path = []
         @full_reconfigures = true
 
         # a key => value association of defines for CMake
         attr_reader :defines
+        # The list of all -D options that should be passed on to CMake
+        def all_defines
+            additional_defines = Hash[
+                "CMAKE_INSTALL_PREFIX" => prefix,
+                "CMAKE_MODULE_PATH" => module_path.join(";"),
+                "CMAKE_PREFIX_PATH" => prefix_path.join(";")]
+            self.class.defines.merge(additional_defines).merge(defines)
+        end
+
         # If true, always run cmake before make during the build
         attr_accessor :always_reconfigure
         # If true, we always remove the CMake cache before reconfiguring.
@@ -279,6 +290,25 @@ module Autobuild
             end
         end
 
+        def module_path
+            CMake.module_path
+        end
+
+        def prefix_path
+            seen = Set.new
+            result = Array.new
+
+            raw = (dependencies.map { |pkg_name| Autobuild::Package[pkg_name].prefix } +
+                CMake.prefix_path)
+            raw.each do |path|
+                if !seen.include?(path)
+                    seen << path
+                    result << path
+                end
+            end
+            result
+        end
+
         def prepare
             # A failed initial CMake configuration leaves a CMakeCache.txt file,
             # but no Makefile.
@@ -291,9 +321,7 @@ module Autobuild
             doc_utility.source_ref_dir = builddir
 
             if File.exist?(cmake_cache)
-                all_defines = self.class.defines.merge(defines)
-                all_defines['CMAKE_INSTALL_PREFIX'] = prefix
-                all_defines['CMAKE_MODULE_PATH'] = "#{CMake.module_path.join(";")}"
+                all_defines = self.all_defines
                 cache = File.read(cmake_cache)
                 did_change = all_defines.any? do |name, value|
                     cache_line = cache.each_line.find do |line|
@@ -334,14 +362,14 @@ module Autobuild
                         raise ConfigException.new(self, 'configure'), "#{srcdir} contains no CMakeLists.txt file"
                     end
 
-                    command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_MODULE_PATH=#{CMake.module_path.join(";")}" ]
+                    command = [ "cmake" ]
 
                     if Autobuild.windows?
                         command << '-G' 
                         command << "MSYS Makefiles"
                     end
-					
-                    self.class.defines.merge(defines).each do |name, value|
+
+                    all_defines.each do |name, value|
                         command << "-D#{name}=#{value}"
                     end
                     if generator

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.9.2" unless defined? Autobuild::VERSION
+    VERSION = "1.9.3.b1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3.b1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
@@ -93,7 +99,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
-- ".gemtest"
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -166,12 +171,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms