bake-toolkit 2.20.4 → 2.21.0

data/lib/bake/model/metamodel_ext.rb

@@ -1,27 +1,27 @@
-require 'bake/model/metamodel'
-require 'common/ext/file'
-
-module Bake
-  module Metamodel
-
-      module ModelElement::ClassModule
-        def get_project_dir
-          comp = self
-          while comp.respond_to?"parent"
-            comp = comp.parent
-          end
-          ::File.dirname(comp.file_name)
-        end
-      end
-      
-      module BaseConfig_INTERNAL::ClassModule
-        def qname
-          @qname ||= parent.name + "," + name
-        end
-        def dependency
-          libStuff.find_all { |l| Dependency === l }
-        end
-      end      
-      
-  end
-end
+require 'bake/model/metamodel'
+require 'common/ext/file'
+
+module Bake
+  module Metamodel
+
+      module ModelElement::ClassModule
+        def get_project_dir
+          comp = self
+          while comp.respond_to?"parent"
+            comp = comp.parent
+          end
+          ::File.dirname(comp.file_name)
+        end
+      end
+
+      module BaseConfig_INTERNAL::ClassModule
+        def qname
+          @qname ||= parent.name + "," + name
+        end
+        def dependency
+          libStuff.find_all { |l| Dependency === l }
+        end
+      end
+
+  end
+end

data/lib/bake/options/create.rb

@@ -1,96 +1,96 @@
-require 'fileutils'
-
-module Bake
-
-  class Create
-  
-    def self.exeTemplate
-      "Project default: main {\n"+
-      "\n"+
-      "  Responsible {\n"+
-      "    Person \"#{ENV["USER"]}\"\n"+
-      "  }\n"+
-      "\n"+
-      "  ExecutableConfig main {\n"+
-      "    # Dependency ...\n"+
-      "    Files \"src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "    DefaultToolchain GCC\n"+
-      "  }\n"+
-      "}\n"
-    end
-    
-    def self.libTemplate
-      "Project default: lib {\n"+
-      "\n"+
-      "  Responsible {\n"+
-      "    Person \"#{ENV["USER"]}\"\n"+
-      "  }\n"+
-      "\n"+
-      "  LibraryConfig lib {\n"+
-      "    Files \"src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "  }\n"+
-      "\n"+
-      "  ExecutableConfig UnitTest {\n"+
-      "    Dependency config: lib\n"+
-      "    Files \"test/src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "    DefaultToolchain GCC\n"+
-      "  }\n"+
-      "}\n"
-    end
-    
-    def self.customTemplate
-      "Project default: lib {\n"+
-      "\n"+
-      "  Responsible {\n"+
-      "    Person \"#{ENV["USER"]}\"\n"+
-      "  }\n"+
-      "\n"+
-      "  CustomConfig lib {\n"+
-      "    Files \"src/**/*.cpp\"\n"+
-      "    IncludeDir \"include\"\n"+
-      "  }\n"+
-      "}\n"
-    end
-    
-    def self.mainTemplate
-      "int main()\n"+
-      "{\n"+
-      "  return 0;\n"+
-      "}\n"
-    end
-    
-    def self.checkFile(name)
-      if File.exists?(name)
-        puts "#{name} already exists"
-        ExitHelper.exit(1)  
-      end
-    end
-    
-    def self.proj(type)
-      checkFile("Project.meta")
-      checkFile("src/main.cpp") if (type == "exe")
-      FileUtils::mkdir_p "src"
-      FileUtils::mkdir_p "include"
-            
-      if (type == "lib")
-        File.write("Project.meta", libTemplate);
-      elsif (type == "exe")
-        File.write("Project.meta", exeTemplate);
-        File.write("src/main.cpp", mainTemplate);
-      elsif (type == "custom")
-        File.write("Project.meta", customTemplate);
-      else
-        puts "'--create' must be followed by 'lib', 'exe' or 'custom'"
-        ExitHelper.exit(1)  
-      end
-        
-      puts "Project created."
-      ExitHelper.exit(1)    
-    end
-
-  end
-
+require 'fileutils'
+
+module Bake
+
+  class Create
+
+    def self.exeTemplate
+      "Project default: main {\n"+
+      "\n"+
+      "  Responsible {\n"+
+      "    Person \"#{ENV["USER"]}\"\n"+
+      "  }\n"+
+      "\n"+
+      "  ExecutableConfig main {\n"+
+      "    # Dependency ...\n"+
+      "    Files \"src/**/*.cpp\"\n"+
+      "    IncludeDir \"include\"\n"+
+      "    DefaultToolchain GCC\n"+
+      "  }\n"+
+      "}\n"
+    end
+
+    def self.libTemplate
+      "Project default: lib {\n"+
+      "\n"+
+      "  Responsible {\n"+
+      "    Person \"#{ENV["USER"]}\"\n"+
+      "  }\n"+
+      "\n"+
+      "  LibraryConfig lib {\n"+
+      "    Files \"src/**/*.cpp\"\n"+
+      "    IncludeDir \"include\"\n"+
+      "  }\n"+
+      "\n"+
+      "  ExecutableConfig UnitTest {\n"+
+      "    Dependency config: lib\n"+
+      "    Files \"test/src/**/*.cpp\"\n"+
+      "    IncludeDir \"include\"\n"+
+      "    DefaultToolchain GCC\n"+
+      "  }\n"+
+      "}\n"
+    end
+
+    def self.customTemplate
+      "Project default: lib {\n"+
+      "\n"+
+      "  Responsible {\n"+
+      "    Person \"#{ENV["USER"]}\"\n"+
+      "  }\n"+
+      "\n"+
+      "  CustomConfig lib {\n"+
+      "    Files \"src/**/*.cpp\"\n"+
+      "    IncludeDir \"include\"\n"+
+      "  }\n"+
+      "}\n"
+    end
+
+    def self.mainTemplate
+      "int main()\n"+
+      "{\n"+
+      "  return 0;\n"+
+      "}\n"
+    end
+
+    def self.checkFile(name)
+      if File.exists?(name)
+        puts "#{name} already exists"
+        ExitHelper.exit(1)
+      end
+    end
+
+    def self.proj(type)
+      checkFile("Project.meta")
+      checkFile("src/main.cpp") if (type == "exe")
+      FileUtils::mkdir_p "src"
+      FileUtils::mkdir_p "include"
+
+      if (type == "lib")
+        File.write("Project.meta", libTemplate);
+      elsif (type == "exe")
+        File.write("Project.meta", exeTemplate);
+        File.write("src/main.cpp", mainTemplate);
+      elsif (type == "custom")
+        File.write("Project.meta", customTemplate);
+      else
+        puts "'--create' must be followed by 'lib', 'exe' or 'custom'"
+        ExitHelper.exit(1)
+      end
+
+      puts "Project created."
+      ExitHelper.exit(1)
+    end
+
+  end
+
 end

data/lib/bake/options/options.rb

@@ -1,310 +1,315 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/options/parser'
-require 'bake/options/showToolchains'
-require 'bake/options/showLicense'
-require 'bake/options/showDoc'
-require 'bake/options/usage'
-require 'bake/options/create'
-require 'bake/bundle'
-
-module Bake
-
-  def self.options
-    @@options
-  end
-  def self.options=(options)
-    @@options = options
-  end
-
-  class Options < Parser
-    attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
-    attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename, :bundleDir, :buildDirDelimiter, :dot # String
-    attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
-    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :compileOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro, :oldLinkOrder, :prebuild # Boolean
-    attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
-    attr_reader :vars # map
-    attr_reader :verbose
-    attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
-
-
-    def initialize(argv)
-      super(argv)
-
-      @dot = nil
-      @prebuild = false
-      @buildDirDelimiter = "/"
-      @oldLinkOrder = false
-      @conversion_info = false
-      @envToolchain = false
-      @analyze = false
-      @eclipseOrder = false
-      @showConfigs = false
-      @consoleOutput_fullnames = false
-      @consoleOutput_visualStudio = false
-      @prepro = false
-      @stopOnFirstError = false
-      @verbose = 1
-      @vars = {}
-      @build_config = ""
-      @main_dir = nil
-      @project = nil
-      @filename = nil
-      @cc2j_filename = nil
-      @clean = false
-      @clobber = false
-      @lint = false
-      @docu = false
-      @debug = false
-      @rebuild = false
-      @nocache = false
-      @show_includes = false
-      @show_includes_and_defines = false
-      @linkOnly = false
-      @compileOnly = false
-      @no_autodir = false
-      @threads = 8
-      @lint_min = 0
-      @lint_max = -1
-      @roots = []
-      @socket = 0
-      @include_filter = []
-      @exclude_filter = []
-      @def_roots = []
-      @main_project_name = ""
-      @adapt = []
-      @bundleDir = nil
-
-      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(["--compile-only",       "--compile_only"       ], lambda {     @compileOnly = 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(["--adapt"                                      ], lambda { |x| set_adapt(x)                            })
-
-      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(["--debug"                                      ], lambda {     @debug = true                           })
-      add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
-
-      add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
-      add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
-      add_option(["-j",                   "--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(["--dot",                                       ], lambda { |x| @dot = x                                })
-      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(["--bundle"                                     ], lambda { |x| Bake::Usage.bundle                      })
-      add_option(["--bundle"                                     ], lambda {     Bake::Usage.bundle                      })
-#      add_option(["--bundle"                                     ], lambda { |x| set_bundle_dir(x)                       })
-# OLD flag renamed in case someone uses this feature
-      add_option(["--bundleDeprecated"                           ], lambda { |x| set_bundle_dir(x)                       })
-      add_option(["--prebuild"                                   ], lambda {     @prebuild = 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(/[\\]/,'/')     })
-      add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
-      add_option(["--build_",                                    ], lambda {     @buildDirDelimiter = "_"                })
-
-
-      # 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()
-      Bake::Bundle.instance.cleanup()
-      parse_internal(false)
-      set_main_dir(Dir.pwd) if @main_dir.nil?
-      @roots = @def_roots if @roots.length == 0
-      @roots.uniq!
-      @adapt.uniq!
-
-      if @project
-        if @project.split(',').length > 2
-          Bake.formatter.printError("Error: only one comma allowed for -p")
-          ExitHelper.exit(1)
-        end
-      end
-
-      if @conversion_info
-        if @rebuild
-          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")
-          ExitHelper.exit(1)
-        end
-        if @prepro
-          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")
-          ExitHelper.exit(1)
-        end
-        if @compileOnly
-          Bake.formatter.printError("Error: --conversion-info and --compileOnly 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")
-          ExitHelper.exit(1)
-        end
-        if @docu
-          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")
-          ExitHelper.exit(1)
-        end
-      end
-
-      if @linkOnly
-        if @rebuild
-          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")
-          ExitHelper.exit(1)
-        end
-        if @prepro
-          Bake.formatter.printError("Error: --link-only and --prepro not allowed at the same time")
-          ExitHelper.exit(1)
-        end
-        if @filename
-          Bake.formatter.printError("Error: --link-only and --filename not allowed at the same time")
-          ExitHelper.exit(1)
-        end
-      end
-
-      if @compileOnly
-        if @linkOnly
-          Bake.formatter.printError("Error: --compile-only and --link-only not allowed at the same time")
-          ExitHelper.exit(1)
-        end
-        if @filename
-          Bake.formatter.printError("Error: --compile-only and --filename not allowed at the same time")
-          ExitHelper.exit(1)
-        end
-      end
-
-      if @prepro
-        if @rebuild
-          Bake.formatter.printError("Error: --prepro and --rebuild not allowed at the same time")
-          ExitHelper.exit(1)
-        end
-        if @clean
-          Bake.formatter.printError("Error: --prepro and -c not allowed at the same time")
-          ExitHelper.exit(1)
-        end
-      end
-
-      if @lint and @docu
-        Bake.formatter.printError("Error: --lint and --docu not allowed at the same time")
-        ExitHelper.exit(1)
-      end
-
-      @filename = "." if @compileOnly
-
-    end
-
-    def check_valid_dir(dir)
-     if not File.exists?(dir)
-        Bake.formatter.printError("Error: Directory #{dir} does not exist")
-        ExitHelper.exit(1)
-      end
-      if not File.directory?(dir)
-        Bake.formatter.printError("Error: #{dir} is not a directory")
-        ExitHelper.exit(1)
-      end
-    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}'")
-        ExitHelper.exit(1)
-      end
-      @build_config = config
-    end
-
-    def set_main_dir(dir)
-      check_valid_dir(dir)
-      @main_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @main_project_name = File::basename(@main_dir)
-      @def_roots = calc_def_roots(@main_dir)
-    end
-
-    def set_bundle_dir(dir)
-      d = File.expand_path(dir.gsub(/[\\]/,'/'))
-      Bake::Bundle.instance.setOutputDir(d)
-    end
-
-
-    def set_root(dir)
-      check_valid_dir(dir)
-      r = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @roots << r if not @roots.include?r
-    end
-
-    def set_adapt(name)
-      @adapt << name if not @adapt.include?name
-    end
-
-    def set_threads(num)
-      @threads = String === num ? num.to_i : num
-      if @threads <= 0
-        Bake.formatter.printError("Error: number of threads must be > 0")
-        ExitHelper.exit(1)
-      end
-    end
-
-    def set_set(str)
-      ar = str.split("=")
-      if not str.include?"=" or ar[0].length == 0
-        Bake.formatter.printError("Error: --set must be followed by key=value")
-        ExitHelper.exit(1)
-      end
-      @vars[ar[0]] = ar[1..-1].join("=")
-    end
-
-  end
-
-end
-
-
+require 'bake/toolchain/colorizing_formatter'
+require 'common/options/parser'
+require 'bake/options/showToolchains'
+require 'bake/options/showLicense'
+require 'bake/options/showDoc'
+require 'bake/options/usage'
+require 'bake/options/create'
+require 'bake/bundle'
+
+module Bake
+
+  def self.options
+    @@options
+  end
+  def self.options=(options)
+    @@options = options
+  end
+
+  class Options < Parser
+    attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
+    attr_reader :main_dir, :project, :filename, :main_project_name, :bundleDir, :buildDirDelimiter, :dot, :cc2j_filename # String
+    attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
+    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :compileOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro, :oldLinkOrder, :prebuild, :printTime, :json # Boolean
+    attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
+    attr_reader :vars # map
+    attr_reader :verbose
+    attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
+
+
+    def initialize(argv)
+      super(argv)
+
+      @dot = nil
+      @prebuild = false
+      @printTime = false
+      @buildDirDelimiter = "/"
+      @oldLinkOrder = false
+      @conversion_info = false
+      @envToolchain = false
+      @analyze = false
+      @eclipseOrder = false
+      @showConfigs = false
+      @consoleOutput_fullnames = false
+      @consoleOutput_visualStudio = false
+      @prepro = false
+      @stopOnFirstError = false
+      @verbose = 1
+      @vars = {}
+      @build_config = ""
+      @main_dir = nil
+      @project = nil
+      @filename = nil
+      @cc2j_filename = nil
+      @json = false
+      @clean = false
+      @clobber = false
+      @lint = false
+      @docu = false
+      @debug = false
+      @rebuild = false
+      @nocache = false
+      @show_includes = false
+      @show_includes_and_defines = false
+      @linkOnly = false
+      @compileOnly = false
+      @no_autodir = false
+      @threads = 8
+      @lint_min = 0
+      @lint_max = -1
+      @roots = []
+      @socket = 0
+      @include_filter = []
+      @exclude_filter = []
+      @def_roots = []
+      @main_project_name = ""
+      @adapt = []
+      @bundleDir = nil
+
+      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(["--compile-only",       "--compile_only"       ], lambda {     @compileOnly = 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(["--adapt"                                      ], lambda { |x| set_adapt(x)                            })
+
+      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(["--debug"                                      ], lambda {     @debug = true                           })
+      add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
+
+      add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
+      add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
+      add_option(["-j",                   "--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(["--dot",                                       ], lambda { |x| @dot = x                                })
+      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(["--bundle"                                     ], lambda { |x| Bake::Usage.bundle                      })
+      add_option(["--bundle"                                     ], lambda {     Bake::Usage.bundle                      })
+#      add_option(["--bundle"                                     ], lambda { |x| set_bundle_dir(x)                       })
+# OLD flag renamed in case someone uses this feature
+      add_option(["--bundleDeprecated"                           ], lambda { |x| set_bundle_dir(x)                       })
+      add_option(["--prebuild"                                   ], lambda {     @prebuild = true                        })
+
+      add_option(["-h",                   "--help"               ], lambda {     Bake::Usage.show                        })
+      add_option(["--time",                                      ], lambda {     @printTime = true                       })
+
+      add_option(["--incs-and-defs",      "--show_incs_and_defs" ], lambda {     @show_includes_and_defines = true       })
+      add_option(["--incs-and-defs=bake",                        ], lambda {     @show_includes_and_defines = true       })
+      add_option(["--incs-and-defs=json"                         ], lambda { @show_includes_and_defines=true; @json=true })
+      add_option(["--license",            "--show_license"       ], lambda {     License.show                            })
+      add_option(["--doc",                "--show_doc"           ], lambda {     Doc.show                                })
+
+      add_option(["--version"                                    ], lambda {     Bake::Usage.version                     })
+      add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
+      add_option(["--compilation-db"                             ], lambda { |x,dummy| @cc2j_filename = (x ? x : "compilation-db.json" )})
+      add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
+      add_option(["--build_",                                    ], lambda {     @buildDirDelimiter = "_"                })
+
+
+      # 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()
+      Bake::Bundle.instance.cleanup()
+      parse_internal(false)
+      set_main_dir(Dir.pwd) if @main_dir.nil?
+      @roots = @def_roots if @roots.length == 0
+      @roots.uniq!
+      @adapt.uniq!
+
+      if @project
+        if @project.split(',').length > 2
+          Bake.formatter.printError("Error: only one comma allowed for -p")
+          ExitHelper.exit(1)
+        end
+      end
+
+      if @conversion_info
+        if @rebuild
+          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")
+          ExitHelper.exit(1)
+        end
+        if @prepro
+          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")
+          ExitHelper.exit(1)
+        end
+        if @compileOnly
+          Bake.formatter.printError("Error: --conversion-info and --compileOnly 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")
+          ExitHelper.exit(1)
+        end
+        if @docu
+          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")
+          ExitHelper.exit(1)
+        end
+      end
+
+      if @linkOnly
+        if @rebuild
+          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")
+          ExitHelper.exit(1)
+        end
+        if @prepro
+          Bake.formatter.printError("Error: --link-only and --prepro not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+        if @filename
+          Bake.formatter.printError("Error: --link-only and --filename not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+      end
+
+      if @compileOnly
+        if @linkOnly
+          Bake.formatter.printError("Error: --compile-only and --link-only not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+        if @filename
+          Bake.formatter.printError("Error: --compile-only and --filename not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+      end
+
+      if @prepro
+        if @rebuild
+          Bake.formatter.printError("Error: --prepro and --rebuild not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+        if @clean
+          Bake.formatter.printError("Error: --prepro and -c not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+      end
+
+      if @lint and @docu
+        Bake.formatter.printError("Error: --lint and --docu not allowed at the same time")
+        ExitHelper.exit(1)
+      end
+
+      @filename = "." if @compileOnly
+
+    end
+
+    def check_valid_dir(dir)
+     if not File.exists?(dir)
+        Bake.formatter.printError("Error: Directory #{dir} does not exist")
+        ExitHelper.exit(1)
+      end
+      if not File.directory?(dir)
+        Bake.formatter.printError("Error: #{dir} is not a directory")
+        ExitHelper.exit(1)
+      end
+    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}'")
+        ExitHelper.exit(1)
+      end
+      @build_config = config
+    end
+
+    def set_main_dir(dir)
+      check_valid_dir(dir)
+      @main_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
+      @main_project_name = File::basename(@main_dir)
+      @def_roots = calc_def_roots(@main_dir)
+    end
+
+    def set_bundle_dir(dir)
+      d = File.expand_path(dir.gsub(/[\\]/,'/'))
+      Bake::Bundle.instance.setOutputDir(d)
+    end
+
+
+    def set_root(dir)
+      check_valid_dir(dir)
+      r = File.expand_path(dir.gsub(/[\\]/,'/'))
+      @roots << r if not @roots.include?r
+    end
+
+    def set_adapt(name)
+      @adapt << name if not @adapt.include?name
+    end
+
+    def set_threads(num)
+      @threads = String === num ? num.to_i : num
+      if @threads <= 0
+        Bake.formatter.printError("Error: number of threads must be > 0")
+        ExitHelper.exit(1)
+      end
+    end
+
+    def set_set(str)
+      ar = str.split("=")
+      if not str.include?"=" or ar[0].length == 0
+        Bake.formatter.printError("Error: --set must be followed by key=value")
+        ExitHelper.exit(1)
+      end
+      @vars[ar[0]] = ar[1..-1].join("=")
+    end
+
+  end
+
+end
+
+