bake-toolkit 2.54.0 → 2.54.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13e4226c82faa0439951dd701951b5af74bceabbf73c185791fa46d70afc6835
-  data.tar.gz: 54c74b7f0daf417c1581340ffdfdea95d72a1e516b4df6d622639be4d06480ae
+  metadata.gz: 6e16ce4a5c963510156b004f0a5ec43b3b202df504771dc81212ac8261a4ea73
+  data.tar.gz: 38316ab9a96840d40f5aa8f39cb4db125f1eff310c82b8f9eb84a348fe41e36f
 SHA512:
-  metadata.gz: 6b2241a42ca4b0430c6e408a3ed03fdcbd2aad0d378046e48486dd7256f49dc59007dca65c32dbd7aa9374a8da019293cf21de5632d519d18475849b6c700445
-  data.tar.gz: e6d9bbd765ac4767a78106a18465d648dc85300444f407971971ebe8b6c0f5692b9d554f13c1faa76bb3858636596fb2fea59ba554664869a8e1ae070bec9250
+  metadata.gz: 2da16803f58972316da3b55ed526373b930e6c851078ce64dbdda59e0636f9e6e6745383d987813c6d2615d85ce3d3bcdf3a768f85de290dd6423885fa48709e
+  data.tar.gz: 4c8771bd76f452800fc7f5229453853fc7b48ab8950f89604c1753a99e561c07d1c038bd2900ce2a49050a79c1a217bab69107bb08d7c4649e6d5777fd53564c

data/lib/blocks/compile.rb

@@ -409,7 +409,6 @@ module Bake
           return true if @config.files.empty?
           
           SyncOut.mutex.synchronize do
-            calcFileTcs
             calcIncludes
             calcDefines # not for files with changed tcs
             calcFlags   # not for files with changed tcs
@@ -537,6 +536,7 @@ module Bake
         return @source_files if @source_files and not @source_files.empty?
         @source_files = []
         @source_files_ignored_in_lib = []
+        @fileTcs = {}
 
         exclude_files = Set.new
         @config.excludeFiles.each do |pr|
@@ -549,13 +549,6 @@ module Bake
           pr = pr[2..-1] if pr.start_with?"./"
 
           res = Dir.glob_dir(pr, @projectDir).sort
-          regExSearch = pr.gsub("*",".*").gsub("?",".")
-          if !res.all?{|r| r.match(/#{regExSearch}/)}
-            if res.all?{|r| r.match(/#{regExSearch}/i)}
-              Bake.formatter.printError("Case sensitivity error for source file '#{pr}'", sources)
-              raise SystemCommandFailed.new
-            end
-          end
           if res.length == 0 and cleaning == false
             if not pr.include?"*" and not pr.include?"?"
               Bake.formatter.printError("Source file '#{pr}' not found", sources)
@@ -564,11 +557,15 @@ module Bake
               Bake.formatter.printInfo("Source file pattern '#{pr}' does not match to any file", sources)
             end
           end
+          if (sources.define.length > 0 or sources.flags.length > 0)
+            icf = integrateCompilerFile(Utils.deep_copy(@block.tcs),sources)
+          end
           res.each do |f|
             next if exclude_files.include?(f)
             next if source_files.include?(f)
             source_files << f
             @source_files << f
+            @fileTcs[f] = icf if icf
             @source_files_ignored_in_lib << f if sources.compileOnly
           end
         end
@@ -757,25 +754,6 @@ module Bake
         end
       end
 
-      def calcFileTcs
-        @fileTcs = {}
-        @config.files.each do |f|
-          if (f.define.length > 0 or f.flags.length > 0)
-            if f.name.include?"*"
-              Bake.formatter.printWarning("Toolchain settings not allowed for file pattern #{f.name}", f)
-              err_res = ErrorDesc.new
-              err_res.file_name = @config.file_name
-              err_res.line_number = f.line_number
-              err_res.severity = ErrorParser::SEVERITY_WARNING
-              err_res.message = "Toolchain settings not allowed for file patterns"
-              Bake::IDEInterface.instance.set_errors([err_res])
-            else
-              @fileTcs[f.name] = integrateCompilerFile(Utils.deep_copy(@block.tcs),f)
-            end
-          end
-        end
-      end
-
       def tcs4source(source)
         @fileTcs[source] || @block.tcs
       end

data/lib/blocks/convert.rb

@@ -12,7 +12,6 @@ module Bake
 
       def execute
         Dir.chdir(@projectDir) do
-          calcFileTcs
           calcIncludes
           calcDefines
           calcFlags

data/lib/blocks/showIncludes.rb

@@ -100,7 +100,6 @@ module Bake
           blockIncs = []
           blockDefs = {:CPP => [], :C => [], :ASM => []}
           blocks.each do |block|
-            block.calcFileTcs
             block.calcIncludes
             block.calcDefines
             block.calcFlags 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.54.0"
+      "2.54.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.54.0
+  version: 2.54.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext