bake-toolkit 2.71.0 → 2.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f124f36bbd221636166d8e01a9854b4c680f235643dab7154d3d6e50df0c4c
-  data.tar.gz: 664f60e7f0fec1089b08f55a7662c1d3f5c3e6ad81c7f5332b206e10ca28fc47
+  metadata.gz: bcfee442bc92aa4c2c56199a5828ead8044dceadd34a4d7be67addc58f91bc44
+  data.tar.gz: 56887689de79a09756c04214ab696688c52c827310e392563abb51490c583f6f
 SHA512:
-  metadata.gz: 655d3a58f54e604245af4a38feb61e099ae8ea9af58ec135a181a312cca39ed1cb18461ca4733c8d2754090cf782e0e2ca918b490ddce55f071add4ce09d9824
-  data.tar.gz: 14034133ac3b08bcfc0c3b54483bf0f1cc98138a2a04e452d0860ca91fb9914f37115b822a068cdbc42caf8d584ca8c0e96268f82cf601992e6403a4209625fe
+  metadata.gz: 8b081a75cc9d44b832df446fcf6ee548babdacac87a3c96300f5ac7ee290e3b5fcb0111eb51ad884ce78b67b9e807236cb2b8fd52ebdaf761982d8532137efef
+  data.tar.gz: 68cc7ca438a0633a09cf0b95df002695fffa6bb7f860dfa5c9ed76e2289d707bcb985b7fdb6ac5af2f671ff83fa3e3dd87920b234113e56a2edf09b9ec3c1616

data/lib/adapt/config/loader.rb

@@ -70,7 +70,7 @@ module Bake
         end
         Bake.options.adapt.each do |a|
           adaptBaseName = File.expand_path(a.gsub(/\(.*\)/,"") + "/Adapt.meta")
-          potentialAdapts << adaptBaseName  if File.exists?adaptBaseName
+          potentialAdapts << adaptBaseName  if File.exist?adaptBaseName
         end
         potentialAdapts.concat(Root.search_to_depth(r, "Adapt.meta", root.depth))
       end

data/lib/bake/cache.rb

@@ -64,7 +64,7 @@ module Bake
               puts "Cache: Checking if referenced configs are up to date..." if Bake.options.debug
               cache.referencedConfigs.each do |pname,configs|
                 configs.each do |config|
-                  fileExists = File.exists?(config.file_name)
+                  fileExists = File.exist?(config.file_name)
                   puts "Cache: Checking if #{config.file_name} exists: #{fileExists}" if Bake.options.debug
                   if not fileExists
                     Bake.options.nocache = true
@@ -97,7 +97,7 @@ module Bake
             if (cache != nil)
               cache.adapt_filenames.each do |fHash|
                 f = fHash[:file]
-                fileExists = File.exists?(f)
+                fileExists = File.exist?(f)
                 puts "Cache: Checking if #{f} exists: #{fileExists}" if Bake.options.debug
                 if !fileExists
                   Bake.formatter.printInfo("Info: #{f} does not exist anymore, reloading meta information")

data/lib/bake/model/loader.rb

@@ -142,7 +142,7 @@ module Bake
     def load(filename)
       sumErrors = 0
 
-      if not File.exists?filename
+      if not File.exist?filename
         Bake.formatter.printError("Error: #{filename} does not exist")
         ExitHelper.exit(1)
       end

data/lib/bake/options/create.rb

@@ -75,7 +75,7 @@ module Bake
     end
 
     def self.checkFile(name)
-      if File.exists?(name)
+      if File.exist?(name)
         puts "#{name} already exists"
         ExitHelper.exit(1)
       end

data/lib/bake/options/options.rb

@@ -296,7 +296,7 @@ module Bake
     end
 
     def check_valid_dir(dir)
-     if not File.exists?(dir)
+     if not File.exist?(dir)
         Bake.formatter.printError("Error: Directory #{dir} does not exist")
         ExitHelper.exit(1)
       end

data/lib/bakeqac/options/options.rb

@@ -103,7 +103,7 @@ module Bake
     end
 
     def check_valid_dir(dir)
-     if not File.exists?(dir)
+     if not File.exist?(dir)
         Bake.formatter.printError("Error: Directory #{dir} does not exist")
         ExitHelper.exit(1)
       end
@@ -251,16 +251,16 @@ module Bake
       end
 
       @cct.each do |cct|
-        if !File.exists?(cct)
+        if !File.exist?(cct)
           Bake.formatter.printError("Error: cct file not found: #{cct}")
           ExitHelper.exit(1)
         end
       end
-      if !File.exists?(@acf)
+      if !File.exist?(@acf)
         Bake.formatter.printError("Error: acf file not found: #{@acf}")
         ExitHelper.exit(1)
       end
-      if !File.exists?(@rcf)
+      if !File.exist?(@rcf)
         Bake.formatter.printError("Error: rcf file not found: #{@rcf}")
         ExitHelper.exit(1)
       end

data/lib/bakery/model/loader.rb

@@ -1,57 +1,57 @@
-require_relative 'metamodel'
-require_relative 'language'
-require_relative '../../common/version'
-
-require 'rgen/environment'
-require 'rgen/fragment/fragmented_model'
-
-require 'rtext/default_loader'
-
-require_relative '../../common/ext/rgen'
-require_relative '../../common/exit_helper'
-require_relative '../../bake/toolchain/colorizing_formatter'
-
-module Bake
-
-  class BakeryLoader
-
-    attr_reader :model
-
-    def initialize
-      @env = RGen::Environment.new
-      @model = RGen::Fragment::FragmentedModel.new(:env => @env)
-    end
-
-    def load(filename)
-
-      sumErrors = 0
-
-      if not File.exists?filename
-        Bake.formatter.printError("Error: #{filename} does not exist")
-        ExitHelper.exit(1)
-      end
-
-      loader = RText::DefaultLoader.new(
-        Bake::BakeryLanguage,
-        @model,
-        :file_provider => proc { [filename] },
-        :cache => @DumpFileCache)
-      loader.load()
-
-      f = @model.fragments[0]
-
-      f.data[:problems].each do |p|
-        Bake.formatter.printError(p.message, p.file, p.line)
-      end
-
-      if f.data[:problems].length > 0
-        ExitHelper.exit(1)
-      end
-
-      return @env
-
-    end
-
-
-  end
+require_relative 'metamodel'
+require_relative 'language'
+require_relative '../../common/version'
+
+require 'rgen/environment'
+require 'rgen/fragment/fragmented_model'
+
+require 'rtext/default_loader'
+
+require_relative '../../common/ext/rgen'
+require_relative '../../common/exit_helper'
+require_relative '../../bake/toolchain/colorizing_formatter'
+
+module Bake
+
+  class BakeryLoader
+
+    attr_reader :model
+
+    def initialize
+      @env = RGen::Environment.new
+      @model = RGen::Fragment::FragmentedModel.new(:env => @env)
+    end
+
+    def load(filename)
+
+      sumErrors = 0
+
+      if not File.exist?filename
+        Bake.formatter.printError("Error: #{filename} does not exist")
+        ExitHelper.exit(1)
+      end
+
+      loader = RText::DefaultLoader.new(
+        Bake::BakeryLanguage,
+        @model,
+        :file_provider => proc { [filename] },
+        :cache => @DumpFileCache)
+      loader.load()
+
+      f = @model.fragments[0]
+
+      f.data[:problems].each do |p|
+        Bake.formatter.printError(p.message, p.file, p.line)
+      end
+
+      if f.data[:problems].length > 0
+        ExitHelper.exit(1)
+      end
+
+      return @env
+
+    end
+
+
+  end
 end

data/lib/bakery/options/options.rb

@@ -1,106 +1,106 @@
-require_relative '../../bake/toolchain/colorizing_formatter'
-require_relative '../../common/options/parser'
-require_relative '../../common/options/finder'
-require_relative '../../common/root'
-
-module Bake
-
-  class BakeryOptions < Parser
-    attr_reader :collection_name, :collection_dir # String
-    attr_reader :roots # Root list
-    attr_reader :color, :error # Boolean
-    attr_reader :socket # Fixnum
-
-    def initialize(argv)
-      super(argv)
-
-      @collection_name = ""
-      @collection_dir = nil
-      @color = nil
-      @error = false
-      @roots = []
-      @socket = 0
-
-      add_option(["-b", ""      ], lambda { |x| set_collection_name(x)                  })
-      add_option(["-m"          ], lambda { |x| @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 " -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', 'black' and 'none' (default)."
-      puts " -h, --help            Print this help."
-      puts " -w <root>[,<depth>]   Add a workspace root (can be used multiple times). Additionally the search depth can be specified (>=0)."
-      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."
-      puts "Note: all parameters except -b, -m and -h will be passed to bake - see bake help for more options."
-    end
-
-    def parse_options(bakeOptions)
-      parse_internal(true, bakeOptions)
-
-      searchDir = @collection_dir.nil? ? Dir.pwd : @collection_dir
-      dir = Bake.findDirOfFileToRoot(searchDir,"Collection.meta")
-      if dir
-        set_collection_dir(dir)
-      else
-        Bake.formatter.printError("Error: Collection.meta not found in #{searchDir} or upwards")
-        ExitHelper.exit(1)
-      end
-
-      def_roots = Root.calc_roots_bake(@collection_dir)
-      @roots += def_roots
-
-      if @roots.empty?
-        @roots = []
-        @roots = Root.calc_def_roots(@collection_dir)
-      end
-
-      @roots = Root.uniq(@roots)
-    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_collection_name(collection_name)
-      if not @collection_name.empty?
-        Bake.formatter.printError("Error: Cannot set collection name '#{collection_name}', because collection name is already set to '#{@collection_name}'")
-        ExitHelper.exit(1)
-      end
-      @collection_name = collection_name
-    end
-
-    def set_collection_dir(dir)
-      check_valid_dir(dir)
-      @collection_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
-    end
-
-    def set_root(dir)
-      if File.file?(dir)
-        @roots += Root.calc_roots_bake(dir)
-      else
-        root = Root.extract_depth(dir)
-        check_valid_dir(root.dir)
-        root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
-        @roots << root
-      end
-    end
-
-  end
-
-end
+require_relative '../../bake/toolchain/colorizing_formatter'
+require_relative '../../common/options/parser'
+require_relative '../../common/options/finder'
+require_relative '../../common/root'
+
+module Bake
+
+  class BakeryOptions < Parser
+    attr_reader :collection_name, :collection_dir # String
+    attr_reader :roots # Root list
+    attr_reader :color, :error # Boolean
+    attr_reader :socket # Fixnum
+
+    def initialize(argv)
+      super(argv)
+
+      @collection_name = ""
+      @collection_dir = nil
+      @color = nil
+      @error = false
+      @roots = []
+      @socket = 0
+
+      add_option(["-b", ""      ], lambda { |x| set_collection_name(x)                  })
+      add_option(["-m"          ], lambda { |x| @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 " -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', 'black' and 'none' (default)."
+      puts " -h, --help            Print this help."
+      puts " -w <root>[,<depth>]   Add a workspace root (can be used multiple times). Additionally the search depth can be specified (>=0)."
+      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."
+      puts "Note: all parameters except -b, -m and -h will be passed to bake - see bake help for more options."
+    end
+
+    def parse_options(bakeOptions)
+      parse_internal(true, bakeOptions)
+
+      searchDir = @collection_dir.nil? ? Dir.pwd : @collection_dir
+      dir = Bake.findDirOfFileToRoot(searchDir,"Collection.meta")
+      if dir
+        set_collection_dir(dir)
+      else
+        Bake.formatter.printError("Error: Collection.meta not found in #{searchDir} or upwards")
+        ExitHelper.exit(1)
+      end
+
+      def_roots = Root.calc_roots_bake(@collection_dir)
+      @roots += def_roots
+
+      if @roots.empty?
+        @roots = []
+        @roots = Root.calc_def_roots(@collection_dir)
+      end
+
+      @roots = Root.uniq(@roots)
+    end
+
+    def check_valid_dir(dir)
+     if not File.exist?(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_collection_name(collection_name)
+      if not @collection_name.empty?
+        Bake.formatter.printError("Error: Cannot set collection name '#{collection_name}', because collection name is already set to '#{@collection_name}'")
+        ExitHelper.exit(1)
+      end
+      @collection_name = collection_name
+    end
+
+    def set_collection_dir(dir)
+      check_valid_dir(dir)
+      @collection_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
+    end
+
+    def set_root(dir)
+      if File.file?(dir)
+        @roots += Root.calc_roots_bake(dir)
+      else
+        root = Root.extract_depth(dir)
+        check_valid_dir(root.dir)
+        root.dir  = File.expand_path(root.dir.gsub(/[\\]/,'/'))
+        @roots << root
+      end
+    end
+
+  end
+
+end

data/lib/blocks/block.rb

@@ -142,14 +142,14 @@ module Bake
           Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please use a Dependency to \"#{inc[0]}\" instead", elem) if warnIfLocal
         end
 
-        if File.exists?(@projectDir + "/" + d) # prio 2: local, e.g. "include"
+        if File.exist?(@projectDir + "/" + d) # prio 2: local, e.g. "include"
           res << d
         end
 
         # prio 3: check if dir exists without Project.meta entry
         Bake.options.roots.each do |r|
           absIncDir = r.dir+"/"+d
-          if File.exists?(absIncDir)
+          if File.exist?(absIncDir)
             res << File.rel_from_to_project(@projectDir,absIncDir,false)
             Bake.formatter.printInfo("\"#{d}\" uses path magic in IncludeDir, please create a Project.meta in \"#{absIncDir}\" or upwards and use a Dependency instead", elem) if warnIfLocal && res.length == 1
           end

data/lib/blocks/blockBase.rb

@@ -15,7 +15,7 @@ module Bake
       end
 
       def check_config_file()
-        if File.exists?(@config.file_name) and File.mtime(@config.file_name) > @config_date
+        if File.exist?(@config.file_name) and File.mtime(@config.file_name) > @config_date
           begin
             FileUtils.touch(@config.file_name) if !Bake.options.dry
           rescue Exception=>e
@@ -30,7 +30,7 @@ module Bake
         return if Bake.options.dry
         filename = File.expand_path(filename, @projectDir)
         begin
-          if File.exists?(filename)
+          if File.exist?(filename)
             FileUtils.rm(filename)
           else
             FileUtils::mkdir_p(File.dirname(filename))

data/lib/blocks/executable.rb

@@ -77,25 +77,25 @@ module Bake
         return "because linkOnly was specified" if Bake.options.linkOnly
 
         # exe
-        return "because executable does not exist" if not File.exists?(@exe_name)
+        return "because executable does not exist" if not File.exist?(@exe_name)
 
         eTime = File.mtime(@exe_name)
 
         # linkerscript
         if @linker_script
-          return "because linker script does not exist - will most probably result in an error" if not File.exists?(@linker_script)
+          return "because linker script does not exist - will most probably result in an error" if not File.exist?(@linker_script)
           return "because linker script is newer than executable" if eTime < File.mtime(@linker_script)
         end
 
         # sources
         @compileBlock.objects.each do |obj|
-          return "because object #{obj} does not exist" if not File.exists?(obj)
+          return "because object #{obj} does not exist" if not File.exist?(obj)
           return "because object #{obj} is newer than executable" if eTime < File.mtime(obj)
         end if @compileBlock
 
         # libs
         libs.each do |lib|
-          return "because library #{lib} does not exist" if not File.exists?(lib)
+          return "because library #{lib} does not exist" if not File.exist?(lib)
           return "because library #{lib} is newer than executable" if eTime < File.mtime(lib)
         end
         false

data/lib/blocks/library.rb

@@ -52,13 +52,13 @@ module Bake
         Dir.mutex.synchronize do
           Dir.chdir(@projectDir) do
             # lib
-            return "because library does not exist" if not File.exists?(@archive_name)
+            return "because library does not exist" if not File.exist?(@archive_name)
 
             aTime = File.mtime(@archive_name)
 
             # sources
             @objects.each do |obj|
-              return "because object #{obj} does not exist" if not File.exists?(obj)
+              return "because object #{obj} does not exist" if not File.exist?(obj)
               return "because object #{obj} is newer than executable" if aTime < File.mtime(obj)
             end
           end
@@ -87,7 +87,7 @@ module Bake
               @objects.concat(Dir.glob_dir("#{@block.output_dir}/**/*#{e}", @projectDir))
             end
             if @objects.empty?
-              if !File.exists?(File.expand_path(@archive_name, @projectDir))
+              if !File.exist?(File.expand_path(@archive_name, @projectDir))
                 SyncOut.mutex.synchronize do
                   puts "No object files, library won't be created" if Bake.options.verbose >= 2
                 end

data/lib/blocks/makefile.rb

@@ -83,7 +83,7 @@ module Bake
             else
               Bake.options.roots.each do |r|
                 absIncDir = r.dir+"/"+nameOfP
-                if File.exists?(absIncDir)
+                if File.exist?(absIncDir)
                   dirOfP = absIncDir
                   break
                 end

data/lib/blocks/showIncludes.rb

@@ -49,7 +49,7 @@ module Bake
 
             iname = mainBlock.convPath(iinc)
             if iname != ""
-              if not File.exists?(iname)
+              if not File.exist?(iname)
                 Bake.formatter.printError("InternalIncludes file #{iname} does not exist", iinc)
                 ExitHelper.exit(1)
               end
@@ -74,7 +74,7 @@ module Bake
             if (c.internalDefines)
               dname = mainBlock.convPath(c.internalDefines)
               if dname != ""
-                if not File.exists?(dname)
+                if not File.exist?(dname)
                   Bake.formatter.printError("InternalDefines file #{dname} does not exist", c.internalDefines)
                   ExitHelper.exit(1)
                 end

data/lib/common/options/finder.rb

@@ -1,7 +1,7 @@
 module Bake
 
   def self.findDirOfFileToRoot(dir, filename)
-    if !File.exists?(dir)
+    if !File.exist?(dir)
       Bake.formatter.printError("Error: #{dir} does not exist")
       ExitHelper.exit(1)
     end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.71.0"
+      "2.72.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.71.0
+  version: 2.72.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Build tool to compile C/C++ projects fast and easy.