autorake 2.1.1 → 2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODk3MTNhZjU5MzVlZDQ4OTRiZjFlYWIxYThjYmZhMzJhMGRhN2I3MA==
+    ZGVkY2MwNDQwNWY2YzYwMmE3OGI2MTc4ZGQwNWVlZTNlODhiNzk4Ng==
   data.tar.gz: !binary |-
-    NGY4OTk5MGJkMDI4MjI0MjU5NzE5OTVkZjU5OTEwZGNiMjUwZGY0Zg==
+    Zjg4NWFjZmU0ODExMDU2NWE1MTNhZWMxZGZlMmUyOGYwYzAzM2EyZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDQ4NWUxZjFiYzBhODEzZGQ2MDVjNzRjZjZkZjg2OTExZTFkYTllODdkMWYy
-    ZTI1OGQyZjY5MGVkMjMyYjdiMjkzYjMzZmM1YjM3Njc3YzFmYTVlYTBkNDlm
-    OGExOGE1YmI3M2I4N2JhY2ZjMGY0M2MxMWY1ZjljNDkwMTg2NTg=
+    OGIwMDJlZmM5YzUyOTk1OTk3ZTAwOWEyZmYxZmU2YmVmYzk0ZDFiMTNjNTdk
+    Mzg2OTQxOTM2NTdjMGZiMzY1MTJjNzViZWE4NTg3MWQ1YzcwNTg1NTJlNWI3
+    M2ZlOTQwOTFlZmYyYTZkOTAwNTM1MmYwOWQ2MWQyNjU1NDVjMzY=
   data.tar.gz: !binary |-
-    NmE5YzUwN2M2YWMxMGIxNDhhYmY4YjkwMzRlMTEzZTA5NTkzODM5ZDk2ODVh
-    OWYyODEzZWJiMjBkZGZiZTA1NzUyYzM2ZGJiYWJiNTU2NDI1ZjRmZjlmZGVm
-    YjNhNTRkNGI4YmRjZjA2NjYyZjljYTdmMGExOTZhZTJlZDUzZDA=
+    MTFkYWQ1ZDQ0Mzg5ZTFkOWRiMWEzZWI5Y2MzMTI3ZDlkMWUwZDA0M2E2MzE0
+    MjAzZjdlYWQ0ZTEyNjhkN2RjOTJkNTVjMDg5Njg5YTI3NzVhYTlkNTcwYTc4
+    NzNjOTA3NTg0NWQ2Y2Y2ZDQ5YzMxZTQyMTdhOTI0NTU1ZWExYjA=

data/lib/autorake.rb

@@ -12,7 +12,7 @@ module Autorake
     class <<self
       def extended obj
         obj.load_autorake ENV[ "AUTORAKE_CONFIGURE"]
-        Compiler.verbose = true
+        Builder.verbose = true
       end
     end
 
@@ -25,7 +25,7 @@ module Autorake
     end
 
     def compiler *args
-      CompilerC.new @autorake.incdirs, @autorake.macros, *args
+      Compiler.new @autorake.incdirs, @autorake.macros, *args
     end
 
     def linker *args

data/lib/autorake/compile.rb

@@ -4,7 +4,7 @@
 
 module Autorake
 
-  class Compiler
+  class Builder
 
     class Error < StandardError ; end
 
@@ -13,30 +13,42 @@ module Autorake
     end
 
     def cc *a
-      a.flatten!
-      a.compact!
-      a.unshift ENV[ "CC"] || "cc"
-      message a
-      f = fork do
-        $stderr.reopen "/dev/null" if Compiler.quiet
-        exec *a
-      end
-      Process.waitpid f
-      $?.success? or raise Error, "#{self.class} failed."
+      command "CC", "cc" do build *a end
     end
 
+    def cxx *a
+      command "CXX", "c++" do build *a end
+    end
+    alias cpp cxx
+
     private
 
-    def message a
-      if Compiler.verbose then
+    def command env, default
+      @cmd = ENV[ env] || default
+      yield
+    ensure
+      @cmd = nil
+    end
+
+    def build *a
+      a.flatten!
+      a.compact!
+      a.unshift @cmd
+      if Builder.verbose then
         m = a.join " "
         puts m
       end
+      f = fork do
+        $stderr.reopen "/dev/null" if Builder.quiet
+        exec *a
+      end
+      Process.waitpid f
+      $?.success? or raise Error, "#{self.class} failed."
     end
 
   end
 
-  class CompilerPP < Compiler
+  class Preprocessor < Builder
 
     def initialize incdirs, macros, *args
       @incdirs = incdirs.map { |d| "-I#{d}" }
@@ -51,7 +63,7 @@ module Autorake
       @cflags = e.split if e
     end
 
-    def cc obj, src
+    def build obj, src
       io = [ "-o", obj.to_s, "-c", src.to_s]
       super @cflags, @macros, @incdirs, @args, opt_E, io
     end
@@ -64,7 +76,7 @@ module Autorake
 
   end
 
-  class CompilerC < CompilerPP
+  class Compiler < Preprocessor
 
     private
 
@@ -72,17 +84,17 @@ module Autorake
 
   end
 
-  class Linker < Compiler
+  class Linker < Builder
 
     def initialize libdirs, libs, *args
       @libdirs = libdirs.map { |d| "-Wl,-L#{d}" }
       @libs = libs.map { |d| "-Wl,-l#{d}" }
-    @args = args
+      @args = args
       e = ENV[ "LDFLAGS"]
       @ldflags = e.split if e
     end
 
-    def cc bin, *objs
+    def build bin, *objs
       io = [ "-o", bin.to_s, objs]
       super @ldflags, @libdirs, @libs, @args, io
     end

data/lib/autorake/definition.rb

@@ -28,7 +28,7 @@ module Autorake
     end
 
     def perform
-      Compiler.quiet = true
+      Builder.quiet = true
       c = Configuration.new @environment, @directories
       c.do_env
       c.features.update @features
@@ -197,7 +197,7 @@ module Autorake
       end
       print "yes"
       true
-    rescue Compiler::Error
+    rescue Builder::Error
       print "no"
       false
     ensure
@@ -214,7 +214,7 @@ module Autorake
       SRC
     end
     def compile t
-      c = CompilerPP.new @config.incdirs, @config.macros, "-w"
+      c = Preprocessor.new @config.incdirs, @config.macros, "-w"
       c.cc t.cpp, t.src
     end
     def set!
@@ -247,7 +247,7 @@ module Autorake
       SRC
     end
     def compile t
-      c = CompilerPP.new @config.incdirs, @config.macros, "-w"
+      c = Preprocessor.new @config.incdirs, @config.macros, "-w"
       c.cc t.cpp, t.src
     end
     def check!
@@ -267,7 +267,7 @@ void dummy( void)
       SRC
     end
     def compile t
-      c = CompilerC.new @config.incdirs, @config.macros, "-w"
+      c = Compiler.new @config.incdirs, @config.macros, "-w"
       c.cc t.obj, t.src
     end
     def set!
@@ -283,7 +283,7 @@ int main( int argc, char *argv[]) { return 0; }
       SRC
     end
     def compile t
-      c = CompilerC.new @config.incdirs, @config.macros, "-w"
+      c = Compiler.new @config.incdirs, @config.macros, "-w"
       c.cc t.obj, t.src
       l = Linker.new @config.libdirs, [ @name], "-w"
       l.cc t.bin, t.obj

data/lib/autorake/version.rb

@@ -5,7 +5,7 @@
 module Autorake
 
   NAME        = "autorake"
-  VERSION     = "2.1.1"
+  VERSION     = "2.2"
   SUMMARY     = "Automake like project config before Rake build or install."
 
   DESCRIPTION = <<EOT

data/samples/plainc/Rakefile

@@ -11,7 +11,7 @@ rule ".o" => ".c" do |t|
   c.cc t.name, t.source
 end
 
-task "hello" => "hello.o" do |t|
+file "hello" => "hello.o" do |t|
   l.cc t.name, t.prerequisites
 end
 

data/samples/plainc/hello.c

@@ -7,7 +7,7 @@
     #define SAY_IT
 #endif
 
-int main( int argc, char ** argv)
+int main( int argc, char **argv)
 {
 #ifdef SAY_IT
     printf( "Hello, world!\n");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autorake
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: '2.2'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake