bake-toolkit 2.62.0 → 2.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b32e4c31cf5d36f26b6f3287b4c31ec250b5f6ad49118d9b8823351fcccc7a63
-  data.tar.gz: d83e5c807aaa312b9ada14d0f330cf5b0177a7e78489ebd038f32c49c08caaf8
+  metadata.gz: 225fc376c9b3409d01e708f2ec67bb2d80f9c081d26de339d5b4bb3451141e50
+  data.tar.gz: e3769b3550aee5ae45685d8445b0ea3bfec59eea4ffa885900a461c82269b16b
 SHA512:
-  metadata.gz: f3fcbdebee31ec340a3967c11df66e905355551d7a32daa2646573c1e1b004bfcb5aab944bda38fe36bf04fe15b7c91d91948dc4822beb972b7503af72d2f092
-  data.tar.gz: 5981dcc38b1dd5f0001b0fd4218d247499a9ae840619ed851a22f61ba940f0db3e1e840491c393079910f207262b9ceab6464403c9ae8b41aff4599ffb7ea0ee
+  metadata.gz: 419125459eab7fb1ea49939389ff85c43ef6e7ddfd2fdc4bbd555e0a5b8d0e282d28e6e52da5ab3bac1d08d1b5cee4d163315d99bceab7700011aa5f3feda46f
+  data.tar.gz: 3e273c6f6a16f89ba30b1d40c8a787a9439693ba50dd33d4667328c91894b7302ae3c1f6e9f2c4d48078fdbba545270fb5c73ff0158f0e6766bc640774808896

data/bin/bakery

@@ -24,6 +24,8 @@ require_relative "../lib/bakery/buildPattern"
 require_relative '../lib/common/ext/stdout'
 require_relative '../lib/common/cleanup'
 
+require 'json'
+
 module Bake
 
   @options = BakeryOptions.new(ARGV)
@@ -104,6 +106,7 @@ module Bake
 
   exitValue = 0
   abort = false
+  @ideps = {}
   @toBuild.each do |bp|
     currentRun += 1
     p = File.dirname(bp.proj)
@@ -135,6 +138,12 @@ module Bake
       puts e.message
     end
 
+    if Bake.options.dev_features.detect { |x| x.start_with?("dep-overview=") }
+      Bake::ToCxx.include_deps.each do |pdir, deps|
+        @ideps[pdir] = Set.new if !@ideps.has_key?(pdir)
+        @ideps[pdir].merge(deps)
+      end
+    end
     Bake::cleanup
     ExitHelper.reset_exit_code
 
@@ -148,6 +157,22 @@ module Bake
       end
     end
   end
+  
+  dep_json = Bake.options.dev_features.detect { |x| x.start_with?("dep-overview=") }
+  if dep_json
+    # remove duplicates
+    @ideps.each do |m,d| 
+      d.delete_if {|d_tbc| d_tbc.start_with?(m) }
+      d.delete_if {|d_tbc| d.any? {|any_d| d_tbc != any_d && d_tbc.start_with?(any_d + "/") } }
+    end
+    # generate format for output
+    ideps = []
+    @ideps.each do |m,d|
+      ideps << {"module" => m, "dependencies" => d.sort.to_a}
+    end
+    # output
+    File.write(dep_json[13..-1], JSON.pretty_generate(ideps))
+  end
 
   print "\n"
 

data/lib/bake/config/checks.rb

@@ -103,6 +103,10 @@ module Bake
               Bake.formatter.printError("IncludeDir must have inject OR infix (deprecated)", inc)
               ExitHelper.exit(1)
             end
+            if (inc.name.empty? || inc.name[0] == " ")
+              Bake.formatter.printError("IncludeDir must not be empty or start with a space", inc)
+              ExitHelper.exit(1)
+            end
           end if config.respond_to?("includeDir")
 
           if not ["", "yes", "no", "all"].include?config.mergeInc

data/lib/bake/libElement.rb

@@ -60,6 +60,19 @@ module Bake
           @@source_libraries << adaptedPath
         end
       end
+      le = block.library ? block.library : (block.executable ? block.executable : nil)
+      if le
+        cb = le.compileBlock
+        if !cb.nil? && !cb.object_files_ignored_in_lib.nil?
+          cb.object_files_ignored_in_lib.each do |ldirect|
+            adaptedPath, prefix = adaptPath(ldirect, block, prefix)
+            if (!block.prebuild or File.exist?adaptedPath)
+              @@linker_libs_array << adaptedPath
+              @@source_libraries << adaptedPath
+            end
+          end
+        end
+      end
     end
 
     def self.collect_recursive(block, levels = -1)

data/lib/bake/model/metamodel.rb

@@ -147,6 +147,7 @@ module Bake
       class Files < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'compileOnly', Boolean, :defaultValueLiteral => "false"
+        has_attr 'linkDirectly', Boolean, :defaultValueLiteral => "false"
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
       end

data/lib/bake/options/options.rb

@@ -11,13 +11,6 @@ require_relative '../../common/crc32'
 
 module Bake
 
-  def self.options
-    @@options
-  end
-  def self.options=(options)
-    @@options = options
-  end
-
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :showConfigs, :cc2j_filename
     attr_reader :main_dir, :working_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :dotFilename # String
@@ -393,6 +386,14 @@ module Bake
 
   end
 
+  def self.options
+    @@options ||= Options.new([])
+  end
+
+  def self.options=(options)
+    @@options = options
+  end
+
 end
 
 

data/lib/blocks/block.rb

@@ -22,7 +22,7 @@ module Bake
       @@delayed_result = true
       @@threads = []
 
-      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
+      attr_reader :lib_elements, :projectDir, :library, :executable, :config, :projectName, :configName, :prebuild, :output_dir, :tcs
       attr_accessor :visited, :inDeps, :result, :bes, :besDirect
 
       def startupSteps
@@ -64,7 +64,11 @@ module Bake
       def set_library(library)
         @library = library
       end
-      
+
+      def set_executable(executable)
+        @executable = executable
+      end
+
       def qname()
         @projectName + "," + @configName
       end
@@ -74,6 +78,7 @@ module Bake
         @prebuild = prebuild
         @visited = false
         @library = nil
+        @executable = nil
         @config = config
         @referencedConfigs = referencedConfigs
         @projectName = config.parent.name
@@ -119,6 +124,13 @@ module Bake
           resPathMagic = inc[1..-1].join("/") # within self
           resPathMagic = "." if resPathMagic == ""
           res << resPathMagic
+          if warnIfLocal
+            if resPathMagic == "."
+              Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please use \".\" instead", elem)
+            else
+              Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please omit \"#{inc[0]}/\" or use \"./#{resPathMagic}\"", elem) if warnIfLocal
+            end
+          end
         elsif @referencedConfigs.include?(inc[0])
           dirOther = @referencedConfigs[inc[0]].first.parent.get_project_dir
           resPathMagic = File.rel_from_to_project(@projectDir, dirOther, false)
@@ -126,17 +138,19 @@ module Bake
           resPathMagic = resPathMagic + "/" + postfix if postfix != ""
           resPathMagic = "." if resPathMagic == ""
           res << resPathMagic
+          Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please use a Dependency to \"#{inc[0]}\" instead", elem) if warnIfLocal
         end
 
         if File.exists?(@projectDir + "/" + d) # prio 2: local, e.g. "include"
           res << d
         end
 
-        # prioo 3: check if dir exists without Project.meta entry
+        # prio 3: check if dir exists without Project.meta entry
         Bake.options.roots.each do |r|
           absIncDir = r.dir+"/"+d
           if File.exists?(absIncDir)
             res << File.rel_from_to_project(@projectDir,absIncDir,false)
+            Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please create a Project.meta in \"#{absIncDir}\" or upwards and use a Dependency instead", elem) if warnIfLocal && res.length == 1
           end
         end
 
@@ -355,14 +369,14 @@ module Bake
       def callSteps(method)
         @config.writeEnvVars()
         Thread.current[:lastCommand] = nil
-        allSteps = (preSteps + mainSteps + postSteps)
+        @allSteps = (preSteps + mainSteps + postSteps)
         # check if we have to delay the output (if the last step of this block is not in a thread)
         @outputStep = nil
-        allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }
-        while !allSteps.empty?
+        @allSteps.each { |step| @outputStep = independent?(method, step) ? step : nil }
+        while !@allSteps.empty?
           parallel = []
-          while allSteps.first && independent?(method, allSteps.first)
-            parallel << allSteps.shift
+          while @allSteps.first && independent?(method, @allSteps.first)
+            parallel << @allSteps.shift
           end
           if parallel.length > 0
             execute_in_thread(parallel) {
@@ -383,7 +397,7 @@ module Bake
                end
              }
           else
-            step = allSteps.shift
+            step = @allSteps.shift
             Blocks::Block::waitForAllThreads()
             @result = executeStep(step, method) if @result
             @outputStep = nil if !@result && blockAbort?(@result)
@@ -404,13 +418,29 @@ module Bake
           return true
         end
 
-        return true if (@visited)
-        @visited = true
+        SyncOut.mutex.synchronize do
+          if @visited
+            while !defined?(@allSteps) || !@allSteps.empty?
+              sleep(0.1)
+            end
+            return true # maybe to improve later (return false if step has a failed non-independent step)
+          end
+          @visited = true
+        end
 
         @inDeps = true
-        depResult = callDeps(:execute)
+        begin
+          depResult = callDeps(:execute)
+        rescue Exception => e
+          @allSteps = []
+          raise
+        end
+
         @inDeps = false
-        return @result && depResult if blockAbort?(depResult)
+        if blockAbort?(depResult)
+          @allSteps = []
+          return @result && depResult 
+        end
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
         begin
@@ -445,8 +475,9 @@ module Bake
               SyncOut.discardStreams()
             end
           end
+          @allSteps = []
         end
-
+        
         return (depResult && @result)
       end
 

data/lib/blocks/compile.rb

@@ -47,7 +47,7 @@ module Bake
 
     class Compile < BlockBase
 
-      attr_reader :objects, :include_list, :source_files_ignored_in_lib
+      attr_reader :objects, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
@@ -513,6 +513,7 @@ module Bake
       end
 
       def calcObjects
+        @object_files_ignored_in_lib = []
         @source_files.each do |source|
           type = get_source_type(source)
           if not type.nil?
@@ -526,7 +527,13 @@ module Bake
               end
             end
             @object_files[source] = object
-            @objects << object unless @source_files_ignored_in_lib.include?(source)
+            if @source_files_ignored_in_lib.include?(source)
+              if @source_files_link_directly.include?(source)
+                @object_files_ignored_in_lib << object
+              end
+            else
+              @objects << object
+            end
           end
         end
       end
@@ -535,6 +542,7 @@ module Bake
         return @source_files if @source_files and not @source_files.empty?
         @source_files = []
         @source_files_ignored_in_lib = []
+        @source_files_link_directly = []
         @fileTcs = {}
 
         exclude_files = Set.new
@@ -564,11 +572,17 @@ module Bake
             if ((!@fileTcs.has_key?(f)) || singleFile)
               @fileTcs[f] = icf
             end
-            next if exclude_files.include?(f)
-            next if source_files.include?(f)
+            if source_files.include?(f) || exclude_files.include?(f)
+              if (singleFile)
+                @source_files_ignored_in_lib << f if sources.compileOnly || sources.linkDirectly
+                @source_files_link_directly << f if sources.linkDirectly
+              end
+              next
+            end
             source_files << f
             @source_files << f
-            @source_files_ignored_in_lib << f if sources.compileOnly
+            @source_files_ignored_in_lib << f if sources.compileOnly || sources.linkDirectly
+            @source_files_link_directly << f if sources.linkDirectly
           end
         end
 

data/lib/blocks/executable.rb

@@ -6,10 +6,14 @@ module Bake
 
     class Executable < BlockBase
 
+      attr_reader :compileBlock
+
       def initialize(block, config, referencedConfigs, compileBlock)
         super(block, config, referencedConfigs)
         @compileBlock = compileBlock
 
+        block.set_executable(self)
+
         calcArtifactName
         calcMapFile
         calcLinkerScript

data/lib/common/cleanup.rb

@@ -12,7 +12,7 @@ module Bake
       Blocks::Block.reset_block_counter
       Blocks::Block.reset_delayed_result
       Configs::Checks.cleanupWarnings
-      
+      ToCxx::reset_include_deps
     end
 
 end

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -45,10 +45,19 @@ module Bake
   class ToCxx
 
     @@linkBlock = 0
+    @@include_deps = {}
 
     def self.linkBlock
       @@linkBlock = 1
     end
+    
+    def self.include_deps
+      @@include_deps
+    end
+
+    def self.reset_include_deps
+      @@include_deps = {}
+    end
 
     def initialize
       @configTcMap = {}
@@ -232,6 +241,21 @@ module Bake
       end
     end
     
+    def makeDepOverview
+      return if !Bake.options.dev_features.any? {|feature| feature.start_with?("dep-overview=") }
+      Blocks::ALL_BLOCKS.each do |name,block|
+        block.bes.each do |depInc|
+          @@include_deps[block.projectDir] = Set.new if !@@include_deps.has_key?(block.projectDir)
+          if (Metamodel::Dependency === depInc)
+            c = @referencedConfigs[depInc.name].detect { |configRef| configRef.name == depInc.config }
+            @@include_deps[block.projectDir] << Blocks::ALL_BLOCKS[c.qname].projectDir
+          else
+            @@include_deps[block.projectDir] << depInc.name
+          end
+        end
+      end
+    end
+    
     def makeIncs
       Blocks::ALL_BLOCKS.each do |name,block|
         bes2 = []
@@ -692,6 +716,8 @@ module Bake
           makeGraph
           puts "Profiling #{Time.now - $timeStart}: make includes..." if Bake.options.profiling
           makeIncs
+          puts "Profiling #{Time.now - $timeStart}: make dep overview..." if Bake.options.profiling
+          makeDepOverview
           puts "Profiling #{Time.now - $timeStart}: make uniq..." if Bake.options.profiling
           makeUniq
           puts "Profiling #{Time.now - $timeStart}: convert to building blocks..." if Bake.options.profiling

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.62.0
+  version: 2.63.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext