bake-toolkit 2.66.0 → 2.70.0

data/lib/bake/subst.rb

@@ -227,6 +227,13 @@ module Bake
             args = Bake.options.include_filter_args[splittedVar[1]]
             substStr << args if args
           end
+        elsif var == "OriginalDir"
+          org = File.dirname(elem.org_file_name)
+          if (org == @@projDir)
+            substStr << @@projDir
+          else
+            substStr << File.rel_from_to_project(@@projDir,File.dirname(elem.org_file_name),false)
+          end
         elsif var == "ProjectDir" or (splittedVar.length == 2 and splittedVar[0] == "ProjectDir")
           if (var == "ProjectDir")
             substStr << @@projDir
@@ -258,12 +265,18 @@ module Bake
             configs = @@referencedConfigs[out_proj_name]
             config = configs.select {|c| c.name == out_conf_name }.first
             if config
-              out_dir = nil
-              if (config.toolchain and config.toolchain.outputDir and config.toolchain.outputDir != "")
+
+              if config.toolchain && config.toolchain.outputDir && config.toolchain.outputDir != ""
                 out_dir = config.toolchain.outputDir
               else
                 out_dir = @@configTcMap[config][:OUTPUT_DIR]
               end
+              if config.toolchain && config.toolchain.outputDirPostfix && config.toolchain.outputDirPostfix != ""
+                out_dir_postfix = config.toolchain.outputDirPostfix
+              else
+                out_dir_postfix = @@configTcMap[config][:OUTPUT_DIR_POSTFIX]
+              end
+
               if not out_dir
                 qacPart = Bake.options.qac ? (".qac" + Bake.options.buildDirDelimiter) : ""
                 if out_proj_name == Bake.options.main_project_name and out_conf_name == Bake.options.build_config
@@ -272,6 +285,7 @@ module Bake
                   out_dir = "build" + Bake.options.buildDirDelimiter + qacPart + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
                 end
               end
+              out_dir += out_dir_postfix if out_dir_postfix
 
               if (out_dir.include?"$(")
                 if !elem
@@ -374,8 +388,14 @@ module Bake
         return if Metamodel::DefaultToolchain === elem
         return if Metamodel::Toolchain === elem.class
         next if a.eType.name != "EString"
-        substStr = substString(elem.getGeneric(a.name), elem, a.name)
-        elem.setGeneric(a.name, substStr)
+        value = elem.getGeneric(a.name)
+        if value.kind_of?(Array)
+          substArr = value.map { |s| substString(s, elem, a.name) }
+          elem.setGeneric(a.name, substArr)
+        else
+          substStr = substString(value, elem, a.name)
+          elem.setGeneric(a.name, substStr)
+        end
       end
 
       childsRefs = elem.class.ecore.eAllReferences.select{|r| r.containment}

data/lib/bake/util.rb

@@ -44,6 +44,7 @@ def integrateToolchain(tcs, toolchain)
 
   tcs[:KEEP_FILE_ENDINGS] = @mainConfig.defaultToolchain.keepObjFileEndings
   tcs[:OUTPUT_DIR] = toolchain.outputDir if toolchain.outputDir != ""
+  tcs[:OUTPUT_DIR_POSTFIX] = toolchain.outputDirPostfix if toolchain.outputDirPostfix != ""
   integrateLinker(tcs, toolchain.linker) if toolchain.respond_to?"linker"
   integrateArchiver(tcs, toolchain.archiver)
   toolchain.compiler.each do |c|

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,11 +20,16 @@ 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 => ""
       has_attr 'config', String, :defaultValueLiteral => ""
     end
+
+    class ExcludeDir < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+    end
     class SubCollection < ModelElement
       has_attr 'name', String, :defaultValueLiteral => ""
     end
@@ -32,6 +37,7 @@ module Bake
       has_attr 'name', String, :defaultValueLiteral => ""
       contains_many 'project', Project, 'collection'
       contains_many 'exclude', Exclude, 'collection'
+      contains_many 'exclude_dir', ExcludeDir, 'collection'
       contains_many 'collections', SubCollection, 'collection'
     end
 

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
@@ -67,11 +67,18 @@ module Bake
       p.config = "^"+p.config.gsub("*","(\\w*)")+"$"
     end
 
+    col.exclude_dir.each do |e|
+      e.name = File.expand_path(e.name, @options.collection_dir)
+    end
+
     toBuild.delete_if do |bp|
       exclude = false
       col.exclude.each do |p|
         exclude = true if (bp.proj.match(p.name) != nil and bp.conf.match(p.config) != nil)
       end
+      col.exclude_dir.each do |e|
+        exclude = true if bp.proj.start_with?(e.name)
+      end
       exclude
     end
 

data/lib/blocks/block.rb

@@ -598,6 +598,12 @@ module Bake
             @output_dir = "build" + Bake.options.buildDirDelimiter + qacPart + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
           end
         end
+        if @tcs[:OUTPUT_DIR_POSTFIX] != nil
+          @output_dir = @output_dir + @tcs[:OUTPUT_DIR_POSTFIX] 
+        end
+        if Bake.options.consoleOutput_fullnames
+          @output_dir = File.expand_path(@output_dir, @projectDir)
+        end
       end
 
     end

data/lib/blocks/commandLine.rb

@@ -1,44 +1,44 @@
-require_relative 'has_execute_command'
-
-module Bake
-  module Blocks
-
-    class CommandLine
-      include HasExecuteCommand
-
-      def initialize(config)
-        @config = config # Bake::Metamodel::CommandLine
-        @commandLine = config.name
-        @projectDir = config.get_project_dir
-      end
-
-      def run
-        return true if Bake.options.linkOnly
-        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 cleanStep
-        return run()
-      end
-
-      def clean
-        # nothing to do here
-        return true
-      end
-
-    end
-
-  end
-end
+require_relative 'has_execute_command'
+
+module Bake
+  module Blocks
+
+    class CommandLine
+      include HasExecuteCommand
+
+      def initialize(config)
+        @config = config # Bake::Metamodel::CommandLine
+        @commandLine = config.name.kind_of?(Array) ? config.name.join(' ') : config.name
+        @projectDir = config.get_project_dir
+      end
+
+      def run
+        return true if Bake.options.linkOnly
+        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 cleanStep
+        return run()
+      end
+
+      def clean
+        # nothing to do here
+        return true
+      end
+
+    end
+
+  end
+end

data/lib/blocks/compile.rb

@@ -255,7 +255,7 @@ module Bake
           cmdJson = cmd.is_a?(Array) ? cmd.join(' ') : cmd
           srcFilePath = source
           if Bake.options.consoleOutput_fullnames
-            srcFilePath = File.join(@projectDir, srcFilePath)
+            srcFilePath = File.join(@projectDir, srcFilePath) if !File.is_absolute?(srcFilePath)
             cmdJson[source] = srcFilePath
           end
           cmdJson.gsub!("\"" , "\\\"")
@@ -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|
@@ -524,10 +524,16 @@ module Bake
 
       def calcObjects
         @object_files_ignored_in_lib = []
-        @source_files.each do |source|
+        @source_files.map! do |source|
           type = get_source_type(source)
           if not type.nil?
             object = get_object_file(source)
+
+            if Bake.options.consoleOutput_fullnames
+              object = File.expand_path(object, @projectDir)
+              source = File.expand_path(source, @projectDir)
+            end
+
             if @objects.include?object
               @object_files.each do |k,v|
                 if (v == object) # will be found exactly once
@@ -545,6 +551,7 @@ module Bake
               @objects << object
             end
           end
+          source
         end
       end
 
@@ -629,16 +636,18 @@ module Bake
       end
 
       def calcIncludesInternal(block)
-        # puts "#{block.projectName},#{block.configName} " + block.to_s
         noDeps = @blocksRead.include?(block)
         @blocksRead << block
         block.bes.each do |be|
           if Metamodel::IncludeDir === be
-            # puts "-- #{be.name}"
             if be.inherit == true || block == @block
-              mappedInc = File.rel_from_to_project(@projectDir,be.name,false)
-              mappedInc  = "." if mappedInc.empty?
-              if !@include_set.include?(mappedInc) # todo set!!
+              if Bake.options.consoleOutput_fullnames
+                mappedInc = be.name
+              else
+                mappedInc = File.rel_from_to_project(@projectDir,be.name,false)
+                mappedInc  = "." if mappedInc.empty?
+              end
+              if !@include_set.include?(mappedInc)
                 @include_list << mappedInc
                 @include_set << mappedInc
                 if !@include_merge.has_key?(mappedInc)
@@ -674,15 +683,7 @@ module Bake
         @include_list = []
         @include_merge = {}
         @system_includes = Set.new
-        
-          #puts @block.bes.length
-          #@block.bes.each {|b| puts "#{b.class}: #{b.name}, #{b.respond_to?(:config) ? b.config : ""}"}
-          #exit(1)
-        
-
-        
         calcIncludesInternal(@block) # includeDir and child dependencies with inherit: true
-        # exit(1)
         @include_list = @include_list.flatten.uniq
       end
 

data/lib/blocks/executable.rb

@@ -43,6 +43,10 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @exe_name ||= File.join([@block.output_dir, baseFilename])
+        if Bake.options.consoleOutput_fullnames
+          @exe_name = File.expand_path(@exe_name, @projectDir)
+        end
+        return @exe_name
       end
 
       def calcCmdlineFile()

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/blocks/library.rb

@@ -34,6 +34,10 @@ module Bake
           baseFilename += ".#{@config.artifactExtension.name}"
         end
         @archive_name ||= File.join([@block.output_dir, baseFilename])
+        if Bake.options.consoleOutput_fullnames
+          @archive_name = File.expand_path(@archive_name, @projectDir)
+        end
+        return @archive_name
       end
 
       def calcCmdlineFile()

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.66.0"
+      "2.70.0"
     end
 
     def self.printBakeVersion(ry = "")
@@ -29,26 +29,22 @@ module Bake
     end
   end
 
-  expectedRGen = "0.8.2"
-  expectedRText = "0.9.0"
-  expectedConcurrent = "1.0.5"
-
-  begin
-    gem "rgen", "=#{expectedRGen}"
-  rescue Exception => e
-    puts "Warning: Failed to load rgen #{expectedRGen}, using latest version"
-  end
-
-  begin
-    gem "rtext", "=#{expectedRText}"
-  rescue Exception => e
-    puts "Warning: Failed to load rtext #{expectedRText}, using latest version"
-  end
-
-  begin
-    gem "concurrent-ruby", "=#{expectedConcurrent}"
-  rescue Exception => e
-    puts "Warning: Failed to load concurrent-ruby #{expectedConcurrent}, using latest version"
+  deps = [
+    ["rgen", "0.8.2"],
+    ["rtext", "0.9.0"],
+    ["concurrent-ruby", "1.0.5"],
+    ["highline", "1.7.8"],
+    ["colored", "1.2"],
+    ["thwait", "0.1.0"],
+    ["e2mmap", "0.1.0"]]
+
+  deps.each do |d|
+    begin
+      gem d[0], "=#{d[1]}"
+    rescue Exception => e
+      puts "Error: Failed to load gem #{d[0]} #{d[1]}, please reinstall bake-toolkit."
+      exit -1
+    end
   end
 
 end