bake-toolkit 2.39.1 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c9ada3c69825228c2c91cf6b3402c5db5999c5
-  data.tar.gz: 1ef73767df14105792adb00059813cbf2141c0bc
+  metadata.gz: bb0adac43c63f67a6209eb737f5fea0441715416
+  data.tar.gz: 8f8b68bad2c337986352025b60cde6630e9ae7a5
 SHA512:
-  metadata.gz: 89bb98b431c4175de864c7e124b2d8f889937e0ad1d254a6367c15308394f9b337aeef439a4fe8ca58d48a06744388820d3bde36373a4e2853a0d2b128dcaf4d
-  data.tar.gz: ff4f583bc45946c011a3b944e0be9ef6146442a9241fedbdbfb34bb802cfeba45caa13813754c7622bbec448f88125703861fd8649cb99fbb61300d4013feb22
+  metadata.gz: 0ae585591499cfb4c85cd413388d7e07679c79f07b0e7d415849dc2e008393a8f2af0c787457f2554d1445d94e2fa77bbed6fd3f9feb80e8f362d86053fca820
+  data.tar.gz: ad887fd898e1e4b8570e1b8c334fad34669957cee3c44f7678dbe3dbec2c55f30872f367884df4e234f3ef16334b37041c53b37974cd3315c895d31d852bb058

data/lib/bake/options/options.rb

@@ -24,7 +24,7 @@ module Bake
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :projectPaths, :qac, :dry, :syncedOutput, :debug_threads # 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 # map
+    attr_reader :vars, :include_filter_args # map
     attr_reader :verbose
     attr_reader :filelist # set
     attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
@@ -77,6 +77,7 @@ module Bake
       @roots = []
       @socket = 0
       @include_filter = []
+      @include_filter_args = {}
       @exclude_filter = []
       @main_project_name = ""
       @adapt = []
@@ -120,7 +121,7 @@ module Bake
       add_option(["--toolchain-info",     "--toolchain_info"     ], lambda { |x| ToolchainInfo.showToolchain(x)          })
       add_option(["--toolchain-names",    "--toolchain_names"    ], lambda {     ToolchainInfo.showToolchainList         })
       add_option(["--dot",                                       ], lambda { |x| @dot = x                                })
-      add_option(["--do",                 "--include_filter"     ], lambda { |x| @include_filter << x                    })
+      add_option(["--do",                 "--include_filter"     ], lambda { |x| set_filter(x)                           })
       add_option(["--omit",               "--exclude_filter"     ], lambda { |x| @exclude_filter << x                    })
       add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @consoleOutput_fullnames = true         })
       add_option(["--prebuild"                                   ], lambda {     @prebuild = true                        })
@@ -326,6 +327,12 @@ module Bake
       @vars[ar[0]] = ar[1..-1].join("=")
     end
 
+    def set_filter(f)
+      splitted = f.split("=", 2)
+      @include_filter << splitted[0]
+      @include_filter_args[splitted[0]] = splitted[1] if splitted.length == 2
+    end
+
   end
 
 end

data/lib/bake/options/usage.rb

@@ -38,7 +38,8 @@ 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>              Includes steps with this filter name (can be used multiple times)."
+      puts " --do <name>[=<arg>]      Includes steps 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 "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' excludes all according steps."

data/lib/bake/subst.rb

@@ -163,7 +163,7 @@ module Bake
         @@resolvedVars += 1
         var = str[posStart+2..posEnd-1]
 
-        splittedVar = var.split(",")
+        splittedVar = var.split(",").map { |v| v.strip() }
 
         if Bake.options.vars.has_key?(var)
           substStr << Bake.options.vars[var]
@@ -181,15 +181,21 @@ module Bake
          substStr << @@toolchainName
         elsif var == "ProjectName"
           substStr << @@projName
+        elsif var == "FilterArguments" or (splittedVar.length == 2 and splittedVar[0] == "FilterArguments")
+          if (var == "FilterArguments")
+            # default = nothing
+          else
+            args = Bake.options.include_filter_args[splittedVar[1]]
+            substStr << args if args
+          end
         elsif var == "ProjectDir" or (splittedVar.length == 2 and splittedVar[0] == "ProjectDir")
           if (var == "ProjectDir")
             substStr << @@projDir
           else
-            out_proj_name = splittedVar[1].strip
+            out_proj_name = splittedVar[1]
             if @@referencedConfigs.has_key?out_proj_name
               configs = @@referencedConfigs[out_proj_name]
               config = configs.first
-
               substStr << File.rel_from_to_project(@@projDir,config.get_project_dir,false)
             else
               if Bake.options.verbose > 0
@@ -203,8 +209,8 @@ module Bake
             out_proj_name = @@projName
             out_conf_name = @@configName
           else
-            out_proj_name = splittedVar[1].strip
-            out_conf_name = splittedVar[2].strip
+            out_proj_name = splittedVar[1]
+            out_conf_name = splittedVar[2]
           end
           if @@referencedConfigs.has_key?out_proj_name
             configs = @@referencedConfigs[out_proj_name]

data/lib/common/root.rb

@@ -87,8 +87,10 @@ module Bake
         array = Array.new(depth+1) {|i| root + '/*'*i + '/' + baseName}
         return Dir.glob(array).sort
       else
-        str = "#{root}/**/#{baseName}"
-        return Dir.glob(str).sort
+        # when using junctions, /**/ does not work, so the glob is splitted into two globs to find at least first level projects
+        str1 = "#{root}/#{baseName}"
+        str2 = "#{root}/*/**/#{baseName}"
+        return (Dir.glob(str1) + Dir.glob(str2)).sort
       end
     end
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.39.1"
+      "2.40.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.39.1
+  version: 2.40.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext