bake-toolkit 2.68.0 → 2.70.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d635c3cc903018e92f111403d9a1450fa76c82cabd5d1159afbfe1269c3b1e
-  data.tar.gz: a4ecb9b50ead0faaf4e3a2ac37d3d295886bb8d3e6a221f41da69e74ad805474
+  metadata.gz: 416c14f84643a59f67c1c7d3ba19032a847d56bbef738c8e3563a9919ba255db
+  data.tar.gz: 59250025415e8353a51a7e753d5af219491a05f2bd959cf520b682c963758ef2
 SHA512:
-  metadata.gz: b5d974d79c37da1ced9fa7ae03273a5aacd27531d2e080259225df1884b646ffc7cd2b0b2658011e80446eba81617eef4072474515ee66d500e7fbbdcb87f81f
-  data.tar.gz: 998f741470db5a771b26356519f58bc904a0ac26e838aca5f100e4c2f73ef646fe09aa0ca8f96f5b08c075edc3e6dd699c136462a9cab9f8708d286cf882d5e8
+  metadata.gz: 815be1963aef84b578e080d47dd0454170f93b0ba8b0b455c7478fb8a6d04be5fc08bba9b8c649666f237774ac280803a76d7b53d537eaa904126c162247b6f4
+  data.tar.gz: 8efb1f2f9594f3affcf970c06829e9791b16cbe54dc554dbc566f21066a2d0bb3cd7934fc88ae03c821c8d0a4d7f0b1d7c04b1f3f4a74fb1825f442a90720543

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/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/compile.rb

@@ -375,7 +375,7 @@ module Bake
             deps_string = File.read(dep_filename)
             deps_string = deps_string.gsub(/\\\n/,'')
             dep_splitted = deps_string.split(/([^\\]) /).each_slice(2).map(&:join)[2..-1]
-            deps = dep_splitted.map { |d| d.gsub(/[\\] /,' ').gsub(/[\\]/,'/').strip }.delete_if {|d| d == "" }
+            deps = dep_splitted.map { |d| d.gsub(/[\\] /,' ').gsub(/\\:\\/,':\\').gsub(/[\\]/,'/').strip }.delete_if {|d| d == "" }
           elsif lineType == :plain
             firstLine = true
             File.readlines(dep_filename).each do |line|
@@ -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.consoleOutput_fullnames ? 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)
@@ -781,11 +782,6 @@ module Bake
         end
       end
 
-      def tcs4source(source)
-        @fileTcs[source] || @block.tcs
-      end
-
-
     end
 
   end

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/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.0"
+      "2.70.1"
     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.0
+  version: 2.70.1
 platform: ruby
 authors:
 - Alexander Schaal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-12-09 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: []