bake-toolkit 2.54.1 → 2.54.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e16ce4a5c963510156b004f0a5ec43b3b202df504771dc81212ac8261a4ea73
-  data.tar.gz: 38316ab9a96840d40f5aa8f39cb4db125f1eff310c82b8f9eb84a348fe41e36f
+  metadata.gz: b1f28f604eabf9369d88baeca22ca3197b795869d2e63abf5abad688e4bcd029
+  data.tar.gz: 4013fa730dd7932df41e7b1600d9a6be5ca9532778371944d54490fbfa5b3249
 SHA512:
-  metadata.gz: 2da16803f58972316da3b55ed526373b930e6c851078ce64dbdda59e0636f9e6e6745383d987813c6d2615d85ce3d3bcdf3a768f85de290dd6423885fa48709e
-  data.tar.gz: 4c8771bd76f452800fc7f5229453853fc7b48ab8950f89604c1753a99e561c07d1c038bd2900ce2a49050a79c1a217bab69107bb08d7c4649e6d5777fd53564c
+  metadata.gz: a5714a0943746ec267597eb12de35b821a6fd57ca69be8d93c61a851706662f962ae2571a4d1f3a9414f6bcc9a4273943a45c52bac483ca0c86387b182824a7e
+  data.tar.gz: 8eb1da4a19aab634a3576225594f4e4318be9bc7bf4b71f91c464fb3c7e8b4a3ba3cd8948a24fc9b0ed37b7079c381f82e669e339fef6bb3e0ceb9929e3b4705

data/lib/blocks/blockBase.rb

@@ -127,7 +127,13 @@ module Bake
           if error_parser
             begin
               x = [console_output]
-              error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
+              if metadata_json = Bake.options.dev_features.include?("no-error-parser")
+                error_descs = []
+                console_output_full = x[0]
+                incList = []
+              else
+                error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
+              end
 
               console_output = x[0]
               console_output = console_output_full if Bake.options.consoleOutput_fullnames
@@ -135,9 +141,13 @@ module Bake
               ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
 
               console_output.gsub!(/[\r]/, "")
-              Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
+              if metadata_json = Bake.options.dev_features.include?("no-error-parser")
+                puts console_output
+              else
+                Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
+                Bake::IDEInterface.instance.set_errors(error_descs)
+              end
 
-              Bake::IDEInterface.instance.set_errors(error_descs)
             rescue Exception => e
               Bake.formatter.printWarning("Parsing output failed (maybe language not set to English?): " + e.message)
               Bake.formatter.printWarning("Original output:")

data/lib/blocks/compile.rb

@@ -561,11 +561,11 @@ module Bake
             icf = integrateCompilerFile(Utils.deep_copy(@block.tcs),sources)
           end
           res.each do |f|
+            @fileTcs[f] = icf if icf && !@fileTcs.has_key?(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

data/lib/blocks/executable.rb

@@ -23,16 +23,16 @@ module Bake
       def calcArtifactName
         if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
+          baseFilename += Bake::Toolchain.outputEnding(@block.tcs) if !baseFilename.include?(".")
         else
-          if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
-            extension = ".#{@config.artifactExtension.name}"
-          else
-            extension = Bake::Toolchain.outputEnding(@block.tcs)
-          end
-          baseFilename = "#{@projectName}#{extension}"
+          baseFilename = "#{@projectName}#{Bake::Toolchain.outputEnding(@block.tcs)}"
         end
-        if !baseFilename.include?(".")
-          baseFilename += Bake::Toolchain.outputEnding(@block.tcs)
+        if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
+          extension = ".#{@config.artifactExtension.name}"
+          if baseFilename.include?(".")
+            baseFilename = baseFilename.split(".")[0...-1].join(".")
+          end
+          baseFilename += ".#{@config.artifactExtension.name}"
         end
         @exe_name ||= File.join([@block.output_dir, baseFilename])
       end

data/lib/blocks/library.rb

@@ -21,12 +21,14 @@ module Bake
         if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
         else
-          if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
-            extension = ".#{@config.artifactExtension.name}"
-          else
-            extension =".a"
+          baseFilename = "lib#{@projectName}.a"
+        end
+        if !@config.artifactExtension.nil? && @config.artifactExtension.name != "default"
+          extension = ".#{@config.artifactExtension.name}"
+          if baseFilename.include?(".")
+            baseFilename = baseFilename.split(".")[0...-1].join(".")
           end
-          baseFilename = "lib#{@projectName}#{extension}"
+          baseFilename += ".#{@config.artifactExtension.name}"
         end
         @archive_name ||= File.join([@block.output_dir, baseFilename])
       end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.54.1"
+      "2.54.2"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -705,11 +705,12 @@ module Bake
           end
 
           
-          metadata_json = Bake.options.dev_features.first { |x| x.start_with?("metadata=") }
+          metadata_json = Bake.options.dev_features.detect { |x| x.start_with?("metadata=") }
           if metadata_json
             metadata_file = metadata_json[9..-1]
             mainBlock = Blocks::ALL_BLOCKS[@mainConfig.parent.name + "," + @mainConfig.name]
             if Metamodel::ExecutableConfig === mainBlock.config || Metamodel::LibraryConfig === mainBlock.config
+              Subst.substToolchain(@defaultToolchain)
               File.open(metadata_file, "w") do |f|
                 f.puts "{"
                 f.puts "  \"module_path\":  \"#{mainBlock.projectDir}\","
@@ -720,7 +721,8 @@ module Bake
                 f.puts "  \"compiler_c\":   \"#{@defaultToolchain[:COMPILER][:C][:COMMAND]}\","
                 f.puts "  \"compiler_cxx\": \"#{@defaultToolchain[:COMPILER][:CPP][:COMMAND]}\","
                 f.puts "  \"flags_c\":      \"#{@defaultToolchain[:COMPILER][:C][:FLAGS]}\","
-                f.puts "  \"flags_cxx\":    \"#{@defaultToolchain[:COMPILER][:CPP][:FLAGS]}\""
+                f.puts "  \"flags_cxx\":    \"#{@defaultToolchain[:COMPILER][:CPP][:FLAGS]}\","
+                f.puts "  \"toolchain\":    \"#{@mainConfig.defaultToolchain.basedOn}\""
                 f.puts "}"
               end
               puts "File #{metadata_file} written."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.54.1
+  version: 2.54.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext