bake-toolkit 2.34.4 → 2.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a509502821070f924447f0e5690dac7a98efcf3c
-  data.tar.gz: d3ea565246f0a2e940d0cda680edc07cb6807e92
+  metadata.gz: 2bdce1be8c9d734fc44596c799f18524eca9f3c9
+  data.tar.gz: 4a9302c6b3fd75f2888311246cc304d10e807c86
 SHA512:
-  metadata.gz: 9c91af0ff514ce5a5c92b501e73246ce2f4b0981427f0e30cc60febc899f06849a7df4a02689e4d07a86f4c9a38f6eee154b3730383ce8c8760dbbcc0e63f91b
-  data.tar.gz: 76c5d9412bf476a6eb41916a556bf844cf231c9213b2a7edfb528f161cfe9599d11651cae884e009432c078c67eabc628c8cb7109ada25a7c21da659ff748be7
+  metadata.gz: 0c2b3cebcf34dc1910f32cf45e50eb743d2045daf0ac055984159287bee694966220cf21dbca3196b0bdfaa398d4e7a7a4f2d7bf17bf71357c3c3746c7e98907
+  data.tar.gz: 6cf22898b9cb33808f930929bd4dd74347ce01f6d80828b11a853ab7462dc565362078357598104db71d2ddece9bb64d8729fdc97ad52b32464a745231446d68

data/lib/adapt/config/loader.rb

@@ -53,16 +53,16 @@ module Bake
 
     def getPotentialAdaptionProjects()
       potentialAdapts = []
-      Bake.options.roots.each do |r|
+      Bake.options.roots.each do |root|
+        r = root.dir
         if (r.length == 3 && r.include?(":/"))
           r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
         end
         Bake.options.adapt.each do |a|
           adaptBaseName = a + "/Adapt.meta"
           potentialAdapts << adaptBaseName  if File.exists?adaptBaseName
-          fn = r+"/**{,/*/**}/#{adaptBaseName}"
-          potentialAdapts.concat(Dir.glob(fn).sort)
         end
+        potentialAdapts.concat(Root.search_to_depth(r, "Adapt.meta", root.depth))
       end
 
       potentialAdapts.uniq
@@ -71,7 +71,7 @@ module Bake
     def chooseProjectFilenames(potentialAdapts)
       @@filenames = []
       Bake.options.adapt.each do |a|
-        adapts = potentialAdapts.find_all { |p| p.include?(a+"/Adapt.meta") }
+        adapts = potentialAdapts.find_all { |p| p.include?("/"+a+"/Adapt.meta") or p == a+"/Adapt.meta" }
         if adapts.empty?
           Bake.formatter.printError("Adaption project #{a} not found")
           ExitHelper.exit(1)

data/lib/bake/cache.rb

@@ -113,9 +113,7 @@ module Bake
 
             if cache != nil
               puts "Cache: Checking root options: #{cache.workspace_roots.inspect} vs. #{Bake.options.roots.inspect}" if Bake.options.debug
-              if (cache.workspace_roots.length != Bake.options.roots.length) ||
-                (cache.workspace_roots.any? { |a| !Bake.options.roots.include?(a) }) ||
-                (Bake.options.roots.any? { |a| !cache.workspace_roots.include?(a) })
+              if (!Root.equal(cache.workspace_roots, Bake.options.roots))
                 Bake.formatter.printInfo("Info: specified roots differ from cached roots, reloading meta information") if cache.nil?
                 cache = nil
               end

data/lib/bake/config/loader.rb

@@ -331,19 +331,18 @@ module Bake
 
     def checkRoots()
       @potentialProjs = []
-      Bake.options.roots.each do |r|
+      Bake.options.roots.each do |root|
+        r = root.dir
         if (r.length == 3 && r.include?(":/"))
           r = r + Bake.options.main_project_name # glob would not work otherwise on windows (ruby bug?)
         end
-        puts "Checking root #{r}" if Bake.options.verbose >= 1
-        r = r+"/**{,/*/**}/Project.meta"
-        @potentialProjs.concat(Dir.glob(r).sort)
+        depthStr = root.depth.nil? ? "max" : root.depth.to_s
+        puts "Checking root #{r} (depth: #{depthStr})" if Bake.options.verbose >= 1
+        @potentialProjs.concat(Root.search_to_depth(r, "Project.meta", root.depth))
       end
-
-      @potentialProjs = @potentialProjs.uniq
+      @potentialProjs.uniq!
     end
 
-
     def filterStep(step, globalFilterStr)
 
       # 1st prio: explicit single filter

data/lib/bake/options/options.rb

@@ -6,6 +6,7 @@ require 'bake/options/showDoc'
 require 'bake/options/usage'
 require 'bake/options/create'
 require 'common/options/finder'
+require 'common/root'
 
 module Bake
 
@@ -19,7 +20,7 @@ module Bake
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
     attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
-    attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
+    attr_reader :include_filter, :exclude_filter, :adapt # String List
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads # Boolean
     attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse # Boolean
     attr_reader :threads, :socket # Fixnum
@@ -27,6 +28,7 @@ module Bake
     attr_reader :verbose
     attr_reader :filelist # set
     attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
+    attr_reader :roots # Root array
 
 
     def initialize(argv)
@@ -76,13 +78,12 @@ module Bake
       @socket = 0
       @include_filter = []
       @exclude_filter = []
-      @def_roots = []
       @main_project_name = ""
       @adapt = []
       @syncedOutput = false
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
-      add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
+      add_option(["-m"                                           ], lambda { |x| @main_dir = x                           })
       add_option(["-p"                                           ], lambda { |x| @project = x                            })
       add_option(["-f"                                           ], lambda { |x| @filename = x.gsub(/[\\]/,'/')          })
       add_option(["-c"                                           ], lambda {     @clean = true                           })
@@ -164,8 +165,16 @@ module Bake
         ExitHelper.exit(1)
       end
 
-      @roots += @def_roots
-      @roots.uniq!
+      def_roots = Root.calc_roots_bake(@main_dir)
+      @roots += def_roots
+
+      if @roots.empty?
+        @roots = []
+        @roots = Root.calc_def_roots(@main_dir)
+      end
+
+      @roots = Root.uniq(@roots)
+
       @adapt.uniq!
 
       if @project
@@ -270,13 +279,13 @@ module Bake
       check_valid_dir(dir)
       @main_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
       @main_project_name = File::basename(@main_dir)
-      @def_roots = calc_def_roots(@main_dir)
     end
 
     def set_root(dir)
-      check_valid_dir(dir)
-      r = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @roots << r if not @roots.include?r
+      root = Root.extract_depth(dir)
+      check_valid_dir(root.dir)
+      root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
+      @roots << root
     end
 
     def set_adapt(name)

data/lib/bake/options/usage.rb

@@ -21,7 +21,7 @@ module Bake
       puts " -a <scheme>              Use ansi color sequences (console must-- support it). Possible values are 'white' and 'black'."
       puts " -v<level>                Verbose level from 0 to 3, whereas -v0 is less, -v1 is normal (default) and -v2 and -v3 are more verbose."
       puts " -r                       Stop on first error."
-      puts " -w <root>                Add a workspace root (can be used multiple times)."
+      puts " -w <root>[,<depth>]      Add a workspace root (can be used multiple times). Additionally the search depth can be specified (>=0)."
       puts "                          If no root is specified, the parent directory of the main project is added automatically."
       puts " --list                   Lists all configs with a DefaultToolchain."
       puts " --rebuild                Clean before build."

data/lib/bake/util.rb

@@ -112,36 +112,6 @@ def sanitize_filename(filename)
   end
 end
 
-def searchRootsFile(dir)
-  rootsFile = dir+"/roots.bake"
-  return rootsFile if File.exist?(rootsFile)
-
-  parent = File.dirname(dir)
-  return searchRootsFile(parent) if parent != dir
-
-  return nil
-end
-
-def calc_def_roots(dir)
-  def_roots = []
-  rootsFile = searchRootsFile(dir)
-  if (rootsFile)
-    File.open(rootsFile).each do |line|
-      line = line.split("#")[0].strip.gsub(/[\\]/,'/')
-      if line != ""
-        if File.is_absolute?(line)
-          def_roots << line
-        else
-          def_roots << File.expand_path(File.dirname(rootsFile) + "/" + line)
-        end
-      end
-    end
-  else
-    def_roots << File.dirname(dir)
-  end
-  def_roots
-end
-
 def add_line_if_no_comment(array, str)
   s = str.split("#")[0].strip
   array << s unless s.empty?

data/lib/bakery/options/options.rb

@@ -1,12 +1,13 @@
 require 'bake/toolchain/colorizing_formatter'
 require 'common/options/parser'
 require 'common/options/finder'
+require 'common/root'
 
 module Bake
 
   class BakeryOptions < Parser
     attr_reader :collection_name, :collection_dir # String
-    attr_reader :roots # String List
+    attr_reader :roots # Root list
     attr_reader :color, :error # Boolean
     attr_reader :socket # Fixnum
 
@@ -19,10 +20,9 @@ module Bake
       @error = false
       @roots = []
       @socket = 0
-      @def_roots = []
 
       add_option(["-b", ""      ], lambda { |x| set_collection_name(x)                  })
-      add_option(["-m"          ], lambda { |x| set_collection_dir(x)                   })
+      add_option(["-m"          ], lambda { |x| @collection_dir = x                    })
       add_option(["-r"          ], lambda {     @error = true                           })
       add_option(["-a"          ], lambda { |x| Bake.formatter.setColorScheme(x.to_sym) })
       add_option(["-w"          ], lambda { |x| set_root(x)                             })
@@ -32,14 +32,14 @@ module Bake
 
     def usage
       puts "\nUsage: bake <name> [options]"
-      puts " [-b] <name>     Name of the collection to build."
-      puts " -m <dir>        Directory containing the collection file (default is current directory)."
-      puts " -r              Stop on first error."
-      puts " -a <scheme>     Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
-      puts " -h, --help      Print this help."
-      puts " -w <root>       Add a workspace root (can be used multiple times)."
-      puts "                 If no root is specified, the parent directory of Collection.meta is added automatically."
-      puts " --socket <num>  Set socket for sending errors, receiving commands, etc. - used by e.g. Eclipse."
+      puts " [-b] <name>           Name of the collection to build."
+      puts " -m <dir>              Directory containing the collection file (default is current directory)."
+      puts " -r                    Stop on first error."
+      puts " -a <scheme>           Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
+      puts " -h, --help            Print this help."
+      puts " -w <root>[,<depth>]   Add a workspace root (can be used multiple times). Additionally the search depth can be specified (>=0)."
+      puts "                       If no root is specified, the parent directory of Collection.meta is added automatically."
+      puts " --socket <num>        Set socket for sending errors, receiving commands, etc. - used by e.g. Eclipse."
       puts "Note: all parameters except -b, -m and -h will be passed to bake - see bake help for more options."
     end
 
@@ -55,8 +55,15 @@ module Bake
         ExitHelper.exit(1)
       end
 
-      @roots += @def_roots
-      @roots.uniq!
+      def_roots = Root.calc_roots_bake(@collection_dir)
+      @roots += def_roots
+
+      if @roots.empty?
+        @roots = []
+        @roots = Root.calc_def_roots(@collection_dir)
+      end
+
+      @roots = Root.uniq(@roots)
     end
 
     def check_valid_dir(dir)
@@ -81,16 +88,15 @@ module Bake
     def set_collection_dir(dir)
       check_valid_dir(dir)
       @collection_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @def_roots = calc_def_roots(@collection_dir)
     end
 
     def set_root(dir)
-      check_valid_dir(dir)
-      r = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @roots << r if not @roots.include?r
+      root = Root.extract_depth(dir)
+      check_valid_dir(root.dir)
+      root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
+      @roots << root
     end
 
-
   end
 
 end

data/lib/bakery/toBake.rb

@@ -28,9 +28,9 @@ module Bake
     end
 
     toBuildPattern = []
-    @options.roots.each do |r|
+    @options.roots.each do |root|
       col.project.each do |p|
-        projs = Dir.glob(r+"/**/"+p.name+"/Project.meta")
+        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth)
         if projs.length == 0
           toBuildPattern << BuildPattern.new(nil, nil, p) # remember it for sorted info printout
         end

data/lib/blocks/block.rb

@@ -133,7 +133,7 @@ module Bake
 
         # prioo 3: check if dir exists without Project.meta entry
         Bake.options.roots.each do |r|
-          absIncDir = r+"/"+d
+          absIncDir = r.dir+"/"+d
           if File.exists?(absIncDir)
             res << File.rel_from_to_project(@projectDir,absIncDir,false)
           end
@@ -262,16 +262,17 @@ module Bake
         # not true for Windows RubyInstaller packages.
         ctrl_c_found = false
         begin
-          while IO.select([$stdin],nil,nil,0) do
-            nextChar = $stdin.sysread(1)
-            if nextChar == "\x03"
-              ctrl_c_found = true
+          @@mutexStdinSelect.synchronize do
+            while IO.select([$stdin],nil,nil,0) do
+              nextChar = $stdin.sysread(1)
+              if nextChar == "\x03"
+                ctrl_c_found = true
+              end
             end
           end
         rescue Exception => e
         end
         raise AbortException.new if ctrl_c_found
-
         return @result
       end
 
@@ -320,6 +321,7 @@ module Bake
                   Bake.formatter.printError("Error: #{ex1.message}")
                   puts ex1.backtrace if Bake.options.debug
                 end
+
               end
             end
             if !exceptionOccured
@@ -494,6 +496,7 @@ module Bake
         @@threads = []
         @@result = true
         @@mutex = Mutex.new
+        @@mutexStdinSelect = Mutex.new
         Bake::Multithread::Jobs.init_semaphore()
       end
 

data/lib/blocks/compile.rb

@@ -463,7 +463,7 @@ module Bake
       def mapInclude(inc, orgBlock)
 
         if inc.name == "___ROOTS___"
-          return Bake.options.roots.map { |r| File.rel_from_to_project(@projectDir,r,false) }
+          return Bake.options.roots.map { |r| File.rel_from_to_project(@projectDir,r.dir,false) }
         end
 
         i = orgBlock.convPath(inc,nil,true)

data/lib/blocks/makefile.rb

@@ -54,7 +54,7 @@ module Bake
               dirOfP = referencedConfigs[nameOfP].first.get_project_dir
             else
               Bake.options.roots.each do |r|
-                absIncDir = r+"/"+nameOfP
+                absIncDir = r.dir+"/"+nameOfP
                 if File.exists?(absIncDir)
                   dirOfP = absIncDir
                   break

data/lib/common/root.rb

@@ -0,0 +1,92 @@
+module Bake
+
+  class Root
+    attr_accessor :dir
+    attr_accessor :depth
+
+    def initialize(directory,search_depth)
+      @dir = directory
+      @depth = search_depth
+    end
+
+    def self.uniq(array)
+      maxDepth = {}
+      newArray = []
+      array.each do |r|
+        if maxDepth.has_key?r.dir
+          d = maxDepth[r.dir]
+          if !d.nil? && (r.depth.nil? || d < r.depth) # not covered yet
+            newArray << r
+            maxDepth[r.dir] = r.depth
+          end
+        else
+          newArray << r
+          maxDepth[r.dir] = r.depth
+        end
+      end
+      return newArray
+    end
+
+    def self.extract_depth(str)
+      regex = /(.*)\s*,\s*(\d+)\s*\z/
+      scan_res = str.scan(regex)
+      if scan_res.length > 0
+        return Root.new(scan_res[0][0],scan_res[0][1].to_i)
+      else
+        return Root.new(str, nil)
+      end
+    end
+
+    def self.equal(rootArrayA, rootArrayB)
+      return false if rootArrayA.length != rootArrayB.length
+      rootArrayA.each_with_index do |a, i|
+        b = rootArrayB[i]
+        return false if (a.dir != b.dir) || (a.depth != b.depth)
+      end
+      return true
+    end
+
+    def self.searchRootsFile(dir)
+      rootsFile = dir+"/roots.bake"
+      return rootsFile if File.exist?(rootsFile)
+
+      parent = File.dirname(dir)
+      return searchRootsFile(parent) if parent != dir
+
+      return nil
+    end
+
+    def self.calc_roots_bake(dir)
+      def_roots = []
+      rootsFile = searchRootsFile(dir)
+      if (rootsFile)
+        File.open(rootsFile).each do |line|
+          line = line.split("#")[0].strip.gsub(/[\\]/,'/')
+          if line != ""
+            root = Root.extract_depth(line)
+            if !File.is_absolute?(root.dir)
+              root.dir = File.expand_path(File.dirname(rootsFile) + "/" + root.dir)
+            end
+            def_roots << root
+          end
+        end
+      end
+      return def_roots
+    end
+
+    def self.calc_def_roots(dir)
+      return [Root.new(File.dirname(dir), nil)]
+    end
+
+    def self.search_to_depth(root, baseName, depth)
+      if depth != nil
+        array = Array.new(depth+1) {|i| root + '/*'*i + '/' + baseName}
+        return Dir.glob(array).sort
+      else
+        str = "#{root}/**/#{baseName}"
+        return Dir.glob(str).sort
+      end
+    end
+
+  end
+end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.34.4"
+      "2.35.0"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.34.4
+  version: 2.35.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -219,6 +219,7 @@ files:
 - lib/common/options/finder.rb
 - lib/common/options/parser.rb
 - lib/common/process.rb
+- lib/common/root.rb
 - lib/common/utils.rb
 - lib/common/version.rb
 - lib/format/bake_format.rb