bake-toolkit 2.63.0 → 2.64.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 225fc376c9b3409d01e708f2ec67bb2d80f9c081d26de339d5b4bb3451141e50
-  data.tar.gz: e3769b3550aee5ae45685d8445b0ea3bfec59eea4ffa885900a461c82269b16b
+  metadata.gz: 1241aa9fcd9ce24d5761701ddd95271bed509b193893143c277796f2d5ba5507
+  data.tar.gz: 7935527ed54346bca16a792df57c7933418c3072d19ac226b4dfbc3553e280ab
 SHA512:
-  metadata.gz: 419125459eab7fb1ea49939389ff85c43ef6e7ddfd2fdc4bbd555e0a5b8d0e282d28e6e52da5ab3bac1d08d1b5cee4d163315d99bceab7700011aa5f3feda46f
-  data.tar.gz: 3e273c6f6a16f89ba30b1d40c8a787a9439693ba50dd33d4667328c91894b7302ae3c1f6e9f2c4d48078fdbba545270fb5c73ff0158f0e6766bc640774808896
+  metadata.gz: c7a8521d57d7e25c52a84a18114fed44d7c64e817f16850727579e511b38cf46ddd05f87d9d74f0f37f44422e800c845055d27e64236714f0885d50d78a1e2cf
+  data.tar.gz: 45099b859072ff9dab75f24ee74680b6c69b157844a1143a5bb9c7bfb028683ba9379591430435e7efe535a983b2a818e9168a83cb3ff069b0047623dec7ef9c

data/lib/adapt/config/loader.rb

@@ -1,4 +1,5 @@
 require_relative '../../bake/model/loader'
+require_relative '../../bake/config/loader'
 require_relative '../../bake/config/checks'
 
 module Bake
@@ -24,6 +25,10 @@ module Bake
         ExitHelper.exit(1)
       end
 
+      f.root_elements.each do |a|
+        Bake::Config::checkVer(a.requiredBakeVersion)
+      end
+
       configs = []
       f.root_elements.each { |re| configs.concat(re.getConfig) }
       AdaptConfig::checkSyntax(configs, filename)

data/lib/bake/cache.rb

@@ -31,7 +31,7 @@ module Bake
           @cacheFilename = Bake.options.main_dir+"/.bake/Project.meta." + sanitize_filename(Bake.options.build_config) + qacStr + ".cache"
         end
         if !Bake.options.dry
-          Utils.gitIgnore(File.dirname(@cacheFilename)) 
+          Utils.gitIgnore(File.dirname(@cacheFilename), :silent) 
         end
       end
 
@@ -187,10 +187,16 @@ module Bake
         cache.adapt_filenames = AdaptConfig.filenames
         bbdump = Marshal.dump(cache)
         begin
-          File.delete(@cacheFilename)
-        rescue
+          File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
+        rescue Exception=>e
+          if Bake.options.verbose >= 3
+            Bake.formatter.printWarning("Warning: Could not write cache file #{@cacheFilename}")
+            if Bake.options.debug
+              puts e.message
+              puts e.backtrace
+            end
+          end
         end
-        File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
         Bake.options.nocache = false
       end
 

data/lib/bake/config/loader.rb

@@ -161,7 +161,7 @@ module Bake
       [config, configname]
     end
 
-    def checkVerFormat(ver)
+    def self.checkVerFormat(ver)
       return true if ver.empty?
       return false if ver.length > 3
       ver.each do |v|
@@ -170,7 +170,7 @@ module Bake
       true
     end
 
-    def bailOutVer(reqVersion)
+    def self.bailOutVer(reqVersion)
       text1 = (reqVersion.minimum.empty? ? "" : "minimum = #{reqVersion.minimum}")
       text2 = ((reqVersion.minimum.empty? or reqVersion.maximum.empty?) ? "" : ", ")
       text3 = (reqVersion.maximum.empty? ? "" : "maximum = #{reqVersion.maximum}")
@@ -178,7 +178,7 @@ module Bake
       ExitHelper.exit(1)
     end
 
-    def checkVer(reqVersion)
+    def self.checkVer(reqVersion)
       return if reqVersion.nil?
       min = reqVersion.minimum.split(".")
       max = reqVersion.maximum.split(".")
@@ -217,7 +217,7 @@ module Bake
       proj = projRoots[0]
 
       reqVersion = proj.getRequiredBakeVersion
-      checkVer(reqVersion)
+      Bake::Config::checkVer(reqVersion)
 
       configs = proj.getConfig
       Bake::Configs::Checks::commonMetamodelCheck(configs, filename)
@@ -236,6 +236,7 @@ module Bake
       adaptRoots = f.root_elements.select { |re| Metamodel::Adapt === re }
       if adaptRoots.length > 0
         adaptRoots.each do |adapt|
+          Bake::Config::checkVer(adapt.requiredBakeVersion)
           adapt.mainProject = @mainProjectName if adapt.mainProject == "__THIS__"
           adaptConfigs = adapt.getConfig
           AdaptConfig.checkSyntax(adaptConfigs, filename, true)

data/lib/bake/model/loader.rb

@@ -9,6 +9,7 @@ require 'rgen/util/file_cache_map'
 
 require 'rtext/default_loader'
 
+require_relative '../../common/ext/rgen'
 require_relative '../../common/exit_helper'
 require_relative '../toolchain/colorizing_formatter'
 require_relative '../options/options'

data/lib/bake/model/metamodel.rb

@@ -284,6 +284,12 @@ module Bake
         has_attr 'env', Boolean, :defaultValueLiteral => "false"
       end
 
+      class CompilationCheck < ModelElement
+        has_attr 'exclude', String, :defaultValueLiteral => ""
+        has_attr 'include', String, :defaultValueLiteral => ""
+        has_attr 'ignore', String, :defaultValueLiteral => ""
+      end
+
       class BaseConfig_INTERNAL < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'extends', String, :defaultValueLiteral => ""
@@ -305,6 +311,7 @@ module Bake
         contains_many 'set', Set, 'parent'
         contains_many 'prebuild', Prebuild, 'parent'
         contains_one 'cdb', CompilationDB, 'parent'
+        contains_many 'compilationCheck', CompilationCheck, 'parent'
 
         module ClassModule
           def ident
@@ -356,6 +363,7 @@ module Bake
         has_attr 'mainConfig', String, :defaultValueLiteral => ""
         contains_many 'config', BaseConfig_INTERNAL, 'parent'
         contains_many 'scopes', Scope, 'parent'
+        contains_one 'requiredBakeVersion', RequiredBakeVersion, 'parent'
       end
 
       class If < Adapt

data/lib/bake/options/options.rb

@@ -361,6 +361,10 @@ module Bake
     end
 
     def set_verbose(num)
+      if num.nil?
+        Bake.formatter.printError("Error: verbose must be between 0 and 3")
+        ExitHelper.exit(1)
+      end
       checkNum(num)
       @verbose = String === num ? num.to_i : num
       if @verbose < 0 || verbose > 3

data/lib/bakery/model/loader.rb

@@ -7,6 +7,7 @@ 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'
 

data/lib/bakery/toBake.rb

@@ -35,7 +35,7 @@ module Bake
           projs << root.dir + "/Project.meta"
         end
         if projs.length == 0
-          toBuildPattern << BuildPattern.new(nil, nil, p.args, p) # remember it for sorted info printout
+          Bake.formatter.printWarning("pattern does not match any project: #{p.name}", p)
         end
         projs.each do |f|
           toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p.args, p)
@@ -58,6 +58,10 @@ module Bake
       end
     end
 
+    toBuildPattern.select {|bp| !bp.coll_p.isFound}.map {|bp| bp.coll_p}.uniq.each do |p|
+      Bake.formatter.printWarning("pattern does not match any config: #{p.config}", p)
+    end
+
     col.exclude.each do |p|
       p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
       p.config = "^"+p.config.gsub("*","(\\w*)")+"$"

data/lib/blocks/compile.rb

@@ -7,47 +7,52 @@ require_relative '../common/utils'
 require_relative '../bake/toolchain/colorizing_formatter'
 require_relative '../bake/config/loader'
 
-
 begin
-require 'Win32API'
+  module Kernel32
+    require 'fiddle'
+    require 'fiddle/import'
+    require 'fiddle/types'
+    extend Fiddle::Importer
+    dlload 'kernel32'
+    include Fiddle::Win32Types
+    extern 'DWORD GetLongPathName(LPCSTR, LPSTR, DWORD)'
+    extern 'DWORD GetShortPathName(LPCSTR, LPSTR, DWORD)'
+  end
 
-def longname short_name
-  max_path = 1024
-  long_name = " " * max_path
-  lfn_size = Win32API.new("kernel32", "GetLongPathName", ['P','P','L'],'L').call(short_name, long_name, max_path)
-  return long_name[0..lfn_size-1]
-end
+  def longname short_name
+    max_path = 1024
+    long_name = " " * max_path
+    lfn_size = Kernel32.GetLongPathName(short_name, long_name, max_path)
+    return long_name[0..lfn_size-1]
+  end
 
-def shortname long_name
-  max_path = 1024
-  short_name = " " * max_path
-  lfn_size = Win32API.new("kernel32", "GetShortPathName", ['P','P','L'],'L').call(long_name, short_name, max_path)
-  return short_name[0..lfn_size-1]
-end
+  def shortname long_name
+    max_path = 1024
+    short_name = " " * max_path
+    lfn_size = Kernel32.GetShortPathName(long_name, short_name, max_path)
+    return short_name[0..lfn_size-1]
+  end
 
-def realname file
-    longname(shortname(file))
-end
+  def realname file
+    x = longname(shortname(file))
+  end
 
-rescue LoadError
+rescue Fiddle::DLError
 
-def realname file
+  def realname file
     file
-end
+  end
 
 end
 
 
-
-
-
 module Bake
 
   module Blocks
 
     class Compile < BlockBase
 
-      attr_reader :objects, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
+      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
 
       def mutex
         @mutex ||= Mutex.new
@@ -421,6 +426,7 @@ module Bake
           Utils.gitIgnore(odir) if !Bake.options.dry
 
           fileListBlock = Set.new if Bake.options.filelist
+          @source_files_compiled = @source_files.dup
           compileJobs = Multithread::Jobs.new(@source_files) do |jobs|
             while source = jobs.get_next_or_nil do
 
@@ -539,7 +545,7 @@ module Bake
       end
 
       def calcSources(cleaning = false, keep = false)
-        return @source_files if @source_files and not @source_files.empty?
+        return @source_files if @source_files && !@source_files.empty?
         @source_files = []
         @source_files_ignored_in_lib = []
         @source_files_link_directly = []

data/lib/blocks/executable.rb

@@ -190,9 +190,15 @@ module Bake
             BlockBase.writeCmdLineFile(cmd, cmdLineFile)
             success = true
             consoleOutput = ""
-            success, consoleOutput = ProcessHelper.run(realCmd, false, false, outPipe) if !Bake.options.dry
-            process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
-
+            retry_linking = Bake.options.dev_features.include?("retry-linking") ? 5 : 1
+            begin
+              success, consoleOutput = ProcessHelper.run(realCmd, false, false, outPipe) if !Bake.options.dry
+              process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
+            rescue Exception
+              retry_linking -= 1
+              retry if !success && retry_linking > 0
+              raise
+            end
             check_config_file()
           end
 

data/lib/common/ext/rgen.rb

@@ -0,0 +1,23 @@
+module RGen
+module Util
+
+  class FileCacheMap
+    alias_method :orig_store_data, :store_data
+    def store_data(key_path, value_data)
+      begin
+        orig_store_data(key_path, value_data)
+      rescue Exception=>e
+        if Bake.options.verbose >= 3
+          cf = cache_file(key_path)
+          Bake.formatter.printWarning("Warning: Could not write cache file #{cf}")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
+    end
+  end
+
+end
+end

data/lib/common/utils.rb

@@ -4,11 +4,21 @@ module Bake
 
   module Utils
     
-    def self.gitIgnore(folder)
-      FileUtils::mkdir_p(folder)
+    def self.gitIgnore(folder, mode = :report)
       gitignore = folder + "/.gitignore"
-      if !File.exist?(gitignore)
-        File.write(gitignore, ".\n")
+      begin
+        FileUtils::mkdir_p(folder)
+        if !File.exist?(gitignore)
+          File.write(gitignore, ".\n")
+        end
+      rescue Exception=>e
+        if mode != :silent && Bake.options.verbose >= 3
+          Bake.formatter.printWarning("Warning: Could not write file #{gitignore}")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
       end
     end
 

data/lib/common/version.rb

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

data/lib/tocxx.rb

@@ -36,6 +36,7 @@ require_relative 'common/abortException'
 
 require_relative 'adapt/config/loader'
 require "thwait"
+require 'pathname'
 
 module Bake
 
@@ -254,6 +255,7 @@ module Bake
           end
         end
       end
+      ExitHelper.exit(0)
     end
     
     def makeIncs
@@ -851,6 +853,84 @@ module Bake
           if Bake.options.linkOnly and @@linkBlock == 0
             Bake.formatter.printSuccess("\nNothing to link.")
           else
+            # CompilationCheck
+            if !Bake.options.project &&
+               !Bake.options.filename &&
+               !Bake.options.linkOnly &&
+               !Bake.options.prepro &&
+               !Bake.options.compileOnly &&
+               !Bake.options.clean
+
+              ccChecks = []
+              ccIncludes = Set.new
+              ccExcludes = Set.new
+              ccIgnores = Set.new
+              @referencedConfigs.each do |projName, configs|
+                configs.compilationCheck.each do |cc|
+                  ccChecks << cc
+                end
+              end
+              ccChecks.each do |cc|
+                Dir.chdir(cc.parent.parent.get_project_dir) do
+                  Dir.glob(cc.include).select {|f| File.file?(f)}.each {|f| ccIncludes << File.expand_path(f)}
+                  Dir.glob(cc.exclude).select {|f| File.file?(f)}.each {|f| ccExcludes << File.expand_path(f)}
+                  Dir.glob(cc.ignore). select {|f| File.file?(f)}.each {|f| ccIgnores  << File.expand_path(f)}
+                end
+              end
+              ccIncludes -= ccIgnores
+              ccExcludes -= ccIgnores
+              ccIncludes -= ccExcludes
+
+              if !ccIncludes.empty? || !ccExcludes.empty?
+                inCompilation = Set.new
+                Blocks::ALL_BLOCKS.each do |name,block|
+                  block.mainSteps.each do |b|
+                    if Blocks::Compile === b && !b.source_files_compiled.nil?
+                      b.source_files_compiled.each do |s|
+                        inCompilation << File.expand_path(s, b.projectDir)
+                        type = b.get_source_type(s)
+                        if type != :ASM
+                          b.objects.each do |o|
+                            dep_filename = b.calcDepFile(o, type)
+                            dep_filename_conv = b.calcDepFileConv(dep_filename)
+                            File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
+                              header = File.expand_path(dep, b.projectDir)
+                              if File.exist?(header)
+                                inCompilation << header
+                              end
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+                pnPwd = Pathname.new(Dir.pwd)
+                ccNotIncluded = (ccIncludes - inCompilation).to_a
+                ccNotExcluded = inCompilation.select {|i| ccExcludes.include?(i) }
+                ccNotIncluded.each do |cc|
+                  cc = Pathname.new(cc).relative_path_from(pnPwd)
+                  Bake.formatter.printWarning("Warning: file not included in build: #{cc}")
+                end
+                ccNotExcluded.each do |cc|
+                  cc = Pathname.new(cc).relative_path_from(pnPwd)
+                  Bake.formatter.printWarning("Warning: file not excluded from build: #{cc}")
+                end
+
+                if Bake.options.verbose >= 3
+                  if ccNotIncluded.empty? && ccNotExcluded.empty?
+                    Bake.formatter.printInfo("Info: CompilationCheck passed")
+                  end
+                end
+
+              elsif !ccChecks.empty?
+                if Bake.options.verbose >= 3
+                  Bake.formatter.printInfo("Info: CompilationCheck passed")
+                end
+              end
+            end
+            
+            
             Bake.formatter.printSuccess("\n#{taskType} done.")
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.63.0
+  version: 2.64.2
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -112,16 +112,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,7 @@ files:
 - lib/common/exit_helper.rb
 - lib/common/ext/dir.rb
 - lib/common/ext/file.rb
+- lib/common/ext/rgen.rb
 - lib/common/ext/rtext.rb
 - lib/common/ext/stdout.rb
 - lib/common/ide_interface.rb