akro 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9cde35182bf4c229ae6c69f93d9b93845dd465b
-  data.tar.gz: b4eddd80a57434cc08afa83573c224a6eacdb4c0
+  metadata.gz: 4edd5eba5c3d173422d004d467b3b1421ca106aa
+  data.tar.gz: 7da62956faa155e9745c302051d400cd1fe10b53
 SHA512:
-  metadata.gz: ee4b34956e2f1e70b517f42aaa7fa58fe27a355695c71d80b2c1ca24beb16e41d7b4eecac1695df45d9d886917876951b72894d4965ce963dbd45372f5a960d7
-  data.tar.gz: c48a54a82ab33aa85a42b5047bc42fa774fcc84222879adbd2813300cdf9de6d7a1c1c3f0eed9417f6c7be4bdbc3bd5bcbd0333738c79ec86ffc6aa379786ca4
+  metadata.gz: e9e183811d8e7a9810ebecd5069835834c7a812b207d4a66b2b381050bf1faadd3f920ac1ebfe32d85c79c3c930ab0ee1b2465d681eb47831fea3faa3cb2ed00
+  data.tar.gz: ad7ae1cba7049a6965cf2de198c95f2a729955fe7cfaac375e9f4346b647deb5aa5aedb86011115646f22ff9fbf3ccf6fe17b96e94a57a5942239674cceb7b11

data/lib/akro.rb

@@ -46,13 +46,8 @@ def windows?
   (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/) != nil
 end
 
-if windows?
-  $HEADER_EXTENSIONS = [".H", ".hpp"]
-  $CPP_EXTENSIONS = [".C", ".cc", ".cpp", ".cxx", ".c++"]
-else
-  $HEADER_EXTENSIONS = [".h", ".hpp", ".H"]
-  $CPP_EXTENSIONS = [".c", ".cc", ".cpp", ".cxx", ".c++", ".C"]
-end
+$HEADER_EXTENSIONS = [".h", ".hpp", ".H"]
+$CPP_EXTENSIONS = [".c", ".cc", ".cpp", ".cxx", ".c++", ".C"]
 $OBJ_EXTENSION = ".o"
 $STATIC_LIB_EXTENSION = ".a"
 if windows?
@@ -83,12 +78,13 @@ $AKRO_BINARIES = []
 $BIN_EXTRA_FLAGS = Hash.new
 
 def add_binaries(*paths)
+  puts("add_binaries call is obsolete. Use add_binary with array instead")
   paths.each do |path|
     $AKRO_BINARIES << path.to_str()
   end
 end
 
-def add_binary(path: nil, additional_link_params: nil)
+def add_binary_internal(path: nil, additional_link_params: nil)
   raise "Must specify path for binary" if path.nil?
   if !additional_link_params.nil? && additional_link_params != ""
     $BIN_EXTRA_FLAGS[path] = additional_link_params
@@ -96,6 +92,17 @@ def add_binary(path: nil, additional_link_params: nil)
   $AKRO_BINARIES << path.to_str()
 end
 
+def add_binary(path: nil, additional_link_params: nil)
+  raise "No path defined" if path.nil?
+  files = path;
+  if !files.kind_of?(Array)
+    files = [path]
+  end
+  files.each do |file|
+    add_binary_internal(path: file, additional_link_params: additional_link_params)
+  end
+end
+
 AkroLibrary = Struct.new("AkroLibrary", :path, :sources, :static, :recurse, :capture_deps, :additional_params)
 $AKRO_LIBS = []
 
@@ -141,7 +148,7 @@ module CmdLine
   def CmdLine.link_cmdline(mode, objs, bin)
     nomodebin = FileMapper.strip_mode(bin)
     per_file_flags = if $BIN_EXTRA_FLAGS.has_key?(nomodebin) then " " + $BIN_EXTRA_FLAGS[nomodebin] else "" end
-    "#{$LINKER_PREFIX}#{$LINKER} #{$LINK_FLAGS} #{$MODE_LINK_FLAGS[mode]} #{objs.join(' ')} #{$ADDITIONAL_LINK_FLAGS}#{per_file_flags} -o #{bin}"
+    "#{$LINKER_PREFIX}#{$LINKER} #{$LINK_FLAGS} #{objs.join(' ')} #{$ADDITIONAL_LINK_FLAGS}#{per_file_flags} #{$MODE_LINK_FLAGS[mode]} -o #{bin}"
   end
   def CmdLine.static_lib_cmdline(objs, bin)
     "#{$AR} rcs #{bin} #{objs.join(' ')}"

data/lib/akrobuild.rake

@@ -74,8 +74,9 @@ module FileMapper
   def FileMapper.map_obj_to_cpp(path)
     raise "#{path} is not a #{$OBJ_EXTENSION} file" if !path.end_with?($OBJ_EXTENSION)
     file = FileMapper.strip_mode(path)
-    file = file[0..-$OBJ_EXTENSION.length-1]   
-    srcs = $CPP_EXTENSIONS.map{|ext| file + ext}.select{|fname| File.exist?(fname)}
+    file = file[0..-$OBJ_EXTENSION.length-1]
+    # Under windows, make_relative_path also canonicalizes the path.
+    srcs = $CPP_EXTENSIONS.map{|ext| file + ext}.select{|fname| File.exist?(fname)}.map{|fname| Util.make_relative_path(fname)}.uniq
     raise "Multiple sources for base name #{file}: #{srcs.join(' ')}" if srcs.length > 1
     srcs.length == 0? nil : srcs[0]
   end
@@ -139,8 +140,6 @@ module FileMapper
     rel_path = Util.make_relative_path(path)
     # file is not local
     return nil if rel_path.nil?
-    #$HEADER_EXTENSIONS.select{|ext| rel_path.end_with?(ext)}.each do |ext|
-    #end
     srcs = $HEADER_EXTENSIONS.select{|ext| rel_path.end_with?(ext)}.collect{ |ext|
       base_path = rel_path[0..-ext.length-1]
       $CPP_EXTENSIONS.map{|cppext| base_path + cppext}.select{|file| File.exist?(file)}
@@ -295,7 +294,7 @@ rule ".dynlinkcmd" => ->(dc) {
   dynlib = FileMapper.map_linkcmd_to_dynamic_lib(dc)
   raise "Internal error - linkcmd not mapped for #{dynlib}" if !$LINK_BINARY_OBJS.has_key?(dynlib)
   mode = FileMapper.get_mode_from_akpath(dc)
-  cmd = CmdLine.dynamic_lib_cmdline(mode, $LINK_BINARY_OBJS[dynlib], "", dynlib)
+  cmd = CmdLine.dynamic_lib_cmdline(mode, $LINK_BINARY_OBJS[dynlib], $LINK_LIBRARY_EXTRAFLAGS[dynlib], dynlib)
   if File.exists?(dc) && File.read(dc).strip == cmd.strip then
     []
   else
@@ -307,7 +306,7 @@ rule ".dynlinkcmd" => ->(dc) {
   FileUtils.mkdir_p(basedir)
   output = File.open(task.name, "w")
   mode = FileMapper.get_mode_from_akpath(task.name)
-  output << CmdLine.dynamic_lib_cmdline(mode, $LINK_BINARY_OBJS[dynlib], "", dynlib) << "\n"
+  output << CmdLine.dynamic_lib_cmdline(mode, $LINK_BINARY_OBJS[dynlib], $LINK_LIBRARY_EXTRAFLAGS[dynlib], dynlib) << "\n"
   output.close
 end
 
@@ -334,7 +333,7 @@ end
 
 rule ".depcache" => ->(dc){
   [FileMapper.map_dc_to_compcmd(dc), FileMapper.map_dc_to_cpp(dc)] + 
-  (File.exist?(dc) ? File.readlines(dc).map{|line| line.strip}: [])
+  (File.exist?(dc) ? File.readlines(dc).map{|line| line.strip}.map{|file| File.exist?(file) ? file : "always"}: [])
 } do |task|
   src = FileMapper.map_dc_to_cpp(task.name)
   Builder.create_depcache(src, task.name)
@@ -356,6 +355,7 @@ def libname(mode, lib)
 end
 
 $LINK_BINARY_OBJS = Hash.new
+$LINK_LIBRARY_EXTRAFLAGS = Hash.new
 
 rule ".exe" => ->(binary){
   obj = binary.gsub(/\.exe$/, $OBJ_EXTENSION)
@@ -462,6 +462,7 @@ rule $DYNAMIC_LIB_EXTENSION => ->(library) {
     $CAPTURING_LIBS << library
   end
   $LINK_BINARY_OBJS[library] = objs
+  $LINK_LIBRARY_EXTRAFLAGS[library] = libspec.additional_params
   [FileMapper.map_dynamic_lib_to_linkcmd(library)] + objs
 } do |task|
   libspec = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akro
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Vlad Petric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake