bake-toolkit 2.20.4 → 2.21.0

data/lib/blocks/has_execute_command.rb

@@ -1,32 +1,32 @@
-module Bake
-  
-  module Blocks
-  
-    module HasExecuteCommand
-      
-      def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0])
-        puts commandLine if Bake.options.verbose >= 1
-        puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
-        cmd_result = false
-        output = ""
-        begin
-          Dir.chdir(@projectDir) do
-            cmd_result, output = ProcessHelper.run([commandLine], true, true, nil, exitCodeArray)
-          end
-        rescue Exception=>e
-          puts e.message
-          puts e.backtrace if Bake.options.debug
-        end
-          
-        if (cmd_result == false and (not ignoreStr or not output.include?ignoreStr))
-          Bake.formatter.printError("Command \"#{commandLine}\" failed", @config)
-          puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
-          raise SystemCommandFailed.new
-        end
-        return cmd_result
-      end
-          
-    end
-    
-  end
+module Bake
+
+  module Blocks
+
+    module HasExecuteCommand
+
+      def executeCommand(commandLine, ignoreStr=nil, exitCodeArray = [0])
+        puts commandLine if Bake.options.verbose >= 1
+        puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
+        cmd_result = false
+        output = ""
+        begin
+          Dir.chdir(@projectDir) do
+            cmd_result, output = ProcessHelper.run([commandLine], true, true, nil, exitCodeArray)
+          end
+        rescue Exception=>e
+          puts e.message
+          puts e.backtrace if Bake.options.debug
+        end
+
+        if (cmd_result == false and (not ignoreStr or not output.include?ignoreStr))
+          Bake.formatter.printError("Command \"#{commandLine}\" failed", @config)
+          puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
+          raise SystemCommandFailed.new
+        end
+        return cmd_result
+      end
+
+    end
+
+  end
 end

data/lib/blocks/library.rb

@@ -1,115 +1,115 @@
-require 'blocks/blockBase'
-
-module Bake
-  
-  module Blocks
-    
-    class Library < BlockBase
-      
-      attr_reader :compileBlock, :archive_name
-      
-      def initialize(block, config, referencedConfigs, tcs, compileBlock)
-        super(block,config, referencedConfigs, tcs)
-        @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([@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
-        @compileBlock.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
-          if @compileBlock.objects.empty?
-            puts "No source files, library won't be created" if Bake.options.verbose >= 2
-            return true 
-          end
-          
-          cmdLineCheck = false
-          cmdLineFile = calcCmdlineFile()
-          
-          return true if ignore?
-          reason = needed?
-          if not reason
-            cmdLineCheck = true
-            reason = config_changed?(cmdLineFile)
-          end
-          archiver = @tcs[:ARCHIVER]
-       
-          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 += @compileBlock.objects
-        
-          if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
-            success = true
-          else
-            BlockBase.prepareOutput(@archive_name)
-            
-            BlockBase.writeCmdLineFile(cmd, cmdLineFile)
-            success, consoleOutput = ProcessHelper.run(cmd, false, false)
-            process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{@archive_name}", reason, success)
-           
-            check_config_file()
-          end
-          
-          Bake::Bundle.instance.addLib(@archive_name, isMainProject? ? @config : nil)
-          
-          return success
-        end
-      end
-      
-      def clean
-        Dir.chdir(@projectDir) do 
-          if File.exist?@output_dir 
-            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
-            FileUtils.rm_rf(@output_dir)
-          end
-        end unless Bake.options.filename
-        return true
-      end
-   
-      
-    end
-    
-  end
+require 'blocks/blockBase'
+
+module Bake
+
+  module Blocks
+
+    class Library < BlockBase
+
+      attr_reader :compileBlock, :archive_name
+
+      def initialize(block, config, referencedConfigs, tcs, compileBlock)
+        super(block,config, referencedConfigs, tcs)
+        @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([@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
+        @compileBlock.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
+          if @compileBlock.objects.empty?
+            puts "No source files, library won't be created" if Bake.options.verbose >= 2
+            return true
+          end
+
+          cmdLineCheck = false
+          cmdLineFile = calcCmdlineFile()
+
+          return true if ignore?
+          reason = needed?
+          if not reason
+            cmdLineCheck = true
+            reason = config_changed?(cmdLineFile)
+          end
+          archiver = @tcs[:ARCHIVER]
+
+          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 += @compileBlock.objects
+
+          if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+            success = true
+          else
+            BlockBase.prepareOutput(@archive_name)
+
+            BlockBase.writeCmdLineFile(cmd, cmdLineFile)
+            success, consoleOutput = ProcessHelper.run(cmd, false, false)
+            process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{@archive_name}", reason, success)
+
+            check_config_file()
+          end
+
+          Bake::Bundle.instance.addLib(@archive_name, isMainProject? ? @config : nil)
+
+          return success
+        end
+      end
+
+      def clean
+        Dir.chdir(@projectDir) do
+          if File.exist?@output_dir
+            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
+            FileUtils.rm_rf(@output_dir)
+          end
+        end unless Bake.options.filename
+        return true
+      end
+
+
+    end
+
+  end
 end

data/lib/blocks/lint.rb

@@ -1,56 +1,56 @@
-require 'blocks/compile'
-
-module Bake
-  module Blocks
-    class Lint < Compile
-  
-      def initialize(block, config, referencedConfigs, tcs)
-        super(block,config, referencedConfigs, tcs)
-      end
-  
-      def execute
-        success = true
-        Dir.chdir(@projectDir) do
-          compiler = @tcs[:COMPILER][:CPP]
-          calcSources
-          
-          noFilesToLint = (@source_files.length == 0)
-          
-          if Bake.options.lint_min >= 1 and Bake.options.lint_min >= @source_files.length
-            noFilesToLint = true 
-          end
-          
-          if Bake.options.lint_max >= 0 and Bake.options.lint_max < Bake.options.lint_min
-            noFilesToLint = true 
-          end
-                    
-          if noFilesToLint
-            Bake.formatter.printInfo("No files to lint", @config)
-          else
-            @source_files = @source_files[Bake.options.lint_min..Bake.options.lint_max]    
-            
-            cmd = [compiler[:COMMAND]]
-            cmd += compiler[:COMPILE_FLAGS]
-              
-            cmd += @include_array[:CPP]
-            cmd += @define_array[:CPP]
-              
-            cmd += @tcs[:LINT_POLICY]
-            
-            cmd += @source_files
-                   
-            printCmd(cmd, "Linting #{@source_files.length} file(s)...", nil, false)
-            success, consoleOutput = ProcessHelper.run(cmd, false)
-            process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Linting...", nil, success)
-          end
-        end
-        return success
-      end  
-      
-      def clean
-        return true
-      end
-      
-    end
-  end
-end
+require 'blocks/compile'
+
+module Bake
+  module Blocks
+    class Lint < Compile
+
+      def initialize(block, config, referencedConfigs, tcs)
+        super(block,config, referencedConfigs, tcs)
+      end
+
+      def execute
+        success = true
+        Dir.chdir(@projectDir) do
+          compiler = @tcs[:COMPILER][:CPP]
+          calcSources
+
+          noFilesToLint = (@source_files.length == 0)
+
+          if Bake.options.lint_min >= 1 and Bake.options.lint_min >= @source_files.length
+            noFilesToLint = true
+          end
+
+          if Bake.options.lint_max >= 0 and Bake.options.lint_max < Bake.options.lint_min
+            noFilesToLint = true
+          end
+
+          if noFilesToLint
+            Bake.formatter.printInfo("No files to lint", @config)
+          else
+            @source_files = @source_files[Bake.options.lint_min..Bake.options.lint_max]
+
+            cmd = [compiler[:COMMAND]]
+            cmd += compiler[:COMPILE_FLAGS]
+
+            cmd += @include_array[:CPP]
+            cmd += @define_array[:CPP]
+
+            cmd += @tcs[:LINT_POLICY]
+
+            cmd += @source_files
+
+            printCmd(cmd, "Linting #{@source_files.length} file(s)...", nil, false)
+            success, consoleOutput = ProcessHelper.run(cmd, false)
+            process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Linting...", nil, success)
+          end
+        end
+        return success
+      end
+
+      def clean
+        return true
+      end
+
+    end
+  end
+end

data/lib/blocks/makefile.rb

@@ -1,100 +1,100 @@
-require 'blocks/has_execute_command'
-
-module Bake
-  module Blocks
-    
-    class Makefile
-      include HasExecuteCommand
-
-      MAKE_COMMAND = "make"
-      MAKE_FILE_FLAG = "-f"
-      MAKE_DIR_FLAG = "-C"
-      MAKE_CLEAN = "clean"
-      
-      def initialize(config, referencedConfigs, block)
-        @config = config
-        @projectDir = config.get_project_dir
-        @path_to = ""
-        @flags = adjustFlags("",config.flags) if config.flags
-        @makefile = config.name
-        @target = config.target != "" ? config.target : "all"
-        calcPathTo(referencedConfigs)
-        calcCommandLine
-        calcCleanLine
-
-        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
-      end
-      
-      def calcCommandLine
-        @commandLine = remove_empty_strings_and_join([
-          MAKE_COMMAND, @target,
-          @flags,
-          MAKE_DIR_FLAG,  File.dirname(@makefile),
-          MAKE_FILE_FLAG, File.basename(@makefile),
-          @path_to])        
-      end
-      
-      def calcCleanLine
-        @cleanLine = remove_empty_strings_and_join([
-          MAKE_COMMAND, MAKE_CLEAN,
-          @flags, 
-          MAKE_DIR_FLAG,  File.dirname(@makefile),
-          MAKE_FILE_FLAG, File.basename(@makefile),
-          @path_to]) 
-      end      
-      
-      def calcPathTo(referencedConfigs)
-        @path_to = ""
-        if @config.pathTo != ""
-          pathHash = {}
-          @config.pathTo.split(",").each do |p|
-            nameOfP = p.strip
-            dirOfP = nil
-            if referencedConfigs.include?nameOfP
-              dirOfP = referencedConfigs[nameOfP].first.get_project_dir
-            else
-              Bake.options.roots.each do |r|
-                absIncDir = r+"/"+nameOfP
-                if File.exists?(absIncDir)
-                  dirOfP = absIncDir
-                  break
-                end
-              end
-            end
-            if dirOfP == nil
-              Bake.formatter.printError("Project '#{nameOfP}' not found", @config)
-              ExitHelper.exit(1)
-            end
-            pathHash[nameOfP] = File.rel_from_to_project(File.dirname(@projectDir),File.dirname(dirOfP))
-          end
-          path_to_array = []
-          pathHash.each { |k,v| path_to_array << "PATH_TO_#{k}=#{v}" }
-          @path_to = path_to_array.join(" ")
-        end
-        
-      end
-      
-      def execute
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
-       end
-       
-      def startupStep
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
-      end
-
-      def exitStep
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes)
-      end
-            
-      def clean
-        return true if Bake.options.linkOnly
-        return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes) unless Bake.options.filename
-      end
-    
-    end
-    
-  end
-end
+require 'blocks/has_execute_command'
+
+module Bake
+  module Blocks
+
+    class Makefile
+      include HasExecuteCommand
+
+      MAKE_COMMAND = "make"
+      MAKE_FILE_FLAG = "-f"
+      MAKE_DIR_FLAG = "-C"
+      MAKE_CLEAN = "clean"
+
+      def initialize(config, referencedConfigs, block)
+        @config = config
+        @projectDir = config.get_project_dir
+        @path_to = ""
+        @flags = adjustFlags("",config.flags) if config.flags
+        @makefile = config.name
+        @target = config.target != "" ? config.target : "all"
+        calcPathTo(referencedConfigs)
+        calcCommandLine
+        calcCleanLine
+
+        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
+      end
+
+      def calcCommandLine
+        @commandLine = remove_empty_strings_and_join([
+          MAKE_COMMAND, @target,
+          @flags,
+          MAKE_DIR_FLAG,  File.dirname(@makefile),
+          MAKE_FILE_FLAG, File.basename(@makefile),
+          @path_to])
+      end
+
+      def calcCleanLine
+        @cleanLine = remove_empty_strings_and_join([
+          MAKE_COMMAND, MAKE_CLEAN,
+          @flags,
+          MAKE_DIR_FLAG,  File.dirname(@makefile),
+          MAKE_FILE_FLAG, File.basename(@makefile),
+          @path_to])
+      end
+
+      def calcPathTo(referencedConfigs)
+        @path_to = ""
+        if @config.pathTo != ""
+          pathHash = {}
+          @config.pathTo.split(",").each do |p|
+            nameOfP = p.strip
+            dirOfP = nil
+            if referencedConfigs.include?nameOfP
+              dirOfP = referencedConfigs[nameOfP].first.get_project_dir
+            else
+              Bake.options.roots.each do |r|
+                absIncDir = r+"/"+nameOfP
+                if File.exists?(absIncDir)
+                  dirOfP = absIncDir
+                  break
+                end
+              end
+            end
+            if dirOfP == nil
+              Bake.formatter.printError("Project '#{nameOfP}' not found", @config)
+              ExitHelper.exit(1)
+            end
+            pathHash[nameOfP] = File.rel_from_to_project(File.dirname(@projectDir),File.dirname(dirOfP))
+          end
+          path_to_array = []
+          pathHash.each { |k,v| path_to_array << "PATH_TO_#{k}=#{v}" }
+          @path_to = path_to_array.join(" ")
+        end
+
+      end
+
+      def execute
+        return true if Bake.options.linkOnly
+        return executeCommand(@commandLine, nil, @config.validExitCodes)
+       end
+
+      def startupStep
+        return true if Bake.options.linkOnly
+        return executeCommand(@commandLine, nil, @config.validExitCodes)
+      end
+
+      def exitStep
+        return true if Bake.options.linkOnly
+        return executeCommand(@commandLine, nil, @config.validExitCodes)
+      end
+
+      def clean
+        return true if Bake.options.linkOnly
+        return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes) unless Bake.options.filename
+      end
+
+    end
+
+  end
+end