bake-toolkit 2.68.1 → 2.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aedaaf58ee97493bdcc5a0002b571de20295c8ea013f3a45be44755931da8a2f
-  data.tar.gz: 66f7876ca45bf0955be3dbaa58bc522f5e5fb848c15bdf527f71d9c159a4f89a
+  metadata.gz: 97f124f36bbd221636166d8e01a9854b4c680f235643dab7154d3d6e50df0c4c
+  data.tar.gz: 664f60e7f0fec1089b08f55a7662c1d3f5c3e6ad81c7f5332b206e10ca28fc47
 SHA512:
-  metadata.gz: 7cc330fc24ae6454869a1dff273461784f10c4d92af7c6b144251be2606595eda7976a04772f62059963dff1ec2db4f8697eaf2e7e4a164c351e85d83e0d5b73
-  data.tar.gz: ee9003412d36a81cff6606b19783637da7379940b241a77188c48522f569b7afd01d110384827e4956397f698ea6d74654046484214e69e60f42ed4653014045
+  metadata.gz: 655d3a58f54e604245af4a38feb61e099ae8ea9af58ec135a181a312cca39ed1cb18461ca4733c8d2754090cf782e0e2ca918b490ddce55f071add4ce09d9824
+  data.tar.gz: 14034133ac3b08bcfc0c3b54483bf0f1cc98138a2a04e452d0860ca91fb9914f37115b822a068cdbc42caf8d584ca8c0e96268f82cf601992e6403a4209625fe

data/Rakefile.rb

@@ -1,7 +1,3 @@
-gem "coveralls", "=0.8.23"
-gem "simplecov", "=0.16.1"
-gem "rspec",     "=3.10.0"
-
 require 'rake'
 
 require './rake_helper/spec.rb'

data/bin/bakery

@@ -112,7 +112,7 @@ module Bake
     p = File.dirname(bp.proj)
     pRel = File.rel_from_to_project(Dir.pwd, p, false)
     pRel = "." if pRel.empty?
-    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams)
+    cmd = (["-m", pRel, "-b", bp.conf] + bp.args.split + passedParams + bp.args_end.split)
     cmdWithNum = "bakery #{currentRun} of #{maxRuns}: bake " + cmd.join(" ")
     puts "\n#{$stars}"
     Bake.formatter.printInfo(cmdWithNum)

data/lib/bake/config/loader.rb

@@ -143,6 +143,9 @@ module Bake
                 if !configHash.has_key?(name)
                   return adaptHash[name].any?{|ah| ah.match("")}
                 end
+                if name == "toolchain" && configHash[name] == [""]
+                  Bake.formatter.printWarning("Trying to adapt '#{config.name}' with 'toolchain == #{c.parent.toolchain}', but toolchain is not defined yet", c)
+                end
                 adaptHash[name].any? { |ah| configHash[name].any?{|ch| ah.match(ch)}}
               }
   

data/lib/bake/libElement.rb

@@ -56,7 +56,7 @@ module Bake
         cb = block.library.compileBlock
         if (block.prebuild and File.exist?adaptedPath) or
            (!cb.nil? and !(cb.calcSources(true, true) - cb.source_files_ignored_in_lib).empty?)
-          if Bake.options.consoleOutput_fullnames
+          if Bake.options.abs_path_in
             adaptedPath = File.expand_path(adaptedPath, @projectDir)
           end
           @@linker_libs_array << adaptedPath
@@ -70,7 +70,7 @@ module Bake
           cb.object_files_ignored_in_lib.each do |ldirect|
             adaptedPath, prefix = adaptPath(ldirect, block, prefix)
             if (!block.prebuild or File.exist?adaptedPath)
-              if Bake.options.consoleOutput_fullnames
+              if Bake.options.abs_path_in
                 adaptedPath = File.expand_path(adaptedPath, @projectDir)
               end
               @@linker_libs_array << adaptedPath

data/lib/bake/options/options.rb

@@ -22,7 +22,7 @@ module Bake
     attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
     attr_reader :filelist # set
-    attr_reader :consoleOutput_fullnames
+    attr_reader :abs_path_in, :abs_path_out
     attr_reader :roots # Root array
     attr_reader :diabCaseCheck
     attr_reader :defines
@@ -50,7 +50,8 @@ module Bake
       @analyze = false
       @eclipseOrder = false
       @showConfigs = false
-      @consoleOutput_fullnames = false
+      @abs_path_in = false
+      @abs_path_out = false
       @prepro = false
       @stopOnFirstError = false
       @verbose = 1
@@ -141,7 +142,9 @@ module Bake
       add_option(["--dot-project-level",                         ], lambda { @dot = true; @dotShowProjOnly = true        })
       add_option(["--do",                 "--include_filter"     ], lambda { |x| set_filter(x)                           })
       add_option(["--omit",               "--exclude_filter"     ], lambda { |x| @exclude_filter << x                    })
-      add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @consoleOutput_fullnames = true         })
+      add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @abs_path_in = @abs_path_out = true     })
+      add_option(["--abs-paths-in",       "--show_abs_paths"     ], lambda {     @abs_path_in = true                     })
+      add_option(["--abs-paths-out",      "--show_abs_paths"     ], lambda {     @abs_path_out = true                    })
       add_option(["--prebuild"                                   ], lambda {     @prebuild = true                        })
       add_option(["--Wparse"                                     ], lambda {     @wparse = true                          })
 

data/lib/bake/options/usage.rb

@@ -48,7 +48,10 @@ module Bake
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' includes all according steps."
       puts " --omit <name>            Excludes elements with this filter name (can be used multiple times)."
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' excludes all according steps."
-      puts " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
+      puts " --abs-paths              Relative filename paths are converted to absolute paths for compiler commands and output."
+      puts " --abs-paths-in           Relative filename paths are converted to absolute paths for compiler commands."
+      puts "                          Depending on the compiler this might have also effects on the raw output of the compiler."
+      puts " --abs-paths-out          Relative filename paths are converted to absolute paths for compiler output."
       puts " --Wparse                 The error parser result is also taken into account, not only the return value of compiler, archiver and linker."
       puts " --no-autodir             Disable auto completion of paths like in IncludeDir"
       puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."

data/lib/bakery/buildPattern.rb

@@ -1,11 +1,12 @@
 module Bake
 
   class BuildPattern
-    attr_reader :proj, :conf, :args, :coll_p
-    def initialize(proj, conf, args, coll_p)
+    attr_reader :proj, :conf, :args, :args_end, :coll_p
+    def initialize(proj, conf, args, args_end, coll_p)
       @proj = proj
       @conf = conf
       @args = args
+      @args_end = args_end
       @coll_p = coll_p
     end
     def getId

data/lib/bakery/model/metamodel.rb

@@ -20,6 +20,7 @@ module Bake
       has_attr 'name', String, :defaultValueLiteral => ""
       has_attr 'config', String, :defaultValueLiteral => ""
       has_attr 'args', String, :defaultValueLiteral => ""
+      has_attr 'args_end', String, :defaultValueLiteral => ""
     end
     class Exclude < ModelElement
       has_attr 'name', String, :defaultValueLiteral => ""

data/lib/bakery/toBake.rb

@@ -30,7 +30,7 @@ module Bake
     toBuildPattern = []
     @options.roots.each do |root|
       col.project.each do |p|
-        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth)
+        projs = Root.search_to_depth(root.dir,p.name + "/Project.meta", root.depth).map { |p| Pathname.new(p).cleanpath.to_s }
         if File.basename(root.dir) == p.name && File.exist?(root.dir + "/Project.meta")
           projs << root.dir + "/Project.meta"
         end
@@ -38,7 +38,7 @@ module Bake
           Bake.formatter.printWarning("pattern does not match any project: #{p.name}", p)
         end
         projs.each do |f|
-          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p)
+          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p.args_end, p)
         end
       end
     end
@@ -51,7 +51,7 @@ module Bake
         res = c.gsub(/#.*/,"").match("\\s*(Library|Executable|Custom){1}Config\\s*\"?([\\w:-]*)\"?")
         if res
           if res[2].match(bp.conf) != nil
-            toBuild << BuildPattern.new(bp.proj, res[2], bp.args, nil)
+            toBuild << BuildPattern.new(bp.proj, res[2], bp.args, bp.args_end, nil)
             bp.coll_p.found
           end
         end

data/lib/blocks/block.rb

@@ -601,7 +601,7 @@ module Bake
         if @tcs[:OUTPUT_DIR_POSTFIX] != nil
           @output_dir = @output_dir + @tcs[:OUTPUT_DIR_POSTFIX] 
         end
-        if Bake.options.consoleOutput_fullnames
+        if Bake.options.abs_path_in
           @output_dir = File.expand_path(@output_dir, @projectDir)
         end
       end

data/lib/blocks/blockBase.rb

@@ -136,7 +136,7 @@ module Bake
               end
 
               console_output = x[0]
-              console_output = console_output_full if Bake.options.consoleOutput_fullnames
+              console_output = console_output_full if Bake.options.abs_path_out
 
               ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
 

data/lib/blocks/compile.rb

@@ -254,7 +254,7 @@ module Bake
         if Bake.options.cc2j_filename
           cmdJson = cmd.is_a?(Array) ? cmd.join(' ') : cmd
           srcFilePath = source
-          if Bake.options.consoleOutput_fullnames
+          if Bake.options.abs_path_in
             srcFilePath = File.join(@projectDir, srcFilePath) if !File.is_absolute?(srcFilePath)
             cmdJson[source] = srcFilePath
           end
@@ -529,7 +529,7 @@ module Bake
           if not type.nil?
             object = get_object_file(source)
 
-            if Bake.options.consoleOutput_fullnames
+            if Bake.options.abs_path_in
               object = File.expand_path(object, @projectDir)
               source = File.expand_path(source, @projectDir)
             end
@@ -586,8 +586,9 @@ module Bake
           end
           res.each do |f|
             singleFile = res.length == 1 && res[0] == pr
-            if ((!@fileTcs.has_key?(f)) || singleFile)
-              @fileTcs[f] = icf
+            fTcs = (Bake.options.abs_path_in ? File.expand_path(f, @projectDir) : f)
+            if ((!@fileTcs.has_key?(fTcs)) || singleFile)
+              @fileTcs[fTcs] = icf
             end
             if source_files.include?(f) || exclude_files.include?(f)
               if (singleFile)
@@ -641,7 +642,7 @@ module Bake
         block.bes.each do |be|
           if Metamodel::IncludeDir === be
             if be.inherit == true || block == @block
-              if Bake.options.consoleOutput_fullnames
+              if Bake.options.abs_path_in
                 mappedInc = be.name
               else
                 mappedInc = File.rel_from_to_project(@projectDir,be.name,false)
@@ -781,11 +782,6 @@ module Bake
         end
       end
 
-      def tcs4source(source)
-        @fileTcs[source] || @block.tcs
-      end
-
-
     end
 
   end

data/lib/blocks/executable.rb

@@ -43,7 +43,7 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @exe_name ||= File.join([@block.output_dir, baseFilename])
-        if Bake.options.consoleOutput_fullnames
+        if Bake.options.abs_path_in
           @exe_name = File.expand_path(@exe_name, @projectDir)
         end
         return @exe_name

data/lib/blocks/fileutil.rb

@@ -11,6 +11,13 @@ module Bake
         @type = type
         @projectDir = projectDir
         @echo = (config.echo != "off")
+        if !@arg1 || @arg1.empty?
+          Bake.formatter.printError("Error: source of file-step must not be empty")
+          ExitHelper.exit(1)
+        elsif [:copy, :move].include?(@type) && (!@arg2 || @arg2.empty?)
+          Bake.formatter.printError("Error: target of file-step must not be empty")
+          ExitHelper.exit(1)
+        end
       end
 
       def run
@@ -20,13 +27,13 @@ module Bake
             FileUtils.touch(@arg1)
           elsif @type == :move
             puts "Moving #{@arg1} to #{@arg2}" if @echo
-            FileUtils.mv(@arg1, @arg2)
+            Dir.glob(@arg1).each {|f| FileUtils.mv(f, @arg2)}
           elsif @type == :copy
             puts "Copying #{@arg1} to #{@arg2}" if @echo
-            FileUtils.cp_r(@arg1, @arg2)
+            Dir.glob(@arg1).each {|f| FileUtils.cp_r(f, @arg2)}
           elsif @type == :remove
             puts "Removing #{@arg1}" if @echo
-            FileUtils.rm_rf(@arg1)
+            Dir.glob(@arg1).each {|f| FileUtils.rm_rf(f)}
           elsif @type == :makedir
             puts "Making #{@arg1}" if @echo
             FileUtils.mkdir_p(@arg1)

data/lib/blocks/library.rb

@@ -34,7 +34,7 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @archive_name ||= File.join([@block.output_dir, baseFilename])
-        if Bake.options.consoleOutput_fullnames
+        if Bake.options.abs_path_in
           @archive_name = File.expand_path(@archive_name, @projectDir)
         end
         return @archive_name

data/lib/blocks/showIncludes.rb

@@ -22,7 +22,7 @@ module Bake
           print projName
           incs = []
           blocks.each do |block|
-            if Bake.options.consoleOutput_fullnames
+            if Bake.options.abs_path_in
               incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
             else
               incs += block.include_list
@@ -103,7 +103,7 @@ module Bake
             block.calcIncludes
             block.calcDefines
             block.calcFlags 
-            if Bake.options.consoleOutput_fullnames
+            if Bake.options.abs_path_in
               blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
             else
               blockIncs += block.include_list

data/lib/common/root.rb

@@ -80,6 +80,7 @@ module Bake
     end
 
     def self.search_to_depth(root, baseName, depth)
+      return Dir.glob(baseName) if File.is_absolute?(baseName)
       if not File.exist?(root)
         Bake.formatter.printError("Root #{root} does not exist.")
         ExitHelper.exit(1)

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.68.1"
+      "2.71.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.68.1
+  version: 2.71.0
 platform: ruby
 authors:
 - Alexander Schaal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: 0.8.0
 description: See documentation for more details
 email: alexander.schaal@esrlabs.com
 executables:
@@ -269,7 +269,7 @@ homepage: https://github.com/esrlabs/bake
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "-x"
 - doc
@@ -286,8 +286,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.
 test_files: []