autorake 2.13 → 2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b95b008d4d21fcd53f281bab5cacdc883a2653a30366e04cac61ab11525a473
-  data.tar.gz: 90448f01970bab9c3a97beac34c880d9726c56baf5855809e6a53c16101b7c5b
+  metadata.gz: 38b38d81398d9d978a224f9252d9cb15e2e2bec52904b85822c6adce9e9b5919
+  data.tar.gz: 9120db4495065ab5a21c9f04c40113df7be020aaffa4fad308c071e29a0c1b2e
 SHA512:
-  metadata.gz: 027562f49fe9f62a8ba52846962b509e3642680eba89087933924acd63542a28ba5ed544cda885a06d1d7e3ecc0cf9a5008cc1d41163b2fa622e2dbbc29bcc0e
-  data.tar.gz: d6b170435c6472d274fab3834ac7a669498ac0c3d9a031f9a20429526148045479ff9dee1e1140a9e14a6ef32a06fda950e8e7d09fac3f0258b74dd387381296
+  metadata.gz: d67224292371165f371d5c4ff1affce3675addef4c30dc5d0da255519cd1d47acf5e3250a057e6fecb4ba6304ab01ecea54b973308eaaa311859afd5882f1e66
+  data.tar.gz: 3c4340d8c10b40b66e69e4f2f47d1449f69ff807cdbff36dc341d46fba945fe6d17e8ee655fd408854a2fb56761536eedc1f67d7c2b40816c4ea30c9dde1582f

data/examples/plainc/mkrf_conf

@@ -6,11 +6,14 @@
 
 require "autorake/mkconfig"
 
+Autorake::Builder.verbose = :keep
+
+
 Autorake.configure {
 
   # Normal header and library lookup
   have_header "stdio.h"     # Look if there is a header of this name.
-  have_library "curses"     # Look for library
+  need_library "curses"     # Look for library
 
   # We #include from there.
   incdir :bar, "INCLUDE/anotherproject"
@@ -27,7 +30,7 @@ Autorake.configure {
 
   disable :weirdfeature do
     # Call it as "./mkrf_conf --enable-weirdfeature" to let it fail.
-    have_library "nonexistent"
+    need_library "nonexistent"
   end
 
 

data/lib/autorake/application.rb

@@ -124,13 +124,13 @@ module Autorake
 
     def version
       require "autorake/version"
-      puts <<-EOT
-#{NAME} #{VERSION}  --  #{SUMMARY}
+      puts <<~EOT
+        #{NAME} #{VERSION}  --  #{SUMMARY}
 
-Copyright: #{COPYRIGHT}
-License:   #{LICENSE}
+        Copyright: #{COPYRIGHT}
+        License:   #{LICENSE}
 
-#{HOMEPAGE}
+        #{HOMEPAGE}
       EOT
       raise Done
     end

data/lib/autorake/compile.rb

@@ -35,19 +35,70 @@ module Autorake
       a.compact!
       a.unshift @cmd
       if Builder.verbose then
-        m = a.join " "
-        puts m
+        puts
+        puts a.join " "
       end
       f = fork do
-        $stderr.reopen "/dev/null" if Builder.quiet
+        $stderr.reopen "/dev/null" if Builder.quiet and not Builder.verbose
         exec *a
       end
       Process.waitpid f
+      print "..." if Builder.verbose
       $?.success? or raise Error, "#{self.class} failed."
     end
 
+
+    class <<self
+      def tmpfiles source
+        TmpFiles.open source, @verbose==:keep do |t|
+          yield t
+        end
+      end
+    end
+
+    class TmpFiles
+
+      class <<self
+        def open source, keep = nil
+          i = new source
+          yield i
+        ensure
+          i.cleanup unless keep
+        end
+        private :new
+      end
+
+      attr_reader :src
+
+      def initialize source
+        @plain = "autorake-tmp-0001"
+        begin
+          @src = "#@plain.c"
+          File.open @src, File::WRONLY|File::CREAT|File::EXCL do |c|
+            c.puts source
+          end
+        rescue Errno::EEXIST
+          @plain.succ!
+          retry
+        end
+      end
+
+      def cpp ; @cpp = "#@plain.cpp" ; end
+      def obj ; @obj = "#@plain.o"   ; end
+      def bin ; @bin = "#@plain"     ; end
+
+      def cleanup
+        File.delete @bin if @bin and File.exists? @bin
+        File.delete @obj if @obj and File.exists? @obj
+        File.delete @cpp if @cpp and File.exists? @cpp
+        File.delete @src
+      end
+
+    end
+
   end
 
+
   class Preprocessor < Builder
 
     def initialize incdirs, macros, *args
@@ -101,46 +152,5 @@ module Autorake
 
   end
 
-
-  class TmpFiles
-
-    class <<self
-      def open source
-        i = new source
-        yield i
-      ensure
-        i.cleanup
-      end
-      private :new
-    end
-
-    attr_reader :src
-
-    def initialize source
-      @plain = "tmp-0001"
-      begin
-        @src = "#@plain.c"
-        File.open @src, File::WRONLY|File::CREAT|File::EXCL do |c|
-          c.puts source
-        end
-      rescue Errno::EEXIST
-        @plain.succ!
-        retry
-      end
-    end
-
-    def cpp ; @cpp = "#@plain.cpp" ; end
-    def obj ; @obj = "#@plain.o"   ; end
-    def bin ; @bin = "#@plain"     ; end
-
-    def cleanup
-      File.delete @bin if @bin and File.exists? @bin
-      File.delete @obj if @obj and File.exists? @obj
-      File.delete @cpp if @cpp and File.exists? @cpp
-      File.delete @src
-    end
-
-  end
-
 end
 

data/lib/autorake/definition.rb

@@ -84,11 +84,16 @@ module Autorake
       else
         l[ /\Alib(.*?)\.so(?:\..*)?\z/, 1]
       end
-      have_library l
+      need_library l
     end
 
     def have_header name
-      c = CheckHeader.new @current, name
+      c = CheckHeader.new @current, name, false
+      @checks.push c
+    end
+
+    def need_header name
+      c = CheckHeader.new @current, name, true
       @checks.push c
     end
 
@@ -103,7 +108,7 @@ module Autorake
     end
     alias have_func have_function
 
-    def have_library name
+    def need_library name
       c = CheckLibrary.new @current, name
       @checks.push c
     end
@@ -193,7 +198,7 @@ module Autorake
     def check!
       super or return
       print "Checking for #{self.class::TYPE} #@name ... "
-      res = TmpFiles.open build_source do |t|
+      res = Builder.tmpfiles build_source do |t|
         compile t
       end
       print "yes"
@@ -209,15 +214,24 @@ module Autorake
   class CheckHeader < Check
     TYPE = "header"
     private
+    def initialize feature, name, need = nil
+      super feature, name
+      @need = need
+    end
     def build_source
-      <<-SRC
-#include <#@name>
+      <<~SRC
+        #include <#@name>
       SRC
     end
     def compile t
       c = Preprocessor.new @config.incdirs, @config.macros, "-w"
       c.cc t.cpp, t.src
     end
+    def check!
+      r = super
+      r or not @need or raise "Can't continue."
+      r
+    end
     def set!
       @config.macros[ "HAVE_HEADER_#{name_upcase}"] = true
       @config.headers.push @name
@@ -229,8 +243,8 @@ module Autorake
     def build_source
       src = ""
       @config.headers.each { |i|
-        src << <<-SRC
-#include <#{i}>
+        src << <<~SRC
+          #include <#{i}>
         SRC
       }
       src
@@ -241,10 +255,10 @@ module Autorake
     TYPE = "macro"
     private
     def build_source
-      super << <<-SRC
-#ifndef #@name
-#error not defined
-#endif
+      super << <<~SRC
+        #ifndef #@name
+        #error not defined
+        #endif
       SRC
     end
     def compile t
@@ -260,11 +274,11 @@ module Autorake
     TYPE = "function"
     private
     def build_source
-      super << <<-SRC
-void dummy( void)
-{
-  void (*f)( void) = (void (*)( void)) #@name;
-}
+      super << <<~SRC
+        void dummy( void)
+        {
+          void (*f)( void) = (void (*)( void)) #@name;
+        }
       SRC
     end
     def compile t
@@ -279,8 +293,8 @@ void dummy( void)
   class CheckLibrary < Check
     TYPE = "library"
     def build_source
-      <<-SRC
-int main( int argc, char *argv[]) { return 0; }
+      <<~SRC
+        int main( int argc, char *argv[]) { return 0; }
       SRC
     end
     def compile t

data/lib/autorake/mkconfig.rb

@@ -31,7 +31,16 @@ module Autorake
     end
 
     attr_accessor :outfile
-    attr_bang :clean, :verbose
+    attr_bang :clean
+
+    def verbose!
+      @verbose = true
+      Builder.verbose ||= @verbose
+    end
+    def keep!
+      Builder.verbose = :keep
+    end
+
 
     def initialize definition
       @definition = definition
@@ -47,6 +56,8 @@ module Autorake
       add_option %w(d dump),    "just dump the results", nil, :dump
       add_option %w(v verbose), "lots of ugly debugging information",
                                                         nil, :verbose!
+      add_option %w(k keep),    "keep temporary files",
+                                                        nil, :keep!
       super
       @definition.directories.each { |k,v|
         add_option %W(dir-#{k}), "set directory #{k}", v, :set_dir, k

data/lib/autorake/version.rb

@@ -5,15 +5,15 @@
 module Autorake
 
   NAME        = "autorake"
-  VERSION     = "2.13".freeze
+  VERSION     = "2.15".freeze
   SUMMARY     = "Automake like project config before Rake build or install."
 
-  DESCRIPTION = <<EOT
-This script allows you to write pretty mkrf_conf scripts
-with autocmd-like functionality.
+  DESCRIPTION = <<~EOT
+    This script allows you to write pretty mkrf_conf scripts
+    with autocmd-like functionality.
 
-The config scripts may be held short and readable.
-EOT
+    The config scripts may be held short and readable.
+  EOT
 
   COPYRIGHT   = "(C) 2009-2019 Bertram Scharpf"
   LICENSE     = "BSD-2-Clause"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autorake
 version: !ruby/object:Gem::Version
-  version: '2.13'
+  version: '2.15'
 platform: ruby
 authors:
 - Bertram Scharpf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,7 +70,7 @@ homepage: http://www.bertram-scharpf.de/software/autorake
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset"
 - utf-8
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Rake
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Automake like project config before Rake build or install.
 test_files: []