bake-toolkit 2.65.0 → 2.68.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/toolchain/clang.rb

@@ -32,6 +32,9 @@ module Bake
     if Bake::Utils::OS::name == "Mac"
       CLANG_CHAIN[:ARCHIVER][:COMMAND] = "libtool"
       CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-static -o"
+    elsif Bake::Utils::OS::name == "Windows"
+      CLANG_CHAIN[:ARCHIVER][:COMMAND] = "clang"
+      CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "-fuse-ld=llvm-lib -o"
     else
       CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
       CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"

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/model/metamodel.rb

@@ -25,6 +25,10 @@ module Bake
       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 +36,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

@@ -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

@@ -37,7 +37,7 @@ begin
     x = longname(shortname(file))
   end
 
-rescue Fiddle::DLError
+rescue Exception
 
   def realname file
     file
@@ -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!("\"" , "\\\"")
@@ -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/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/blocks/makefile.rb

@@ -17,14 +17,16 @@ module Bake
         @projectDir = config.get_project_dir
         @path_to = ""
         @flags = adjustFlags("",config.flags) if config.flags
-        @makefile = config.name
+        @makefile = block.convPath(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 != ""
+        if config.lib != ""
+          block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, block.convPath(config.lib))
+        end 
       end
 
       def calcEnv

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.65.0"
+      "2.68.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

data/lib/tocxx.rb

@@ -652,8 +652,8 @@ module Bake
               al = AdaptConfig.new
               adaptConfigs = al.load()
 
-              @loadedConfig = Config.new
-              @referencedConfigs = @loadedConfig.load(adaptConfigs)
+              loadedConfig = Config.new
+              @referencedConfigs = loadedConfig.load(adaptConfigs)
 
               cache.write_cache(@referencedConfigs, adaptConfigs)
             end
@@ -894,10 +894,13 @@ module Bake
                           o = b.object_files[s]
                           dep_filename = b.calcDepFile(o, type)
                           dep_filename_conv = b.calcDepFileConv(dep_filename)
-                          File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
-                            header = File.expand_path(dep, b.projectDir)
-                            if File.exist?(header)
-                              inCompilation << header
+                          fname = File.expand_path(dep_filename_conv, b.projectDir)
+                          if File.exist?(fname)
+                            File.readlines(fname).map{|line| line.strip}.each do |dep|
+                              header = File.expand_path(dep, b.projectDir)
+                              if File.exist?(header)
+                                inCompilation << header
+                              end
                             end
                           end
                         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.65.0
+  version: 2.68.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -98,72 +98,58 @@ dependencies:
   name: e2mmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.23
 description: See documentation for more details
 email: alexander.schaal@esrlabs.com
 executables:
@@ -279,7 +265,7 @@ files:
 - lib/rtext-service/options/options.rb
 - lib/tocxx.rb
 - license.txt
-homepage: 
+homepage: https://github.com/esrlabs/bake
 licenses:
 - MIT
 metadata: {}
@@ -300,8 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.