bake-toolkit 2.35.0 → 2.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bdce1be8c9d734fc44596c799f18524eca9f3c9
-  data.tar.gz: 4a9302c6b3fd75f2888311246cc304d10e807c86
+  metadata.gz: 0a7786f0adcdc09c7f5860b6b5921a74924c5cc3
+  data.tar.gz: 9040049b27bed9600030f2d2bb7e7ee0c9a64698
 SHA512:
-  metadata.gz: 0c2b3cebcf34dc1910f32cf45e50eb743d2045daf0ac055984159287bee694966220cf21dbca3196b0bdfaa398d4e7a7a4f2d7bf17bf71357c3c3746c7e98907
-  data.tar.gz: 6cf22898b9cb33808f930929bd4dd74347ce01f6d80828b11a853ab7462dc565362078357598104db71d2ddece9bb64d8729fdc97ad52b32464a745231446d68
+  metadata.gz: e93a6de2b383b7d14889e9a13b84898cc6ff4fb093ee4bc441fb722d2aabcc7e2994e40470f6b859da9a9f6f647ccc6be5bde1915781db9f59cfbaf916f49bdf
+  data.tar.gz: faba3697e24876269608136072c51a330ba2d8bee7ee548aefdf6eeb12c22dda72824af38fca4bd282d065f14950ed87aa44d2671b1252fb68a6fafc47e12e54

data/lib/bake/libElement.rb

@@ -59,8 +59,8 @@ module Bake
       if block.library
         adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
         if (block.prebuild and File.exist?adaptedPath) or
-           (not block.library.compileBlock.objects.empty?) or
-           (not block.library.compileBlock.calcSources(true, true).empty?)
+           (!block.library.compileBlock.nil? and !block.library.compileBlock.objects.empty?) or
+           (!block.library.compileBlock.nil? and !block.library.compileBlock.calcSources(true, true).empty?)
           @@linker_libs_array << adaptedPath
           @@source_libraries << adaptedPath
         end

data/lib/blocks/block.rb

@@ -223,7 +223,7 @@ module Bake
         else
           counter = 0
           blocks.each do |b|
-            counter += 1 if b.isBuildBlock? || b.prebuild
+            counter += 1 if b.isBuildBlock?
           end
           @@num_projects = counter
         end
@@ -416,7 +416,7 @@ module Bake
           SyncOut.mutex.synchronize do
             @outputStep = nil
             SyncOut.startStream() if Bake.options.syncedOutput
-            if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+            if Bake.options.verbose >= 2 || isBuildBlock?
               typeStr = "Building"
               if @prebuild
                 typeStr = "Using"
@@ -467,7 +467,7 @@ module Bake
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 
-        if Bake.options.verbose >= 2 || isBuildBlock? || @prebuild
+        if Bake.options.verbose >= 2 || isBuildBlock?
           Block.inc_block_counter()
         end
 

data/lib/blocks/executable.rb

@@ -66,7 +66,7 @@ module Bake
         @compileBlock.objects.each do |obj|
           return "because object #{obj} does not exist" if not File.exists?(obj)
           return "because object #{obj} is newer than executable" if eTime < File.mtime(obj)
-        end
+        end if @compileBlock
 
         # libs
         libs.each do |lib|

data/lib/blocks/library.rb

@@ -56,8 +56,8 @@ module Bake
 
         #Dir.chdir(@projectDir) do
 
-          @objects = @compileBlock.objects
           if !@block.prebuild
+            @objects = @compileBlock.objects
             if @objects.empty?
               SyncOut.mutex.synchronize do
                 puts "No source files, library won't be created" if Bake.options.verbose >= 2

data/lib/common/options/parser.rb

@@ -19,7 +19,9 @@ module Bake
     end
 
     def valid?(argument)
-      @arguments.keys.any? { |a| a != "" && argument.start_with?(a) }
+      @arguments.any? { |a, b|
+        argument == a || (a != "" && argument.start_with?(a) && (!b || (b.parameters.length==3 && argument[a.length..-1].scan(/\A\d*\z/).length > 0)))
+      }
     end
 
     def get_block(argument)
@@ -28,8 +30,10 @@ module Bake
       @arguments.each do |a, b|
         if argument.start_with?(a) && a != ""
           return [b, nil] if a == argument
-          block = b
-          arg = b.parameters.length==3 ? argument[a.length..-1] : nil
+          if b && b.parameters.length==3 && argument[a.length..-1].scan(/\A\d*\z/).length > 0
+            block = b
+            arg = argument[a.length..-1]
+          end
         end
       end
       return [block, arg]

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -80,7 +80,13 @@ module Bake
       end
     end
 
-
+    def addLib(block, configSteps)
+      Array(configSteps.step).each do |step|
+        if Bake::Metamodel::Makefile === step
+          block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, step.lib) if step.lib != ""
+        end
+      end if configSteps
+    end
 
     def addSteps(block, blockSteps, configSteps)
       Array(configSteps.step).each do |step|
@@ -299,17 +305,29 @@ module Bake
           addSteps(block, block.startupSteps,  config.startupSteps)
           addSteps(block, block.exitSteps,  config.exitSteps)
 
-          if not block.prebuild and not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
-            addSteps(block, block.preSteps,   config.preSteps)
-            addSteps(block, block.postSteps,  config.postSteps)
-            addSteps(block, block.cleanSteps, config.cleanSteps)
+          if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
+            if block.prebuild
+              addLib(block, config.preSteps)
+              addLib(block, config.postSteps)
+              addLib(block, config.cleanSteps)
+            else
+              addSteps(block, block.preSteps,   config.preSteps)
+              addSteps(block, block.postSteps,  config.postSteps)
+              addSteps(block, block.cleanSteps, config.cleanSteps)
+            end
           end
 
           if Bake.options.docu
             block.mainSteps << Blocks::Docu.new(config, @configTcMap[config]) unless block.prebuild
           elsif Metamodel::CustomConfig === config
             if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
-              addSteps(block, block.mainSteps, config) if config.step unless block.prebuild
+              p block.prebuild
+              if block.prebuild
+                addLib(block, config)
+              else
+                puts config.parent.name
+                addSteps(block, block.mainSteps, config) if config.step
+              end
             end
           elsif Bake.options.conversion_info
             block.mainSteps << Blocks::Convert.new(block, config, @referencedConfigs) unless block.prebuild

metadata

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