bake-toolkit 2.46.0 → 2.47.0

data/lib/blocks/commandLine.rb

@@ -1,4 +1,4 @@
-require 'blocks/has_execute_command'
+require_relative 'has_execute_command'
 
 module Bake
   module Blocks
@@ -6,7 +6,7 @@ module Bake
     class CommandLine
       include HasExecuteCommand
 
-      def initialize(config, referencedConfigs)
+      def initialize(config)
         @config = config # Bake::Metamodel::CommandLine
         @commandLine = config.name
         @projectDir = config.get_project_dir

data/lib/blocks/compile.rb

@@ -1,11 +1,11 @@
-require 'blocks/blockBase'
+require_relative 'blockBase'
 
-require 'multithread/job'
-require 'common/process'
-require 'common/ext/dir'
-require 'common/utils'
-require 'bake/toolchain/colorizing_formatter'
-require 'bake/config/loader'
+require_relative '../multithread/job'
+require_relative '../common/process'
+require_relative '../common/ext/dir'
+require_relative '../common/utils'
+require_relative '../bake/toolchain/colorizing_formatter'
+require_relative '../bake/config/loader'
 
 
 begin
@@ -254,14 +254,70 @@ module Bake
 
           success = true
           consoleOutput = ""
-          success, consoleOutput = ProcessHelper.run(cmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
-          incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], nil, reason, success)
+          incList = nil
+          if !Bake.options.diabCaseCheck
+            success, consoleOutput = ProcessHelper.run(cmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
+            incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], nil, reason, success)
+          end
+
           if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
             Dir.mutex.synchronize do
-              Dir.chdir(@projectDir) do
-                incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
-                Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
+              if !Bake.options.diabCaseCheck
+                Dir.chdir(@projectDir) do
+                  incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
+                  Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
+                end
               end
+              if !Bake.options.dry && Bake.options.caseSensitivityCheck
+                wrongCase = []
+
+                if compiler[:COMMAND] == "dcc"
+                  if Bake.options.diabCaseCheck
+                    pos = cmd.find_index(compiler[:OBJECT_FILE_FLAG])
+                    preProCmd = (cmd[0..pos-1] + cmd[pos+2..-1] + ["-E"])
+                    success, consoleOutput = ProcessHelper.run(preProCmd, false, false, nil, [0], @projectDir)
+                    if !success
+                      Bake.formatter.printError("Error: could not compile #{source}")
+                      raise SystemCommandFailed.new
+                    end
+                    Dir.chdir(@projectDir) do
+                      incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE])
+                      Compile.write_depfile(source, incList, dep_filename_conv, @projectDir)
+                    end
+                    ergs = consoleOutput.scan(/# \d+ "([^"]+)" \d+/)
+                    ergs.each do |f|
+                      next if source.include?f[0]
+                      next if f[0].length>=2 && f[0][1] == ":"
+                      filenameToCheck = f[0].gsub(/\\/,"/").gsub(/\/\//,"/").gsub(/\A\.\//,"")
+                      if incList.none?{|i| i.include?(filenameToCheck) }
+                        Dir.chdir(@projectDir) do
+                          wrongCase << [filenameToCheck, realname(filenameToCheck)]
+                        end
+                      end
+                    end
+                  end
+                else # not diab
+                  Dir.chdir(@projectDir) do
+                    incList.each do |dep|
+                      if dep.length<2 || dep[1] != ":"
+                        real = realname(dep)
+                        if dep != real && dep.upcase == real.upcase
+                          wrongCase << [dep, real]
+                        end
+                      end
+                    end unless incList.nil?
+                  end
+                end
+
+                if wrongCase.length > 0
+                  wrongCase.each do |c|
+                    Bake.formatter.printError("Case sensitivity error in #{source}:\n  included: #{c[0]}\n  realname: #{c[1]}")
+                  end
+                  FileUtils.rm_f(dep_filename_conv)
+                  raise SystemCommandFailed.new
+                end
+              end
+
             end
 
             incList.each do |h|
@@ -316,32 +372,16 @@ module Bake
       # todo: move to toolchain util file
       def self.write_depfile(source, deps, dep_filename_conv, projDir)
         if deps && !Bake.options.dry
-          wrongCase = false
           begin
             File.open(dep_filename_conv, 'wb') do |f|
               deps.each do |dep|
                 f.puts(dep)
-
-                if (Bake.options.caseSensitivityCheck)
-                  if dep.length<2 || dep[1] != ":"
-                    real = realname(dep)
-                    if dep != real && dep.upcase == real.upcase
-                      Bake.formatter.printError("Case sensitivity error in #{source}:\n  included: #{dep}\n  realname: #{real}")
-                      wrongCase = true
-                    end
-                  end
-                end
-
               end
             end
           rescue Exception
             Bake.formatter.printWarning("Could not write '#{dep_filename_conv}'", projDir)
             return nil
           end
-          if wrongCase
-            FileUtils.rm_f(dep_filename_conv)
-            raise SystemCommandFailed.new
-          end
         end
       end
 
@@ -601,7 +641,7 @@ module Bake
       end
 
       def getDefines(compiler)
-        compiler[:DEFINES].map {|k| "#{compiler[:DEFINE_FLAG]}#{k}"}
+        (compiler[:DEFINES] + Bake.options.defines).map {|k| "#{compiler[:DEFINE_FLAG]}#{k}"}
       end
 
       def getFlags(compiler)

data/lib/blocks/convert.rb

@@ -1,4 +1,4 @@
-require 'blocks/compile'
+require_relative 'compile'
 
 module Bake
 

data/lib/blocks/docu.rb

@@ -1,4 +1,4 @@
-require 'blocks/compile'
+require_relative 'compile'
 
 module Bake
   module Blocks

data/lib/blocks/executable.rb

@@ -1,4 +1,4 @@
-require 'blocks/blockBase'
+require_relative 'blockBase'
 
 module Bake
 

data/lib/blocks/fileutil.rb

@@ -0,0 +1,62 @@
+require 'fileutils'
+
+module Bake
+  module Blocks
+
+    class FileUtil
+
+      def initialize(config, type, projectDir)
+        @arg1 = config.name
+        @arg2 = config.respond_to?(:to) ? config.to : nil
+        @type = type
+        @projectDir = projectDir
+        @echo = (config.echo != "off")
+      end
+
+      def run
+        Dir.chdir(@projectDir) do
+          if @type == :touch
+            puts "Touching #{@arg1}" if @echo
+            FileUtils.touch(@arg1)
+          elsif @type == :move
+            puts "Moving #{@arg1} to #{@arg2}" if @echo
+            FileUtils.mv(@arg1, @arg2)
+          elsif @type == :copy
+            puts "Copying #{@arg1} to #{@arg2}" if @echo
+            FileUtils.cp_r(@arg1, @arg2)
+          elsif @type == :remove
+            puts "Removing #{@arg1}" if @echo
+            FileUtils.rm_rf(@arg1)
+          elsif @type == :makedir
+            puts "Making #{@arg1}" if @echo
+            FileUtils.mkdir_p(@arg1)
+          end
+        end
+        return true
+      end
+
+      def execute
+        return run()
+      end
+
+      def startupStep
+        return run()
+      end
+
+      def exitStep
+        return run()
+      end
+
+      def cleanStep
+        return run()
+      end
+
+      def clean
+        # nothing to do here
+        return true
+      end
+
+    end
+
+  end
+end

data/lib/blocks/library.rb

@@ -1,4 +1,4 @@
-require 'blocks/blockBase'
+require_relative 'blockBase'
 
 module Bake
 

data/lib/blocks/makefile.rb

@@ -1,4 +1,4 @@
-require 'blocks/has_execute_command'
+require_relative 'has_execute_command'
 
 module Bake
   module Blocks

data/lib/blocks/showIncludes.rb

@@ -110,9 +110,9 @@ module Bake
           if Bake.options.json
             projs[projName] =
               {  :includes => (blockIncs + intIncs).uniq,
-                 :cpp_defines => (blockDefs[:CPP] + intDefs[:CPP]).uniq,
-                 :c_defines => (blockDefs[:C] + intDefs[:C]).uniq,
-                 :asm_defines => (blockDefs[:ASM] + intDefs[:ASM]).uniq,
+                 :cpp_defines => (blockDefs[:CPP] + intDefs[:CPP]).uniq + Bake.options.defines,
+                 :c_defines => (blockDefs[:C] + intDefs[:C]).uniq + Bake.options.defines,
+                 :asm_defines => (blockDefs[:ASM] + intDefs[:ASM]).uniq + Bake.options.defines,
                  :dir => blocks.first.projectDir
               }
           else
@@ -122,7 +122,7 @@ module Bake
             (blockIncs + intIncs).uniq.each { |i| puts "  #{i}" }
             [:CPP, :C, :ASM].each do |type|
               puts " #{type} defines"
-              (blockDefs[type] + intDefs[type]).uniq.each { |d| puts "  #{d}" }
+              (blockDefs[type] + intDefs[type] + Bake.options.defines).uniq.each { |d| puts "  #{d}" }
             end
             puts " done"
           end

data/lib/blocks/sleep.rb

@@ -0,0 +1,41 @@
+module Bake
+  module Blocks
+
+    class Sleep
+
+      def initialize(config)
+        @echo = (config.echo != "off")
+        @time = config.name.to_f
+      end
+
+      def run
+        puts "Sleeping #{@time}s" if @echo
+        sleep @time
+        return true
+      end
+
+      def execute
+        return run()
+      end
+
+      def startupStep
+        return run()
+      end
+
+      def exitStep
+        return run()
+      end
+
+      def cleanStep
+        return run()
+      end
+
+      def clean
+        # nothing to do here
+        return true
+      end
+
+    end
+
+  end
+end

data/lib/common/cleanup.rb

@@ -1,4 +1,4 @@
-require "blocks/block"
+require_relative "../blocks/block"
 
 module Bake
 

data/lib/common/crc32.rb

@@ -1,4 +1,4 @@
-require 'common/exit_helper'
+require_relative 'exit_helper'
 
 module Bake
 

data/lib/common/ext/file.rb

@@ -1,4 +1,4 @@
-require 'common/utils'
+require_relative '../utils'
 
 class File
 

data/lib/common/ext/stdout.rb

@@ -1,5 +1,5 @@
 require 'stringio'
-require 'blocks/block'
+require_relative '../../blocks/block'
 
 class ThreadOut
 

data/lib/common/ide_interface.rb

@@ -1,5 +1,5 @@
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/colorizing_formatter'
+require_relative '../bake/toolchain/errorparser/error_parser'
+require_relative '../bake/toolchain/colorizing_formatter'
 require 'thread'
 
 module Bake

data/lib/common/options/parser.rb

@@ -1,5 +1,5 @@
-require 'bake/toolchain/colorizing_formatter'
-require 'common/exit_helper'
+require_relative '../../bake/toolchain/colorizing_formatter'
+require_relative '../exit_helper'
 
 module Bake
 

data/lib/common/version.rb

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

data/lib/multithread/job.rb

@@ -1,4 +1,4 @@
-require 'common/ext/stdout'
+require_relative '../common/ext/stdout'
 require 'stringio'
 require 'thread'
 require 'monitor' # this should fix a missing require in concurrent gem

data/lib/tocxx.rb

@@ -1,38 +1,40 @@
 #!/usr/bin/env ruby
 
 
-require 'bake/model/metamodel_ext'
-
-require 'bake/util'
-require 'bake/cache'
-require 'bake/subst'
-require 'bake/mergeConfig'
-
-require 'common/exit_helper'
-require 'common/ide_interface'
-require 'common/ext/file'
-require 'bake/toolchain/provider'
-require 'common/ext/stdout'
-require 'common/utils'
-require 'bake/toolchain/colorizing_formatter'
-require 'bake/config/loader'
-
-require 'blocks/block'
-require 'blocks/commandLine'
-require 'blocks/makefile'
-require 'blocks/compile'
-require 'blocks/convert'
-require 'blocks/library'
-require 'blocks/executable'
-require 'blocks/docu'
+require_relative 'bake/model/metamodel_ext'
+
+require_relative 'bake/util'
+require_relative 'bake/cache'
+require_relative 'bake/subst'
+require_relative 'bake/mergeConfig'
+
+require_relative 'common/exit_helper'
+require_relative 'common/ide_interface'
+require_relative 'common/ext/file'
+require_relative 'bake/toolchain/provider'
+require_relative 'common/ext/stdout'
+require_relative 'common/utils'
+require_relative 'bake/toolchain/colorizing_formatter'
+require_relative 'bake/config/loader'
+
+require_relative 'blocks/block'
+require_relative 'blocks/commandLine'
+require_relative 'blocks/sleep'
+require_relative 'blocks/fileutil'
+require_relative 'blocks/makefile'
+require_relative 'blocks/compile'
+require_relative 'blocks/convert'
+require_relative 'blocks/library'
+require_relative 'blocks/executable'
+require_relative 'blocks/docu'
 
 require 'set'
 require 'socket'
 
-require 'blocks/showIncludes'
-require 'common/abortException'
+require_relative 'blocks/showIncludes'
+require_relative 'common/abortException'
 
-require 'adapt/config/loader'
+require_relative 'adapt/config/loader'
 require "thwait"
 
 module Bake
@@ -94,7 +96,19 @@ module Bake
         if Bake::Metamodel::Makefile === step
           blockSteps << Blocks::Makefile.new(step, @referencedConfigs, block)
         elsif Bake::Metamodel::CommandLine === step
-          blockSteps << Blocks::CommandLine.new(step, @referencedConfigs)
+          blockSteps << Blocks::CommandLine.new(step)
+        elsif Bake::Metamodel::Sleep === step
+          blockSteps << Blocks::Sleep.new(step)
+        elsif Bake::Metamodel::Move === step
+          blockSteps << Blocks::FileUtil.new(step, :move, block.projectDir)
+        elsif Bake::Metamodel::Copy === step
+          blockSteps << Blocks::FileUtil.new(step, :copy, block.projectDir)
+        elsif Bake::Metamodel::Remove === step
+          blockSteps << Blocks::FileUtil.new(step, :remove, block.projectDir)
+        elsif Bake::Metamodel::MakeDir === step
+          blockSteps << Blocks::FileUtil.new(step, :makedir, block.projectDir)
+        elsif Bake::Metamodel::Touch === step
+          blockSteps << Blocks::FileUtil.new(step, :touch, block.projectDir)
         end
       end if configSteps
     end
@@ -422,111 +436,119 @@ module Bake
 
     def doit()
 
-      if Bake.options.show_includes or Bake.options.show_includes_and_defines
-        s = StringIO.new
-        tmp = Thread.current[:stdout]
-        Thread.current[:stdout] = s unless tmp
-      end
-
-      taskType = "Building"
-      if Bake.options.conversion_info
-        taskType = "Showing conversion infos"
-      elsif Bake.options.docu
-        taskType = "Generating documentation"
-      elsif Bake.options.prepro
-        taskType = "Preprocessing"
-      elsif Bake.options.linkOnly
-          taskType = "Linking"
-      elsif Bake.options.rebuild
-        taskType = "Rebuilding"
-      elsif Bake.options.clean
-        taskType = "Cleaning"
+      stdoutSuppression = nil
+      orgStdout = nil
+      if Bake.options.show_includes || Bake.options.show_includes_and_defines
+        stdoutSuppression = StringIO.new
+        orgStdout = Thread.current[:stdout]
+        Thread.current[:stdout] = stdoutSuppression unless orgStdout
       end
 
       begin
 
-        if Bake.options.showConfigs
-          al = AdaptConfig.new
-          adaptConfigs = al.load()
-          Config.new.printConfigs(adaptConfigs)
-        else
-          cache = CacheAccess.new()
-          @referencedConfigs = cache.load_cache unless Bake.options.nocache
+        taskType = "Building"
+        if Bake.options.conversion_info
+          taskType = "Showing conversion infos"
+        elsif Bake.options.docu
+          taskType = "Generating documentation"
+        elsif Bake.options.prepro
+          taskType = "Preprocessing"
+        elsif Bake.options.linkOnly
+            taskType = "Linking"
+        elsif Bake.options.rebuild
+          taskType = "Rebuilding"
+        elsif Bake.options.clean
+          taskType = "Cleaning"
+        end
+
+        begin
 
-          if @referencedConfigs.nil?
+          if Bake.options.showConfigs
             al = AdaptConfig.new
             adaptConfigs = al.load()
+            Config.new.printConfigs(adaptConfigs)
+          else
+            cache = CacheAccess.new()
+            @referencedConfigs = cache.load_cache unless Bake.options.nocache
+
+            if @referencedConfigs.nil?
+              al = AdaptConfig.new
+              adaptConfigs = al.load()
 
-            @loadedConfig = Config.new
-            @referencedConfigs = @loadedConfig.load(adaptConfigs)
+              @loadedConfig = Config.new
+              @referencedConfigs = @loadedConfig.load(adaptConfigs)
 
-            cache.write_cache(@referencedConfigs, adaptConfigs)
+              cache.write_cache(@referencedConfigs, adaptConfigs)
+            end
           end
-        end
 
-        taskType = "Analyzing" if Bake.options.analyze
+          taskType = "Analyzing" if Bake.options.analyze
 
-        @mainConfig = @referencedConfigs[Bake.options.main_project_name].select { |c| c.name == Bake.options.build_config }.first
+          @mainConfig = @referencedConfigs[Bake.options.main_project_name].select { |c| c.name == Bake.options.build_config }.first
 
-        basedOn =  @mainConfig.defaultToolchain.basedOn
-        basedOnToolchain = Bake::Toolchain::Provider[basedOn]
-        if basedOnToolchain.nil?
-          Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", @mainConfig.defaultToolchain)
-          ExitHelper.exit(1)
-        end
+          basedOn =  @mainConfig.defaultToolchain.basedOn
+          basedOnToolchain = Bake::Toolchain::Provider[basedOn]
+          if basedOnToolchain.nil?
+            Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", @mainConfig.defaultToolchain)
+            ExitHelper.exit(1)
+          end
 
-        # The flag "-FS" must only be set for VS2013 and above
-        ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = ""
-        if basedOn == "MSVC"
-          begin
-            res = `cl.exe 2>&1`
-            raise Exception.new unless $?.success?
-            scan_res = res.scan(/ersion (\d+).(\d+).(\d+)/)
-            if scan_res.length > 0
-              ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = "-FS" if scan_res[0][0].to_i >= 18 # 18 is the compiler major version in VS2013
-            else
-              Bake.formatter.printError("Could not read MSVC version")
+          # The flag "-FS" must only be set for VS2013 and above
+          ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = ""
+          if basedOn == "MSVC"
+            begin
+              res = `cl.exe 2>&1`
+              raise Exception.new unless $?.success?
+              scan_res = res.scan(/ersion (\d+).(\d+).(\d+)/)
+              if scan_res.length > 0
+                ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = "-FS" if scan_res[0][0].to_i >= 18 # 18 is the compiler major version in VS2013
+              else
+                Bake.formatter.printError("Could not read MSVC version")
+                ExitHelper.exit(1)
+              end
+            rescue SystemExit
+              raise
+            rescue Exception => e
+              Bake.formatter.printError("Could not detect MSVC compiler")
               ExitHelper.exit(1)
             end
-          rescue SystemExit
-            raise
-          rescue Exception => e
-            Bake.formatter.printError("Could not detect MSVC compiler")
-            ExitHelper.exit(1)
           end
-        end
 
-        @defaultToolchain = Utils.deep_copy(basedOnToolchain)
-        Bake.options.envToolchain = true if (basedOn.include?"_ENV")
+          @defaultToolchain = Utils.deep_copy(basedOnToolchain)
+          Bake.options.envToolchain = true if (basedOn.include?"_ENV")
 
-        integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
+          integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
 
-        # todo: cleanup this hack
-        Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
-        Bake.options.eclipseOrder = @mainConfig.defaultToolchain.eclipseOrder
+          # todo: cleanup this hack
+          Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
+          Bake.options.eclipseOrder = @mainConfig.defaultToolchain.eclipseOrder
 
-        createBaseTcsForConfig
-        substVars
-        createTcsForConfig
+          createBaseTcsForConfig
+          substVars
+          createTcsForConfig
 
-        @@linkBlock = 0
+          @@linkBlock = 0
 
-        @prebuild = nil
-        calcPrebuildBlocks if Bake.options.prebuild
+          @prebuild = nil
+          calcPrebuildBlocks if Bake.options.prebuild
 
-        makeBlocks
-        makeGraph
-        makeDot if Bake.options.dot
+          makeBlocks
+          makeGraph
+          makeDot if Bake.options.dot
 
-        convert2bb
+          convert2bb
+        ensure
+          if Bake.options.show_includes || Bake.options.show_includes_and_defines
+            Thread.current[:stdout] = orgStdout
+            puts stdoutSuppression.string # this ensures to print a error message is needed even in case of an exception
+          end
+        end
 
         if Bake.options.show_includes
-          Thread.current[:stdout] = tmp
           Blocks::Show.includes
         end
 
         if Bake.options.show_includes_and_defines
-          Thread.current[:stdout] = tmp
           Blocks::Show.includesAndDefines(@mainConfig, @configTcMap[@mainConfig])
         end