bake-toolkit 2.54.3 → 2.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b660cd9c40c8aac3678294bc00bf7f797b2c4fdd024bcf329db5ea640da69223
-  data.tar.gz: 45c476b4b32fa4990f2502f6e5f4dedc0386a3177f870fee6b25ef72cff4a437
+  metadata.gz: a40a0ec952c134a225a1e53450bdef8376ed73f77b60db9d41743058dbccebe9
+  data.tar.gz: 375a59b66acae2710691fefff1e5e2943e2709e4c4126ddcb155ede08e3cea7e
 SHA512:
-  metadata.gz: 36a9dbdae13d2985641b0d16a213c5daaa42279e41232dc6830aa3e07eac3df51ba8050c92a6f0febf2923f47f5e79dff3ccff748b2fd90b8e3a46501cc3db71
-  data.tar.gz: 368185045fe98fa0801f45fd268410adcf86651ac300f26015e51060196b7f7d784c17cb119219e7e6a3354ab870f36d82d66e0dfc8f5b2d8321686d030d255e
+  metadata.gz: '05777421187c7f4ea2e7ce5d29ef862715cef952399ad4a09a7034536f3a6593870c31a47b3a3a40ef6ddec8db8ae0ac83ab96bad9c8888a8238e949c8daaee5'
+  data.tar.gz: dfa5aa9606167fe6f92e6aecb59e317d6f1dfd0586dbc2da34f2dd15871ad7b9cbf0f8040eaa2cee65d708dd3b3144ed51bad19eafa3f6c222fe7ef3bf157850

data/bin/bake

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+if RUBY_VERSION[0..1] == "1."
+   puts ("Error: Ruby 1.x not supported anymore. Use Ruby 2.0 or greater.")
+   exit 1
+ end
+
 $timeStart = Time.now
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
@@ -17,11 +22,6 @@ module Bake
 
   earlyExit = nil
   begin
-    if RUBY_VERSION[0..1] == "1."
-      Bake.formatter.printError("Error: Ruby 1.x not supported anymore. Use Ruby 2.0 or greater.")
-      ExitHelper.exit(1)
-    end
-
     puts "Profiling #{Time.now - $timeStart}: parse options..." if ARGV.include?("--profiling")
     Bake.options = Options.new(ARGV)
     Bake.options.parse_options

data/lib/bake/options/options.rb

@@ -19,7 +19,7 @@ module Bake
   end
 
   class Options < Parser
-    attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
+    attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :showConfigs
     attr_reader :main_dir, :project, :filename, :main_project_name, :buildDirDelimiter, :dot, :dotFilename, :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, :skipBuildingLine # Boolean
@@ -54,7 +54,6 @@ module Bake
       @printTime = false
       @buildDirDelimiter = "/"
       @conversion_info = false
-      @envToolchain = false
       @analyze = false
       @eclipseOrder = false
       @showConfigs = false
@@ -80,7 +79,12 @@ module Bake
       @linkOnly = false
       @compileOnly = false
       @no_autodir = false
-      @threads = 8
+      if RUBY_VERSION.split(".")[0].to_i > 2 || RUBY_VERSION.split(".")[1].to_i >= 2
+        require 'etc'
+        @threads = Etc.nprocessors
+      else
+        @threads = 8
+      end
       @roots = []
       @socket = 0
       @include_filter = []

data/lib/bake/options/usage.rb

@@ -33,7 +33,7 @@ module Bake
       puts " --no-case-check          Disables case-sensitivity-check of included header files (only relative paths on Windows are checked)."
       puts " --generate-doc           Builds docu instead of compiling sources."
       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 " -j <num>                 Set NUMBER of parallel compiled files (default is number of logical processors or 8 for Ruby <= 2.1)."
       puts " -O                       The output will be synchronized per configuration. Note, this delays output."
       puts " -D <define>              Adds this define to the compiler commands"
       puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."

data/lib/bake/util.rb

@@ -16,12 +16,11 @@ def adjustFlags(orgStr, flags)
     if f.overwrite != ""
       orgSplitted = Bake::Utils::flagSplit(f.overwrite, false)
     end
-
     if f.remove != ""
       rmSplitted = Bake::Utils::flagSplit(f.remove, false)
       orgSplitted.delete_if {|o| rmSplitted.any? { |r|
         begin
-          o.match("\\A"+r+"\\Z")
+          o.match(/\A#{Regexp.escape(r)}\z/) || o.match(/\A#{r}\z/)
         rescue Exception => e
           Bake.formatter.printError(e.message, f)
           Bake::ExitHelper.exit(1)
@@ -123,3 +122,29 @@ def add_line_if_no_comment(array, str)
   s = str.split("#")[0].strip
   array << s unless s.empty?
 end
+
+def fill_compiler_env(dt)
+  env = ENV["BAKE_C_COMPILER"]
+  dt[:COMPILER][:C][:COMMAND] = env if env && !env.empty?
+  env = ENV["BAKE_CPP_COMPILER"]
+  dt[:COMPILER][:CPP][:COMMAND] = env if env && !env.empty?
+  env = ENV["BAKE_ASM_COMPILER"]
+  dt[:COMPILER][:ASM][:COMMAND] = env if env && !env.empty?
+  env = ENV["BAKE_ARCHIVER"]
+  dt[:ARCHIVER][:COMMAND] = env if env && !env.empty?
+  env = ENV["BAKE_LINKER"]
+  dt[:LINKER][:COMMAND] = env if env && !env.empty?
+
+  env = ENV["BAKE_C_FLAGS"]
+  dt[:COMPILER][:C][:FLAGS] = env if env && !env.empty?
+  env = ENV["BAKE_CPP_FLAGS"]
+  dt[:COMPILER][:CPP][:FLAGS] = env if env && !env.empty?
+  env = ENV["BAKE_ASM_FLAGS"]
+  dt[:COMPILER][:ASM][:FLAGS] = env if env && !env.empty?
+  env = ENV["BAKE_ARCHIVER_FLAGS"]
+  dt[:ARCHIVER][:FLAGS] = env if env && !env.empty?
+  env = ENV["BAKE_LINKER_FLAGS"]
+  dt[:LINKER][:FLAGS] = env if env && !env.empty?
+
+  return dt
+end

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -667,8 +667,8 @@ module Bake
           end
 
           @defaultToolchain = Utils.deep_copy(basedOnToolchain)
-          Bake.options.envToolchain = true if (basedOn.include?"_ENV")
-
+          @defaultToolchain = fill_compiler_env(@defaultToolchain)
+    
           integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
 
           # todo: cleanup this hack

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.54.3
+  version: 2.55.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.