lib/blocks/compile.rb in bake-toolkit-2.64.0 vs lib/blocks/compile.rb in bake-toolkit-2.64.1

- old
+ new

@@ -50,11 +50,11 @@ module Blocks class Compile < BlockBase - attr_reader :objects, :source_files, :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 end @@ -424,10 +424,11 @@ odir = File.expand_path(@block.output_dir, @projectDir) 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 if (jobs.failed && Bake.options.stopOnFirstError) or Bake::IDEInterface.instance.get_abort break @@ -542,10 +543,10 @@ end end 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 = [] @fileTcs = {} \ No newline at end of file