bake-toolkit 2.40.1 → 2.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47018509fb45c727f0be0b11470726b01d13606a
-  data.tar.gz: 3b0fa9295363deb6ee596df9c4c3d1c87d4c40e7
+  metadata.gz: 9265c5c61a09ad000f71da3b935c655ab972cb81
+  data.tar.gz: 287a266d8db00d5a34c197915a0cb8d42d3e154b
 SHA512:
-  metadata.gz: d0ba48431dba2e59155c9d8026acce4a9f1d23a844ae4c347131d71a1b7150a24201e62f0b4afbd7e4c9a3581a12d2ee4a1a993c951ca744ce25aa82ae59889f
-  data.tar.gz: aa757eb55d06270e41ecfb84d885ec0db3d94b37702f589cfd39f965f4df8870f1caed7b8126fffaeff6c3ba94a92d1119dced7509a9b2e49aab885de98a0008
+  metadata.gz: 7e0d5ea92a4b631dda6ac2540c3769a5bb963af978e69859c9ebb3c4d59fe08c6bba766d0475406a84fa016c2f5c0b28867684d65f07d2228448606156a5e79d
+  data.tar.gz: 424d1b303dbcdb345cc7f9e1a51d14b5ab5f6351328d3c8e3b9ca869713cfabca7cebf42b7af8a109a7d207e3cceca44a44e0bbe82940fa0461f60ad87c770af

data/bin/bakeqac

@@ -281,7 +281,9 @@ $cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove
             converted_line = (scan_res[0][0].downcase + scan_res[0][1] + scan_res[0][2].gsub(/\\/,"/"))
             foundFile = ProjectFilter.localFile(converted_line)
           end
-          if foundFile && (!line.include?("QAC++ Deep Flow Static Analyser") || !@options.qacmsgfilter)
+          if line.include?("requires QA C++ version")
+            filteredLines << line # either downgrade gcc or upgrade QA C++
+          elsif foundFile && (!line.include?("QAC++ Deep Flow Static Analyser") || !@options.qacmsgfilter)
             filteredLines << line
           else
             misraLine = ["MSG: ", "trc: ", "// ======= Results for", "QAC++ Deep Flow Static Analyser"].none? { |pattern| line.include?(pattern) }

data/lib/bake/config/loader.rb

@@ -343,40 +343,6 @@ module Bake
       @potentialProjs.uniq!
     end
 
-    def filterStep(step, globalFilterStr)
-
-      # 1st prio: explicit single filter
-      if step.filter != ""
-        return true if  Bake.options.exclude_filter.include?step.filter
-        return false if Bake.options.include_filter.include?step.filter
-      end
-
-      # 2nd prio: explicit global filter
-      if globalFilterStr != nil
-        return true if  Bake.options.exclude_filter.include?globalFilterStr
-        return false if Bake.options.include_filter.include?globalFilterStr
-      end
-
-      # 3nd prio: default
-      return true if step.default == "off"
-      false
-    end
-
-    def filterSteps
-      @referencedConfigs.each do |projName, configs|
-        configs.each do |config|
-          config.startupSteps.step  = config.startupSteps.step.delete_if  { |step| filterStep(step, "STARTUP") }  if config.startupSteps
-          config.preSteps.step      = config.preSteps.step.delete_if      { |step| filterStep(step, "PRE") }      if config.preSteps
-          config.postSteps.step     = config.postSteps.step.delete_if     { |step| filterStep(step, "POST") }     if config.postSteps
-          config.exitSteps.step     = config.exitSteps.step.delete_if     { |step| filterStep(step, "EXIT") }     if config.exitSteps
-          config.cleanSteps.step    = config.cleanSteps.step.delete_if    { |step| filterStep(step, "CLEAN") }    if config.cleanSteps
-          if Metamodel::CustomConfig === config and config.step
-            config.step = nil if filterStep(config.step, nil)
-          end
-        end
-      end
-    end
-
     def defaultConfigName
       @loadedConfigs[Bake.options.main_project_name].first.parent.default
     end
@@ -420,7 +386,6 @@ module Bake
         loadMeta(dep)
       end
 
-      filterSteps
       return @referencedConfigs
     end
 

data/lib/bake/model/loader.rb

@@ -32,6 +32,14 @@ module Bake
       end
 
       @model = RGen::Fragment::FragmentedModel.new(:env => @env)
+
+      @globalFilterStrMap = {
+        Bake::Metamodel::StartupSteps => "STARTUP",
+        Bake::Metamodel::PreSteps => "PRE",
+        Bake::Metamodel::PostSteps => "POST",
+        Bake::Metamodel::ExitSteps => "EXIT",
+        Bake::Metamodel::CleanSteps => "CLEAN"
+      }
     end
 
     def load_internal(filename, silent = false)
@@ -68,6 +76,62 @@ module Bake
       frag
     end
 
+    def filterElement?(elem)
+      return false if Bake::Metamodel::Project === elem
+
+      # 1st prio: explicit single filter
+      if elem.filter != ""
+        return true if  Bake.options.exclude_filter.include?elem.filter
+        return false if Bake.options.include_filter.include?elem.filter
+      end
+
+      # 2nd prio: explicit global filter
+      if defined?(elem.parent)
+        globalFilterStr = @globalFilterStrMap[elem.parent.class]
+        if (globalFilterStr)
+            return true if  Bake.options.exclude_filter.include?globalFilterStr
+            return false if Bake.options.include_filter.include?globalFilterStr
+        end
+      end
+
+      # 3nd prio: default
+      return true if elem.default == "off"
+      false
+    end
+
+    def applyFilterOnArray(a)
+      toRemove = []
+      a.each do |elem|
+        if filterElement?(elem)
+          toRemove << elem
+        else
+          applyFilterOnElement(elem)
+        end
+      end
+      toRemove.each { |r| r.parent = nil }
+    end
+
+    def applyFilterOnElement(elem)
+      return if elem.nil?
+      elem.class.ecore.eAllReferences.each do |f|
+       next unless f.containment
+       begin
+         childData = elem.getGeneric(f.name)
+       rescue Exception => ex
+         next
+       end
+       next if childData.nil?
+       if (Array === childData)
+         applyFilterOnArray(childData)
+       elsif Metamodel::ModelElement === childData
+         if filterElement?(childData)
+           childData.parent = nil
+         else
+           applyFilterOnElement(childData)
+         end
+       end
+      end
+    end
 
     def load(filename)
       sumErrors = 0
@@ -98,6 +162,8 @@ module Bake
         ExitHelper.exit(1)
       end
 
+      applyFilterOnArray(frag.root_elements)
+
       return frag
 
     end

data/lib/bake/model/metamodel.rb

@@ -8,6 +8,8 @@ module Bake
 
     class ModelElement < RGen::MetamodelBuilder::MMBase
       abstract
+      has_attr 'default', String, :defaultValueLiteral => "on"
+      has_attr 'filter', String, :defaultValueLiteral => ""
       has_attr 'line_number', Integer do
         annotation :details => {'internal' => 'true'}
       end
@@ -181,8 +183,6 @@ module Bake
 
       class Step < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
-        has_attr 'default', String, :defaultValueLiteral => "on"
-        has_attr 'filter', String, :defaultValueLiteral => ""
         has_attr 'echo', String, :defaultValueLiteral => "on"
         has_attr 'independent', Boolean, :defaultValueLiteral => "false"
         has_many_attr 'validExitCodes', Integer

data/lib/bake/options/options.rb

@@ -179,10 +179,13 @@ module Bake
       @adapt.uniq!
 
       if @project
-        if @project.split(',').length > 2
+        ar = @project.split(",")
+        if ar.length > 2
           Bake.formatter.printError("Error: only one comma allowed for -p")
           ExitHelper.exit(1)
         end
+        ar[0] = File::basename(Dir.pwd) if ar[0] == "."
+        @project = ar.join(",")
       end
 
       if @conversion_info

data/lib/bake/options/usage.rb

@@ -38,10 +38,10 @@ module Bake
       puts " --toolchain-info <name>  Prints default values of a toolchain."
       puts " --toolchain-names        Prints available toolchains."
       puts " --dot <filename>         Creates a .dot file of the config dependencies."
-      puts " --do <name>[=<arg>]      Includes steps with this filter name (can be used multiple times)."
+      puts " --do <name>[=<arg>]      Includes elements with this filter name (can be used multiple times)."
       puts "                          Optional arguments which can be accessed in Project.meta via $(FilterArguments, <name>)."
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' includes all according steps."
-      puts " --omit <name>            Excludes steps with this filter name (can be used multiple times)."
+      puts " --omit <name>            Excludes elements with this filter name (can be used multiple times)."
       puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' excludes all according steps."
       puts " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
       puts " --Wparse                 The error parser result is also taken into account, not only the return value of compiler, archiver and linker."

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.40.1
+  version: 2.41.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -84,56 +84,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: See documentation for more details
@@ -248,23 +248,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- -x
+- "-x"
 - doc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.