bake-toolkit 2.12.2 → 2.13.0

data/lib/bake/model/metamodel.rb

@@ -106,6 +106,11 @@ module Bake
         has_attr 'text', String, :defaultValueLiteral => ""
       end
       
+      class RequiredBakeVersion < ModelElement
+        has_attr 'minimum', String, :defaultValueLiteral => ""
+        has_attr 'maximum', String, :defaultValueLiteral => ""
+      end
+      
       class Responsible < ModelElement
         contains_many "person", Person, 'parent'
       end
@@ -238,6 +243,7 @@ module Bake
       class Project < ModelElement
         has_attr 'default', String, :defaultValueLiteral => ""
         contains_one 'description', Description, 'parent'
+        contains_one 'requiredBakeVersion', RequiredBakeVersion, 'parent'
         contains_one 'responsible', Responsible, 'parent'
         contains_many 'config', BaseConfig_INTERNAL, 'parent'
         

data/lib/bake/options/options.rb

@@ -6,7 +6,6 @@ require 'bake/options/showLicense'
 require 'bake/options/showDoc'
 require 'bake/options/usage'
 require 'bake/options/create'
-require 'common/options/option'
 
 module Bake
 
@@ -68,62 +67,65 @@ module Bake
       @def_roots = []
       @main_project_name = ""
       
-      add_default(Proc.new{ |x| set_build_config_default(x) })
-      
-      add_option(Option.new("-m",true)                     { |x| set_main_dir(x)            })
-      add_option(Option.new("-b",true)                     { |x| set_build_config(x)        })
-      add_option(Option.new("-p",true)                     { |x| @project = x;})
-      add_option(Option.new("-f",true)                     { |x| @filename = x.gsub(/[\\]/,'/')            })
-      add_option(Option.new("-c",false)                    {     @clean = true              })
-      add_option(Option.new("-a",true)                     { |x| Bake.formatter.setColorScheme(x.to_sym)              })
-      add_option(Option.new("-w",true)                     { |x| set_root(x)                })
-      add_option(Option.new("-r",false)                    {     @stopOnFirstError = true                  })
-      add_option(Option.new("--rebuild",false)             {     @rebuild = true                })
-      add_option(Option.new("--prepro",false)              {     @prepro = true                 })
-      add_option(Option.new("--link_only",false)           {     @linkOnly = true;              })
-      add_option(Option.new("--no_autodir",false)          {     @no_autodir = true         })
-      add_option(Option.new("--lint",false)                {     @lint = true               })
-      add_option(Option.new("--lint_min",true)             { |x| @lint_min = String === x ? x.to_i : x            })
-      add_option(Option.new("--lint_max",true)             { |x| @lint_max = String === x ? x.to_i : x            })
-      
-      add_option(Option.new("--create",true)               { |x| Bake::Create.proj(x) })     
-      add_option(Option.new("--conversion_info",false)        { @conversion_info = true  }) 
+      add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
+      add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
+      add_option(["-p"                                           ], lambda { |x| @project = x                            })
+      add_option(["-f"                                           ], lambda { |x| @filename = x.gsub(/[\\]/,'/')          })
+      add_option(["-c"                                           ], lambda {     @clean = true                           })
+      add_option(["-a"                                           ], lambda { |x| Bake.formatter.setColorScheme(x.to_sym) })
+      add_option(["-w"                                           ], lambda { |x| set_root(x)                             })
+      add_option(["-r"                                           ], lambda {     @stopOnFirstError = true                })
+      add_option(["--rebuild"                                    ], lambda {     @rebuild = true                         })
+      add_option(["--prepro"                                     ], lambda {     @prepro = true                          })
+      add_option(["--link-only",          "--link_only"          ], lambda {     @linkOnly = true;                       })
+      add_option(["--no-autodir",         "--no_autodir"         ], lambda {     @no_autodir = true                      })
+      add_option(["--lint"                                       ], lambda {     @lint = true                            })
+      add_option(["--lint-min",           "--lint_min"           ], lambda { |x| @lint_min = String === x ? x.to_i : x   })
+      add_option(["--lint-max",           "--lint_max"           ], lambda { |x| @lint_max = String === x ? x.to_i : x   })
+                                                                                                                         
+      add_option(["--create"                                     ], lambda { |x| Bake::Create.proj(x)                    })     
+      add_option(["--conversion-info",    "--conversion_info"    ], lambda { @conversion_info = true                     }) 
+                                                                                                                         
+      add_option(["--generate-doc",       "--docu"               ], lambda {     @docu = true                            })
+                                                                                                                         
+      add_option(["-v0"                                          ], lambda {     @verbose = 0                            })
+      add_option(["-v1"                                          ], lambda {     @verbose = 1                            })
+      add_option(["-v2"                                          ], lambda {     @verbose = 2                            })
+      add_option(["-v3"                                          ], lambda {     @verbose = 3                            })
         
