bake-toolkit 2.23.12 → 2.24.0

data/lib/bake/options/usage.rb

@@ -1,78 +1,78 @@
-require 'common/version'
-
-module Bake
-
-  class Usage
-
-    def self.version
-      Bake::Version.printBakeVersion
-      ExitHelper.exit(0)
-    end
-
-
-    def self.show
-      Bake::Version.printBakeVersion
-      puts "\nUsage: bake [options]"
-      puts " [-b] <name>              Config name of main project"
-      puts " -m <dir>                 Directory of main project (default is current directory)."
-      puts " -p <dir>                 Project to build/clean (default is main project)"
-      puts " -f <name>                Build/Clean this file only."
-      puts " -c                       Clean the file/project."
-      puts " -a <scheme>              Use ansi color sequences (console must-- support it). Possible values are 'white' and 'black'."
-      puts " -v<level>                Verbose level from 0 to 3, whereas -v0 is less, -v1 is normal (default) and -v2 and -v3 are more verbose."
-      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 " --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 "                          Forces executables to be relinked."
-      puts " --compile-only           Only the compile steps are executed, equivalent to -f '.'"
-      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 "                          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 " -j <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 " --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 "                          'PRE', 'POST', 'STARTUP' or 'EXIT' includes all according steps."
-      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 " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
-      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 " --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"
-#      puts " --bundle <dir>           Bundles the output (experimental, description will follow)"
-      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 " --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."
-      puts " --time                   Print elapsed time at the end."
-      puts " --doc                    Open documentation in browser"
-      puts " -h, --help               Print this help."
-      puts " --license                Print the license."
-      puts " --debug                  Print out backtraces in some cases - used only for debugging bake."
-      ExitHelper.exit(0)
-    end
-
-    def self.bundle
-      puts "\nOption --bundle not supported anymore, please contact the author via github if still needed."
-      ExitHelper.exit(1)
-    end
-
-  end
-
+require 'common/version'
+
+module Bake
+
+  class Usage
+
+    def self.version
+      Bake::Version.printBakeVersion
+      ExitHelper.exit(0)
+    end
+
+
+    def self.show
+      Bake::Version.printBakeVersion
+      puts "\nUsage: bake [options]"
+      puts " [-b] <name>              Config name of main project"
+      puts " -m <dir>                 Directory of main project (default is current directory)."
+      puts " -p <dir>                 Project to build/clean (default is main project)"
+      puts " -f <name>                Build/Clean this file only."
+      puts " -c                       Clean the file/project."
+      puts " -a <scheme>              Use ansi color sequences (console must-- support it). Possible values are 'white' and 'black'."
+      puts " -v<level>                Verbose level from 0 to 3, whereas -v0 is less, -v1 is normal (default) and -v2 and -v3 are more verbose."
+      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 " --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 "                          Forces executables to be relinked."
+      puts " --compile-only           Only the compile steps are executed, equivalent to -f '.'"
+      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 "                          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 " -j <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 " --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 "                          'PRE', 'POST', 'STARTUP' or 'EXIT' includes all according steps."
+      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 " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
+      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 " --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"
+#      puts " --bundle <dir>           Bundles the output (experimental, description will follow)"
+      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 " --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."
+      puts " --time                   Print elapsed time at the end."
+      puts " --doc                    Open documentation in browser"
+      puts " -h, --help               Print this help."
+      puts " --license                Print the license."
+      puts " --debug                  Print out backtraces in some cases - used only for debugging bake."
+      ExitHelper.exit(0)
+    end
+
+    def self.bundle
+      puts "\nOption --bundle not supported anymore, please contact the author via github if still needed."
+      ExitHelper.exit(1)
+    end
+
+  end
+
 end

data/lib/bake/subst.rb

@@ -59,7 +59,7 @@ module Bake
           @@artifactName = config.artifactName.name
         else
           if Metamodel::ExecutableConfig === config
-            @@artifactName = projName+toolchain[:LINKER][:OUTPUT_ENDING]
+            @@artifactName = projName+Bake::Toolchain.outputEnding(toolchain)
           elsif Metamodel::LibraryConfig === config
             @@artifactName = "lib#{projName}.a"
           end
@@ -193,10 +193,11 @@ module Bake
                 out_dir = @@configTcMap[config][:OUTPUT_DIR]
               end
               if not out_dir
+                qacPart = Bake.options.qac ? (".qac" + Bake.options.buildDirDelimiter) : ""
                 if out_proj_name == Bake.options.main_project_name and out_conf_name == Bake.options.build_config
-                  out_dir = "build" + Bake.options.buildDirDelimiter + Bake.options.build_config
+                  out_dir = "build" + Bake.options.buildDirDelimiter + qacPart + Bake.options.build_config
                 else
-                  out_dir = "build" + Bake.options.buildDirDelimiter + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
+                  out_dir = "build" + Bake.options.buildDirDelimiter + qacPart + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
                 end
               end
               out_dir = substString(out_dir, elem)

data/lib/bake/toolchain/provider.rb

@@ -1,147 +1,154 @@
-module Bake
-  module Toolchain
-
-    class Provider
-      @@settings = {}
-      @@default = {
-        :COMPILER =>
-        {
-          :CPP => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :OBJECT_FILE_ENDING => ".o",
-            :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
-          },
-          :C => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :OBJECT_FILE_ENDING => ".o",
-            :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".c"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
-          },
-          :ASM => {
-            :COMMAND => "",
-            :DEFINE_FLAG => "",
-            :OBJECT_FILE_FLAG => "",
-            :OBJECT_FILE_ENDING => ".o",
-            :OBJ_FLAG_SPACE => false,
-            :INCLUDE_PATH_FLAG => "",
-            :COMPILE_FLAGS => "",
-            :DEFINES => [],
-            :FLAGS => "",
-            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
-            :DEP_FLAGS => "",
-            :DEP_FLAGS_SPACE => false,
-            :DEP_FLAGS_FILENAME => true,
-            :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => "",
-            :PREPRO_FILE_FLAG => nil
-          }
-        },
-
-        :ARCHIVER =>
-        {
-          :COMMAND => "",
-          :ARCHIVE_FLAGS => "",
-          :ARCHIVE_FLAGS_SPACE => true,
-          :FLAGS => "",
-          :ERROR_PARSER => nil
-        },
-
-        :LINKER =>
-        {
-          :COMMAND => "",
-          :MUST_FLAGS => "",
-          :SCRIPT => "",
-          :USER_LIB_FLAG => "",
-          :EXE_FLAG => "",
-          :EXE_FLAG_SPACE => true,
-          :LIB_FLAG => "",
-          :LIB_PATH_FLAG => "",
-          :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
-          :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
-          :FLAGS => "",
-          :MAP_FILE_FLAG => "",
-          :MAP_FILE_PIPE => true,
-          :OUTPUT_ENDING => ".exe", # or .elf
-          :ERROR_PARSER => nil,
-          :LIST_MODE => false
-        },
-
-        :MAKE =>
-        {
-          :COMMAND => "make",
-          :FLAGS => "-j",
-          :FILE_FLAG => "-f",
-          :DIR_FLAG => "-C",
-          :CLEAN => "clean"
-        },
-
-        :LINT_POLICY => [],
-        :DEP_FILE_SINGLE_LINE => false,
-        :DOCU => ""
-      }
-
-      def self.add(name, basedOn = nil)
-        chain = Marshal.load(Marshal.dump(basedOn.nil? ? @@default : @@settings[basedOn]))
-        @@settings[name] = chain
-        chain
-      end
-
-      def self.default
-        @@default
-      end
-
-      def self.modify_cpp_compiler(based_on, h)
-        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
-        chain[:COMPILER][:CPP].update(h)
-        chain
-      end
-
-      def self.[](name)
-        return @@settings[name] if @@settings.include? name
-        nil
-      end
-
-      def self.list
-        return @@settings.delete_if {|x| x.include?"Lint" }
-      end
-
-    end
-
-  end
-end
-
-require 'bake/toolchain/diab'
-require 'bake/toolchain/gcc'
-require 'bake/toolchain/lint'
-require 'bake/toolchain/clang'
-require 'bake/toolchain/clang_analyze'
-require 'bake/toolchain/ti'
-require 'bake/toolchain/greenhills'
-require 'bake/toolchain/keil'
-require 'bake/toolchain/msvc'
-require 'bake/toolchain/gcc_env'
+module Bake
+  module Toolchain
+
+    def self.outputEnding(tcs = nil)
+      if tcs && tcs[:LINKER][:OUTPUT_ENDING] != ""
+        return tcs[:LINKER][:OUTPUT_ENDING]
+      end
+      Bake::Utils::OS.windows? ? ".exe" : ""
+    end
+
+    class Provider
+      @@settings = {}
+      @@default = {
+        :COMPILER =>
+        {
+          :CPP => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
+            :OBJ_FLAG_SPACE => false,
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".cxx", ".cpp", ".c++", ".cc", ".C"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
+          },
+          :C => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
+            :OBJ_FLAG_SPACE => false,
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".c"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
+          },
+          :ASM => {
+            :COMMAND => "",
+            :DEFINE_FLAG => "",
+            :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
+            :OBJ_FLAG_SPACE => false,
+            :INCLUDE_PATH_FLAG => "",
+            :COMPILE_FLAGS => "",
+            :DEFINES => [],
+            :FLAGS => "",
+            :SOURCE_FILE_ENDINGS => [".asm", ".s", ".S"],
+            :DEP_FLAGS => "",
+            :DEP_FLAGS_SPACE => false,
+            :DEP_FLAGS_FILENAME => true,
+            :ERROR_PARSER => nil,
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
+          }
+        },
+
+        :ARCHIVER =>
+        {
+          :COMMAND => "",
+          :ARCHIVE_FLAGS => "",
+          :ARCHIVE_FLAGS_SPACE => true,
+          :FLAGS => "",
+          :ERROR_PARSER => nil
+        },
+
+        :LINKER =>
+        {
+          :COMMAND => "",
+          :MUST_FLAGS => "",
+          :SCRIPT => "",
+          :USER_LIB_FLAG => "",
+          :EXE_FLAG => "",
+          :EXE_FLAG_SPACE => true,
+          :LIB_FLAG => "",
+          :LIB_PATH_FLAG => "",
+          :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
+          :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
+          :FLAGS => "",
+          :MAP_FILE_FLAG => "",
+          :MAP_FILE_PIPE => true,
+          :OUTPUT_ENDING => "", # if empty, .exe is used on Windows, otherwise no ending
+          :ERROR_PARSER => nil,
+          :LIST_MODE => false
+        },
+
+        :MAKE =>
+        {
+          :COMMAND => "make",
+          :FLAGS => "-j",
+          :FILE_FLAG => "-f",
+          :DIR_FLAG => "-C",
+          :CLEAN => "clean"
+        },
+
+        :LINT_POLICY => [],
+        :DEP_FILE_SINGLE_LINE => false,
+        :DOCU => ""
+      }
+
+      def self.add(name, basedOn = nil)
+        chain = Marshal.load(Marshal.dump(basedOn.nil? ? @@default : @@settings[basedOn]))
+        @@settings[name] = chain
+        chain
+      end
+
+      def self.default
+        @@default
+      end
+
+      def self.modify_cpp_compiler(based_on, h)
+        chain = Marshal.load(Marshal.dump(@@settings[based_on]))
+        chain[:COMPILER][:CPP].update(h)
+        chain
+      end
+
+      def self.[](name)
+        return @@settings[name] if @@settings.include? name
+        nil
+      end
+
+      def self.list
+        return @@settings.delete_if {|x| x.include?"Lint" }
+      end
+
+    end
+
+  end
+end
+
+require 'bake/toolchain/diab'
+require 'bake/toolchain/gcc'
+require 'bake/toolchain/lint'
+require 'bake/toolchain/clang'
+require 'bake/toolchain/clang_analyze'
+require 'bake/toolchain/ti'
+require 'bake/toolchain/greenhills'
+require 'bake/toolchain/keil'
+require 'bake/toolchain/msvc'
+require 'bake/toolchain/gcc_env'