bake-toolkit 2.46.0 → 2.47.0

data/lib/bake/subst.rb

@@ -59,7 +59,7 @@ module Bake
       @@configName = config.name
       @@projDir = config.parent.get_project_dir
       @@projName = projName
-      @@resolvedVars = 0
+      @@unresolvedVars = []
       @@configFilename = config.file_name
 
       @@artifactName = ""
@@ -125,19 +125,18 @@ module Bake
 
       @@userVarMapMain = @@userVarMap.clone if isMainProj
 
-      @@resolvedVars = 0
-      lastFoundInVar = 0
+      unresolvedVarsWithoutOutputDir = []
       10.times do
+        @@unresolvedVars = []
         subst(config)
         substToolchain(toolchain)
-        if @@resolvedVars == lastFoundInVar
-          lastFoundInVar = 0
-          break
-        end
-        lastFoundInVar = @@resolvedVars
+        unresolvedVarsWithoutOutputDir = (@@unresolvedVars - @@outputDirUnresolved)
+        break if unresolvedVarsWithoutOutputDir.empty?
       end
-      if (lastFoundInVar > 0)
-        Bake.formatter.printError("Cyclic variable substitution detected", config.file_name)
+      if (unresolvedVarsWithoutOutputDir.length > 0)
+        unresolvedVarsWithoutOutputDir.each do |elem|
+          Bake.formatter.printError("Could not resolve variable", elem)
+        end
         ExitHelper.exit(1)
       end
 
@@ -151,7 +150,10 @@ module Bake
         posStart = str.index("$(", posSubst)
         break if posStart.nil?
         posEnd = str.index(")", posStart)
-        break if posEnd.nil?
+        if posEnd.nil?
+          Bake.formatter.printError("'$(' found but no ')'", elem)
+          ExitHelper.exit(1)
+        end
         posStartSub = str.index("$(", posStart+1)
         if (not posStartSub.nil? and posStartSub < posEnd) # = nested vars
           newStr = str[0,posStartSub] + substString(str[posStartSub..posEnd],elem)
@@ -165,7 +167,6 @@ module Bake
 
         substStr << str[posSubst..posStart-1] if posStart>0
 
-        @@resolvedVars += 1
         var = str[posStart+2..posEnd-1]
 
         splittedVar = var.split(",").map { |v| v.strip() }
@@ -248,7 +249,6 @@ module Bake
 
               if (out_dir.include?"$(")
                 substStr << str[posStart..posEnd]
-                @@resolvedVars -= 1
                 @@outputDirUnresolved << elem
               else
                 out_dir = substString(out_dir, elem)
@@ -322,6 +322,7 @@ module Bake
         posSubst = posEnd + 1
       end
       substStr << str[posSubst..-1]
+      @@unresolvedVars << elem if substStr.include?("$(")
       substStr
     end
 

data/lib/bake/toolchain/clang.rb

@@ -1,8 +1,8 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
-require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+require_relative'../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/gcc_compiler_error_parser'
+require_relative '../toolchain/errorparser/gcc_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/clang_analyze.rb

@@ -1,5 +1,5 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/diab.rb

@@ -1,7 +1,7 @@
-require 'bake/toolchain/provider'
-require 'common/utils'
-require 'bake/toolchain/errorparser/diab_compiler_error_parser'
-require 'bake/toolchain/errorparser/diab_linker_error_parser'
+require_relative '../toolchain/provider'
+require_relative '../../common/utils'
+require_relative '../toolchain/errorparser/diab_compiler_error_parser'
+require_relative '../toolchain/errorparser/diab_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/errorparser/diab_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class DiabCompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/diab_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class DiabLinkerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/gcc_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class GCCCompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/gcc_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class GCCLinkerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/greenhills_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class GreenHillsCompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/greenhills_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class GreenHillsLinkerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class KeilCompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/keil_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class KeilLinkerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class MSVCCompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/msvc_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class MSVCLinkerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/tasking_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class TaskingCompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/tasking_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class TaskingLinkerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class TICompilerErrorParser < ErrorParser

data/lib/bake/toolchain/errorparser/ti_linker_error_parser.rb

@@ -1,4 +1,4 @@
-require 'bake/toolchain/errorparser/error_parser'
+require_relative 'error_parser'
 
 module Bake
   class TILinkerErrorParser < ErrorParser

data/lib/bake/toolchain/gcc.rb

@@ -1,8 +1,8 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
-require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/gcc_compiler_error_parser'
+require_relative '../toolchain/errorparser/gcc_linker_error_parser'
 
 module Bake
   module Toolchain
@@ -49,10 +49,14 @@ module Bake
 
     GCCChain[:LINKER][:COMMAND] = "g++"
     GCCChain[:LINKER][:SCRIPT] = "-T"
+    GCCChain[:LINKER][:SCRIPT_SPACE] = (Bake::Utils::OS.name == "Mac" ? false : true)
+
     GCCChain[:LINKER][:USER_LIB_FLAG] = "-l:"
     GCCChain[:LINKER][:EXE_FLAG] = "-o"
     GCCChain[:LINKER][:LIB_FLAG] = "-l"
     GCCChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    GCCChain[:LINKER][:MAP_FILE_FLAG] = (Bake::Utils::OS.name == "Mac" ? "-Wl,-map," : "-Wl,-Map=")
+    GCCChain[:LINKER][:MAP_FILE_PIPE] = false
 
     gccCompilerErrorParser =                   GCCCompilerErrorParser.new
     GCCChain[:COMPILER][:C][:ERROR_PARSER] =   gccCompilerErrorParser

data/lib/bake/toolchain/gcc_env.rb

@@ -1,8 +1,8 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
-require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/gcc_compiler_error_parser'
+require_relative '../toolchain/errorparser/gcc_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/greenhills.rb

@@ -1,7 +1,7 @@
-require 'bake/toolchain/provider'
-require 'common/utils'
-require 'bake/toolchain/errorparser/greenhills_compiler_error_parser'
-require 'bake/toolchain/errorparser/greenhills_linker_error_parser'
+require_relative '../toolchain/provider'
+require_relative '../../common/utils'
+require_relative '../toolchain/errorparser/greenhills_compiler_error_parser'
+require_relative '../toolchain/errorparser/greenhills_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/keil.rb

@@ -1,8 +1,8 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/keil_compiler_error_parser'
-require 'bake/toolchain/errorparser/keil_linker_error_parser'
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/keil_compiler_error_parser'
+require_relative '../toolchain/errorparser/keil_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/msvc.rb

@@ -1,8 +1,8 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/msvc_compiler_error_parser'
-require 'bake/toolchain/errorparser/msvc_linker_error_parser'
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/msvc_compiler_error_parser'
+require_relative '../toolchain/errorparser/msvc_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/provider.rb

@@ -151,13 +151,13 @@ module Bake
   end
 end
 
-require 'bake/toolchain/diab'
-require 'bake/toolchain/gcc'
-require 'bake/toolchain/clang'
-require 'bake/toolchain/clang_analyze'
-require 'bake/toolchain/ti'
-require 'bake/toolchain/greenhills'
-require 'bake/toolchain/keil'
-require 'bake/toolchain/msvc'
-require 'bake/toolchain/gcc_env'
-require 'bake/toolchain/tasking'
+require_relative '../toolchain/diab'
+require_relative '../toolchain/gcc'
+require_relative '../toolchain/clang'
+require_relative '../toolchain/clang_analyze'
+require_relative '../toolchain/ti'
+require_relative '../toolchain/greenhills'
+require_relative '../toolchain/keil'
+require_relative '../toolchain/msvc'
+require_relative '../toolchain/gcc_env'
+require_relative '../toolchain/tasking'

data/lib/bake/toolchain/tasking.rb

@@ -1,7 +1,7 @@
-require 'bake/toolchain/provider'
-require 'common/utils'
-require 'bake/toolchain/errorparser/tasking_compiler_error_parser'
-require 'bake/toolchain/errorparser/tasking_linker_error_parser'
+require_relative '../toolchain/provider'
+require_relative '../../common/utils'
+require_relative '../toolchain/errorparser/tasking_compiler_error_parser'
+require_relative '../toolchain/errorparser/tasking_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/toolchain/ti.rb

@@ -1,8 +1,8 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/ti_compiler_error_parser'
-require 'bake/toolchain/errorparser/ti_linker_error_parser'
+require_relative '../../common/utils'
+require_relative '../toolchain/provider'
+require_relative '../toolchain/errorparser/error_parser'
+require_relative '../toolchain/errorparser/ti_compiler_error_parser'
+require_relative '../toolchain/errorparser/ti_linker_error_parser'
 
 module Bake
   module Toolchain

data/lib/bake/util.rb

@@ -1,10 +1,9 @@
-require 'bake/model/metamodel_ext'
-require 'bake/model/metamodel'
+require_relative 'model/metamodel_ext'
+require_relative 'model/metamodel'
 require 'set'
-require 'bake/toolchain/colorizing_formatter'
-require 'common/exit_helper'
-require 'common/utils'
-
+require_relative 'toolchain/colorizing_formatter'
+require_relative '../common/exit_helper'
+require_relative '../common/utils'
 
 def remove_empty_strings_and_join(a, j=' ')
   return a.reject{|e|e.to_s.empty?}.join(j)

data/lib/bakeclean/options/options.rb

@@ -1,5 +1,5 @@
-require 'common/options/parser'
-require 'common/version'
+require_relative '../../common/options/parser'
+require_relative '../../common/version'
 
 module Bake
 

data/lib/bakeqac/options/options.rb

@@ -1,7 +1,7 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/options/parser'
-require 'bake/toolchain/gcc'
-require 'common/options/finder'
+require_relative '../../bake/toolchain/colorizing_formatter'
+require_relative '../../common/options/parser'
+require_relative '../../bake/toolchain/gcc'
+require_relative '../../common/options/finder'
 
 module Bake
 

data/lib/bakery/model/language.rb

@@ -1,4 +1,4 @@
-require 'bake/model/metamodel'
+require_relative '../../bake/model/metamodel'
 require 'rtext/language'
 
 module Bake

data/lib/bakery/model/loader.rb

@@ -1,14 +1,14 @@
-require 'bakery/model/metamodel'
-require 'bakery/model/language'
-require 'common/version'
+require_relative 'metamodel'
+require_relative 'language'
+require_relative '../../common/version'
 
 require 'rgen/environment'
 require 'rgen/fragment/fragmented_model'
 
 require 'rtext/default_loader'
 
-require 'common/exit_helper'
-require 'bake/toolchain/colorizing_formatter'
+require_relative '../../common/exit_helper'
+require_relative '../../bake/toolchain/colorizing_formatter'
 
 module Bake
 

data/lib/bakery/options/options.rb

@@ -1,7 +1,7 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/options/parser'
-require 'common/options/finder'
-require 'common/root'
+require_relative '../../bake/toolchain/colorizing_formatter'
+require_relative '../../common/options/parser'
+require_relative '../../common/options/finder'
+require_relative '../../common/root'
 
 module Bake
 

data/lib/bakery/toBake.rb

@@ -1,4 +1,4 @@
-require "bakery/buildPattern"
+require_relative "buildPattern"
 
 module Bake
 

data/lib/blocks/block.rb

@@ -1,7 +1,7 @@
-require 'bake/libElement'
-require 'bake/model/metamodel'
-require 'common/abortException'
-require "multithread/job"
+require_relative '../bake/libElement'
+require_relative '../bake/model/metamodel'
+require_relative '../common/abortException'
+require_relative "../multithread/job"
 require "thwait"
 
 module Bake

data/lib/blocks/blockBase.rb

@@ -132,17 +132,6 @@ module Bake
               console_output = x[0]
               console_output = console_output_full if Bake.options.consoleOutput_fullnames
 
-              if Bake.options.consoleOutput_visualStudio
-                console_output_VS = ""
-                descCounter = 0
-                console_output.each_line do |l|
-                  d = error_descs[descCounter]
-                  console_output_VS << error_parser.makeVsError(l.rstrip, d) << "\n"
-                  descCounter = descCounter + 1
-                end
-                console_output = console_output_VS
-              end
-
               ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
 
               console_output.gsub!(/[\r]/, "")