-      add_option(Option.new("--docu",false)                {     @docu = true               })
-
-      add_option(Option.new("-v0",false)                   {     @verbose = 0      })
-      add_option(Option.new("-v1",false)                   {     @verbose = 1      })
-      add_option(Option.new("-v2",false)                   {     @verbose = 2      })
-      add_option(Option.new("-v3",false)                   {     @verbose = 3      })
+      add_option(["--debug"                                      ], lambda {     @debug = true                           })
+      add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
         
-      add_option(Option.new("--debug",false)               {     @debug = true              })
-      add_option(Option.new("--set",true)                  { |x| set_set(x)                 })
-        
-      add_option(Option.new("--clobber",false)             {     @clobber = true; @clean = true                })
-      add_option(Option.new("--ignore_cache",false)        {     @nocache = true                })
-      add_option(Option.new("--threads",true)              { |x| set_threads(x)             })
-      add_option(Option.new("--socket",true)               { |x| @socket = String === x ? x.to_i : x              })
-      add_option(Option.new("--toolchain_info",true)       { |x| ToolchainInfo.showToolchain(x)         })
-      add_option(Option.new("--toolchain_names",false)     {     ToolchainInfo.showToolchainList           })
-      add_option(Option.new("--include_filter",true)       { |x| @include_filter << x       })
-      add_option(Option.new("--exclude_filter",true)       { |x| @exclude_filter << x       })
-      add_option(Option.new("--show_abs_paths",false)      {     @consoleOutput_fullnames = true         })
-      add_option(Option.new("--visualStudio",false)        {     @consoleOutput_visualStudio = true           })
-      add_option(Option.new("-h",false)                    {     Bake::Usage.show                 })
-      add_option(Option.new("--help",false)                {     Bake::Usage.show                 })
-      add_option(Option.new("--show_include_paths",false)  {     @show_includes = true      })
-      add_option(Option.new("--show_incs_and_defs",false)  {     @show_includes_and_defines = true  })
-      add_option(Option.new("--show_license",false)        {     License.show              })
-      add_option(Option.new("--show_doc",false)                 {     Doc.show              })
-      add_option(Option.new("--doc",false)                 {     Doc.deprecated              })
-      add_option(Option.new("--version",false)             {     ExitHelper.exit(0)         })
-      add_option(Option.new("--show_configs",false)        {     @showConfigs = true    })
-      add_option(Option.new("--writeCC2J",true)            { |x| @cc2j_filename = x.gsub(/[\\]/,'/')            })
+      add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
+      add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
+      add_option(["--threads"                                    ], lambda { |x| set_threads(x)                          })
+      add_option(["--socket"                                     ], lambda { |x| @socket = String === x ? x.to_i : x     })
+      add_option(["--toolchain-info",     "--toolchain_info"     ], lambda { |x| ToolchainInfo.showToolchain(x)          })
+      add_option(["--toolchain-names",    "--toolchain_names"    ], lambda {     ToolchainInfo.showToolchainList         })
+      add_option(["--do",                 "--include_filter"     ], lambda { |x| @include_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(["-h",                   "--help"               ], lambda {     Bake::Usage.show                        })
+
+      add_option(["--incs-and-defs",      "--show_incs_and_defs" ], lambda {     @show_includes_and_defines = true       })
+      add_option(["--license",            "--show_license"       ], lambda {     License.show                            })
+      add_option(["--doc",                "--show_doc"           ], lambda {     Doc.show                                })
+
+      add_option(["--version"                                    ], lambda {     ExitHelper.exit(0)                      })
+      add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
+      add_option(["--writeCC2J"                                  ], lambda { |x| @cc2j_filename = x.gsub(/[\\]/,'/')     })
+
+      # hidden
+      add_option(["--visualStudio"                               ], lambda {     @consoleOutput_visualStudio = true      })
+            
+      # deprecated and not replaced by new command
+      add_option(["--show_include_paths"                         ], lambda {     @show_includes = true                   })
 
     end
 
     def parse_options()
-      parse_internal(false)
+      parse_internal()
       set_main_dir(Dir.pwd) if @main_dir.nil?
       @roots = @def_roots if @roots.length == 0
       
@@ -136,46 +138,46 @@ module Bake
       
       if @conversion_info
         if @rebuild
-          Bake.formatter.printError("Error: --conversion_info and --rebuild not allowed at the same time")
+          Bake.formatter.printError("Error: --conversion-info and --rebuild not allowed at the same time")
           ExitHelper.exit(1)
         end 
         if @clean
-          Bake.formatter.printError("Error: --conversion_info and -c not allowed at the same time")
+          Bake.formatter.printError("Error: --conversion-info and -c not allowed at the same time")
           ExitHelper.exit(1)
         end
         if @prepro
-          Bake.formatter.printError("Error: --conversion_info and --prepro not allowed at the same time")
+          Bake.formatter.printError("Error: --conversion-info and --prepro not allowed at the same time")
           ExitHelper.exit(1)
         end
         if @linkOnly
-          Bake.formatter.printError("Error: --conversion_info and --linkOnly not allowed at the same time")
+          Bake.formatter.printError("Error: --conversion-info and --linkOnly not allowed at the same time")
           ExitHelper.exit(1)
         end
         if @lint
-          Bake.formatter.printError("Error: --conversion_info and --lint not allowed at the same time")
+          Bake.formatter.printError("Error: --conversion-info and --lint not allowed at the same time")
           ExitHelper.exit(1)
         end
         if @docu
-          Bake.formatter.printError("Error: --conversion_info and --docu not allowed at the same time")
+          Bake.formatter.printError("Error: --conversion-info and --docu not allowed at the same time")
           ExitHelper.exit(1)
         end
         if not @project
-          Bake.formatter.printError("Error: --conversion_info must be used with -p")
+          Bake.formatter.printError("Error: --conversion-info must be used with -p")
           ExitHelper.exit(1)
         end
       end
       
       if @linkOnly
         if @rebuild
-          Bake.formatter.printError("Error: --link_only and --rebuild not allowed at the same time")
+          Bake.formatter.printError("Error: --link-only and --rebuild not allowed at the same time")
           ExitHelper.exit(1)
         end
         if @clean
-          Bake.formatter.printError("Error: --link_only and -c not allowed at the same time")
+          Bake.formatter.printError("Error: --link-only and -c not allowed at the same time")
           ExitHelper.exit(1)
         end
         if @prepro
-          Bake.formatter.printError("Error: --link_only and --prepro not allowed at the same time")
+          Bake.formatter.printError("Error: --link-only and --prepro not allowed at the same time")
           ExitHelper.exit(1)
         end
       end
@@ -210,13 +212,6 @@ module Bake
       end      
     end    
 
-    def set_build_config_default(config)
-      index = config.index('-')
-      return false if (index != nil and index == 0) 
-      set_build_config(config)
-      return true
-    end
-
     def set_build_config(config)
       if not @build_config.empty?
         Bake.formatter.printError("Error: Cannot set build config '#{config}', because build config is already set to '#{@build_config}'")

data/lib/bake/options/showDoc.rb

@@ -16,12 +16,5 @@ module Bake
       ExitHelper.exit(0)
     end
     
-    def self.deprecated
-      puts "Option \"--doc\" not supported anymore. Please use"
-      puts "\"--show_doc\" to open the documentation in the browser OR"
-      puts "\"--docu\" for building the documentation of a project."
-      ExitHelper.exit(1)
-    end
-    
   end
 end

data/lib/bake/options/usage.rb

@@ -14,39 +14,38 @@ module Bake
       puts " -r                       Stop on first error."
       puts " -w <root>                Add a workspace root (can be used multiple times)."
       puts "                          If no root is specified, the parent directory of the main project is added automatically."
-      puts " --show_configs           Shows all configs with DefaultToolchain."
+      puts " --list                   Lists all configs with a DefaultToolchain."
       puts " --rebuild                Clean before build."
       puts " --clobber                Clean the file/project (same as option -c) AND the bake cache files."
       puts " --prepro                 Stop after preprocessor."
-      puts " --link_only              Only link executables - doesn't update objects and archives or start PreSteps and PostSteps."
+      puts " --link-only              Only link executables - doesn't update objects and archives or start PreSteps and PostSteps."
       puts "                          Forces executables to be relinked."
-      puts " --docu                   Builds docu instead of compiling sources."
+      puts " --generate-doc           Builds docu instead of compiling sources."
       puts " --lint                   Performs Lint checks instead of compiling sources."
-      puts " --lint_min <num>         If number of files in a project is too large for lint to handle, it is possible"
+      puts " --lint-min <num>         If number of files in a project is too large for lint to handle, it is possible"
       puts "                          to specify only a part of the file list to lint (default -1)."
-      puts " --lint_max <num>         See above (default -1)."
-      puts " --ignore_cache           Rereads the original meta files - usefull if workspace structure has been changed."
+      puts " --lint-max <num>         See above (default -1)."
+      puts " --ignore-cache           Rereads the original meta files - usefull if workspace structure has been changed."
       puts " --threads <num>          Set NUMBER of parallel compiled files (default is 8)."
       puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
-      puts " --toolchain_info <name>  Prints default values of a toolchain."
-      puts " --toolchain_names        Prints available toolchains."
-      puts " --include_filter <name>  Includes steps with this filter name (can be used multiple times)."
+      puts " --toolchain-info <name>  Prints default values of a toolchain."
+      puts " --toolchain-names        Prints available toolchains."
+      puts " --do <name>              Includes steps with this filter name (can be used multiple times)."
       puts "                          'PRE', 'POST', 'STARTUP' or 'EXIT' includes all according steps."
-      puts " --exclude_filter <name>  Excludes steps with this filter name (can be used multiple times)."
+      puts " --omit <name>            Excludes steps with this filter name (can be used multiple times)."
       puts "                          'PRE', 'POST', 'STARTUP' or 'EXIT' excludes all according steps."
-      puts " --show_abs_paths         Compiler prints absolute filename paths instead of relative paths."
-      puts " --no_autodir             Disable auto completion of paths like in IncludeDir"
+      puts " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
+      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 " --show_include_paths     Used by IDEs plugins"
-      puts " --show_incs_and_defs     Used by IDEs plugins"
-      puts " --conversion_info        Prints infos for an external tool which converts bake configs for other build systems"
+      puts " --incs-and-defs          Used by IDEs plugins"
+      puts " --conversion-info        Prints infos for an external tool which converts bake configs for other build systems"
       puts " --writeCC2J <name>       Writes compiler command into a json file (experimental!)"
       puts " --create exe|lib|custom  Creates a project with exe, lib or custom template"
       puts ""
       puts " --version                Print version."
-      puts " --show_doc               Open documentation in browser"
+      puts " --doc                    Open documentation in browser"
       puts " -h, --help               Print this help."
-      puts " --show_license           Print the license."
+      puts " --license                Print the license."
       puts ""
       puts " --debug                  Print out backtraces in some cases - used only for debugging bake."      
       ExitHelper.exit(0)      

data/lib/bakery/options/options.rb

@@ -20,22 +20,22 @@ module Bake
       @socket = 0
       @def_roots = []
             
-      add_option(Option.new("-b",true)        { |x| set_collection_name(x)     })
-      add_option(Option.new("-m",true)        { |x| set_collection_dir(x)     })
-      add_option(Option.new("-r",false)       {     @error = true                 })
-      add_option(Option.new("-a",true)        { |x|Bake.formatter.setColorScheme(x.to_sym)               })
-      add_option(Option.new("-w",true)        { |x| set_root(x)               })
-      add_option(Option.new("--socket",true)  { |x| @socket = String === x ? x.to_i : x             })
-      add_option(Option.new("-h",false)       {     usage; ExitHelper.exit(0) })
+      add_option(["-b", ""      ], lambda { |x| set_collection_name(x)                  })
+      add_option(["-m"          ], lambda { |x| set_collection_dir(x)                   })
+      add_option(["-r"          ], lambda {     @error = true                           })
+      add_option(["-a"          ], lambda { |x| Bake.formatter.setColorScheme(x.to_sym) })
+      add_option(["-w"          ], lambda { |x| set_root(x)                             })
+      add_option(["--socket"    ], lambda { |x| @socket = String === x ? x.to_i : x     })
+      add_option(["-h", "--help"], lambda {     usage; ExitHelper.exit(0)               })
     end
     
     def usage
       puts "\nUsage: bake <name> [options]"
-      puts " -b <name>       Name of the collection to build."
+      puts " [-b] <name>     Name of the collection to build."
       puts " -m <dir>        Directory containing the collection file (default is current directory)."
       puts " -r              Stop on first error."
       puts " -a <scheme>     Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
-      puts " -h              Print this help."
+      puts " -h, --help      Print this help."
       puts " -w <root>       Add a workspace root (can be used multiple times)."
       puts "                 If no root is specified, the parent directory of Collection.meta is added automatically."
       puts " --socket <num>  Set socket for sending errors, receiving commands, etc. - used by e.g. Eclipse."

data/lib/bakery/toBake.rb

@@ -30,7 +30,7 @@ module Bake
     toBuildPattern = []
     @options.roots.each do |r|
       col.project.each do |p|
-        projs = Dir.glob(r+"/"+p.name+"/Project.meta")
+        projs = Dir.glob(r+"/**/"+p.name+"/Project.meta")
         if projs.length == 0
           toBuildPattern << BuildPattern.new(nil, nil, p) # remember it for sorted info printout
         end

data/lib/blocks/compile.rb

@@ -32,10 +32,8 @@ module Bake
         File.join([@output_dir, adaptedSource])
       end
       
-      def maybe_needed?(source, object, type, dep_filename_conv)
-        return false if Bake.options.linkOnly
-        return false if Bake.options.prepro and type == ASM
-        return true
+      def ignore?(type)
+        Bake.options.linkOnly or (Bake.options.prepro and type == ASM)
       end
       
       def needed?(source, object, type, dep_filename_conv)
@@ -114,8 +112,8 @@ module Bake
         
         cmdLineCheck = false
         cmdLineFile = calcCmdlineFile(object)
-        return true unless maybe_needed?(source, object, type, dep_filename_conv)
 
+        return true if ignore?(type)
         reason = needed?(source, object, type, dep_filename_conv)
         if not reason
           cmdLineCheck = true

data/lib/blocks/executable.rb

@@ -56,8 +56,11 @@ module Bake
         return false
       end
 
+      def ignore?
+        Bake.options.prepro
+      end
+      
       def needed?(libs)
-        return false if Bake.options.prepro
         return "because linkOnly was specified" if Bake.options.linkOnly
         
         # exe
@@ -94,6 +97,8 @@ module Bake
           
           cmdLineCheck = false
           cmdLineFile = calcCmdlineFile()
+          
+          return true if ignore?
           reason = needed?(libs)
           if not reason
             cmdLineCheck = true

data/lib/blocks/library.rb

@@ -23,10 +23,11 @@ module Bake
         archive_name + ".cmdline"
       end
       
+      def ignore?
+        Bake.options.linkOnly or Bake.options.prepro
+      end
+      
       def needed?
-        return false if Bake.options.linkOnly
-        return false if Bake.options.prepro
-        
         # lib
         return "because library does not exist" if not File.exists?(archive_name)
 
@@ -51,6 +52,8 @@ module Bake
           
           cmdLineCheck = false
           cmdLineFile = calcCmdlineFile()
+          
+          return true if ignore?
           reason = needed?
           if not reason
             cmdLineCheck = true

data/lib/common/options/parser.rb

@@ -8,39 +8,44 @@ module Bake
     def initialize(argv)
       @arguments = {}
       @argv = argv
-      @default = nil
     end
     
-    def add_option(opt)
-      @arguments[opt.param] = opt
+    #def add_option(opt)
+    #  @arguments[opt.param] = opt
+    #end
+    
+    def add_option(params, block)
+      params.each { |p| @arguments[p] = block }
     end
     
-    def add_default(opt)
-      @default = opt
+    def get_block(param)
+      opt = @arguments[param]
+      raise "Internal error in option handling" unless opt
+      opt.block
     end
     
-    def parse_internal(ignoreInvalid = true)
+    def parse_internal(ignore_invalid = false)
       pos = 0
       begin
         while pos < @argv.length do
           if not @arguments.include?@argv[pos]
-            if @default
-              res = @default.call(@argv[pos])
-              if (not res and not ignoreInvalid)
-                raise "Option #{@argv[pos]} unknown"
-              end
+            index = @argv[pos].index('-')
+            if index != nil and index == 0
+              raise "Option #{@argv[pos]} unknown" if not ignore_invalid
+            else
+              @arguments[""].call(@argv[pos]) # default paramter without "-"
             end
           else
             option = @arguments[@argv[pos]]
-            if option.arg
+            if option.parameters.length == 1
               if pos+1 < @argv.length and @argv[pos+1][0] != "-"
-                option.block.call(@argv[pos+1])
+                option.call(@argv[pos+1])
                 pos = pos + 1
               else
                 raise "Argument for option #{@argv[pos]} missing" 
               end
             else
-              option.block.call()
+              option.call()
             end
           end
           pos = pos + 1