autobuild 1.9.0.b3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97d91fdc5b06cf57bc85a29436b8ae83de8bf188
-  data.tar.gz: 366b4196e75cb245ba30e241d3b3b2d57b18919e
+  metadata.gz: 7d3bb942267370ce2e0ae0788d95dbae126bb822
+  data.tar.gz: 1b4d9cd82f441501de25ca9c257bf87e2a2b1a93
 SHA512:
-  metadata.gz: 87f2e924550b4c3568e195e065b8e152091d452c177f5409f27ae637019e6e0643a15fde769f124954f23547981c7ef864fb9944659bd849cc20e35ab3f56d79
-  data.tar.gz: cb5e7f5c663ab02bad5c3d1ade8e1090ab2db8e87056af6d33fdd10fc75fa7f37b6e738c05abe81f0582cd4cc5480a47d204398855335ef1c6733dbb92ab7056
+  metadata.gz: b4c2c503656df061fd82e4defddac037294bff228c62b2d7dba636cea89e22dbfc5e0da42fe497971205a2f20b8184a9b8198da80fc64ef54667b0fb046ac449
+  data.tar.gz: 7fe3027e64442123763bef17d20d433889dd2886c4896914ae3f67b2a11c6ac703d310ed8ff9eacf6bd68e8aa2021995ca924e4feed594bf3e40ac6fef760ee2

data/lib/autobuild/package.rb

@@ -21,25 +21,6 @@ module Autobuild
     #
     # Finally, the build stage actually calls the package's build targets (of
     # the form "package_name-build", which will trigger the build if needed.
-    #
-    # <b>Autodetecting dependencies</b>
-    # There are two sides in dependency autodetection. The first side is that
-    # packages must declare what they provide. One example is the handling of
-    # pkgconfig dependencies: packages must declare that they provide a
-    # pkgconfig definition. This side of the autodetection must be done just
-    # after the package's import, by overloading the #import method:
-    #
-    #   def import
-    #     super
-    #
-    #     # Do autodetection and call Package#provides
-    #   end
-    #
-    # Note that, in most cases, the overloaded import method *must* begin with
-    # "super".
-    #
-    # The other side is the detection itself. That must be done by overloading
-    # the #prepare method.
     class Package
 	@@packages = {}
 	@@provides = {}

data/lib/autobuild/packages/autotools.rb

@@ -133,7 +133,7 @@ module Autobuild
             FileUtils.rm_f configurestamp
         end
 
-        def import(only_local=false)
+        def import(options = Hash.new)
             # We force a regen after the first checkout. The issue is that
             # autotools is less robust than it should, and very often it is
             # better to generate the build system for the system on which we

data/lib/autobuild/packages/cmake.rb

@@ -75,6 +75,24 @@ module Autobuild
             super
         end
 
+        @@defines = Hash.new
+
+        def self.defines
+            @@defines
+        end
+
+        def self.define(name, value)
+            @@defines[name] =
+                if value.respond_to?(:to_str)
+                    value.to_str
+                elsif value
+                    'ON'
+                else
+                    'OFF'
+                end
+        end
+
+
         def define(name, value)
             @defines[name] =
                 if value.respond_to?(:to_str)
@@ -252,7 +270,7 @@ module Autobuild
             end
         end
 
-        def import(only_local=false)
+        def import(options = Hash.new)
             super
 
             Dir.glob(File.join(srcdir, "*.pc.in")) do |file|
@@ -273,7 +291,7 @@ module Autobuild
             doc_utility.source_ref_dir = builddir
 
             if File.exist?(cmake_cache)
-                all_defines = defines.dup
+                all_defines = self.class.defines.merge(defines)
                 all_defines['CMAKE_INSTALL_PREFIX'] = prefix
                 all_defines['CMAKE_MODULE_PATH'] = "#{CMake.module_path.join(";")}"
                 cache = File.read(cmake_cache)
@@ -318,12 +336,12 @@ module Autobuild
 
                     command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_MODULE_PATH=#{CMake.module_path.join(";")}" ]
 
-					if(RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!)
-						command << '-G' 
-						command << "MSYS Makefiles"
-					end
+                    if Autobuild.windows?
+                        command << '-G' 
+                        command << "MSYS Makefiles"
+                    end
 					
-                    defines.each do |name, value|
+                    self.class.defines.merge(defines).each do |name, value|
                         command << "-D#{name}=#{value}"
                     end
                     if generator

data/lib/autobuild/packages/dummy.rb

@@ -12,7 +12,7 @@ module Autobuild
             super
         end
 
-        def import(only_local=false)
+        def import(options = Hash.new)
         end
 
         def prepare

data/lib/autobuild/packages/genom.rb

@@ -17,7 +17,7 @@ module Autobuild
 	    use :autogen => 'autogen'
         end
 
-        def import(only_local=false)
+        def import(options = Hash.new)
 	    super
 	    get_provides
 	end

data/lib/autobuild/packages/orogen.rb

@@ -177,10 +177,6 @@ module Autobuild
             FileUtils.rm_f genstamp 
         end
 
-        def import(only_local=false)
-            super
-        end
-
         def update_environment
             super
             typelib_plugin = File.join(prefix, 'share', 'typelib', 'ruby')

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.9.0.b3" unless defined? Autobuild::VERSION
+    VERSION = "1.9.0" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.9.0.b3
+  version: 1.9.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,14 +169,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms
-test_files:
-- test/suite.rb
+test_files: []