bake-toolkit 2.32.0 → 2.33.0

data/lib/blocks/compile.rb

@@ -1,6 +1,8 @@
 require 'blocks/blockBase'
+
 require 'multithread/job'
 require 'common/process'
+require 'common/ext/dir'
 require 'common/utils'
 require 'bake/toolchain/colorizing_formatter'
 require 'bake/config/loader'
@@ -13,6 +15,10 @@ module Bake
 
       attr_reader :objects, :include_list
 
+      def mutex
+        @mutex ||= Mutex.new
+      end
+
       def initialize(block, config, referencedConfigs)
         super(block, config, referencedConfigs)
         @objects = []
@@ -41,47 +47,50 @@ module Bake
         return "because analyzer toolchain is configured" if Bake.options.analyze
         return "because prepro was specified and source is no assembler file" if Bake.options.prepro
 
-        return "because object does not exist" if not File.exist?(object)
-        oTime = File.mtime(object)
+        Dir.mutex.synchronize do
+          Dir.chdir(@projectDir) do
+            return "because object does not exist" if not File.exist?(object)
+            oTime = File.mtime(object)
 
-        return "because source is newer than object" if oTime < File.mtime(source)
+            return "because source is newer than object" if oTime < File.mtime(source)
 
-        if type != :ASM
-          return "because dependency file does not exist" if not File.exist?(dep_filename_conv)
+            if type != :ASM
+              return "because dependency file does not exist" if not File.exist?(dep_filename_conv)
 
-          begin
-            File.readlines(dep_filename_conv).map{|line| line.strip}.each do |dep|
-              Thread.current[:filelist].add(File.expand_path(dep)) if Bake.options.filelist
-
-              if not File.exist?(dep)
-                # we need a hack here. with some windows configurations the compiler prints unix paths
-                # into the dep file which cannot be found easily. this will be true for system includes,
-                # e.g. /usr/lib/...xy.h
-                if (Bake::Utils::OS.windows? and dep.start_with?"/") or
-                  (not Bake::Utils::OS.windows? and dep.length > 1 and dep[1] == ":")
-                  puts "Dependency header file #{dep} ignored!" if Bake.options.debug
-                else
-                  return "because dependent header #{dep} does not exist"
+              begin
+                File.readlines(dep_filename_conv).map{|line| line.strip}.each do |dep|
+                  Thread.current[:filelist].add(File.expand_path(dep, @projectDir)) if Bake.options.filelist
+
+                  if not File.exist?(dep)
+                    # we need a hack here. with some windows configurations the compiler prints unix paths
+                    # into the dep file which cannot be found easily. this will be true for system includes,
+                    # e.g. /usr/lib/...xy.h
+                    if (Bake::Utils::OS.windows? and dep.start_with?"/") or
+                      (not Bake::Utils::OS.windows? and dep.length > 1 and dep[1] == ":")
+                      puts "Dependency header file #{dep} ignored!" if Bake.options.debug
+                    else
+                      return "because dependent header #{dep} does not exist"
+                    end
+                  else
+                    return "because dependent header #{dep} is newer than object" if oTime < File.mtime(dep)
+                  end
                 end
-              else
-                return "because dependent header #{dep} is newer than object" if oTime < File.mtime(dep)
+              rescue Exception => ex
+                if Bake.options.debug
+                  puts "While reading #{dep_filename_conv}:"
+                  puts ex.message
+                  puts ex.backtrace
+                end
+                return "because dependency file could not be loaded"
               end
             end
-          rescue Exception => ex
-            if Bake.options.debug
-              puts "While reading #{dep_filename_conv}:"
-              puts ex.message
-              puts ex.backtrace
-            end
-            return "because dependency file could not be loaded"
           end
         end
-
-        false
+        return false
       end
 
       def calcCmdlineFile(object)
-        object[0..-3] + ".cmdline"
+        File.expand_path(object[0..-3] + ".cmdline", @projectDir)
       end
 
       def calcDepFile(object, type)
@@ -125,7 +134,7 @@ module Bake
           reason = config_changed?(cmdLineFile)
         end
 
-        Thread.current[:filelist].add(File.expand_path(source)) if Bake.options.filelist
+        Thread.current[:filelist].add(File.expand_path(source, @projectDir)) if Bake.options.filelist
 
         if @fileTcs.include?(source)
           compiler = @fileTcs[source][:COMPILER][type]
@@ -189,23 +198,26 @@ module Bake
         end
 
         if not (cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile))
-          BlockBase.prepareOutput(object)
+          BlockBase.prepareOutput(File.expand_path(object,@projectDir))
           outputType = Bake.options.analyze ? "Analyzing" : (Bake.options.prepro ? "Preprocessing" : "Compiling")
-          printCmd(cmd, "#{outputType} #{source}", reason, false)
-          flushOutput()
+          printCmd(cmd, "#{outputType} #{@projectName} (#{@config.name}): #{source}", reason, false)
+          SyncOut.flushOutput()
           BlockBase.writeCmdLineFile(cmd, cmdLineFile)
 
           success = true
           consoleOutput = ""
-          success, consoleOutput = ProcessHelper.run(cmd, false, false) if !Bake.options.dry
+          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)
-
           if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
-            incList = Compile.read_depfile(dep_filename, @projectDir, @block.tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
-            Compile.write_depfile(incList, dep_filename_conv)
+            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(incList, dep_filename_conv)
+              end
+            end
 
             incList.each do |h|
-              Thread.current[:filelist].add(File.expand_path(h))
+              Thread.current[:filelist].add(File.expand_path(h, @projectDir))
             end if Bake.options.filelist
           end
           check_config_file
@@ -264,72 +276,44 @@ module Bake
         end
       end
 
-      def mutex
-        @mutex ||= Mutex.new
-      end
-
-      def flushOutput
-        mutex.synchronize do
-          tmp = Thread.current[:stdout]
-          if tmp.string.length > 0
-            Thread.current[:stdout] = Thread.current[:tmpStdout]
-            puts tmp.string
-            tmp.reopen("")
-            Thread.current[:stdout] = tmp
-          end
-        end
-      end
-
-
       def execute
-        Dir.chdir(@projectDir) do
+        #Dir.chdir(@projectDir) do
 
           calcSources
           calcObjects
 
-          @error_strings = {}
-
           fileListBlock = Set.new if Bake.options.filelist
           compileJobs = Multithread::Jobs.new(@source_files) do |jobs|
             while source = jobs.get_next_or_nil do
 
-              if (jobs.failed and Bake.options.stopOnFirstError) or Bake::IDEInterface.instance.get_abort
+              if ((jobs.failed || !Blocks::Block.delayed_result) and Bake.options.stopOnFirstError) or Bake::IDEInterface.instance.get_abort
                 break
               end
 
-              s = StringIO.new
-              Thread.current[:tmpStdout] = Thread.current[:stdout]
-              Thread.current[:stdout] = s unless Thread.current[:tmpStdout]
-              Thread.current[:filelist] = Set.new if Bake.options.filelist
-              Thread.current[:lastCommand] = nil
-
-              result = false
+              SyncOut.startStream()
               begin
-                compileFile(source)
-                result = true
-              rescue Bake::SystemCommandFailed => scf # normal compilation error
-              rescue SystemExit => exSys
-              rescue Exception => ex1
-                if not Bake::IDEInterface.instance.get_abort
-                  Bake.formatter.printError("Error: #{ex1.message}")
-                  puts ex1.backtrace if Bake.options.debug
+                Thread.current[:filelist] = Set.new if Bake.options.filelist
+                Thread.current[:lastCommand] = nil
+
+                result = false
+                begin
+                  compileFile(source)
+                  result = true
+                rescue Bake::SystemCommandFailed => scf # normal compilation error
+                rescue SystemExit => exSys
+                rescue Exception => ex1
+                  if not Bake::IDEInterface.instance.get_abort
+                    Bake.formatter.printError("Error: #{ex1.message}")
+                    puts ex1.backtrace if Bake.options.debug
+                  end
                 end
-              end
 
-              jobs.set_failed if not result
-
-              Thread.current[:stdout] = Thread.current[:tmpStdout]
-
-              mutex.synchronize do
+                jobs.set_failed if not result
+              ensure
+                SyncOut.stopStream(result)
+              end
+              self.mutex.synchronize do
                 fileListBlock.merge(Thread.current[:filelist]) if Bake.options.filelist
-
-                if s.string.length > 0
-                  if Bake.options.stopOnFirstError and not result
-                    @error_strings[source] = s.string
-                  else
-                    puts s.string
-                  end
-                end
               end
 
             end
@@ -339,8 +323,9 @@ module Bake
           if Bake.options.filelist && !Bake.options.dry
             Bake.options.filelist.merge(fileListBlock.merge(fileListBlock))
 
-            FileUtils.mkdir_p(@block.output_dir)
-            File.open(@block.output_dir + "/" + "file-list.txt", 'wb') do |f|
+            odir = File.expand_path(@block.output_dir, @projectDir)
+            FileUtils.mkdir_p(odir)
+            File.open(odir + "/" + "file-list.txt", 'wb') do |f|
               fileListBlock.sort.each do |entry|
                 f.puts(entry)
               end
@@ -348,16 +333,9 @@ module Bake
 
           end
 
-
-          # can only happen in case of bail_on_first_error.
-          # if not sorted, it may be confusing when builing more than once and the order of the error appearances changes from build to build
-          # (it is not deterministic which file compilation finishes first)
-          @error_strings.sort.each {|es| puts es[1]}
-
           raise SystemCommandFailed.new if compileJobs.failed
 
-
-        end
+        #end
         return true
       end
 
@@ -419,65 +397,64 @@ module Bake
 
       def calcSources(cleaning = false, keep = false)
         return @source_files if @source_files and not @source_files.empty?
-        Dir.chdir(@projectDir) do
-          @source_files = []
+        @source_files = []
 
-          exclude_files = Set.new
-          @config.excludeFiles.each do |p|
-            Dir.glob(p.name).each {|f| exclude_files << f}
-          end
+        exclude_files = Set.new
+        @config.excludeFiles.each do |p|
+          Dir.glob_dir(p.name, @projectDir).each {|f| exclude_files << f}
+        end
 
-          source_files = Set.new
-          @config.files.each do |sources|
-            p = sources.name
-            p = p[2..-1] if p.start_with?"./"
-
-            res = Dir.glob(p).sort
-            if res.length == 0 and cleaning == false
-              if not p.include?"*" and not p.include?"?"
-                Bake.formatter.printError("Source file '#{p}' not found", sources)
-                raise SystemCommandFailed.new
-              elsif Bake.options.verbose >= 1
-                Bake.formatter.printInfo("Source file pattern '#{p}' does not match to any file", sources)
-              end
-            end
-            res.each do |f|
-              next if exclude_files.include?(f)
-              next if source_files.include?(f)
-              source_files << f
-              @source_files << f
+        source_files = Set.new
+        @config.files.each do |sources|
+          p = sources.name
+          p = p[2..-1] if p.start_with?"./"
+
+          res = Dir.glob_dir(p, @projectDir).sort
+          if res.length == 0 and cleaning == false
+            if not p.include?"*" and not p.include?"?"
+              Bake.formatter.printError("Source file '#{p}' not found", sources)
+              raise SystemCommandFailed.new
+            elsif Bake.options.verbose >= 1
+              Bake.formatter.printInfo("Source file pattern '#{p}' does not match to any file", sources)
             end
           end
+          res.each do |f|
+            next if exclude_files.include?(f)
+            next if source_files.include?(f)
+            source_files << f
+            @source_files << f
+          end
+        end
 
-          if Bake.options.filename
-            @source_files.keep_if do |source|
-              source.include?Bake.options.filename
-            end
-            if @source_files.length == 0 and cleaning == false and @config.files.length > 0
-              Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
-            end
+        if Bake.options.filename
+          @source_files.keep_if do |source|
+            source.include?Bake.options.filename
+          end
+          if @source_files.length == 0 and cleaning == false and @config.files.length > 0
+            Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
           end
+        end
 
-          if Bake.options.eclipseOrder # directories reverse order, files in directories in alphabetical order
-            dirs = []
-            filemap = {}
-            @source_files.sort.reverse.each do |o|
-              d = File.dirname(o)
-              if filemap.include?(d)
-                filemap[d] << o
-              else
-                filemap[d] = [o]
-                dirs << d
-              end
+        if Bake.options.eclipseOrder # directories reverse order, files in directories in alphabetical order
+          dirs = []
+          filemap = {}
+          @source_files.sort.reverse.each do |o|
+            d = File.dirname(o)
+            if filemap.include?(d)
+              filemap[d] << o
+            else
+              filemap[d] = [o]
+              dirs << d
             end
-            @source_files = []
-            dirs.each do |d|
-              filemap[d].reverse.each do |f|
-                @source_files << f
-              end
+          end
+          @source_files = []
+          dirs.each do |d|
+            filemap[d].reverse.each do |f|
+              @source_files << f
             end
           end
         end
+
         @source_files
       end
 

data/lib/blocks/executable.rb

@@ -153,7 +153,7 @@ module Bake
 
             BlockBase.prepareOutput(@exe_name)
 
-            printCmd(cmdLinePrint, "Linking #{@exe_name}", reason, false)
+            printCmd(cmdLinePrint, "Linking   #{@projectName} (#{@config.name}): #{@exe_name}", reason, false)
             BlockBase.writeCmdLineFile(cmd, cmdLineFile)
             success = true
             consoleOutput = ""

data/lib/blocks/library.rb

@@ -1,132 +1,148 @@
-require 'blocks/blockBase'
-
-module Bake
-
-  module Blocks
-
-    class Library < BlockBase
-
-      attr_reader :compileBlock, :archive_name
-
-      def initialize(block, config, referencedConfigs, compileBlock)
-        super(block,config, referencedConfigs)
-        @compileBlock = compileBlock
-
-        block.set_library(self)
-
-        calcArtifactName
-      end
-
-      def calcArtifactName
-        if not @config.artifactName.nil? and @config.artifactName.name != ""
-          baseFilename = @config.artifactName.name
-        else
-          baseFilename = "lib#{@projectName}.a"
-        end
-        @archive_name ||= File.join([@block.output_dir, baseFilename])
-      end
-
-      def calcCmdlineFile()
-        @archive_name + ".cmdline"
-      end
-
-      def ignore?
-        Bake.options.linkOnly or Bake.options.prepro
-      end
-
-      def needed?
-        # lib
-        return "because library does not exist" if not File.exists?(@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} is newer than executable" if aTime < File.mtime(obj)
-        end
-
-        false
-      end
-
-      def execute
-
-        Dir.chdir(@projectDir) do
-
-          @objects = @compileBlock.objects
-          if !@block.prebuild
-            if @objects.empty?
-              puts "No source files, library won't be created" if Bake.options.verbose >= 2
-              return true
-            end
-          else
-            @objects = Dir.glob("#{@block.output_dir}/**/*.o")
-            if @objects.empty?
-              if !File.exists?(@archive_name)
-                puts "No object files, library won't be created" if Bake.options.verbose >= 2
-              end
-              return true
-            end
-          end
-
-          cmdLineCheck = false
-          cmdLineFile = calcCmdlineFile()
-
-          return true if ignore?
-          reason = needed?
-          if not reason
-            cmdLineCheck = true
-            reason = config_changed?(cmdLineFile)
-          end
-          archiver = @block.tcs[:ARCHIVER]
-
-          cmd = Utils.flagSplit(archiver[:PREFIX], false)
-          cmd += Utils.flagSplit(archiver[:COMMAND], false) # ar
-          cmd += Bake::Utils::flagSplit(archiver[:FLAGS],true) # --all_load
-          cmd += archiver[:ARCHIVE_FLAGS].split(" ")
-
-          if archiver[:ARCHIVE_FLAGS_SPACE]
-            cmd << @archive_name
-          else
-            cmd[cmd.length-1] += @archive_name
-          end
-
-          cmd += @objects
-
-          if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
-            success = true
-          else
-            BlockBase.prepareOutput(@archive_name)
-
-            BlockBase.writeCmdLineFile(cmd, cmdLineFile)
-            success = true
-            consoleOutput = ""
-            success, consoleOutput = ProcessHelper.run(cmd, false, false) if !Bake.options.dry
-            process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{@archive_name}", reason, success)
-
-            check_config_file()
-          end
-
-          return success
-        end
-      end
-
-      def clean
-        if @block.prebuild
-          Dir.chdir(@projectDir) do
-            @objects = Dir.glob("#{@block.output_dir}/**/*.o")
-            if !@objects.empty? && File.exist?(@archive_name)
-              puts "Deleting file #{@archive_name}" if Bake.options.verbose >= 2
-              if !Bake.options.dry
-                FileUtils.rm_rf(@archive_name)
-              end
-            end
-          end
-        else
-          return cleanProjectDir()
-        end
-      end
-
-    end
-  end
+require 'blocks/blockBase'
+
+module Bake
+
+  module Blocks
+
+    class Library < BlockBase
+
+      attr_reader :compileBlock, :archive_name
+
+      def initialize(block, config, referencedConfigs, compileBlock)
+        super(block,config, referencedConfigs)
+        @compileBlock = compileBlock
+
+        block.set_library(self)
+
+        calcArtifactName
+      end
+
+      def calcArtifactName
+        if not @config.artifactName.nil? and @config.artifactName.name != ""
+          baseFilename = @config.artifactName.name
+        else
+          baseFilename = "lib#{@projectName}.a"
+        end
+        @archive_name ||= File.join([@block.output_dir, baseFilename])
+      end
+
+      def calcCmdlineFile()
+        File.expand_path(@archive_name + ".cmdline", @projectDir)
+      end
+
+      def ignore?
+        Bake.options.linkOnly or Bake.options.prepro
+      end
+
+      def needed?
+        Dir.mutex.synchronize do
+          Dir.chdir(@projectDir) do
+            # lib
+            return "because library does not exist" if not File.exists?(@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} is newer than executable" if aTime < File.mtime(obj)
+            end
+          end
+        end
+        return false
+      end
+
+      def execute
+
+        #Dir.chdir(@projectDir) do
+
+          @objects = @compileBlock.objects
+          if !@block.prebuild
+            if @objects.empty?
+              SyncOut.mutex.synchronize do
+                puts "No source files, library won't be created" if Bake.options.verbose >= 2
+              end
+              return true
+            end
+          else
+            @objects = Dir.glob_dir("#{@block.output_dir}/**/*.o", @projectDir)
+            if @objects.empty?
+              if !File.exists?(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
+              end
+              return true
+            end
+          end
+
+          cmdLineCheck = false
+          cmdLineFile = calcCmdlineFile()
+
+          return true if ignore?
+          reason = needed?
+          if not reason
+            cmdLineCheck = true
+            reason = config_changed?(cmdLineFile)
+          end
+          archiver = @block.tcs[:ARCHIVER]
+
+          cmd = Utils.flagSplit(archiver[:PREFIX], false)
+          cmd += Utils.flagSplit(archiver[:COMMAND], false) # ar
+          cmd += Bake::Utils::flagSplit(archiver[:FLAGS],true) # --all_load
+          cmd += archiver[:ARCHIVE_FLAGS].split(" ")
+
+          if archiver[:ARCHIVE_FLAGS_SPACE]
+            cmd << @archive_name
+          else
+            cmd[cmd.length-1] += @archive_name
+          end
+
+          cmd += @objects
+
+          if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+            success = true
+          else
+            SyncOut.startStream()
+
+            begin
+              success = true
+              BlockBase.prepareOutput(File.expand_path(@archive_name, @projectDir))
+              BlockBase.writeCmdLineFile(cmd, cmdLineFile)
+              consoleOutput = ""
+
+              printCmd(cmd, "Creating  #{@projectName} (#{@config.name}): #{@archive_name}", reason, false)
+              SyncOut.flushOutput()
+
+              success, consoleOutput = ProcessHelper.run(cmd, false, false, nil, [0], @projectDir) if !Bake.options.dry
+              process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], nil, reason, success)
+
+              check_config_file()
+            ensure
+              SyncOut.stopStream(success)
+            end
+          end
+
+          return success
+        #end
+      end
+
+      def clean
+        if @block.prebuild
+          Dir.chdir(@projectDir) do
+            @objects = Dir.glob_dir("#{@block.output_dir}/**/*.o", @projectDir)
+            if !@objects.empty? && File.exist?(@archive_name)
+              puts "Deleting file #{@archive_name}" if Bake.options.verbose >= 2
+              if !Bake.options.dry
+                FileUtils.rm_rf(@archive_name)
+              end
+            end
+          end
+        else
+          return cleanProjectDir()
+        end
+      end
+
+    end
+  end
 end