autorake 2.4.3 → 2.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9283e42b88e9467bd88e329e70ab332c19ed8694
+  data.tar.gz: 80072d4b2e24272af48467a9b9f710943a327698
+SHA512:
+  metadata.gz: 5c9f5c46b36d5df91e661dcf78498a6e4160ddb54ad2f56bf5579eaf18d4037e1380f7307397e56c5a72dc2867ac5dc0eaa28c6f47246aa22ea93d35e2db57b1
+  data.tar.gz: 0c7620c1b621f58ffb58749cc09115168dbc21d9eaea321d0f87f54df7d040182d9dd6413ff446715ddd3267bec502267c0a8163ee95fc130bd0096178687c29

data/LICENSE

@@ -5,7 +5,7 @@
   /_/   \_\__,_|\__\___/|_|  \__,_|_|\_\___|
 
 
-Copyright (c) 2009-2013, Bertram Scharpf <software@bertram-scharpf.de>.
+Copyright (c) 2009-2016, Bertram Scharpf <software@bertram-scharpf.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -6,10 +6,11 @@ License: BSD
 
 This project wants to be to Rake what Autocmd is to Make.
 
-Have a look at the self-explaining examples directory.
-
 The script mkrf_conf will build a file .configure that contains
 the whole configuration information. The Rakefile will read it in
 by extending itself. Various #defines will be given in autoconf
 style.
 
+Have a look at the self-explaining examples directory.
+A quick start gives you the files in "examples/plainc/".
+

data/examples/dlcpp/main.cpp

@@ -5,7 +5,7 @@
 #include "dl.h"
 #include <iostream>
 
-int main( int argc, const char *argv)
+int main( int argc, const char **argv)
 {
     try {
         Dl dl( "./hello.so");

data/examples/justinst/Rakefile

@@ -22,9 +22,14 @@ if has? :dial then
   )
 end
 
-ug = { :user => parm[ :user], :group => parm[ :group] }
+if Process.uid == 0 then
+  ug = { :user => parm[ :user], :group => parm[ :group] }
+end
 
-installer "vimfiles", "VIM"
+task :install do
+  dst = expand "VIMFILES"
+  puts "Installing files to '#{dst}'."
+end
 
 installer vims, "VIMFILES", ug
 

data/examples/justinst/plugin/ruby.vim

@@ -12,42 +12,42 @@ function s:Ruby() range
       append "#!! #$! (#{$!.class})"
     end
 .
-endfunc
+endfunction
 
 function s:RubySum() range
   " Build sum of expressions.
   " Everything before :(colon) and after #(hash) is treated as a comment.
   exec a:lastline
-  ruby <<
-    begin
-      $kfm = true
-      _ = eval VIM.evaluate("getline(a:firstline,a:lastline)").map { |l|
-          VIM.numbers_of l
-        }.join( " + ")
-      append "-"*32, ($kfm ? "%.2f" % _ : _.to_s)
-    rescue Exception
-      append "-"*32, "#!! #$! (#{$!.class})"
-    end
+ruby <<
+  begin
+    VIM.kfm = true
+    _ = eval VIM.evaluate("getline(a:firstline,a:lastline)").map { |l|
+      VIM.numbers_of l
+    }.join( " + ")
+    append "-"*32, (VIM.ntos _)
+  rescue Exception
+    append "-"*32, "#!! #$! (#{$!.class})"
+  end
 .
-endfunc
+endfunction
 
 function s:RubySums() range
 ruby <<
   f, l = VIM.evaluate("a:firstline").to_i, VIM.evaluate("a:lastline").to_i
   c = VIM::Buffer.current
   _ = 0
-  $kfm = true
+  VIM.kfm = true
   f.upto l do |i|
     begin
       _ += eval VIM.numbers_of( c[i])
-      c[i] += "  #=> " + ($kfm ? "%.2f" % _ : _.to_s)
+      c[i] += "  #=> " + (VIM.ntos _)
     rescue Exception
       c[i] += "  #!! #$! (#{$!.class})"
       break
     end
   end
 .
-endfunc
+endfunction
 
 
 ruby <<
@@ -55,18 +55,22 @@ ruby <<
 
   module VIM
     class <<self
+      attr_accessor :kfm  # Kaufmännische Zahlen
       def numbers_of line
         line.chomp!
-        line.gsub! /^.*?[:=]/, ""
         line.gsub! /#.*?$/, ""
+        line.gsub! /^.*?[:=]/, ""
         line.gsub! /\d(\.\d{3})+,\d/ do |x|
           x.delete "."
         end
         line.gsub! /(\d+,)-/, "\\100"
         line.gsub! /(\d+),(\d+)(-)?/, "\\3\\1.\\2"
-        $kfm &&= line !~ /(^|[^0-9.])\d+(\.(\d|\d{3,}))?([^0-9.]|$)/
+        @kfm &&= line !~ /(^|[^0-9.])\d+(\.(\d|\d{3,}))?([^0-9.]|$)/
         line =~ /\S/ ? line : "0"
       end
+      def ntos n
+        @kfm ? "%.2f" % n : n.to_s
+      end
     end
   end
   def append *s

data/examples/plainc/Rakefile

@@ -2,26 +2,46 @@
 #  Rakefile  --  build executable
 #
 
+# A simple require statement loads the ".configure" file.
 require "autorake"
 
-c = compiler "-O2"
-l = linker
 
+# The commands we will call
+#
+c = compiler "-O2"        # compile command
+d = compiler "-dM", "-E"  # dump #define macros
+l = linker                # link command
+#
+# Options for -D macros, for include and library directories
+# will be added automatically.
+
+
+# compile rule uses the compile command
 rule ".o" => ".c" do |t|
   c.cc t.name, t.source
 end
 
+# link target uses the link command
 file "hello" => "hello.o" do |t|
   l.cc t.name, t.prerequisites
 end
 
+
 task :default => "hello"
 
 task :clean do
   FileList[ "*.o", "hello"].each { |f| rm_f f }
 end
 
-task :foo do
-  puts "Parameter foo is: %s." % parm[ :foo]
+
+# just show the parameters from ./mkrf_conf
+task :parameters do
+  puts "Parameter `foo' is: `%s'." % parm[ :foo]
+  puts "Parameter `other' is: `%s'." % parm[ :other]
+end
+
+# this task dumps the #define macros to stdout
+task :dump do
+  d.cc "/dev/stdout", "hello.c"
 end
 

data/examples/plainc/hello.c

@@ -7,14 +7,30 @@
     #define SAY_IT
 #endif
 
+#ifdef FEATURE_NOW
+    #include <string.h>
+#endif
+
+
+#define CONFIGFILE WITH_SYSCONF "/myproj.cfg"
+#define DATAFILE   WITH_MYPROJ "/somedata"
+
+
 int main( int argc, char **argv)
 {
+
 #ifdef SAY_IT
     printf( "Hello, world!\n");
 #endif
+
 #ifdef FEATURE_NOW
-    printf( "Now is the time.\n");
+    if (strcmp( WITH_FOO, "dummy") == 0)
+        printf( "Now is the time.\n");
 #endif
+
+    printf( "Config file is: '%s'\n", CONFIGFILE);
+    printf( "Data   file is: '%s'\n", DATAFILE);
+
     return 0;
 }
 

data/examples/plainc/mkrf_conf

@@ -8,13 +8,42 @@ require "autorake/mkconfig"
 
 Autorake.configure {
 
-  have_header "stdio.h"
+  # Normal header and library lookup
+  have_header "stdio.h"     # Look if there is a header of this name.
+  have_library "curses"     # Look for library
 
+  # We #include from there.
+  incdir :bar, "INCLUDE/anotherproject"
+  # We bind in libraries from there
+  libdir :baz, "LIB/anotherproject"
+
+
+  # HAVE_HEADER_NONEXISTENT_H will never be set.
+  have_header "nonexistent.h"
+
+
+  have_macro "__STDC__"  # This cannot go wrong.
+
+
+  disable :weirdfeature do
+    # Call it as "./mkrf_conf --enable-weirdfeature" to let it fail.
+    have_library "nonexistent"
+  end
+
+
+  # Look at macro FEATURE_NOW (twice) in "hello.c" to see what this does.
   disable :now do
-    with :foo, "dummy"
-    # incdir :bar, "/path/to/bar"
-    # libdir :baz, "/path/to/baz"
+    with :foo, 'dummy'
   end
 
+  # The variable will be an integer in "Rakefile" but a string in C code.
+  with :other, 234
+
+
+  # Define a directory and make is accessible through a -D macro.
+  directory :myproj, "DATA/myproj"
+  with :myproj
+  with :sysconf
+
 }
 

data/lib/autorake/application.rb

@@ -38,17 +38,21 @@ module Autorake
           case arg
             when /\A--/ then
               a, val = $'.split "=", 2
-              do_option a do val end
+              do_option a do val || $*.shift end
             when /\A-/ then
               arg = $'
               until (a = arg.slice! 0, 1).empty? do
                 do_option a do
-                  arg.slice! 0, arg.length unless arg.empty?
+                  unless arg.empty? then
+                    arg.slice! 0, arg.length
+                  else
+                    $*.shift
+                  end
                 end
               end
             else
               n, v = arg.split "="
-              environ n, v
+              environ n, v||"1"
           end
         end
       end
@@ -93,8 +97,7 @@ module Autorake
       o or raise "Unknown option: #{a}"
       c = o.call
       if o.arg then
-        g = yield || $*.shift
-        c.push g
+        c.push yield
       end
       send *c
       @rest.delete o

data/lib/autorake/compile.rb

@@ -55,7 +55,7 @@ module Autorake
       @macros = macros.map { |k,v|
         next unless v
         m = "-D#{k}"
-        m << "=#{v}" if String === v
+        m << "=#{v.to_s.inspect}" unless v == true
         m
       }
       @args = args

data/lib/autorake/definition.rb

@@ -32,8 +32,8 @@ module Autorake
       c = Configuration.new @environment, @directories
       c.do_env
       c.features.update @features
-      c.incdirs.push std_incdir
-      c.libdirs.push std_libdir
+      d = @directories.expand "INCLUDE" ; c.incdirs.push d
+      d = @directories.expand "LIB"     ; c.libdirs.push d
       af = @features.keys.map { |k| AddFeature.new k }
       am = @args[ :par].map { |k,v| AddMacro.new k, v }
       ai = @args[ :inc].map { |k,v| AddIncdir.new k, v }
@@ -44,11 +44,8 @@ module Autorake
 
     protected
 
-    def std_incdir ; @directories.expand "INCLUDE" ; end
-    def std_libdir ; @directories.expand "LIB"     ; end
-
     def directory name, dir
-      @directories[ name]= dir
+      @directories[ name] = dir
     end
 
     def feature name, enabled = nil
@@ -67,24 +64,26 @@ module Autorake
       feature name, false, &block
     end
 
-    def with   name, val ; argdef :par, name, val ; end
+    def with name, val = nil ; argdef :par, name, val ; end
 
     def incdir name, dir ; argdef :inc, name, dir ; end
     def libdir name, dir ; argdef :lib, name, dir ; end
 
-    def extending_ruby
+    def extending_ruby full_libname = nil
       if RUBY_VERSION < "1.9" then
         incdir :ruby, RbConfig::CONFIG[ "topdir"]
       else
-        h = RbConfig::CONFIG[ "rubyhdrdir"]
-        incdir :ruby, h
-        incdir :ruby_arch, (File.join h, RbConfig::CONFIG[ "arch"])
-        #incdir :ruby_backward, (File.join h, "ruby/backward")
+        incdir :ruby,      RbConfig::CONFIG[ "rubyhdrdir"]
+        incdir :ruby_arch, RbConfig::CONFIG[ "rubyarchhdrdir"]
       end
-      libdir :ruby, RbConfig::CONFIG[ "libdir"]
+      libdir :ruby,      RbConfig::CONFIG[ "libdir"]
+      libdir :ruby_arch, RbConfig::CONFIG[ "archlibdir"]
       l = RbConfig::CONFIG[ "LIBRUBY"]
-      l.slice! /\Alib/
-      l.slice! /\.so(?:\..*)?\z/
+      l = if full_libname then
+        ":#{l}"
+      else
+        l[ /\Alib(.*?)\.so(?:\..*)?\z/, 1]
+      end
       have_library l
     end
 
@@ -111,12 +110,10 @@ module Autorake
 
     private
 
-    def argdef type, name, dir
-      return unless dir
-      dir.chomp!
-      return if dir.empty?
+    def argdef type, name, val
+      String === val and val.chomp!
       name = "#@current/#{name}" if @current
-      @args[ type][ name.to_sym] = dir
+      @args[ type][ name.to_sym] = val
     end
 
   end
@@ -128,14 +125,16 @@ module Autorake
     end
     def perform config
       @config = config
-      check! and set!
+      relevant? and check! and set!
     ensure
       @config = nil
     end
     private
+    def relevant?
+      not @feature or @config.features[ @feature]
+    end
     def check!
-      not @feature or
-        @config.features[ @feature]
+      true
     end
     def set!
     end
@@ -167,14 +166,15 @@ module Autorake
       @val = val
     end
     private
-    def expanded
-      @config.directories.expand @val
+    def expanded v = nil
+      @config.directories.expand v||@val
     end
   end
   class AddMacro < AddKeyVal
     def set!
-      @config.parameters[ @name] = @val
-      @config.macros[ "WITH_#{name_upcase}"] = @val
+      v = @val || (expanded @name.to_s.upcase)
+      @config.parameters[ @name] = v
+      @config.macros[ "WITH_#{name_upcase}"] = v
     end
   end
   class AddIncdir < AddKeyVal

data/lib/autorake/directories.rb

@@ -29,11 +29,11 @@ module Autorake
     end
 
     def [] key
-      super key.to_sym
+      super key.to_sym.downcase
     end
 
     def []= key, value
-      super key.to_sym, value
+      super key.to_sym.downcase, value
     end
 
     def expanded key

data/lib/autorake/mkconfig.rb

@@ -8,18 +8,28 @@ require "autorake/application"
 module Autorake
 
   class <<self
+
     def configure &block
       d = Definitions.new
       d.instance_eval &block
-      p = MkConfig.new d
+      p = MkConfig.mkconfig.new d
       p.run
       nil
     end
+
   end
 
 
   class MkConfig < Application
 
+    @mkconfig = self
+    class <<self
+      attr_reader :mkconfig
+      def inherited cls
+        @mkconfig = cls
+      end
+    end
+
     attr_accessor :outfile
     attr_bang :clean, :verbose
 
@@ -35,7 +45,7 @@ module Autorake
       add_option %w(c clean),   "delete config file resp. -o outfile",
                                                         nil, :clean!
       add_option %w(d dump),    "just dump the results", nil, :dump
-      add_option %w(v verbose), "lots of ubly debugging information",
+      add_option %w(v verbose), "lots of ugly debugging information",
                                                         nil, :verbose!
       super
       @definition.directories.each { |k,v|
@@ -70,7 +80,11 @@ module Autorake
     end
 
     def set_parm name, val
-      @definition.parameters[ name.to_sym] = val
+      n = name.to_sym
+      if Numeric === @definition.parameters[ n] and val =~ /\A(0x)?\d+\z/ then
+        val = Integer val
+      end
+      @definition.parameters[ n] = val
     end
 
     def set_incdir name, val
@@ -93,14 +107,24 @@ module Autorake
     def execute
       if @clean then
         File.unlink @outfile if File.file? @outfile
+        cleaned
       else
         cfg = @definition.perform
         File.open @outfile, "w" do |f|
           f.write cfg.to_yaml
         end
+        made
       end
     end
 
+    # overwrite this to do additional work
+    def made
+    end
+
+    # overwrite this to do additional work
+    def cleaned
+    end
+
   end
 
 end

data/lib/autorake/version.rb

@@ -5,7 +5,7 @@
 module Autorake
 
   NAME        = "autorake"
-  VERSION     = "2.4.3".freeze
+  VERSION     = "2.7".freeze
   SUMMARY     = "Automake like project config before Rake build or install."
 
   DESCRIPTION = <<EOT
@@ -15,7 +15,7 @@ with autocmd-like functionality.
 The config scripts may be held short and readable.
 EOT
 
-  COPYRIGHT   = "(C) 2013,2014 Bertram Scharpf"
+  COPYRIGHT   = "(C) 2013-2015 Bertram Scharpf"
   LICENSE     = "BSD"
   AUTHOR      = "Bertram Scharpf <software@bertram-scharpf.de>"
   TEAM        = [ "Bertram Scharpf"]

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: autorake
 version: !ruby/object:Gem::Version
-  version: 2.4.3
-  prerelease: 
+  version: '2.7'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '11'
 description: |
   This script allows you to write pretty mkrf_conf scripts
   with autocmd-like functionality.
@@ -39,39 +36,40 @@ extra_rdoc_files:
 - README
 - LICENSE
 files:
-- lib/autorake.rb
-- lib/autorake/application.rb
-- lib/autorake/configure.rb
-- lib/autorake/compile.rb
-- lib/autorake/definition.rb
-- lib/autorake/directories.rb
-- lib/autorake/mkconfig.rb
-- lib/autorake/version.rb
+- LICENSE
+- README
 - examples/dlcpp/Rakefile
-- examples/dlcpp/mkrf_conf
 - examples/dlcpp/dl.cpp
 - examples/dlcpp/dl.h
 - examples/dlcpp/hello.cpp
 - examples/dlcpp/hello.h
 - examples/dlcpp/main.cpp
+- examples/dlcpp/mkrf_conf
 - examples/justinst/Rakefile
 - examples/justinst/mkrf_conf
 - examples/justinst/plugin/dial.vim
 - examples/justinst/plugin/ruby.vim
 - examples/justinst/plugin/yesno.vim
 - examples/plainc/Rakefile
-- examples/plainc/mkrf_conf
 - examples/plainc/hello.c
+- examples/plainc/mkrf_conf
 - examples/rbextend/Rakefile
-- examples/rbextend/mkrf_conf
 - examples/rbextend/hello.c
 - examples/rbextend/hello.h
+- examples/rbextend/mkrf_conf
 - examples/rbextend/rbhello
-- README
-- LICENSE
+- lib/autorake.rb
+- lib/autorake/application.rb
+- lib/autorake/compile.rb
+- lib/autorake/configure.rb
+- lib/autorake/definition.rb
+- lib/autorake/directories.rb
+- lib/autorake/mkconfig.rb
+- lib/autorake/version.rb
 homepage: http://www.bertram-scharpf.de/software/autorake
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options:
 - "--charset"
@@ -81,13 +79,11 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
@@ -95,8 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Rake
 rubyforge_project: NONE
-rubygems_version: 1.8.29
+rubygems_version: 2.6.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automake like project config before Rake build or install.
 test_files: []