bake-toolkit 2.42.2 → 2.42.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f143b6235632040aaa32c21fa78875e329f4d4
-  data.tar.gz: 1b9a9c6a99e4eb48b959729c560e0fe29bae8752
+  metadata.gz: db7a56decb2a548940290f127a619920e3904e32
+  data.tar.gz: aee111f1f448b858250af2102509e89360d93412
 SHA512:
-  metadata.gz: 74ef7187d30bd03f96d20028de7d4b7e10c513ef60f2aa46245aced7b0135eae8ab7d8941285cb1d08059ae30e24b5601caef31ef8076f75267560cadee2650f
-  data.tar.gz: 8e1d680f7ad4488183c4cd96a9facf5bcd2e95cb81228ce692c89ac532278b720f68ec87d26767e21d067c858638d946043ce9f0bab89f956e3d667f30d257e6
+  metadata.gz: 5b548504948bba8662e3c239f72cb1f4e81edf0df45e3bbd5304fe3ca745694581809f66f79f4a888954f9ed44e4d681c5d542f80bd61888992d7b39f686f1f9
+  data.tar.gz: d25bad6ab99a8268a55e300583ad4adc3a189174ad84ce123ef24620d5921081dae00adaca7d7501eaeb3e240cc0b147a27c29787a839bf334a9730638bc7131

data/lib/bake/libElement.rb

@@ -25,6 +25,7 @@ module Bake
       @@projectDir = block.projectDir
       @@source_libraries = []
       @@linker_libs_array = []
+      @@withpath = []
 
       levels = @@linker[:LINK_ONLY_DIRECT_DEPS] ? 1 : -1
       collect_recursive(block, levels)
@@ -42,7 +43,7 @@ module Bake
         @@linker_libs_array.reverse!
       end
 
-      return [@@source_libraries, @@linker_libs_array]
+      return [@@source_libraries + @@withpath, @@linker_libs_array]
     end
 
     def self.adaptPath(path, block, prefix)
@@ -90,6 +91,7 @@ module Bake
         when LibElement::LIB_WITH_PATH
           adaptedPath, prefix = adaptPath(elem.value, block, prefix)
           @@linker_libs_array <<  adaptedPath
+          @@withpath << adaptedPath
         when LibElement::SEARCH_PATH
           adaptedPath, prefix = adaptPath(elem.value, block, prefix)
           lpf = "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}"

data/lib/bake/options/options.rb

@@ -21,7 +21,7 @@ module Bake
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
     attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :cc2j_filename # String
     attr_reader :include_filter, :exclude_filter, :adapt # String List
-    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads # Boolean
+    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads, :skipBuildingLine # Boolean
     attr_reader :linkOnly, :compileOnly, :no_autodir, :clobber, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json, :wparse # Boolean
     attr_reader :threads, :socket # Fixnum
     attr_reader :vars, :include_filter_args # map
@@ -34,6 +34,7 @@ module Bake
     def initialize(argv)
       super(argv)
 
+      @skipBuildingLine = false
       @debug_threads = false
       @dry = false
       @filelist = nil
@@ -113,6 +114,7 @@ module Bake
       add_option(["--debug"                                      ], lambda {     @debug = true                           })
       add_option(["--debug-threads"                              ], lambda {     @debug_threads = true                   })
       add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
+      add_option(["-nb"                                          ], lambda {     @skipBuildingLine = true                })
 
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
       add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
@@ -293,7 +295,9 @@ module Bake
     end
 
     def set_adapt(name)
-      @adapt << name if not @adapt.include?name
+      name.split(",").each do |n|
+        @adapt << n if not @adapt.include?n
+      end
     end
 
     def checkNum(num)

data/lib/bake/options/usage.rb

@@ -47,7 +47,7 @@ module Bake
       puts " --Wparse                 The error parser result is also taken into account, not only the return value of compiler, archiver and linker."
       puts " --no-autodir             Disable auto completion of paths like in IncludeDir"
       puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."
-      puts " --adapt <name>           Specifies an adapt project to manipulate the configs (can be used multiple times)"
+      puts " --adapt <name>           Specifies an adapt project to manipulate the configs (can be used multiple times, or --adapt <name1,name2,...>)"
       puts " --incs-and-defs=json     Prints includes and defines of all projects in json format"
       puts " --incs-and-defs=bake     Used by IDEs plugins"
       puts " --conversion-info        Prints infos for an external tool which converts bake configs for other build systems"
@@ -56,6 +56,7 @@ module Bake
       puts " --prebuild               Does not build configs which are marked as 'prebuild', this feature is used for distributions."
       puts " --compilation-db [<fn>]  Writes compilation information into filename fn in json format, default for fn is compilation-db.json"
       puts " --create exe|lib|custom  Creates a project with exe, lib or custom template"
+      puts " --nb                     Suppresses the lines \"**** Building x of y: name (config) ****"
       puts " --link-2-17              DEPRECATED: Using link order of libraries which was used until bake 2.17"
       puts " --build_                 DEPRECATED: build directories will be build_<name> instead of build/<name>"
       puts " --version                Print version."

data/lib/blocks/block.rb

@@ -418,7 +418,7 @@ module Bake
           SyncOut.mutex.synchronize do
             @outputStep = nil
             SyncOut.startStream() if Bake.options.syncedOutput
-            if Bake.options.verbose >= 2 || (isBuildBlock? && Bake.options.verbose >= 1)
+            if !Bake.options.skipBuildingLine && (Bake.options.verbose >= 2 || (isBuildBlock? && Bake.options.verbose >= 1))
               typeStr = "Building"
               if @prebuild
                 typeStr = "Using"

data/lib/common/options/parser.rb

@@ -1,112 +1,112 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/exit_helper'
-
-module Bake
-
-  class Parser
-
-    def initialize(argv)
-      @arguments = {}
-      @argv = argv
-    end
-
-    #def add_option(opt)
-    #  @arguments[opt.param] = opt
-    #end
-
-    def add_option(params, block)
-      params.each { |p| @arguments[p] = block }
-    end
-
-    def valid?(argument)
-      @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)
-      arg = nil
-      block = nil
-      @arguments.each do |a, b|
-        if argument.start_with?(a) && a != ""
-          return [b, nil] if a == argument
-          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]
-    end
-
-    def has_parameter?(argument)
-      b, inPlaceArg = get_block(argument)
-      return false unless b
-      return false if inPlaceArg
-      b.parameters.length >= 1
-    end
-
-    def parse_internal(ignore_invalid, subOptions = nil)
-      pos = 0
-      begin
-        while pos < @argv.length do
-          arg = @argv[pos]
-          if not valid?arg
-
-            # used in bake config, must be passed from bakery to bake
-            if subOptions and subOptions.valid?arg
-              if subOptions.has_parameter?(arg)
-                if pos+1 < @argv.length and @argv[pos+1][0] != "-"
-                  pos = pos + 1
-                else
-                  raise "Argument for option #{arg} missing"
-                end
-              end
-            end
-
-            index = arg.index('-')
-            if index != nil and index == 0
-              raise "Option #{arg} unknown" if not ignore_invalid
-            else
-              @arguments[""].call(arg) # default parameter without "-"
-            end
-          else
-            option, inPlaceArg = get_block(arg)
-            hasArgument = (pos+1 < @argv.length and @argv[pos+1][0] != "-")
-            if option.parameters.length == 3 && (hasArgument || inPlaceArg)
-              if inPlaceArg
-                option.call(inPlaceArg, nil, nil)
-              else
-                option.call(@argv[pos+1], nil, nil) # do not use inplace value
-                pos = pos + 1
-              end
-            elsif option.parameters.length == 2
-              if hasArgument
-                option.call(@argv[pos+1], nil) # do not use default value
-                pos = pos + 1
-              else
-                option.call(nil, nil) # use default value
-              end
-            elsif option.parameters.length == 1 && hasArgument
-              option.call(@argv[pos+1])
-              pos = pos + 1
-            elsif option.parameters.length == 0
-              option.call()
-            else
-              raise "Argument for option #{arg} missing"
-            end
-          end
-          pos = pos + 1
-        end
-      rescue SystemExit => e
-        raise
-      rescue Exception => e
-        Bake.formatter.printError("Error: " + e.message)
-        ExitHelper.exit(1)
-      end
-
-    end
-
-  end
-
+require 'bake/toolchain/colorizing_formatter'
+require 'common/exit_helper'
+
+module Bake
+
+  class Parser
+
+    def initialize(argv)
+      @arguments = {}
+      @argv = argv
+    end
+
+    #def add_option(opt)
+    #  @arguments[opt.param] = opt
+    #end
+
+    def add_option(params, block)
+      params.each { |p| @arguments[p] = block }
+    end
+
+    def valid?(argument)
+      @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)
+      arg = nil
+      block = nil
+      @arguments.each do |a, b|
+        if argument.start_with?(a) && a != ""
+          return [b, nil] if a == argument
+          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]
+    end
+
+    def has_parameter?(argument)
+      b, inPlaceArg = get_block(argument)
+      return false unless b
+      return false if inPlaceArg
+      b.parameters.length >= 1
+    end
+
+    def parse_internal(ignore_invalid, subOptions = nil)
+      pos = 0
+      begin
+        while pos < @argv.length do
+          arg = @argv[pos]
+          if not valid?arg
+
+            # used in bake config, must be passed from bakery to bake
+            if subOptions and subOptions.valid?arg
+              if subOptions.has_parameter?(arg)
+                if pos+1 < @argv.length and @argv[pos+1][0] != "-"
+                  pos = pos + 1
+                else
+                  raise "Argument for option #{arg} missing"
+                end
+              end
+            end
+
+            index = arg.index('-')
+            if index != nil and index == 0
+              raise "Option #{arg} unknown" if not ignore_invalid
+            else
+              @arguments[""].call(arg) # default parameter without "-"
+            end
+          else
+            option, inPlaceArg = get_block(arg)
+            hasArgument = (pos+1 < @argv.length and @argv[pos+1][0] != "-")
+            if option.parameters.length == 3 && (hasArgument || inPlaceArg)
+              if inPlaceArg
+                option.call(inPlaceArg, nil, nil)
+              else
+                option.call(@argv[pos+1], nil, nil) # do not use inplace value
+                pos = pos + 1
+              end
+            elsif option.parameters.length == 2
+              if hasArgument
+                option.call(@argv[pos+1], nil) # do not use default value
+                pos = pos + 1
+              else
+                option.call(nil, nil) # use default value
+              end
+            elsif option.parameters.length == 1 && hasArgument
+              option.call(@argv[pos+1])
+              pos = pos + 1
+            elsif option.parameters.length == 0
+              option.call()
+            else
+              raise "Argument for option #{arg} missing"
+            end
+          end
+          pos = pos + 1
+        end
+      rescue SystemExit => e
+        raise
+      rescue Exception => e
+        Bake.formatter.printError("Error: " + e.message)
+        ExitHelper.exit(1)
+      end
+
+    end
+
+  end
+
 end

data/lib/common/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.42.2
+  version: 2.42.3
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext