bake-toolkit 2.63.2 → 2.64.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 007d1495eeb33f601eb10747f21cae6b0c478041092799bcfd284ab8cdce7253
-  data.tar.gz: cabe15ec22fe017a9946b4287cc8321b5df6fd14b64dac6c0fa0b6f11c88f58a
+  metadata.gz: 511748b7bf298219c3c7f9ea2444ca6ac0049d67c1f01e2510bfd7ae619dfbd0
+  data.tar.gz: a28dea4db9569b991637e0a98e749bec0f5336a2ede3a76869488f701bc74646
 SHA512:
-  metadata.gz: ec0beb0df1b8a9f191faba73671da192424f04714af16b80f047dac259808a778ac822a9f790ffcd679d86579a9100e1fc3325bc83b19a8d40b2b3c30ec6b769
-  data.tar.gz: 2c75dc962078394be1033cd484834b90e4fd326c83a103b8fdb780d827f8f6a78f1689d2e383bc09d6e3aee0e1c0cf2d91a5fafad868eca6e7ad8f660eb09259
+  metadata.gz: 439f8755aa29bdefd4e65300f56a56883db480e0efd277d1692c5494f1368d2ae40226fdf7ddf76c622585735c0750edade07468490a17aa5c4b34e04d833b85
+  data.tar.gz: 3cd7e4828239cebc6e6a61180919c563a4b3e1bd3701eecdb1fe6f60d86610716dcc9f370da5d0f3ec46063b258f6c5e56f42d87b2233985905b33946822b38c

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/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/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/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, :object_files
 
       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 = []
@@ -555,7 +561,7 @@ module Bake
           pr = sources.name
           pr = pr[2..-1] if pr.start_with?"./"
 
-          res = Dir.glob_dir(pr, @projectDir).sort
+          res = Dir.glob_dir(pr, @projectDir).select {|f| !get_source_type(f).nil?}.sort
           if res.length == 0 and cleaning == false
             if not pr.include?"*" and not pr.include?"?"
               Bake.formatter.printError("Source file '#{pr}' not found", sources)

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/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.63.2"
+      "2.64.4"
     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
 
@@ -852,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.object_files && b.object_files.has_key?(s)
+                          o = b.object_files[s]
+                          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
+
+                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.2
+  version: 2.64.4
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext