bake-toolkit 2.51.2 → 2.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8697a5a661d397ab0b18922825cbec08120b390511ca0a57aaa45d9a7c92005f
-  data.tar.gz: 5f30afd19285987fa95a39e5ba0fbf51dfd3cc3c5d352a8d86a95ce168c85829
+  metadata.gz: 652c942772e53a8e02aacd190d4b5c6b7d15c5966727447cc4df221f2cf24843
+  data.tar.gz: 27952eb4784061168c8125bd0825a409e3ea681e9a8d6d4e8288c5f268021ebd
 SHA512:
-  metadata.gz: 177e19aa83ad0525fde24d4e5ae6fb032cb082bb24cbaffb51d24024a6196f725b6be47be1951a86270ad8034573e28c19576e319b2e4218962534527197c6f2
-  data.tar.gz: 1b14989c0d2d91a27bfd1f2dab31268978e35c519f9755c4785df8a33612d13cdd26ef22fe79b55542fecdd50ba157be5de8f644e9b75b627efbf5acbdad4598
+  metadata.gz: 2257e2a91fda80533af002515c7bbfe4e6e8f44ecc719f2ad99ca3ca5d56b3dd4dc2c9e162737da30db73c8c3fa0b99ce36541d1af6e39dd071063305100c501
+  data.tar.gz: 9af48c70d00d6869c9bf59c16e5da761bf29b49b94b9f08ce4a269cc6a32387816ec3a131adc05790badaa176e96ca192e29f73b1051c9b7ce3104ebc66accbb

data/lib/bake/config/loader.rb

@@ -87,13 +87,7 @@ module Bake
 
       # check if config has to be manipulated
       @adaptConfigs.each do |c|
-
-        if isMain
-          @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
-          @mainProjectName = config.parent.name
-          @mainConfigName = config.name
-        end
-
+        
         projSplitted = c.project.split(";")
         confSplitted = c.name.split(";")
         projPatterns = projSplitted.map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
@@ -107,13 +101,28 @@ module Bake
             || (isMain and confSplitted.any? {|p| p == "__MAIN__"}) \
             || confSplitted.any? {|p| p == "__ALL__"}
 
-            conditionProjPattern = c.parent.mainProject.split(";").map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
-            conditionConfPattern = c.parent.mainConfig.split(";").map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
-
-            adaptCondition = (c.parent.toolchain == ""   || c.parent.toolchain == @defaultToolchainName) &&
-              (c.parent.os == ""          || c.parent.os == Utils::OS.name) &&
-              (c.parent.mainProject == "" || conditionProjPattern.any? {|p| p.match(@mainProjectName)}) &&
-              (c.parent.mainConfig ==  "" || conditionConfPattern.any? {|p| p.match(@mainConfigName)})
+            adaptHash = c.parent.getHash
+
+            configHash = {
+              "toolchain"   => [@defaultToolchainName],
+              "os"          => [Utils::OS.name],
+              "mainProject" => [@mainProjectName],
+              "mainConfig"  => [@mainConfigName]
+            }
+            config.scopes.each do |s|
+              configHash[s.name] = [] unless configHash.has_key?(s.name)
+              configHash[s.name] += s.value.split(";")
+            end
+        
+            checkCondition = lambda {|name,value|
+              return true if adaptHash[name].empty?
+              if !configHash.has_key?(name)
+                return adaptHash[name].any?{|ah| ah.empty?}
+              end
+              adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
+            }
+
+            adaptCondition = adaptHash.all? {|name,value| checkCondition.call(name, value)}
 
             invertLogic = (Bake::Metamodel::Unless === c.parent)
             next if (adaptCondition && invertLogic) || (!adaptCondition && !invertLogic)

data/lib/bake/libElement.rb

@@ -53,9 +53,9 @@ module Bake
     def self.addOwnLib(block)
       if block.library
         adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
+        cb = block.library.compileBlock
         if (block.prebuild and File.exist?adaptedPath) or
-           (!block.library.compileBlock.nil? and !block.library.compileBlock.objects.empty?) or
-           (!block.library.compileBlock.nil? and !block.library.compileBlock.calcSources(true, true).empty?)
+           (!cb.nil? and !(cb.calcSources(true, true) - cb.source_files_ignored_in_lib).empty?)
           @@linker_libs_array << adaptedPath
           @@source_libraries << adaptedPath
         end

data/lib/bake/model/metamodel.rb

@@ -30,6 +30,11 @@ module Bake
 
     CompilerType = RGen::MetamodelBuilder::DataTypes::Enum.new( :name => "CompilerType", :literals => [:CPP, :C, :ASM])
 
+    class Scope < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+      has_attr 'value', String, :defaultValueLiteral => ""
+    end
+
     class Flags < ModelElement
       has_attr 'overwrite', String, :defaultValueLiteral => ""
       has_attr 'add', String, :defaultValueLiteral => ""
@@ -137,6 +142,7 @@ module Bake
 
       class Files < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
+        has_attr 'compileOnly', Boolean, :defaultValueLiteral => "false"
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'
       end
@@ -276,6 +282,7 @@ module Bake
         has_attr 'project', String, :defaultValueLiteral => ""
         has_attr 'private', Boolean, :defaultValueLiteral => "false"
         has_attr 'mergeInc', String, :defaultValueLiteral => ""
+        contains_many 'scopes', Scope, 'parent'
         contains_one 'description', Description, 'parent'
         contains_one 'startupSteps', StartupSteps, 'parent'
         contains_one 'preSteps', PreSteps, 'parent'
@@ -336,6 +343,7 @@ module Bake
         has_attr 'mainProject', String, :defaultValueLiteral => ""
         has_attr 'mainConfig', String, :defaultValueLiteral => ""
         contains_many 'config', BaseConfig_INTERNAL, 'parent'
+        contains_many 'scopes', Scope, 'parent'
       end
 
       class If < Adapt

data/lib/bake/model/metamodel_ext.rb

@@ -32,6 +32,27 @@ module Bake
         end
       end
       
+      module Adapt::ClassModule
+        def mapValue(str)
+          str.split(";").map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
+        end
+        def calcHash()
+          @hash = {}
+          deprecated = ["toolchain", "mainConfig", "mainProject", "os"]
+          deprecated.each do |d|
+            @hash[d] = self.send(d).empty? ? [] : mapValue(self.send(d))
+          end
+          self.scopes.each do |s|
+            @hash[s.name] = [] unless @hash.has_key?(s.name)
+            @hash[s.name] += mapValue(s.value)
+          end
+          @hash
+        end
+        def getHash
+          @hash ||= calcHash()
+        end
+      end
+      
       module BaseConfig_INTERNAL::ClassModule
         def qname
           @qname ||= parent.name + "," + name

data/lib/bake/options/options.rb

@@ -24,7 +24,7 @@ module Bake
     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, :skipBuildingLine # Boolean
     attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck, :fileCmd, :profiling # Boolean
-    attr_reader :dotAndCompile
+    attr_reader :dotAndCompile, :show_roots
     attr_reader :threads, :socket # Fixnum
     attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
@@ -91,6 +91,7 @@ module Bake
       @defines = []
       @fileCmd = false
       @dotAndCompile = false
+      @show_roots = false
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| @main_dir = x                           })
@@ -109,7 +110,7 @@ module Bake
       add_option(["--no-autodir",         "--no_autodir"         ], lambda {     @no_autodir = true                      })
 
       add_option(["--create"                                     ], lambda { |x| Bake::Create.proj(x)                    })
-      add_option(["--conversion-info",    "--conversion_info"    ], lambda {     @conversion_info = true                 })
+      add_option(["--conversion-info",    "--conversion_info"    ], lambda {     @conversion_info = true; @syncedOutput = true })
       add_option(["--file-list",          "--file_list"          ], lambda {     @filelist = Set.new                     })
       add_option(["--filter-paths"                               ], lambda {     @projectPaths = true                    })
       add_option(["--qac"                                        ], lambda {     @qac = true                             })
@@ -165,6 +166,8 @@ module Bake
 
       # deprecated and not replaced by new command
       add_option(["--show_include_paths"                         ], lambda {     @show_includes = true                   })
+        
+      add_option(["--roots"                                      ], lambda {     @show_roots = true                      })
 
     end
 
@@ -189,6 +192,11 @@ module Bake
       end
 
       @roots = Root.uniq(@roots)
+      
+      if @show_roots
+        puts @roots.map {|r| r.dir }
+        ExitHelper.exit(0)
+      end
 
       @adapt.uniq!
 

data/lib/bake/options/usage.rb

@@ -54,6 +54,7 @@ module Bake
       puts " --incs-and-defs=json     Prints includes and defines of all projects in json format"
       puts " --incs-and-defs=bake     Used by IDEs plugins"
       puts " --conversion-info        Prints infos for an external tool which converts bake configs for other build systems"
+      puts " --roots                  Prints all workspace roots"
       puts " --file-list              Writes all sources and headers used by a SINGLE config into '<config output folder>/file-list.txt'."
       puts "                          Writes all sources and headers used by ALL configs into '<main config output folder/global-file-list.txt'."
       puts " --prebuild               Does not build configs which are marked as 'prebuild', this feature is used for distributions."

data/lib/bake/toolchain/errorparser/gcc_compiler_error_parser.rb

@@ -4,7 +4,8 @@ module Bake
   class GCCCompilerErrorParser < ErrorParser
 
     def initialize()
-      @error_expression = /([^:]+):([0-9]+)[:0-9]* (catastrophic |fatal )*([A-Za-z\._]+): (.+)/
+      @error_expression =  /([^:]+):([0-9]+)[:0-9]* (catastrophic |fatal )*([A-Za-z\._]+): (.+)/
+      @error_expression2 = /([^:]+)\(([0-9]+)\): (catastrophic |fatal )*([A-Za-z\._]+): (.+)/
     end
 
     def scan_lines(consoleOutput, proj_dir)
@@ -13,6 +14,7 @@ module Bake
       consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
+        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression2) if !(scan_res.length > 0)
         if scan_res.length > 0
           d.file_name = File.expand_path(scan_res[0][0], proj_dir)
           d.line_number = scan_res[0][1].to_i

data/lib/blocks/block.rb

@@ -64,6 +64,10 @@ module Bake
       def set_library(library)
         @library = library
       end
+      
+      def qname()
+        @projectName + "," + @configName
+      end
 
       def initialize(config, referencedConfigs, prebuild, tcs)
         @inDeps = false
@@ -210,6 +214,7 @@ module Bake
       end
 
       def isBuildBlock?
+        return true if Bake.options.conversion_info
         @isBuildBlock ||= calcIsBuildBlock
       end
 
@@ -548,6 +553,7 @@ module Bake
       def calcOutputDir
         if @tcs[:OUTPUT_DIR] != nil
           p = convPath(@tcs[:OUTPUT_DIR])
+          p = p[2..-1] if p.start_with?("./")
           @output_dir = p
         else
           qacPart = Bake.options.qac ? (".qac" + Bake.options.buildDirDelimiter) : ""

data/lib/blocks/compile.rb

@@ -47,7 +47,7 @@ module Bake
 
     class Compile < BlockBase
 
-      attr_reader :objects, :include_list
+      attr_reader :objects, :include_list, :source_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
@@ -526,7 +526,7 @@ module Bake
               end
             end
             @object_files[source] = object
-            @objects << object
+            @objects << object unless @source_files_ignored_in_lib.include?(source)
           end
         end
       end
@@ -534,6 +534,7 @@ module Bake
       def calcSources(cleaning = false, keep = false)
         return @source_files if @source_files and not @source_files.empty?
         @source_files = []
+        @source_files_ignored_in_lib = []
 
         exclude_files = Set.new
         @config.excludeFiles.each do |pr|
@@ -559,6 +560,7 @@ module Bake
             next if source_files.include?(f)
             source_files << f
             @source_files << f
+            @source_files_ignored_in_lib << f if sources.compileOnly
           end
         end
 
@@ -591,7 +593,7 @@ module Bake
           end
         end
 
-        @source_files
+        return @source_files
       end
 
       def calcIncludesInternal(block)

data/lib/blocks/convert.rb

@@ -12,6 +12,10 @@ module Bake
 
       def execute
         Dir.chdir(@projectDir) do
+          calcFileTcs
+          calcIncludes
+          calcDefines
+          calcFlags
           calcSources
 
           puts "START_INFO"
@@ -24,9 +28,9 @@ module Bake
           puts " BAKE_DEFINES"
           (@block.tcs[:COMPILER][:CPP][:DEFINES] + @block.tcs[:COMPILER][:C][:DEFINES] + @block.tcs[:COMPILER][:ASM][:DEFINES]).uniq.each { |s| puts "  #{s}" }
           puts " BAKE_DEPENDENCIES"
-          @block.dependencies.each { |dep| puts "  #{dep.projectName}" }
+          @block.dependencies.each { |dep| puts "  #{ALL_BLOCKS[dep].qname}" }
           puts " BAKE_DEPENDENCIES_FILTERED"
-          @block.dependencies.each { |dep| puts "  #{dep.projectName}" unless @projectName == dep.projectName or dep.projectName == "gmock" or dep.projectName == "gtest" }
+          @block.dependencies.each { |dep| pn = ALL_BLOCKS[dep].projectName; puts "  #{ALL_BLOCKS[dep].qname}" unless @projectName == pn || pn == "gmock" || pn == "gtest" }
           puts "END_INFO"
         end
         return true

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.51.2"
+      "2.52.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.51.2
+  version: 2.52.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext