akro 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cfc55b40c833fc26689d6f9724b557b9b77da6b
-  data.tar.gz: 32be5819893daff110d04e18ffcaf66fb39be062
+  metadata.gz: 4ab35077aadb1258fa54ecfd13766efdfa25abfc
+  data.tar.gz: a5b99d0e7d0ddd1fa232111dd3b85089f49d36cd
 SHA512:
-  metadata.gz: 04c2891f876400791f538b41692c982624200c3e4b5fe3ce6c9ce40c5aca3d98b8e9fb9f7493ec227263e23b4c63e7a1656f8f8c9ef1434185be18450d011208
-  data.tar.gz: 327ef1219233fba4631585251aeac70f1cd1e9d476c4eaac1d70040999d61b73fa8cfc93c4064c6edbba24461e28da64e04eb7a5a653fa7a49bf47afcceb042c
+  metadata.gz: b95c84ba3ff59c354d61a74d4e5034dc3eae61b027613fda0b1e3a5ca1ac549b33be660945231da7ada0dcd40c5e0f18a0d72757f90d8aed6ef9c96fb9b72689
+  data.tar.gz: b583d46338483e265ee078f735b49c9518dac3d0b57794c8173e70a4b55ba129cc3b29473696e30a077cdc491ff3e3e4740ca88a4eb8726e57a162e25787bd0f

data/lib/akro.rb

@@ -19,6 +19,7 @@
 # IN THE SOFTWARE.
 
 require 'rake'
+require 'tempfile'
 
 $VERBOSE_BUILD = false
 
@@ -48,6 +49,7 @@ $STATIC_LIB_EXTENSION = ".a"
 $DYNAMIC_LIB_EXTENSION = ".so"
 
 $LIB_CAPTURE_MAP = Hash.new
+$CAPTURING_LIBS = Set.new
 
 AkroTest = Struct.new("AkroTest", :name, :script, :binary, :cmdline)
 $AKRO_TESTS = []
@@ -133,3 +135,28 @@ module CmdLine
     "#{$LINKER_PREFIX}#{$COMPILER} -shared #{$COMPILE_FLAGS} #{$MODE_COMPILE_FLAGS[mode]} -Wl,-soname,#{soname} -o #{bin} #{objs.join(' ')}#{extra_params}"
   end
 end
+
+# Execute command, redirect output to temporary file, and print if error
+def silent_exec(command, verbose: false, lines_if_error: 200, env: {})
+  Tempfile.open('testout') do |output|
+    puts command if verbose
+    if !system(env, command, [:out, :err] => output)
+      output.close(unlink_now=false)
+      if env.empty?()
+        puts "Command <#{command}> failed:"
+      else
+        envstr = env.map{|k,v| "#{k}=#{v}"}.join(' ')
+        puts "Command <#{envstr} #{command}> failed:"
+      end
+      lines = IO.readlines(output.path)
+      lines = lines[-lines_if_error..-1] if lines.size() > lines_if_error
+      puts lines
+      return false
+    end
+  end
+  return true
+end
+
+def akro_multitask
+  Rake.application.options.enable_multitask = true
+end

data/lib/akrobuild.rake

@@ -341,14 +341,6 @@ def libname(mode, lib)
   "#{mode}/#{lib.path}#{if lib.static then $STATIC_LIB_EXTENSION else $DYNAMIC_LIB_EXTENSION end}"
 end
 
-def invoke_all_capturing_libs(mode)
-  $AKRO_LIBS.each do |lib|
-    if lib.capture_deps 
-      Rake::Task[libname(mode, lib)].invoke
-    end
-  end
-end
-
 $LINK_BINARY_OBJS = Hash.new
 
 rule ".exe" => ->(binary){
@@ -356,6 +348,7 @@ rule ".exe" => ->(binary){
   mode = FileMapper.get_mode(binary)
   cpp = FileMapper.map_obj_to_cpp(obj)
   raise "No proper #{$CPP_EXTENSIONS.join(',')} file found for #{binary}" if cpp.nil?
+  Rake::Task["#{mode}/all_capturing_libs"].invoke
   obj_list = []
   # Two passes through the object list - the capturing libraries will
   # be inserted on the position of the *last* object in the list
@@ -382,6 +375,13 @@ rule ".exe" => ->(binary){
   Builder.link_binary(task.prerequisites[1..-1], task.name)
 end
 
+$MODES.each do |mode|
+  rule /^#{mode}\/all_capturing_libs$/ => $AKRO_LIBS.keep_if{|l| l.capture_deps}.collect{|l| libname(mode, l)} do |task|
+    FileUtils.mkdir_p(mode)
+    FileUtils::touch(task.name)
+  end
+end
+
 rule $STATIC_LIB_EXTENSION => ->(library) {
   mode = FileMapper.get_mode(library)
   srcs = []
@@ -395,19 +395,21 @@ rule $STATIC_LIB_EXTENSION => ->(library) {
     end
   end
   raise "Library #{library} not found!" if libspec.nil?
+  Rake::Task["#{mode}/all_capturing_libs"].invoke if !libspec.capture_deps
   srcs.flatten!
   if libspec.recurse
     objs = Builder.depcache_object_collect(mode, srcs)
   else
     objs = srcs.collect{|src| FileMapper.map_cpp_to_obj(mode, src)}
   end
-  if libspec.capture_deps
+  if libspec.capture_deps && !$CAPTURING_LIBS.include?(library)
     objs.each do |obj|
       if $LIB_CAPTURE_MAP.has_key?(obj)
         raise "Object #{obj} has dependency captures for multiple libraries - #{$LIB_CAPTURE_MAP[obj]} and #{library}"
       end
       $LIB_CAPTURE_MAP[obj] = library
     end
+    $CAPTURING_LIBS << library
   end
   $LINK_BINARY_OBJS[library] = objs
   [FileMapper.map_static_lib_to_linkcmd(library)] + objs
@@ -428,19 +430,22 @@ rule $DYNAMIC_LIB_EXTENSION => ->(library) {
     end
   end
   raise "Library #{library} not found!" if libspec.nil?
+  Rake::Task["#{mode}/all_capturing_libs"].invoke if !libspec.capture_deps
+
   srcs.flatten!
   if libspec.recurse
     objs = Builder.depcache_object_collect(mode, srcs)
   else
     objs = srcs.collect{|src| FileMapper.map_cpp_to_obj(mode, src)}
   end
-  if libspec.capture_deps
+  if libspec.capture_deps && !$CAPTURING_LIBS.include?(library)
     objs.each do |obj|
       if $LIB_CAPTURE_MAP.has_key?(obj)
         raise "Object #{obj} has dependency captures for multiple libraries - #{$LIB_CAPTURE_MAP[obj]} and #{library}"
       end
       $LIB_CAPTURE_MAP[obj] = library
     end
+    $CAPTURING_LIBS << library
   end
   $LINK_BINARY_OBJS[library] = objs
   [FileMapper.map_dynamic_lib_to_linkcmd(library)] + objs
@@ -462,7 +467,6 @@ task :clean do
 end
 
 $MODES.each do |mode|
-  invoke_all_capturing_libs(mode)
   task mode
   task "test_#{mode}"
   $AKRO_BINARIES.each do |bin|
@@ -482,9 +486,7 @@ $MODES.each do |mode|
       base = (if !test.script.nil? then "#{test.script}" else "#{mode}/#{test.binary}" end)
       params = (if !test.cmdline.nil? then " " + test.cmdline else "" end)
       new_ld_path = if ENV.has_key?("LD_LIBRARY_PATH") then "#{mode}/:#{ENV['LD_LIBRARY_PATH']}" else "#{mode}/" end
-      system({"MODE" => mode, "LD_LIBRARY_PATH" => new_ld_path}, base + params) do |ok, res|
-        raise "Test #{task.name} failed" if !ok
-      end
+      raise "Test #{task.name} failed" if !silent_exec(base + params, verbose: $VERBOSE_BUILD, env: {"MODE" => mode, "LD_LIBRARY_PATH" => new_ld_path})
       puts "Test #{task.name} passed"
     end
     Rake::Task["test_#{mode}"].enhance(["#{test.name}_test_#{mode}"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vlad Petric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake