bake-toolkit 2.50.0 → 2.51.0

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -113,25 +113,76 @@ module Bake
       end if configSteps
     end
 
-    def addDependencies(block, config)
-      config.dependency.each do |dep|
-        @referencedConfigs[dep.name].each do |configRef|
-          if configRef.name == dep.config
-
-            if configRef.private && configRef.parent.name != config.parent.name
-              Bake.formatter.printError("#{config.parent.name} (#{config.name}) depends on #{configRef.parent.name} (#{configRef.name}) which is private.", configRef)
-              ExitHelper.exit(1)
+    def addSubDependencies(block, config)
+      subDeps = []
+      config.depInc.each do |dep|
+        if (Metamodel::Dependency === dep)
+          @referencedConfigs[dep.name].each do |configRef|
+            if configRef.name == dep.config
+              blockRef = Blocks::ALL_BLOCKS[configRef.qname]
+              break if blockRef.visited
+              blockRef.visited = true
+
+              subDeps += addSubDependencies(block, configRef)
+              subDeps << dep
+              break
             end
+          end
+        else
+          subDeps << dep if dep.inherit
+        end
+          
+      end
+      @correctOrder << Blocks::ALL_BLOCKS[config.qname] if @corOrderActive
+      return subDeps
+    end
+    
+    def addIncludes(block, config)
+      return if !config.respond_to?("includeDir")
+      config.includeDir.each do |inc|
+        if inc.inject == "front" || inc.infix == "front"
+          
+        elsif inc.inject == "back" || inc.infix == "back"
+        
+        end
+      end
+    
+    end
 
-            block.dependencies << configRef.qname if not Bake.options.project# and not Bake.options.filename
-            blockRef = Blocks::ALL_BLOCKS[configRef.qname]
-            block.childs << blockRef
-            block.depToBlock[dep.name + "," + dep.config] = blockRef
-            blockRef.parents << block
-            break
+    def addDependencies(block, config)
+      Blocks::ALL_BLOCKS.each do |bname, b|
+        b.visited = false
+      end
+      block.visited = true
+
+      block.bes = []
+      block.config.depInc.each do |dep|
+        if (Metamodel::Dependency === dep)
+          @referencedConfigs[dep.name].each do |configRef|
+            if configRef.name == dep.config
+              qname = configRef.qname
+              blockRef = Blocks::ALL_BLOCKS[qname]
+  
+              if configRef.private && configRef.parent.name != config.parent.name
+                Bake.formatter.printError("#{config.parent.name} (#{config.name}) depends on #{configRef.parent.name} (#{configRef.name}) which is private.", configRef)
+                ExitHelper.exit(1)
+              end
+  
+              block.dependencies << qname if not Bake.options.project# and not Bake.options.filename
+              if !blockRef.visited
+                blockRef.visited = true
+                subDeps = addSubDependencies(block, configRef)
+                block.bes += subDeps
+              end
+              block.bes << dep
+              break
+            end
           end
+        else
+          block.bes << dep
         end
       end
+      
     end
 
     def calcPrebuildBlocks
@@ -178,21 +229,59 @@ module Bake
         end
       end
     end
+    
+    def makeIncs
+      Blocks::ALL_BLOCKS.each do |name,block|
+        bes2 = []
+        block.bes.each do |inc|
+          rootsFound = false
+          if Metamodel::IncludeDir === inc
+            if inc.name == "___ROOTS___"
+              Bake.options.roots.each do |r|
+                i = Metamodel::IncludeDir.new
+                i.name = r.dir
+                i.inherit = inc.inherit
+                i.inject = inc.inject
+                i.infix = inc.infix
+                i.parent = inc.parent
+                bes2 << i
+              end
+              rootsFound = true
+            else
+              if inc.parent == block.config 
+                Dir.chdir(block.projectDir) do
+                  i = block.convPath(inc,nil,true)
+                  inc.name  = File.expand_path(Pathname.new(i).cleanpath)
+                end
+              end
+            end
+          end
+          bes2 << inc if !rootsFound
+        end
+        block.bes = bes2
+      end
+    end
 
     def makeGraph
+      mainConfig = @referencedConfigs[Bake.options.main_project_name].select { |c| c.name == Bake.options.build_config }.first
       @referencedConfigs.each do |projName, configs|
         configs.each do |config|
           block = Blocks::ALL_BLOCKS[config.qname]
-            addDependencies(block, config)
+          if (config == mainConfig)
+            @correctOrder = []
+            @corOrderActive = true
+          end
+          addDependencies(block, config)
+          if (config == mainConfig)
+            @correctOrder.unshift(block)
+            @corOrderActive = false
+          end
         end
       end
       Blocks::ALL_BLOCKS.each do |name,block|
         block.dependencies.uniq!
-        block.childs.uniq!
-        block.parents.uniq!
       end
 
-
       # inject dependencies
       num_interations = 0
       begin
@@ -200,44 +289,74 @@ module Bake
           puts "Inject dependencies, iteration #{num_interations}:"
           Blocks::ALL_BLOCKS.each do |name,block|
             puts block.config.qname
-            block.dependencies.each { |d| puts "- #{d}" }
+            block.bes.select{|b| Metamodel::Dependency === b}.each { |d| puts "- #{d.name},#{d.config}" }
           end
         end
 
         counter = 0
-        Blocks::ALL_BLOCKS.each do |name,block|
-          block.getBlocks(:parents).each do |b|
-            b.config.dependency.each do |d|
+        @correctOrder.reverse.each do |block|
+          name = block.config.qname
+          difr = []
+          diba = []
+          block.bes.each do |d|
+            if Metamodel::Dependency === d
               next if d.inject == ""
-
               dqname = "#{d.name},#{d.config}"
-              dblock = Blocks::ALL_BLOCKS[dqname]
               next if name == dqname
-              next if block.childs.include? dblock
-              counter += 1
-              newD = MergeConfig::cloneModelElement(d)
-              newD.setInject("")
-              ls = block.config.getBaseElement
-              dblock.parents << block
-
               if d.inject == "front"
-                block.config.setBaseElement(ls.unshift(newD))
-                block.childs.unshift dblock
-                block.dependencies.unshift dqname if not Bake.options.project
-              else
-                block.config.setBaseElement(ls + [newD])
-                block.childs << dblock
-                block.dependencies << dqname if not Bake.options.project
+                difr << d
+              elsif d.inject == "back"
+                diba << d
+              end
+              d.inject = "" # this prevents injecting to injected deps
+              d.setInjected
+            elsif Metamodel::IncludeDir === d
+              if d.inject == "front" || d.infix == "front"
+                difr << d
+              elsif d.inject == "back" || d.infix == "back" 
+                diba << d
               end
-              block.depToBlock[d.name + "," + d.config] = dblock
+              d.inject = "" # this prevents injecting to injected deps
+              d.infix = ""
+            end
+          end
+          next if difr.empty? && diba.empty?
 
+          block.bes.each do |dep|
+            next unless Metamodel::Dependency === dep
+            if dep.injected?
+              difr2 = difr.select{|d| Metamodel::IncludeDir === d }
+              diba2 = diba.select{|d| Metamodel::IncludeDir === d }
+            else
+              difr2 = difr
+              diba2 = diba
             end
+          
+            fde = Blocks::ALL_BLOCKS[dep.name+","+dep.config]
+            l1 = fde.bes.length 
+            fde.bes = (difr2 + fde.bes + diba2).uniq # .select{|d| !(Metamodel::Dependency===d) || d.name != dep.name || d.config != dep.config }
+            l2 = fde.bes.length
+            counter += 1 if (l2 != l1)
           end
         end
         num_interations += 1
       end while counter > 0
     end
 
+    def makeUniq
+      Blocks::ALL_BLOCKS.each do |name,block|
+        bes2 = []
+        blockSet = Set.new
+        block.bes.each do |b|
+          n = Metamodel::Dependency === b ? b.name+","+b.config : b.name + "," + b.inherit.to_s
+          next if blockSet.include?n
+          blockSet << n
+          bes2 << b
+        end
+        block.bes = bes2
+      end
+    end
+
     def makeDot
 
         File.open(Bake.options.dot, 'w') do |file|
@@ -523,20 +642,33 @@ module Bake
           Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
           Bake.options.eclipseOrder = @mainConfig.defaultToolchain.eclipseOrder
 
+          puts "Profiling #{Time.now - $timeStart}: create base toolchains..." if Bake.options.profiling
           createBaseTcsForConfig
+          puts "Profiling #{Time.now - $timeStart}: substitute variables..." if Bake.options.profiling
           substVars
+          puts "Profiling #{Time.now - $timeStart}: toolchains..." if Bake.options.profiling
           createTcsForConfig
-
           @@linkBlock = 0
-
           @prebuild = nil
-          calcPrebuildBlocks if Bake.options.prebuild
-
+          if Bake.options.prebuild
+            puts "Profiling #{Time.now - $timeStart}: create prebuild blocks..." if Bake.options.profiling
+            calcPrebuildBlocks
+          end
+          puts "Profiling #{Time.now - $timeStart}: make blocks..." if Bake.options.profiling
           makeBlocks
+          puts "Profiling #{Time.now - $timeStart}: make graph..." if Bake.options.profiling
           makeGraph
-          makeDot if Bake.options.dot
-
+          puts "Profiling #{Time.now - $timeStart}: make includes..." if Bake.options.profiling
+          makeIncs
+          puts "Profiling #{Time.now - $timeStart}: make uniq..." if Bake.options.profiling
+          makeUniq
+          if Bake.options.dot
+            puts "Profiling #{Time.now - $timeStart}: make dot..." if Bake.options.profiling
+            makeDot
+          end
+          puts "Profiling #{Time.now - $timeStart}: convert to building blocks..." if Bake.options.profiling
           convert2bb
+
         ensure
           if Bake.options.show_includes || Bake.options.show_includes_and_defines
             Thread.current[:stdout] = orgStdout
@@ -559,6 +691,8 @@ module Bake
         ideAbort = false
         Blocks::Block.reset_delayed_result
 
+        puts "Profiling #{Time.now - $timeStart}: start build..." if Bake.options.profiling
+
         begin
           Blocks::Block.init_threads()
           result = callBlocks(startBlocks, :startup, true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.50.0
+  version: 2.51.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext