bake-toolkit 2.18.0 → 2.19.0

data/lib/bake/toolchain/msvc.rb

@@ -1,58 +1,58 @@
-require 'common/utils'
-require 'bake/toolchain/provider'
-require 'bake/toolchain/errorparser/error_parser'
-require 'bake/toolchain/errorparser/msvc_compiler_error_parser'
-require 'bake/toolchain/errorparser/msvc_linker_error_parser'
-
-module Bake
-  module Toolchain
-
-    MSVCChain = Provider.add("MSVC")
-
-    MSVCChain[:COMPILER][:CPP].update({
-      :COMMAND => "cl",
-      :DEFINE_FLAG => "-D",
-      :OBJECT_FILE_FLAG => "-Fo",
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/msvc_compiler_error_parser'
+require 'bake/toolchain/errorparser/msvc_linker_error_parser'
+
+module Bake
+  module Toolchain
+
+    MSVCChain = Provider.add("MSVC")
+
+    MSVCChain[:COMPILER][:CPP].update({
+      :COMMAND => "cl",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-Fo",
       :OBJ_FLAG_SPACE => false,
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c -EHsc $(MSVC_FORCE_SYNC_PDB_WRITES)",
-      :DEP_FLAGS_FILENAME => false,
-      :DEP_FLAGS => "-showIncludes",
-      :DEP_FLAGS_SPACE => true,
-      :PREPRO_FLAGS => "-P",
-      :PREPRO_FILE_FLAG => "-Fi"
-    })
-
-    MSVCChain[:COMPILER][:C] = Utils.deep_copy(MSVCChain[:COMPILER][:CPP])
-    MSVCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-
-    MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
-    MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"
-    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c $(MSVC_FORCE_SYNC_PDB_WRITES)"
-    MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-
-    MSVCChain[:ARCHIVER][:COMMAND] = "lib"
-    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-out:"
-    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS_SPACE] = false
-
-    MSVCChain[:LINKER][:COMMAND] = "link"
-    MSVCChain[:LINKER][:USER_LIB_FLAG] = ""
-    MSVCChain[:LINKER][:EXE_FLAG] = "-out:"
-    MSVCChain[:LINKER][:EXE_FLAG_SPACE] = false
-    MSVCChain[:LINKER][:LIB_FLAG] = ""
-    MSVCChain[:LINKER][:LIB_PATH_FLAG] = "-libpath:"
-    MSVCChain[:LINKER][:MAP_FILE_FLAG] = "-map:"
-    MSVCChain[:LINKER][:MAP_FILE_PIPE] = false
-    MSVCChain[:LINKER][:SCRIPT] = "Linkerscript option not supported for MSVC"
-    
-    
-    msvcCompilerErrorParser =                   MSVCCompilerErrorParser.new
-    MSVCChain[:COMPILER][:C][:ERROR_PARSER] =   msvcCompilerErrorParser
-    MSVCChain[:COMPILER][:CPP][:ERROR_PARSER] = msvcCompilerErrorParser
-    MSVCChain[:COMPILER][:ASM][:ERROR_PARSER] = msvcCompilerErrorParser
-    MSVCChain[:ARCHIVER][:ERROR_PARSER] =       msvcCompilerErrorParser
-    MSVCChain[:LINKER][:ERROR_PARSER] =         MSVCLinkerErrorParser.new
-
-  end
-end
-
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c -EHsc $(MSVC_FORCE_SYNC_PDB_WRITES)",
+      :DEP_FLAGS_FILENAME => false,
+      :DEP_FLAGS => "-showIncludes",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => "-P",
+      :PREPRO_FILE_FLAG => "-Fi"
+    })
+
+    MSVCChain[:COMPILER][:C] = Utils.deep_copy(MSVCChain[:COMPILER][:CPP])
+    MSVCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+
+    MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
+    MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"
+    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c $(MSVC_FORCE_SYNC_PDB_WRITES)"
+    MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    MSVCChain[:ARCHIVER][:COMMAND] = "lib"
+    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-out:"
+    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS_SPACE] = false
+
+    MSVCChain[:LINKER][:COMMAND] = "link"
+    MSVCChain[:LINKER][:USER_LIB_FLAG] = ""
+    MSVCChain[:LINKER][:EXE_FLAG] = "-out:"
+    MSVCChain[:LINKER][:EXE_FLAG_SPACE] = false
+    MSVCChain[:LINKER][:LIB_FLAG] = ""
+    MSVCChain[:LINKER][:LIB_PATH_FLAG] = "-libpath:"
+    MSVCChain[:LINKER][:MAP_FILE_FLAG] = "-map:"
+    MSVCChain[:LINKER][:MAP_FILE_PIPE] = false
+    MSVCChain[:LINKER][:SCRIPT] = "Linkerscript option not supported for MSVC"
+    
+    
+    msvcCompilerErrorParser =                   MSVCCompilerErrorParser.new
+    MSVCChain[:COMPILER][:C][:ERROR_PARSER] =   msvcCompilerErrorParser
+    MSVCChain[:COMPILER][:CPP][:ERROR_PARSER] = msvcCompilerErrorParser
+    MSVCChain[:COMPILER][:ASM][:ERROR_PARSER] = msvcCompilerErrorParser
+    MSVCChain[:ARCHIVER][:ERROR_PARSER] =       msvcCompilerErrorParser
+    MSVCChain[:LINKER][:ERROR_PARSER] =         MSVCLinkerErrorParser.new
+
+  end
+end
+

data/lib/blocks/block.rb

@@ -6,7 +6,7 @@ module Bake
   BUILD_PASSED = 0
   BUILD_FAILED = 1
   BUILD_ABORTED = 2
-  
+
   module Blocks
 
     CC2J = []
@@ -21,15 +21,15 @@ module Bake
       def startupSteps
         @startupSteps ||= []
       end
-        
+
       def preSteps
         @preSteps ||= []
       end
-      
+
       def mainSteps
         @mainSteps ||= []
-      end      
-      
+      end
+
       def postSteps
         @postSteps ||= []
       end
@@ -37,7 +37,7 @@ module Bake
       def exitSteps
         @exitSteps ||= []
       end
-      
+
       def dependencies
         @dependencies ||= []
       end
@@ -45,15 +45,15 @@ module Bake
       def childs
         @childs ||= []
       end
-      
+
       def parents
         @parents ||= []
       end
-            
+
       def set_library(library)
         @library = library
       end
-      
+
       def initialize(config, referencedConfigs)
         @inDeps = false
         @visited = false
@@ -65,14 +65,14 @@ module Bake
         @projectDir = config.get_project_dir
         @@block_counter = 0
         @result = true
-        
+
         @lib_elements = Bake::LibElements.calcLibElements(self)
       end
-      
+
       def getCompileBlocks()
         mainSteps.select { |m| Compile === m }
       end
-      
+
       def convPath(dir, elem=nil, warnIfLocal=false)
          if dir.respond_to?("name")
            d = dir.name
@@ -80,16 +80,16 @@ module Bake
          else
            d = dir
          end
-                  
+
          @warnConvValid = false
-         
+
          return d if Bake.options.no_autodir
-         
+
          inc = d.split("/")
          res = nil
          if (inc[0] == @projectName)
            res = inc[1..-1].join("/") # within self
-           res = "." if res == "" 
+           res = "." if res == ""
          elsif @referencedConfigs.include?(inc[0])
            dirOther = @referencedConfigs[inc[0]].first.parent.get_project_dir
            res = File.rel_from_to_project(@projectDir, dirOther, false)
@@ -110,19 +110,19 @@ module Bake
                Bake.formatter.printInfo("\"..\" in path name found", elem)
              end
            end
-           
+
            if res.nil? # relative from self as last resort
              warnIfLocal = false # no path magic -> no warning
-             res = d 
+             res = d
            end
          end
-         
+
          @warnConvValid = File.exists?(@projectDir + "/" + d) if warnIfLocal # only warn if path magic hides local path
-            
+
          res
-       end      
-      
-      
+       end
+
+
       def self.block_counter
         @@block_counter += 1
       end
@@ -130,7 +130,7 @@ module Bake
       def self.reset_block_counter
         @@block_counter = 0
       end
-      
+
       def self.set_num_projects(num)
         @@num_projects = num
       end
@@ -150,12 +150,27 @@ module Bake
             Bake.formatter.printError("Error: #{ex1.message}")
             puts ex1.backtrace if Bake.options.debug
           end
-        end 
-        
+        end
+
         if Bake::IDEInterface.instance.get_abort
           raise AbortException.new
         end
 
+        # needed for ctrl-c in Cygwin console
+        #####################################
+        # additionally, the user has to enable raw mode of Cygwin console: "stty raw".
+        # raw mode changes the signals into raw characters.
+        # original problem: Cygwin is compiled with broken control handler config,
+        # which might not be changed due to backward compatibility.
+        # the control handler works only with programs compiled under Cygwin, which is
+        # not true for Windows RubyInstaller packages.
+        while IO.select([$stdin],nil,nil,0) do
+          nextChar = $stdin.sysread(1)
+          if nextChar == "\x03"
+            raise AbortException.new
+          end
+        end
+
         return @result
       end
 
@@ -167,27 +182,27 @@ module Bake
         end
         return depResult
       end
-      
+
       def callSteps(method)
-        
+
         preSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
         end
-        
+
         mainSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
         end
-        
+
         postSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
         end
-        
-        return @result        
+
+        return @result
       end
-      
+
       def execute
         if (@inDeps)
           if Bake.options.verbose >= 1
@@ -198,16 +213,16 @@ module Bake
 
         return true if (@visited)
         @visited = true
-   
+
         @inDeps = true
         depResult = callDeps(:execute)
         @inDeps = false
         return false if not depResult and Bake.options.stopOnFirstError
-        
+
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
-        
+
         if Bake.options.verbose >= 1
-          Bake.formatter.printAdditionalInfo "**** Building #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"     
+          Bake.formatter.printAdditionalInfo "**** Building #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 
         @result = callSteps(:execute)
@@ -220,65 +235,65 @@ module Bake
 
         depResult = callDeps(:clean)
         return false if not depResult and Bake.options.stopOnFirstError
-        
+
         if Bake.options.verbose >= 2
-          Bake.formatter.printAdditionalInfo "**** Cleaning #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"     
+          Bake.formatter.printAdditionalInfo "**** Cleaning #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
-        
+
         @result = callSteps(:clean)
-        
+
         if Bake.options.clobber
           Dir.chdir(@projectDir) do
-            if File.exist?".bake" 
+            if File.exist?".bake"
               puts "Deleting folder .bake" if Bake.options.verbose >= 2
               FileUtils.rm_rf(".bake")
             end
-          end          
+          end
         end
-        
+
         return (depResult && @result)
       end
-      
+
       def startup
         return true if (@visited)
         @visited = true
 
         depResult = callDeps(:startup)
-                
-        if Bake.options.verbose >= 1 and not startupSteps.empty? 
-          Bake.formatter.printAdditionalInfo "**** Starting up #{@projectName} (#{@configName}) ****"     
+
+        if Bake.options.verbose >= 1 and not startupSteps.empty?
+          Bake.formatter.printAdditionalInfo "**** Starting up #{@projectName} (#{@configName}) ****"
         end
-        
+
         startupSteps.each do |step|
           @result = executeStep(step, :startupStep) && @result
         end
-        
+
         return (depResult && @result)
-      end      
+      end
 
       def exits
         return true if (@visited)
         @visited = true
-      
+
         depResult = callDeps(:exits)
-        
+
         if Bake.options.verbose >= 1 and not exitSteps.empty?
-          Bake.formatter.printAdditionalInfo "**** Exiting #{@projectName} (#{@configName}) ****"     
+          Bake.formatter.printAdditionalInfo "**** Exiting #{@projectName} (#{@configName}) ****"
         end
-        
+
         exitSteps.each do |step|
           @result = executeStep(step, :exitStep) && @result
         end
-        
+
         return (depResult && @result)
-      end      
+      end
+
 
-                  
     end
-    
-    
-    
+
+
+
   end
-  
-  
+
+
 end

data/lib/blocks/blockBase.rb

@@ -2,12 +2,12 @@ require 'bake/bundle'
 
 module Bake
   module Blocks
-    
+
     class BlockBase
 
       attr_reader :tcs
       attr_reader :projectDir
-      
+
       def initialize(block, config, referencedConfigs, tcs)
         @block = block
         @config = config
@@ -16,10 +16,10 @@ module Bake
         @projectDir = config.get_project_dir
         @tcs = tcs
         @config_date = Time.now
-        
+
         @printedCmdAlternate = false
         @lastCommand = nil
-        
+
         calcOutputDir
       end
 
@@ -29,17 +29,17 @@ module Bake
             FileUtils.touch(@config.file_name)
           rescue Exception=>e
             if Bake.options.verbose >= 2
-              Bake.formatter.printWarning("Could not touch #{@config.file_name}: #{e.message}", @config.file_name)              
+              Bake.formatter.printWarning("Could not touch #{@config.file_name}: #{e.message}", @config.file_name)
             end
           end
         end
       end
-            
+
       def self.prepareOutput(filename)
         begin
           if File.exists?(filename)
             FileUtils.rm(filename)
-          else 
+          else
             FileUtils.mkdir_p(File.dirname(filename))
           end
         rescue Exception => e
@@ -47,13 +47,13 @@ module Bake
             puts e.message
             puts e.backtrace
           end
-        end        
+        end
       end
-      
+
       def defaultToolchainTime
         @defaultToolchainTime ||= File.mtime(Bake.options.main_dir+"/Project.meta")
       end
-      
+
       def config_changed?(cmdLineFile)
         return "because command line file does not exist" if not File.exist?(cmdLineFile)
         cmdTime = File.mtime(cmdLineFile)
@@ -61,8 +61,8 @@ module Bake
         return "because DefaultToolchain has been changed" if cmdTime < defaultToolchainTime
         return "because command line has been changed"
       end
-      
-      def self.isCmdLineEqual?(cmd, cmdLineFile)       
+
+      def self.isCmdLineEqual?(cmd, cmdLineFile)
         begin
           if File.exist?cmdLineFile
             lastCmdLineArray = File.readlines(cmdLineFile)[0];
@@ -79,8 +79,8 @@ module Bake
         end
         return false
       end
-      
-      def self.writeCmdLineFile(cmd, cmdLineFile) 
+
+      def self.writeCmdLineFile(cmd, cmdLineFile)
         begin
           File.open(cmdLineFile, 'w') { |f| f.write(cmd.join(" ")) }
         rescue Exception => e
@@ -90,31 +90,31 @@ module Bake
           end
         end
       end
-      
+
       def isMainProject?
-        @projectName == Bake.options.main_project_name and @config.name == Bake.options.build_config 
+        @projectName == Bake.options.main_project_name and @config.name == Bake.options.build_config
       end
-      
+
       def calcOutputDir
         if @tcs[:OUTPUT_DIR] != nil
           p = @block.convPath(@tcs[:OUTPUT_DIR])
           @output_dir = p
         elsif isMainProject?
-          @output_dir = "build_" + Bake.options.build_config
+          @output_dir = "build/" + Bake.options.build_config
         else
-          @output_dir = "build_" + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
+          @output_dir = "build/" + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
         end
       end
-      
+
       def printCmd(cmd, alternate, reason, forceVerbose)
         if (cmd == @lastCommand)
           if (Bake.options.verbose >= 2 or (@printedCmdAlternate and not forceVerbose))
             return
           end
         end
-        
+
         @lastCommand = cmd
-        
+
         return if Bake.options.verbose == 0 and not forceVerbose
 
         if forceVerbose or Bake.options.verbose >= 2 or not alternate
@@ -127,7 +127,7 @@ module Bake
             exedIn = ""
             because = ""
           end
-          
+
           if cmd.is_a?(Array)
             puts cmd.join(' ') + exedIn + because
           else
@@ -139,7 +139,7 @@ module Bake
         end
 
       end
-      
+
       def process_console_output(console_output, error_parser)
         ret = false
         incList = nil
@@ -148,7 +148,7 @@ module Bake
             begin
               x = [console_output]
               error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
-            
+
               console_output = x[0]
               console_output = console_output_full if Bake.options.consoleOutput_fullnames
 
@@ -162,16 +162,16 @@ module Bake
                 end
                 console_output = console_output_VS
               end
-  
+
               if Bake.options.lint
                 # ignore error output
               else
                 ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
               end
-  
+
               console_output.gsub!(/[\r]/, "")
               Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
-  
+
               Bake::IDEInterface.instance.set_errors(error_descs)
             rescue Exception => e
               Bake.formatter.printWarning("Parsing output failed (maybe language not set to English?): " + e.message)
@@ -185,7 +185,7 @@ module Bake
         #end
         [ret, incList]
       end
-      
+
       def process_result(cmd, console_output, error_parser, alternate, reason, success)
         hasError = (success == false)
         printCmd(cmd, alternate, reason, (hasError and not Bake.options.lint))
@@ -197,7 +197,7 @@ module Bake
           raise SystemCommandFailed.new
         end
         incList
-      end      
+      end
 
       def getSubBlocks(b, method)
         b.send(method).each do |child_b|
@@ -207,13 +207,13 @@ module Bake
           end
         end
       end
-      
+
       def getBlocks(method)
         @otherBlocks = []
         getSubBlocks(@block, method)
         return @otherBlocks
-      end 
-            
+      end
+
     end
   end
 end