bake-toolkit 2.49.0 → 2.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8844fa101183b5ecb09b0044a22a62114fd6c44b0159073b8dc3384aacd59998
-  data.tar.gz: 94959e16d1b765730b022c485b85653102d0c61abb33ff51cb4234354bb05555
+  metadata.gz: ce5efe331210cc1e31546df0f648bf989d173ed5095cd3cd3ebf6e423941fe77
+  data.tar.gz: 8b9e09c9436b098878e281d02159bb2371b53c1d03ab0e1893b2a282dd8646e7
 SHA512:
-  metadata.gz: 6f778ac7fbed30cbf74b8899b82143f151975f9dd7a0d17fbf12142c379df6285e3a90420be10ddcfa2a97e1b175f9aef2f505fc9aa1a36a4b75c96859981c23
-  data.tar.gz: 452e34af50623a715ac25f417d37f00946a8abb7af1a55552f6c5f6e1cf3ad297e27f83992f3ba0c4279d43379ad602b028d62de6baf2892f94d1d8b938fb663
+  metadata.gz: d07d87f5322ad4d941b4da672eeb34c2da3f2d3e310c110b584e30fe01486a793918e74090fdb1adb5aa1e3005e62ad923ecf65a5af49d4a085d3534047cdc22
+  data.tar.gz: 4749a9fe550431e99305835df4c26b109e9145aef758f345f1fde3fd4823ec3c18c6b2e2e28d54da8519d0863aa16b607886b299053cc309383128fcb6956b5e

data/lib/bake/config/loader.rb

@@ -88,25 +88,32 @@ 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
+        if isMain
+          @defaultToolchainName = config.defaultToolchain.basedOn unless config.defaultToolchain.nil?
+          @mainProjectName = config.parent.name
+          @mainConfigName = config.name
+        end
 
-      projPattern = /\A#{c.project.gsub("*", "(\\w*)")}\z/
-      confPattern = /\A#{c.name.gsub("*", "(\\w*)")}\z/
+        projSplitted = c.project.split(";")
+        confSplitted = c.name.split(";")
+        projPatterns = projSplitted.map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ }
+        confPatterns = confSplitted.map { |p| /\A#{p.gsub("*", "(\\w*)")}\z/ } 
 
-       if projPattern.match(config.parent.name) or (projName == Bake.options.main_project_name and c.project == "__MAIN__") or c.project == "__ALL__"
-          if confPattern.match(config.name) or (isMain and c.name == "__MAIN__") or c.name == "__ALL__"
+        if projPatterns.any? {|p| p.match(config.parent.name) } \
+          || (projName == Bake.options.main_project_name and projSplitted.any? {|p| p == "__MAIN__"}) \
+          || projSplitted.any? {|p| p == "__ALL__"}
+            
+          if confPatterns.any? {|p| p.match(config.name)} \
+            || (isMain and confSplitted.any? {|p| p == "__MAIN__"}) \
+            || confSplitted.any? {|p| p == "__ALL__"}
 
-            conditionProjPattern = /\A#{c.parent.mainProject.gsub("*", "(\\w*)")}\z/
-            conditionConfPattern = /\A#{c.parent.mainConfig.gsub("*", "(\\w*)")}\z/
+            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.match(@mainProjectName).nil?) &&
-              (c.parent.mainConfig ==  "" || !conditionConfPattern.match(@mainConfigName).nil?)
+              (c.parent.mainProject == "" || conditionProjPattern.any? {|p| p.match(@mainProjectName)}) &&
+              (c.parent.mainConfig ==  "" || conditionConfPattern.any? {|p| p.match(@mainConfigName)})
 
             invertLogic = (Bake::Metamodel::Unless === c.parent)
             next if (adaptCondition && invertLogic) || (!adaptCondition && !invertLogic)

data/lib/bake/model/metamodel.rb

@@ -79,6 +79,7 @@ module Bake
       class Compiler < ModelElement
         has_attr 'ctype', CompilerType
         has_attr 'command', String, :defaultValueLiteral => ""
+        has_attr 'cuda', Boolean, :defaultValueLiteral => "false"
         has_attr 'prefix', String, :defaultValueLiteral => ""
         contains_many 'define', Define, 'parent'
         contains_many 'flags', Flags, 'parent'

data/lib/bake/options/options.rb

@@ -23,7 +23,7 @@ module Bake
     attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
     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, :oldLinkOrder, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck # Boolean
+    attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse, :caseSensitivityCheck, :fileCmd, :mergeInc # Boolean
     attr_reader :threads, :socket # Fixnum
     attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
@@ -88,6 +88,8 @@ module Bake
       @syncedOutput = false
       @diabCaseCheck = false
       @defines = []
+      @fileCmd = false
+      @mergeInc = false
 
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| @main_dir = x                           })
@@ -121,7 +123,8 @@ module Bake
       add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
       add_option(["-nb"                                          ], lambda {     @skipBuildingLine = true                })
       add_option(["--no-case-check"                              ], lambda {     @caseSensitivityCheck = false           })
-
+      add_option(["--file-cmd"                                   ], lambda {     @fileCmd = true                         })
+      add_option(["--merge-inc"                                   ], lambda {    @mergeInc = true                        })
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
       add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
       add_option(["-j",                   "--threads"            ], lambda { |x, dummy1, dummy2| set_threads(x)          })

data/lib/bake/options/usage.rb

@@ -61,6 +61,8 @@ module Bake
       puts " --nb                     Suppresses the lines \"**** Building x of y: name (config) ****"
       puts " --crc32 <string>         Calulates the CRC32 of string (0x4C11DB7, init 0, final xor 0, input and result not reflected), used for Uid variable calculation"
       puts " --diab-case-check        When compiling with DCC, this switches to the case check on Windows machines. No actual compilation is done."
+      puts " --file-cmd               Writes arguments into a file and hands it over the compiler/archiver/linker. Works only for supported compilers."
+      puts " --merge-inc              Merges includes together, so the compiler gets only one include directory."
       puts " --link-2-17              DEPRECATED: Using link order of libraries which was used until bake 2.17"
       puts " --build_                 DEPRECATED: build directories will be build_<name> instead of build/<name>"
       puts " --version                Print version."

data/lib/bake/toolchain/diab.rb

@@ -17,7 +17,8 @@ module Bake
       :COMPILE_FLAGS => "-c",
       :DEP_FLAGS => "-Xmake-dependency=5 -Xmake-dependency-savefile=",
       :DEP_FLAGS_SPACE => false,
-      :PREPRO_FLAGS => "-P"
+      :PREPRO_FLAGS => "-P",
+      :FILE_COMMAND => "@"
     })
 
     DiabChain[:COMPILER][:CPP] = Utils.deep_copy(DiabChain[:COMPILER][:C])
@@ -32,7 +33,8 @@ module Bake
 
     DiabChain[:ARCHIVER][:COMMAND] = "dar"
     DiabChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
-
+    DiabChain[:ARCHIVER][:FILE_COMMAND] = "@"
+      
     DiabChain[:LINKER][:COMMAND] = "dcc"
     DiabChain[:LINKER][:SCRIPT] = "-Wm"
     DiabChain[:LINKER][:USER_LIB_FLAG] = "-l:"
@@ -41,6 +43,7 @@ module Bake
     DiabChain[:LINKER][:LIB_PATH_FLAG] = "-L"
     DiabChain[:LINKER][:MAP_FILE_FLAG] = "-Wl,-m6" # no map file if this string is empty, otherwise -Wl,-m6>abc.map
     DiabChain[:LINKER][:OUTPUT_ENDING] = ".elf"
+    DiabChain[:LINKER][:FILE_COMMAND] = "@"
 
     diabCompilerErrorParser =                   DiabCompilerErrorParser.new
     DiabChain[:COMPILER][:C][:ERROR_PARSER] =   diabCompilerErrorParser

data/lib/bake/toolchain/gcc.rb

@@ -34,7 +34,9 @@ module Bake
       :COMPILE_FLAGS => "-c ",
       :DEP_FLAGS => "-MD -MF",
       :DEP_FLAGS_SPACE => true,
-      :PREPRO_FLAGS => "-E -P"
+      :PREPRO_FLAGS => "-E -P",
+      :FILE_COMMAND => "@",
+      :CUDA_PREFIX => "-Xcompiler"
     })
 
     GCCChain[:COMPILER][:C] = Utils.deep_copy(GCCChain[:COMPILER][:CPP])
@@ -47,10 +49,12 @@ module Bake
 
     GCCChain[:ARCHIVER][:COMMAND] = "ar"
     GCCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
-
+    GCCChain[:ARCHIVER][:FILE_COMMAND] = "@"
+ 
     GCCChain[:LINKER][:COMMAND] = "g++"
     GCCChain[:LINKER][:SCRIPT] = "-T"
     GCCChain[:LINKER][:SCRIPT_SPACE] = (Bake::Utils::OS.name == "Mac" ? false : true)
+    GCCChain[:LINKER][:FILE_COMMAND] = "@"
 
     GCCChain[:LINKER][:USER_LIB_FLAG] = "-l:"
     GCCChain[:LINKER][:EXE_FLAG] = "-o"

data/lib/bake/toolchain/provider.rb

@@ -29,9 +29,11 @@ module Bake
             :DEP_FLAGS => "",
             :DEP_FLAGS_SPACE => false,
             :DEP_FLAGS_FILENAME => true,
+            :CUDA_PREFIX => "",
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
+            :PREPRO_FILE_FLAG => nil,
+            :FILE_COMMAND => ""
           },
           :C => {
             :COMMAND => "",
@@ -49,9 +51,11 @@ module Bake
             :DEP_FLAGS => "",
             :DEP_FLAGS_SPACE => false,
             :DEP_FLAGS_FILENAME => true,
+            :CUDA_PREFIX => "",
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
+            :PREPRO_FILE_FLAG => nil,
+            :FILE_COMMAND => ""
           },
           :ASM => {
             :COMMAND => "",
@@ -69,9 +73,11 @@ module Bake
             :DEP_FLAGS => "",
             :DEP_FLAGS_SPACE => false,
             :DEP_FLAGS_FILENAME => true,
+            :CUDA_PREFIX => "",
             :ERROR_PARSER => nil,
             :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
+            :PREPRO_FILE_FLAG => nil,
+            :FILE_COMMAND => ""
           },
           :DEP_FILE_SINGLE_LINE => :multi
         },
@@ -83,7 +89,8 @@ module Bake
           :ARCHIVE_FLAGS => "",
           :ARCHIVE_FLAGS_SPACE => true,
           :FLAGS => "",
-          :ERROR_PARSER => nil
+          :ERROR_PARSER => nil,
+          :FILE_COMMAND => ""
         },
 
         :LINKER =>
@@ -105,7 +112,8 @@ module Bake
           :MAP_FILE_PIPE => true,
           :OUTPUT_ENDING => "", # if empty, .exe is used on Windows, otherwise no ending
           :ERROR_PARSER => nil,
-          :LIST_MODE => false
+          :LIST_MODE => false,
+          :FILE_COMMAND => ""
         },
 
         :MAKE =>

data/lib/bake/util.rb

@@ -79,6 +79,9 @@ def integrateCompiler(tcs, compiler, type)
   if compiler.respond_to?("command") && compiler.command != ""
     tcs[:COMPILER][type][:COMMAND] = compiler.command
   end
+  if compiler.respond_to?("cuda") && compiler.command != ""
+    tcs[:COMPILER][type][:CUDA] = compiler.cuda
+  end
   if compiler.respond_to?("prefix") && compiler.prefix != ""
     tcs[:COMPILER][type][:PREFIX] = compiler.prefix
   end

data/lib/blocks/blockBase.rb

@@ -189,6 +189,20 @@ module Bake
         end
         return true
       end
+      
+      def calcFileCmd(cmd, onlyCmd, orgOut, tcs, postfix = "")
+        if tcs[:FILE_COMMAND] == ""
+          Bake.formatter.printWarning("Warning: file command option not yet supported for this toolchain")
+          return cmd
+        end
+        args = cmd.drop(onlyCmd.length)
+        argsFlat = args.join(' ')
+        cmdFile = orgOut + ".file" + postfix
+        cmdFileLong = File.expand_path(cmdFile, @projectDir)
+        FileUtils.mkdir_p(File.dirname(cmdFileLong))
+        File.open(cmdFileLong, "w") { |f| f.puts argsFlat }
+        return onlyCmd + ["#{tcs[:FILE_COMMAND]}#{cmdFile}"]
+      end
 
     end
   end

data/lib/blocks/compile.rb

@@ -197,24 +197,35 @@ module Bake
 
         cmd = Utils.flagSplit(compiler[:PREFIX], true)
         cmd += Utils.flagSplit(compiler[:COMMAND], true)
+        onlyCmd = cmd
         cmd += compiler[:COMPILE_FLAGS].split(" ")
 
         if dep_filename
-          cmd += @block.tcs[:COMPILER][type][:DEP_FLAGS].split(" ")
-          if @block.tcs[:COMPILER][type][:DEP_FLAGS_FILENAME]
-            if @block.tcs[:COMPILER][type][:DEP_FLAGS_SPACE]
-              cmd << dep_filename
+          cmdDep = compiler[:DEP_FLAGS].split(" ")
+          if compiler[:DEP_FLAGS_FILENAME]
+            if compiler[:DEP_FLAGS_SPACE]
+              cmdDep << dep_filename
             else
               if dep_filename.include?" "
-                cmd[cmd.length-1] << "\"" + dep_filename + "\""
+                cmdDep[cmdDep.length-1] << "\"" + dep_filename + "\""
               else
-                cmd[cmd.length-1] << dep_filename
+                cmdDep[cmdDep.length-1] << dep_filename
               end
-
             end
           end
+          if compiler[:CUDA]
+            if compiler[:CUDA_PREFIX] == ""
+              Bake.formatter.printWarning("Warning: Cuda not yet supported by this toolchain.")
+            else
+              cmdDep.each do |c|
+                cmd += [compiler[:CUDA_PREFIX], c]
+              end
+              cmdDep = nil
+            end
+          end
+          cmd += cmdDep if cmdDep
         end
-
+        
         cmd += compiler[:PREPRO_FLAGS].split(" ") if Bake.options.prepro
         cmd += flags
         cmd += includes
@@ -248,7 +259,8 @@ module Bake
         if not (cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile))
           BlockBase.prepareOutput(File.expand_path(object,@projectDir))
           outputType = Bake.options.analyze ? "Analyzing" : (Bake.options.prepro ? "Preprocessing" : "Compiling")
-          printCmd(cmd, "#{outputType} #{@projectName} (#{@config.name}): #{source}", reason, false)
+          realCmd = Bake.options.fileCmd ? calcFileCmd(cmd, onlyCmd, object, compiler) : cmd 
+          printCmd(realCmd, "#{outputType} #{@projectName} (#{@config.name}): #{source}", reason, false)
           SyncOut.flushOutput()
           BlockBase.writeCmdLineFile(cmd, cmdLineFile)
 
@@ -256,8 +268,8 @@ module Bake
           consoleOutput = ""
           incList = nil
           if !Bake.options.diabCaseCheck
-            success, consoleOutput = ProcessHelper.run(cmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
-            incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], nil, reason, success)
+            success, consoleOutput = ProcessHelper.run(realCmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
+            incList = process_result(realCmd, consoleOutput, compiler[:ERROR_PARSER], nil, reason, success)
           end
 
           if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
@@ -275,6 +287,7 @@ module Bake
                   if Bake.options.diabCaseCheck
                     pos = cmd.find_index(compiler[:OBJECT_FILE_FLAG])
                     preProCmd = (cmd[0..pos-1] + cmd[pos+2..-1] + ["-E"])
+                    preProCmd = calcFileCmd(preProCmd, onlyCmd, object, compiler, ".dccCaseCheck") if Bake.options.fileCmd
                     success, consoleOutput = ProcessHelper.run(preProCmd, false, false, nil, [0], @projectDir)
                     if !success
                       Bake.formatter.printError("Error: could not compile #{source}")
@@ -400,6 +413,7 @@ module Bake
           SyncOut.mutex.synchronize do
             calcSources
             calcObjects
+            prepareIncludes
           end
 
           fileListBlock = Set.new if Bake.options.filelist
@@ -637,6 +651,20 @@ module Bake
 
         @include_list = @include_list.flatten.uniq
 
+      end
+
+      def prepareIncludes
+        if Bake.options.mergeInc
+          mdir = File.expand_path(@block.output_dir+"/mergedIncludes", @projectDir)
+          @include_list.each do |idir|
+            FileUtils.mkdir_p(mdir)
+            idir = idir.to_s
+            idir = File.expand_path(idir, @projectDir) if !File.is_absolute?(idir)
+            FileUtils.cp_r(Dir.glob(idir+"/*"), mdir)
+          end
+          @include_list = [@block.output_dir+"/mergedIncludes"]
+        end 
+
         @include_array = {}
         [:CPP, :C, :ASM].each do |type|
           @include_array[type] = @include_list.map do |k|

data/lib/blocks/executable.rb

@@ -118,10 +118,10 @@ module Bake
 
           cmd = Utils.flagSplit(linker[:PREFIX], true)
           cmd += Utils.flagSplit(linker[:COMMAND], true) # g++
+          onlyCmd = cmd
+
           cmd += linker[:MUST_FLAGS].split(" ")
           cmd += Bake::Utils::flagSplit(linker[:FLAGS],true)
-
-
           cmd << linker[:EXE_FLAG]
           if linker[:EXE_FLAG_SPACE]
             cmd << @exe_name
@@ -148,11 +148,17 @@ module Bake
 
           mapfileStr = (@mapfile and linker[:MAP_FILE_PIPE]) ? " >#{@mapfile}" : ""
 
+          realCmd = Bake.options.fileCmd ? calcFileCmd(cmd, onlyCmd, @exe_name, linker) : cmd
+            
           # pre print because linking can take much time
-          cmdLinePrint = cmd.dup
-          outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
-          cmdLinePrint << "> #{outPipe}" if outPipe
-
+          if Bake.options.fileCmd
+            cmdLinePrint = realCmd
+          else
+            cmdLinePrint = cmd.dup
+            outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
+            cmdLinePrint << "> #{outPipe}" if outPipe
+          end
+          
           if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
             success = true
           else
@@ -164,7 +170,7 @@ module Bake
             BlockBase.writeCmdLineFile(cmd, cmdLineFile)
             success = true
             consoleOutput = ""
-            success, consoleOutput = ProcessHelper.run(cmd, false, false, outPipe) if !Bake.options.dry
+            success, consoleOutput = ProcessHelper.run(realCmd, false, false, outPipe) if !Bake.options.dry
             process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
 
             check_config_file()

data/lib/blocks/library.rb

@@ -95,6 +95,7 @@ module Bake
 
           cmd = Utils.flagSplit(archiver[:PREFIX], true)
           cmd += Utils.flagSplit(archiver[:COMMAND], true) # ar
+          onlyCmd = cmd
           cmd += Bake::Utils::flagSplit(archiver[:FLAGS],true) # --all_load
           cmd += archiver[:ARCHIVE_FLAGS].split(" ")
 
@@ -117,11 +118,12 @@ module Bake
               BlockBase.writeCmdLineFile(cmd, cmdLineFile)
               consoleOutput = ""
 
-              printCmd(cmd, "Creating  #{@projectName} (#{@config.name}): #{@archive_name}", reason, false)
+              realCmd = Bake.options.fileCmd ? calcFileCmd(cmd, onlyCmd, @archive_name, archiver) : cmd
+              printCmd(realCmd, "Creating  #{@projectName} (#{@config.name}): #{@archive_name}", reason, false)
               SyncOut.flushOutput()
 
-              success, consoleOutput = ProcessHelper.run(cmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
-              process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], nil, reason, success)
+              success, consoleOutput = ProcessHelper.run(realCmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
+              process_result(realCmd, consoleOutput, archiver[:ERROR_PARSER], nil, reason, success)
 
               check_config_file()
             ensure

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.49.0"
+      "2.50.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.49.0
+  version: 2.50.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext