bake-toolkit 2.37.1 → 2.37.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4231ba10a8dbc7711dac892e7b932faf30050404
-  data.tar.gz: 4cf03457745cf2bfe3521db89d7847607e160820
+  metadata.gz: a45aa63944be2d13c5930eb7d647b2698e5fe5cc
+  data.tar.gz: bd806a9beba3f69d8bd86ec10ca6272d8ec1044c
 SHA512:
-  metadata.gz: b900fde5e96ff7eadb477bf6856bcd45a4eb4c2c57aa2399b95eaa6060a19dbb53af56ec8bd6ea05b53521662681fb5eabe6d87b04d7efa90e12ec678ec03280
-  data.tar.gz: a572d8d68f5cd1761db7f46af0222cdc3412fd73ee4d4284d21df66ad422394184313964c1dddaf4a7e32b897e9778dd33fbe5a5c4127c7aa4311d1af6220452
+  metadata.gz: 64c323e37a9ed5401d5e14060e2f1ff41ffcc45f3d878a206ab6d8b2b697ee5d5d645d7c25bca1dc3dedbd31b1735deeef08c023510f7e8834a8b3cb080f1db5
+  data.tar.gz: 830a4382f9ef11dc1945f0ffc7c31cb32530feac9f04815a02f8ecc26ef0fd6de72a98c48873abb184ac2af268382641f8af4b6a38bd50fee6226db805a98252

data/bin/bakeqac

@@ -25,17 +25,17 @@ def self.checkCipSize()
     s = File.size?(cips[0])
     s = 0 if s.nil?
     if s < @@cipFileSize
-      puts "cip file too small: #{cips[0]} has #{s} bytes"
+      puts "bakeqac: cip file too small: #{cips[0]} has #{s} bytes"
       return false
     end
     @@cipFileSize = s
     return true
   end
-  puts "cip file does not exist!"
+  puts "bakeqac: cip file does not exist!"
   return false
 end
 
-def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
+def self.executeQacli(cmd, adminStepAndImmediateOutput = false, cmdRemoveLocks = nil)
   timeStart = Time.now
   cSizeCheck = true
   licenseError = false
@@ -55,17 +55,20 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
     consoleOutput.each_line do |line|
       if (line.include?("License Refused") && !line.include?("License Refused: C:"))
         licenseError = true
-        puts "License refused!"
+        puts "bakeqac: License refused!"
         break
       end
       if (line.include?("unable to connect to QAX Daemon") && !line.include?("License Refused: C:"))
         qacDaemonError = true
-        puts "Unable to connect to QAX Daemon!"
+        puts "bakeqac: Unable to connect to QAX Daemon!"
         break
       end
       if (line.include?("Process timeout"))
-        puts "Process takes too long!"
+        puts "bakeqac: Process takes too long!"
         processTimeout = true
+        puts "bakeqac: Removing locks from #{@options.qacdata}..."
+        successRemove, consoleOutput = ProcessHelper.run(cmdRemoveLocks, false)
+        puts consoleOutput unless consoleOutput.empty?
         break
       end
     end
@@ -145,7 +148,8 @@ end
 
     puts "bakeqac: creating database..."
 
-    success, consoleOutput, checkError = executeQacli(cmd, true)
+    cmdRemoveLocks = qaExe + ["admin", "--qaf-project", @options.qacdata, "--remove-locks"]
+    success, consoleOutput, checkError = executeQacli(cmd, true, cmdRemoveLocks)
 
     if success
       cctFilename = @options.qacdata+"/prqa/config/"+File.basename(@options.cct[0])
@@ -169,7 +173,7 @@ end
         end
       end
     else
-      puts consoleOutput
+      puts consoleOutput unless consoleOutput.empty?
     end
   end
 

data/lib/bake/libElement.rb

@@ -26,7 +26,8 @@ module Bake
       @@source_libraries = []
       @@linker_libs_array = []
 
-      collect_recursive(block)
+      levels = @@linker[:LINK_ONLY_DIRECT_DEPS] ? 1 : -1
+      collect_recursive(block, levels)
 
       if Bake.options.oldLinkOrder
         if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
@@ -67,7 +68,7 @@ module Bake
       end
     end
 
-    def self.collect_recursive(block)
+    def self.collect_recursive(block, levels = -1)
       return if @@dep_set.include?block
       @@dep_set << block
 
@@ -117,20 +118,17 @@ module Bake
         when LibElement::DEPENDENCY
           if Blocks::ALL_BLOCKS.include?elem.value
             bb = Blocks::ALL_BLOCKS[elem.value]
-            collect_recursive(bb)
+            collect_recursive(bb, levels-1)
           else
             # TODO: warning or error?
           end
         end
-      end
+      end if levels != 0
 
       addOwnLib(block) if not Bake.options.oldLinkOrder
-
     end
 
 
-
-
     def self.calcLibElements(block)
       lib_elements = [] # value = array pairs [type, name/path string]
 

data/lib/bake/model/metamodel.rb

@@ -64,6 +64,7 @@ module Bake
       class Linker < ModelElement
         has_attr 'command', String, :defaultValueLiteral => ""
         has_attr 'prefix', String, :defaultValueLiteral => "$(LinkerPrefix)"
+        has_attr 'onlyDirectDeps', Boolean, :defaultValueLiteral => "false"
         contains_many 'flags', Flags, 'parent'
         contains_many 'libprefixflags', LibPrefixFlags, 'parent'
         contains_many 'libpostfixflags', LibPostfixFlags, 'parent'

data/lib/bake/util.rb

@@ -60,6 +60,7 @@ end
 def integrateLinker(tcs, linker)
   return tcs unless linker
   tcs[:LINKER][:COMMAND] = linker.command if linker.command != ""
+  tcs[:LINKER][:LINK_ONLY_DIRECT_DEPS] = linker.onlyDirectDeps
   tcs[:LINKER][:PREFIX] = linker.prefix if linker.prefix != ""
   tcs[:LINKER][:FLAGS] = adjustFlags(tcs[:LINKER][:FLAGS], linker.flags)
   tcs[:LINKER][:LIB_PREFIX_FLAGS] = adjustFlags(tcs[:LINKER][:LIB_PREFIX_FLAGS], linker.libprefixflags)

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.37.1
+  version: 2.37.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext