bake-toolkit 2.50.0 → 2.51.0

data/lib/blocks/convert.rb

@@ -24,9 +24,9 @@ module Bake
           puts " BAKE_DEFINES"
           (@block.tcs[:COMPILER][:CPP][:DEFINES] + @block.tcs[:COMPILER][:C][:DEFINES] + @block.tcs[:COMPILER][:ASM][:DEFINES]).uniq.each { |s| puts "  #{s}" }
           puts " BAKE_DEPENDENCIES"
-          @block.childs.each { |dep| puts "  #{dep.projectName}" }
+          @block.dependencies.each { |dep| puts "  #{dep.projectName}" }
           puts " BAKE_DEPENDENCIES_FILTERED"
-          @block.childs.each { |dep| puts "  #{dep.projectName}" unless @projectName == dep.projectName or dep.projectName == "gmock" or dep.projectName == "gtest" }
+          @block.dependencies.each { |dep| puts "  #{dep.projectName}" unless @projectName == dep.projectName or dep.projectName == "gmock" or dep.projectName == "gtest" }
           puts "END_INFO"
         end
         return true

data/lib/blocks/executable.rb

@@ -78,8 +78,9 @@ module Bake
 
       def execute
         Dir.chdir(@projectDir) do
-          childs = @block.getBlocks(:childs)
-          if childs.any? { |b| b.result == false }
+          
+          subBlocks = @block.bes.select{|d| Metamodel::Dependency === d}.map { |d| ALL_BLOCKS["#{d.name},#{d.config}"] }
+          if subBlocks.any? { |d| d.result == false }
             if Bake.options.stopOnFirstError
               Blocks::Block.set_delayed_result
               return true
@@ -89,13 +90,15 @@ module Bake
           end
 
           allSources = []
-          (childs + [@block]).each do |b|
+          (subBlocks + [@block]).each do |b|
             Dir.chdir(b.projectDir) do
               b.getCompileBlocks.each do |c|
-                allSources += c.calcSources(true, true).map { |s| File.expand_path(s) }
+                srcs = c.calcSources(true, true).map { |s| File.expand_path(s) }
+                allSources += srcs
               end
             end
           end
+          
           duplicateSources = allSources.group_by{ |e| e }.select { |k, v| v.size > 1 }.map(&:first)
           duplicateSources.each do |d|
             Bake.formatter.printError("Source compiled more than once: #{d}")
@@ -146,19 +149,15 @@ module Bake
           cmd += linker_libs_array
           cmd += Bake::Utils::flagSplit(linker[:LIB_POSTFIX_FLAGS],true) # "-Wl,--no-whole-archive "
 
-          mapfileStr = (@mapfile and linker[:MAP_FILE_PIPE]) ? " >#{@mapfile}" : ""
-
           realCmd = Bake.options.fileCmd ? calcFileCmd(cmd, onlyCmd, @exe_name, linker) : cmd
             
           # pre print because linking can take much time
-          if Bake.options.fileCmd
-            cmdLinePrint = realCmd
-          else
-            cmdLinePrint = cmd.dup
-            outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
-            cmdLinePrint << "> #{outPipe}" if outPipe
-          end
-          
+          cmdLinePrint = Bake.options.fileCmd ? realCmd.dup : cmd.dup
+
+          # some mapfiles are printed in stdout
+          outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
+          cmdLinePrint << "> #{outPipe}" if outPipe
+
           if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
             success = true
           else

data/lib/blocks/makefile.rb

@@ -1,138 +1,138 @@
-require_relative 'has_execute_command'
-
-module Bake
-  module Blocks
-
-    class Makefile
-      include HasExecuteCommand
-
-      MAKE_COMMAND = "make"
-      MAKE_FILE_FLAG = "-f"
-      MAKE_DIR_FLAG = "-C"
-      MAKE_CLEAN = "clean"
-
-      def initialize(config, referencedConfigs, block)
-        @config = config
-        @tcs = block.tcs
-        @projectDir = config.get_project_dir
-        @path_to = ""
-        @flags = adjustFlags("",config.flags) if config.flags
-        @makefile = config.name
-        @target = config.target != "" ? config.target : "all"
-        calcPathTo(referencedConfigs)
-        calcCommandLine
-        calcCleanLine
-        calcEnv
-
-        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
-      end
-
-      def calcEnv
-        @envs = {}
-        [:CPP, :C, :ASM].each do |type|
-          compiler = @tcs[:COMPILER][type]
-          defs = compiler[:DEFINES].map {|k| "#{compiler[:DEFINE_FLAG]}#{k}"}.join(" ")
-          args = [defs, compiler[:FLAGS]].reject(&:empty?).join(" ")
-          @envs["BAKE_#{type.to_s}_FLAGS"] = args
-          @envs["BAKE_#{type.to_s}_COMMAND"] = compiler[:COMMAND]
-        end
-        @envs["BAKE_AR_FLAGS"] = @tcs[:ARCHIVER][:FLAGS]
-        @envs["BAKE_LD_FLAGS"] = @tcs[:LINKER][:FLAGS]
-        @envs["BAKE_AR_COMMAND"] = @tcs[:ARCHIVER][:COMMAND]
-        @envs["BAKE_LD_COMMAND"] = @tcs[:LINKER][:COMMAND]
-      end
-
-      def fileAndDir
-        if @config.changeWorkingDir
-          return remove_empty_strings_and_join([
-            MAKE_DIR_FLAG,  File.dirname(@makefile),
-            MAKE_FILE_FLAG, File.basename(@makefile)])
-        else
-          return remove_empty_strings_and_join([
-            MAKE_FILE_FLAG, @makefile])
-        end
-      end
-
-      def calcCommandLine
-        @commandLine = remove_empty_strings_and_join([
-          MAKE_COMMAND, @target,
-          @flags,
-          fileAndDir,
-          @path_to])
-      end
-
-      def calcCleanLine
-        @cleanLine = remove_empty_strings_and_join([
-          MAKE_COMMAND, MAKE_CLEAN,
-          @flags,
-          fileAndDir,
-          @path_to])
-      end
-
-      def calcPathTo(referencedConfigs)
-        @path_to = ""
-        if @config.pathTo != ""
-          pathHash = {}
-          @config.pathTo.split(",").each do |p|
-            nameOfP = p.strip
-            dirOfP = nil
-            if referencedConfigs.include?nameOfP
-              dirOfP = referencedConfigs[nameOfP].first.get_project_dir
-            else
-              Bake.options.roots.each do |r|
-                absIncDir = r.dir+"/"+nameOfP
-                if File.exists?(absIncDir)
-                  dirOfP = absIncDir
-                  break
-                end
-              end
-            end
-            if dirOfP == nil
-              Bake.formatter.printError("Project '#{nameOfP}' not found", @config)
-              ExitHelper.exit(1)
-            end
-            pathHash[nameOfP] = File.rel_from_to_project(File.dirname(@projectDir),File.dirname(dirOfP))
-          end
-          path_to_array = []
-          pathHash.each { |k,v| path_to_array << "PATH_TO_#{k}=#{v}" }
-          @path_to = path_to_array.join(" ")
-        end
-
-      end
-
-      def run
-        return true if Bake.options.linkOnly
-        @envs.each { |k,v| ENV[k] = v }
-        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
-      end
-
-      def execute
-        return run()
-       end
-
-      def startupStep
-        return run()
-      end
-
-      def exitStep
-        return run()
-      end
-
-      def do_clean
-        return true if Bake.options.linkOnly || @config.noClean
-        @envs.each { |k,v| ENV[k] = v }
-        return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes, @config.echo) unless Bake.options.filename
-      end
-
-      def clean
-        return do_clean()
-      end
-
-      def cleanStep
-        return do_clean()
-      end
-
-    end
-
-  end
-end
+require_relative 'has_execute_command'
+
+module Bake
+  module Blocks
+
+    class Makefile
+      include HasExecuteCommand
+
+      MAKE_COMMAND = "make"
+      MAKE_FILE_FLAG = "-f"
+      MAKE_DIR_FLAG = "-C"
+      MAKE_CLEAN = "clean"
+
+      def initialize(config, referencedConfigs, block)
+        @config = config
+        @tcs = block.tcs
+        @projectDir = config.get_project_dir
+        @path_to = ""
+        @flags = adjustFlags("",config.flags) if config.flags
+        @makefile = config.name
+        @target = config.target != "" ? config.target : "all"
+        calcPathTo(referencedConfigs)
+        calcCommandLine
+        calcCleanLine
+        calcEnv
+
+        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
+      end
+
+      def calcEnv
+        @envs = {}
+        [:CPP, :C, :ASM].each do |type|
+          compiler = @tcs[:COMPILER][type]
+          defs = compiler[:DEFINES].map {|k| "#{compiler[:DEFINE_FLAG]}#{k}"}.join(" ")
+          args = [defs, compiler[:FLAGS]].reject(&:empty?).join(" ")
+          @envs["BAKE_#{type.to_s}_FLAGS"] = args
+          @envs["BAKE_#{type.to_s}_COMMAND"] = compiler[:COMMAND]
+        end
+        @envs["BAKE_AR_FLAGS"] = @tcs[:ARCHIVER][:FLAGS]
+        @envs["BAKE_LD_FLAGS"] = @tcs[:LINKER][:FLAGS]
+        @envs["BAKE_AR_COMMAND"] = @tcs[:ARCHIVER][:COMMAND]
+        @envs["BAKE_LD_COMMAND"] = @tcs[:LINKER][:COMMAND]
+      end
+
+      def fileAndDir
+        if @config.changeWorkingDir
+          return remove_empty_strings_and_join([
+            MAKE_DIR_FLAG,  File.dirname(@makefile),
+            MAKE_FILE_FLAG, File.basename(@makefile)])
+        else
+          return remove_empty_strings_and_join([
+            MAKE_FILE_FLAG, @makefile])
+        end
+      end
+
+      def calcCommandLine
+        @commandLine = remove_empty_strings_and_join([
+          MAKE_COMMAND, @target,
+          @flags,
+          fileAndDir,
+          @path_to])
+      end
+
+      def calcCleanLine
+        @cleanLine = remove_empty_strings_and_join([
+          MAKE_COMMAND, MAKE_CLEAN,
+          @flags,
+          fileAndDir,
+          @path_to])
+      end
+
+      def calcPathTo(referencedConfigs)
+        @path_to = ""
+        if @config.pathTo != ""
+          pathHash = {}
+          @config.pathTo.split(",").each do |p|
+            nameOfP = p.strip
+            dirOfP = nil
+            if referencedConfigs.include?nameOfP
+              dirOfP = referencedConfigs[nameOfP].first.get_project_dir
+            else
+              Bake.options.roots.each do |r|
+                absIncDir = r.dir+"/"+nameOfP
+                if File.exists?(absIncDir)
+                  dirOfP = absIncDir
+                  break
+                end
+              end
+            end
+            if dirOfP == nil
+              Bake.formatter.printError("Project '#{nameOfP}' not found", @config)
+              ExitHelper.exit(1)
+            end
+            pathHash[nameOfP] = File.rel_from_to_project(File.dirname(@projectDir),File.dirname(dirOfP))
+          end
+          path_to_array = []
+          pathHash.each { |k,v| path_to_array << "PATH_TO_#{k}=#{v}" }
+          @path_to = path_to_array.join(" ")
+        end
+
+      end
+
+      def run
+        return true if Bake.options.linkOnly
+        @envs.each { |k,v| ENV[k] = v }
+        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+      end
+
+      def execute
+        return run()
+       end
+
+      def startupStep
+        return run()
+      end
+
+      def exitStep
+        return run()
+      end
+
+      def do_clean
+        return true if Bake.options.linkOnly || @config.noClean
+        @envs.each { |k,v| ENV[k] = v }
+        return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes, @config.echo) unless Bake.options.filename
+      end
+
+      def clean
+        return do_clean()
+      end
+
+      def cleanStep
+        return do_clean()
+      end
+
+    end
+
+  end
+end

data/lib/blocks/showIncludes.rb

@@ -1,141 +1,145 @@
-module Bake
-  module Blocks
-    class Show
-
-      def self.secureShow
-        begin
-          yield
-        rescue Exception => e
-          if (not SystemExit === e)
-            puts e
-            puts e.backtrace
-            ExitHelper.exit(1)
-          else
-            raise e
-          end
-        end
-      end
-
-      def self.includes
-        secureShow {
-        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
-          print projName
-          incs = []
-          blocks.each do |block|
-            if Bake.options.consoleOutput_fullnames
-              incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
-            else
-              incs += block.include_list
-            end
-          end
-
-          incs.uniq.each { |inc| print "##{inc}" }
-          print "\n"
-        end
-        ExitHelper.exit(0) }
-      end
-
-      def self.readInternalIncludes(mainConfig, mainBlock, mainTcs)
-        intIncs = []
-        iinc = mainConfig.defaultToolchain.internalIncludes
-        Dir.chdir(Bake.options.main_dir) do
-          if (iinc)
-
-            cppExe      = File.which(mainTcs[:COMPILER][:CPP][:COMMAND])
-            cExe        = File.which(mainTcs[:COMPILER][:C][:COMMAND])
-            asmExe      = File.which(mainTcs[:COMPILER][:ASM][:COMMAND])
-            archiverExe = File.which(mainTcs[:ARCHIVER][:COMMAND])
-            linkerExe   = File.which(mainTcs[:LINKER][:COMMAND])
-
-            iname = mainBlock.convPath(iinc)
-            if iname != ""
-              if not File.exists?(iname)
-                Bake.formatter.printError("InternalIncludes file #{iname} does not exist", iinc)
-                ExitHelper.exit(1)
-              end
-              IO.foreach(iname) do |x|
-                x.sub!("$(CPPPath)",      cppExe)
-                x.sub!("$(CPath)",        cExe)
-                x.sub!("$(ASMPath)",      asmExe)
-                x.sub!("$(ArchiverPath)", archiverExe)
-                x.sub!("$(LinkerPath)",   linkerExe)
-                add_line_if_no_comment(intIncs,x)
-              end
-            end
-          end
-        end
-        return intIncs
-      end
-
-      def self.readInternalDefines(mainConfig, mainBlock)
-        intDefs = {:CPP => [], :C => [], :ASM => []}
-        Dir.chdir(Bake.options.main_dir) do
-          mainConfig.defaultToolchain.compiler.each do |c|
-            if (c.internalDefines)
-              dname = mainBlock.convPath(c.internalDefines)
-              if dname != ""
-                if not File.exists?(dname)
-                  Bake.formatter.printError("InternalDefines file #{dname} does not exist", c.internalDefines)
-                  ExitHelper.exit(1)
-                end
-                IO.foreach(dname) {|x| add_line_if_no_comment(intDefs[c.ctype],x)  }
-              end
-            end
-          end
-        end
-        return intDefs
-      end
-
-      def self.includesAndDefines(mainConfig, mainTcs)
-        secureShow {
-        mainBlock = Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]
-
-        intIncs = readInternalIncludes(mainConfig, mainBlock, mainTcs)
-        intDefs = readInternalDefines(mainConfig, mainBlock)
-
-
-        projs = {}
-        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
-
-          blockIncs = []
-          blockDefs = {:CPP => [], :C => [], :ASM => []}
-          blocks.each do |block|
-            if Bake.options.consoleOutput_fullnames
-              blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
-            else
-              blockIncs += block.include_list
-            end
-            [:CPP, :C, :ASM].each { |type| blockDefs[type] += block.block.tcs[:COMPILER][type][:DEFINES] }
-          end
-          if Bake.options.json
-            projs[projName] =
-              {  :includes => (blockIncs + intIncs).uniq,
-                 :cpp_defines => (blockDefs[:CPP] + intDefs[:CPP]).uniq + Bake.options.defines,
-                 :c_defines => (blockDefs[:C] + intDefs[:C]).uniq + Bake.options.defines,
-                 :asm_defines => (blockDefs[:ASM] + intDefs[:ASM]).uniq + Bake.options.defines,
-                 :dir => blocks.first.projectDir
-              }
-          else
-            puts projName
-            puts " dir #{blocks.first.projectDir}"
-            puts " includes"
-            (blockIncs + intIncs).uniq.each { |i| puts "  #{i}" }
-            [:CPP, :C, :ASM].each do |type|
-              puts " #{type} defines"
-              (blockDefs[type] + intDefs[type] + Bake.options.defines).uniq.each { |d| puts "  #{d}" }
-            end
-            puts " done"
-          end
-        end
-
-        if Bake.options.json
-          require "json"
-          puts JSON.pretty_generate(projs)
-        end
-
-        ExitHelper.exit(0) }
-      end
-
-    end
-  end
-end
+module Bake
+  module Blocks
+    class Show
+
+      def self.secureShow
+        begin
+          yield
+        rescue Exception => e
+          if (not SystemExit === e)
+            puts e
+            puts e.backtrace
+            ExitHelper.exit(1)
+          else
+            raise e
+          end
+        end
+      end
+
+      def self.includes
+        secureShow {
+        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
+          print projName
+          incs = []
+          blocks.each do |block|
+            if Bake.options.consoleOutput_fullnames
+              incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
+            else
+              incs += block.include_list
+            end
+          end
+
+          incs.uniq.each { |inc| print "##{inc}" }
+          print "\n"
+        end
+        ExitHelper.exit(0) }
+      end
+
+      def self.readInternalIncludes(mainConfig, mainBlock, mainTcs)
+        intIncs = []
+        iinc = mainConfig.defaultToolchain.internalIncludes
+        Dir.chdir(Bake.options.main_dir) do
+          if (iinc)
+
+            cppExe      = File.which(mainTcs[:COMPILER][:CPP][:COMMAND])
+            cExe        = File.which(mainTcs[:COMPILER][:C][:COMMAND])
+            asmExe      = File.which(mainTcs[:COMPILER][:ASM][:COMMAND])
+            archiverExe = File.which(mainTcs[:ARCHIVER][:COMMAND])
+            linkerExe   = File.which(mainTcs[:LINKER][:COMMAND])
+
+            iname = mainBlock.convPath(iinc)
+            if iname != ""
+              if not File.exists?(iname)
+                Bake.formatter.printError("InternalIncludes file #{iname} does not exist", iinc)
+                ExitHelper.exit(1)
+              end
+              IO.foreach(iname) do |x|
+                x.sub!("$(CPPPath)",      cppExe)
+                x.sub!("$(CPath)",        cExe)
+                x.sub!("$(ASMPath)",      asmExe)
+                x.sub!("$(ArchiverPath)", archiverExe)
+                x.sub!("$(LinkerPath)",   linkerExe)
+                add_line_if_no_comment(intIncs,x)
+              end
+            end
+          end
+        end
+        return intIncs
+      end
+
+      def self.readInternalDefines(mainConfig, mainBlock)
+        intDefs = {:CPP => [], :C => [], :ASM => []}
+        Dir.chdir(Bake.options.main_dir) do
+          mainConfig.defaultToolchain.compiler.each do |c|
+            if (c.internalDefines)
+              dname = mainBlock.convPath(c.internalDefines)
+              if dname != ""
+                if not File.exists?(dname)
+                  Bake.formatter.printError("InternalDefines file #{dname} does not exist", c.internalDefines)
+                  ExitHelper.exit(1)
+                end
+                IO.foreach(dname) {|x| add_line_if_no_comment(intDefs[c.ctype],x)  }
+              end
+            end
+          end
+        end
+        return intDefs
+      end
+
+      def self.includesAndDefines(mainConfig, mainTcs)
+        secureShow {
+        mainBlock = Blocks::ALL_BLOCKS[Bake.options.main_project_name+","+Bake.options.build_config]
+
+        intIncs = readInternalIncludes(mainConfig, mainBlock, mainTcs)
+        intDefs = readInternalDefines(mainConfig, mainBlock)
+
+
+        projs = {}
+        Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
+
+          blockIncs = []
+          blockDefs = {:CPP => [], :C => [], :ASM => []}
+          blocks.each do |block|
+            block.calcFileTcs
+            block.calcIncludes
+            block.calcDefines
+            block.calcFlags 
+            if Bake.options.consoleOutput_fullnames
+              blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
+            else
+              blockIncs += block.include_list
+            end
+            [:CPP, :C, :ASM].each { |type| blockDefs[type] += block.block.tcs[:COMPILER][type][:DEFINES] }
+          end
+          if Bake.options.json
+            projs[projName] =
+              {  :includes => (blockIncs + intIncs).uniq,
+                 :cpp_defines => (blockDefs[:CPP] + intDefs[:CPP]).uniq + Bake.options.defines,
+                 :c_defines => (blockDefs[:C] + intDefs[:C]).uniq + Bake.options.defines,
+                 :asm_defines => (blockDefs[:ASM] + intDefs[:ASM]).uniq + Bake.options.defines,
+                 :dir => blocks.first.projectDir
+              }
+          else
+            puts projName
+            puts " dir #{blocks.first.projectDir}"
+            puts " includes"
+            (blockIncs + intIncs).uniq.each { |i| puts "  #{i}" }
+            [:CPP, :C, :ASM].each do |type|
+              puts " #{type} defines"
+              (blockDefs[type] + intDefs[type] + Bake.options.defines).uniq.each { |d| puts "  #{d}" }
+            end
+            puts " done"
+          end
+        end
+
+        if Bake.options.json
+          require "json"
+          puts JSON.pretty_generate(projs)
+        end
+
+        ExitHelper.exit(0) }
+      end
+
+    end
+  end
+end