bake-toolkit 1.8.0.1 → 2.0.10

data/lib/bake/options/usage.rb

@@ -0,0 +1,54 @@
+module Bake
+
+  class Usage
+  
+    def self.show
+      puts "\nUsage: bake [options]"
+      puts " [-b] <name>              Config name of main project"
+      puts " -m <dir>                 Directory of main project (default is current directory)."
+      puts " -p <dir>                 Project to build/clean (default is main project)"
+      puts " -f <name>                Build/Clean this file only."
+      puts " -c                       Clean the file/project."
+      puts " -a <scheme>              Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
+      puts " -v<level>                Verbose level from 0 to 2, whereas -v0 is less, -v1 is normal (default) and -v2 is more verbose."
+      puts " -r                       Stop on first error."
+      puts " -w <root>                Add a workspace root (can be used multiple times)."
+      puts "                          If no root is specified, the parent directory of the main project is added automatically."
+      puts " --show_configs           Shows all configs with DefaultToolchain."
+      puts " --rebuild                Clean before build."
+      puts " --clobber                Clean the file/project (same as option -c) AND the bake cache files."
+      puts " --prepro                 Stop after preprocessor."
+      puts " --link_only              Only link executables - doesn't update objects and archives or start PreSteps and PostSteps."
+      puts "                          Forces executables to be relinked."
+      puts " --docu                   Builds docu instead of compiling sources."
+      puts " --lint                   Performs Lint checks instead of compiling sources."
+      puts " --lint_min <num>         If number of files in a project is too large for lint to handle, it is possible"
+      puts "                          to specify only a part of the file list to lint (default -1)."
+      puts " --lint_max <num>         See above (default -1)."
+      puts " --ignore_cache           Rereads the original meta files - usefull if workspace structure has been changed."
+      puts " --threads <num>          Set NUMBER of parallel compiled files (default is 8)."
+      puts " --socket <num>           Set SOCKET for sending errors, receiving commands, etc. - used by e.g. Eclipse."
+      puts " --toolchain_info <name>  Prints default values of a toolchain."
+      puts " --toolchain_names        Prints available toolchains."
+      puts " --include_filter <name>  Includes steps with this filter name (can be used multiple times)."
+      puts "                          'PRE' or 'POST' includes all PreSteps respectively PostSteps."
+      puts " --exclude_filter <name>  Excludes steps with this filter name (can be used multiple times)."
+      puts "                          'PRE' or 'POST' excludes all PreSteps respectively PostSteps."
+      puts " --show_abs_paths         Compiler prints absolute filename paths instead of relative paths."
+      puts " --no_autodir             Disable auto completion of paths like in IncludeDir"
+      puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."
+      puts " --show_include_paths     Used by IDEs plugins"
+      puts " --show_incs_and_defs     Used by IDEs plugins"
+      puts ""
+      puts " --version                Print version."
+      puts " --doc                    Open documentation in browser"
+      puts " -h, --help               Print this help."
+      puts " --show_license           Print the license."
+      puts ""
+      puts " --debug                  Print out backtraces in some cases - used only for debugging bake."      
+      ExitHelper.exit(0)      
+    end
+
+  end
+
+end

data/lib/bake/process_output.rb

@@ -0,0 +1,10 @@
+module Bake
+
+  class ProcessOutput
+    
+    
+    
+  end
+  
+
+end

data/lib/bake/subst.rb

@@ -1,14 +1,48 @@
-module Cxxproject
+module Bake
 
   class Subst
   
-    def self.itute(config, projName, options, isMainProj, toolchain)
+    # this is done lazy because usually there is no need to calculate that
+    def self.lazyPathes
+      return unless @@lazy
+      
+      cppCmd = @@toolchain[:COMPILER][:CPP][:COMMAND]
+      cCmd = @@toolchain[:COMPILER][:C][:COMMAND]
+      asmCmd = @@toolchain[:COMPILER][:ASM][:COMMAND]
+      archiverCmd = @@toolchain[:ARCHIVER][:COMMAND]
+      linkerCmd = @@toolchain[:LINKER][:COMMAND]
+        
+      if @@config.toolchain
+        linkerCmd = @@config.toolchain.linker.command if @@config.toolchain.linker and @@config.toolchain.linker.command != ""
+        archiverCmd = @@config.toolchain.archiver.command if @@config.toolchain.linker and @@config.toolchain.archiver.command != ""
+        @@config.toolchain.compiler.each do |c|
+          if c.ctype == :CPP
+            cppCmd = c.command
+          elsif c.ctype == :C
+            cCmd = c.command
+          elsif c.ctype == :ASM
+            asmCmd = c.command
+          end
+        end
+      end 
+      
+      @@cppExe      = File.which(cppCmd) 
+      @@cExe        = File.which(cCmd)
+      @@asmExe      = File.which(asmCmd)
+      @@archiverExe = File.which(archiverCmd)
+      @@linkerExe   = File.which(linkerCmd)
+      
+      @@lazy = false
+    end
     
+    def self.itute(config, projName, isMainProj, toolchain)
+      @@lazy = true
+      @@config = config
+      @@toolchain = toolchain
+      
       @@configName = config.name
       @@projDir = config.parent.get_project_dir
       @@projName = projName
-      @@options = options
-      @@mainProjectName = File::basename(options.main_dir)
       @@resolvedVars = 0
       @@configFilename = config.file_name
       
@@ -17,7 +51,7 @@ module Cxxproject
         if not config.artifactName.nil?
           @@artifactName = config.artifactName.name
         elsif config.defaultToolchain != nil
-          basedOnToolchain = Cxxproject::Toolchain::Provider[config.defaultToolchain.basedOn]
+          basedOnToolchain = Bake::Toolchain::Provider[config.defaultToolchain.basedOn]
           if basedOnToolchain != nil
             @@artifactName = projName+basedOnToolchain[:LINKER][:OUTPUT_ENDING]
           end
@@ -33,30 +67,30 @@ module Cxxproject
       config.set.each do |s|
      
         if (s.value != "" and s.cmd != "")
-          Printer.printError "Error: #{config.file_name}(#{s.line_number}): value and cmd attributes must be used exclusively"
+          Bake.formatter.printError("value and cmd attributes must be used exclusively", s)
           ExitHelper.exit(1)
         end
         
         if (s.value != "")
-          @@userVarMap[s.name] = substString(s.value)
+          setName = substString(s.name, s)
+          if (setName.empty?)
+            Bake.formatter.printWarning("Name of variable must not be empty - variable will be ignored", s)
+          else
+            @@userVarMap[s.name] = substString(s.value, s)
+          end
         else
           cmd_result = false
           begin
-            rd, wr = IO.pipe
-            cmd = [substString(s.cmd)]
-            cmd << {
-             :err=>wr,
-             :out=>wr
-            }
-            consoleOutput = ""
             Dir.chdir(@@projDir) do
-              cmd_result, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
+              cmd = [substString(s.cmd, s)]
+              cmd_result, consoleOutput = ProcessHelper.run(cmd)
+              @@userVarMap[s.name] = consoleOutput.chomp
             end
-          @@userVarMap[s.name] = consoleOutput.chomp
-          rescue
+          rescue Exception=>e
+            consoleOutput = e.message
           end
           if (cmd_result == false)
-            Printer.printWarning "Warning: #{config.file_name}(#{s.line_number}): command not successful, variable #{s.name} wil be set to \"\"  (#{consoleOutput.chomp})."
+            Bake.formatter.printWarning("Command not successful, variable #{s.name} wil be set to \"\" (#{consoleOutput.chomp}).", s)
             @@userVarMap[s.name] = ""
           end          
         end
@@ -78,13 +112,13 @@ module Cxxproject
         lastFoundInVar = @@resolvedVars 
       end      
       if (@@resolvedVars > 0)
-        Printer.printError "Error: #{config.file_name}: cyclic variable substitution detected"
+        Bake.formatter.printError("Cyclic variable substitution detected", config.file_name)
         ExitHelper.exit(1)
       end
       
     end
     
-    def self.substString(str)
+    def self.substString(str, elem=nil)
       substStr = ""
       posSubst = 0
       while (true)
@@ -97,16 +131,16 @@ module Cxxproject
         @@resolvedVars += 1
         var = str[posStart+2..posEnd-1]
 
-        if @@options.vars.has_key?(var)
-          substStr << @@options.vars[var]  
+        if Bake.options.vars.has_key?(var)
+          substStr << Bake.options.vars[var]  
         elsif @@userVarMap.has_key?(var)
           substStr << @@userVarMap[var]       
         elsif var == "MainConfigName"
-          substStr << @@options.build_config
+          substStr << Bake.options.build_config
         elsif var == "MainProjectName"
-          substStr << @@mainProjectName
+          substStr << Bake.options.main_project_name
         elsif var == "MainProjectDir"
-          substStr << @@options.main_dir
+          substStr << Bake.options.main_dir
         elsif var == "ConfigName"
          substStr << @@configName
         elsif var == "ProjectName"
@@ -114,10 +148,10 @@ module Cxxproject
         elsif var == "ProjectDir"
           substStr << @@projDir
         elsif var == "OutputDir"
-          if @@projName == @@mainProjectName 
-            substStr << @@options.build_config
+          if @@projName == Bake.options.main_project_name
+            substStr << Bake.options.build_config
           else
-            substStr << (@@options.build_config + "_" + @@mainProjectName)
+            substStr << @@configName + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
           end
         elsif var == "Time"
           substStr << Time.now.to_s
@@ -127,10 +161,25 @@ module Cxxproject
           substStr << @@artifactName
         elsif var == "ArtifactNameBase"
           substStr << @@artifactName.chomp(File.extname(@@artifactName))
+        elsif var == "CPPPath"
+          self.lazyPathes
+          substStr << @@cppExe
+        elsif var == "CPath"
+          self.lazyPathes
+          substStr << @@cExe
+        elsif var == "ASMPath"
+          self.lazyPathes
+          substStr << @@asmExe
+        elsif var == "ArchiverPath"
+          self.lazyPathes
+          substStr << @@archiverExe
+        elsif var == "LinkerPath"
+          self.lazyPathes
+          substStr << @@linkerExe
         elsif var == "Roots"
           substStr << "___ROOTS___"
         elsif var == "/"
-          if Cxxproject::OS.windows?
+          if Bake::Utils::OS.windows?
             substStr << "\\"
           else
             substStr << "/"
@@ -138,8 +187,13 @@ module Cxxproject
         elsif ENV[var]
           substStr << ENV[var]
         else
-          if @@options.verbose
-            Printer.printInfo "Info: #{@@configFilename}: substitute variable '$(#{var})' with empty string"
+          if Bake.options.verboseHigh
+            msg = "Substitute variable '$(#{var})' with empty string"
+            if elem
+              Bake.formatter.printInfo(msg, elem)
+            else
+              Bake.formatter.printInfo(msg +  " in the toolchain", @@config)
+            end
           end
           substStr << ""
         end
@@ -151,22 +205,33 @@ module Cxxproject
     end
 
     def self.substToolchain(elem)
-      elem.each do |k, e|
-        if Hash === e or Array === e
-          substToolchain(e) 
-        elsif String === e
-          elem[k] = substString(e)
-        end  
+      if Hash === elem
+        elem.each do |k, e|
+          if Hash === e or Array === e
+            substToolchain(e)
+          elsif String === e
+            elem[k] = substString(e)
+          end
+        end
+      elsif Array === elem
+        elem.each_with_index do |e, i|
+          if Hash === e or Array === e
+            substToolchain(e)
+          elsif String === e
+            elem[i] = substString(e)
+          end
+        end
       end
     end
-
     
     def self.subst(elem)
       elem.class.ecore.eAllAttributes_derived.each do |a|
         next if a.name == "file_name" or a.name == "line_number"
-        #next if Metamodel::DefaultToolchain === elem
+        return if Metamodel::Set === elem.class
+        return if Metamodel::DefaultToolchain === elem
+        return if Metamodel::Toolchain === elem.class
         next if a.eType.name != "EString" 
-        substStr = substString(elem.getGeneric(a.name))
+        substStr = substString(elem.getGeneric(a.name), elem)
         elem.setGeneric(a.name, substStr)
       end
     

data/lib/bake/toolchain/clang.rb

@@ -0,0 +1,44 @@
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
+require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+
+module Bake
+  module Toolchain
+    gccCompilerErrorParser = GCCCompilerErrorParser.new
+
+    CLANG_CHAIN = Provider.add("CLANG")
+
+    CLANG_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "llvm-g++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MD -MF ", # empty space at the end is important!
+      :ERROR_PARSER => gccCompilerErrorParser
+    })
+
+    CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
+    CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "llvm-gcc"
+
+    CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
+    CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+
+    CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
+    CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+    CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
+
+    CLANG_CHAIN[:LINKER][:COMMAND] = "llvm-g++"
+    CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
+    CLANG_CHAIN[:LINKER][:USER_LIB_FLAG] = "-l:"
+    CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"
+    CLANG_CHAIN[:LINKER][:LIB_FLAG] = "-l"
+    CLANG_CHAIN[:LINKER][:LIB_PATH_FLAG] = "-L"
+      
+    CLANG_CHAIN[:LINKER][:ERROR_PARSER] = GCCLinkerErrorParser.new      
+  end
+end

data/lib/bake/toolchain/colorizing_formatter.rb

@@ -0,0 +1,125 @@
+require 'colored'
+
+module Bake
+  #include Utils ????
+
+  class ColorizingFormatter
+    
+    def initialize
+      @scheme = :none
+    end
+  
+    def setColorScheme(scheme)
+      
+      if (scheme != :black and scheme != :white and scheme != :none)
+        Bake.formatter.printError("Error: color scheme must be 'black' or 'white'")
+        ExitHelper.exit(1)
+      end
+      @scheme = scheme
+      
+      if @scheme == :black
+        @warning_color = :yellow
+        @error_color = :red
+        @info_color = :white
+        @additional_info_color = :cyan
+        @success_color = :green
+      elsif @scheme == :white
+        @warning_color = :magenta
+        @error_color = :red
+        @info_color = :black
+        @additional_info_color = :blue
+        @success_color = :green
+      end
+    end
+  
+    def printInternal(col, str)
+      puts(@scheme == :none ? str : [col,:bold].inject(str) {|m,x| m.send(x)})
+    end
+    
+    def createIdeError(str, file_name, line_number, severity)
+      if (file_name)
+        d = ErrorDesc.new
+        d.file_name = file_name
+        d.line_number = (line_number ? line_number : 0)
+        d.message = str
+        d.severity = severity
+        Bake::IDEInterface.instance.set_errors([d])
+      end
+    end
+  
+    def processString(prefix, str, file_name_or_elem, line_num, severity)
+      if file_name_or_elem.respond_to?("file_name")
+        file_name = file_name_or_elem.file_name
+        line_num = file_name_or_elem.line_number
+      elsif String === file_name_or_elem
+        file_name = file_name_or_elem
+      else
+        file_name = nil
+      end
+
+      createIdeError(str, file_name, line_num, severity)
+      
+      line = (line_num ? ":#{line_num}" : "")
+      file = (file_name ? "#{file_name}#{line}: " : "")
+      return file + prefix + ": " + str
+    end
+    
+    def printError(str, file_name_or_elem=nil, line_num=nil)
+      str = processString("Error", str, file_name_or_elem, line_num, Bake::ErrorParser::SEVERITY_ERROR) if file_name_or_elem
+      printInternal(@error_color, str)
+    end
+  
+    def printWarning(str, file_name=nil, line_num=nil)
+      str = processString("Warning", str, file_name, line_num, Bake::ErrorParser::SEVERITY_WARNING) if file_name
+      printInternal(@warning_color, str)
+    end
+  
+    def printInfo(str, file_name=nil, line_num=nil)
+      str = processString("Info", str, file_name, line_num, Bake::ErrorParser::SEVERITY_INFO) if file_name
+      printInternal(@info_color, str)
+    end
+  
+    def printAdditionalInfo(str)
+      printInternal(@additional_info_color, str)
+    end
+  
+    def printSuccess(str)
+      printInternal(@success_color, str)
+    end
+  
+    # formats several lines of compiler output
+    def format(compiler_output, error_descs, error_parser)
+      if @scheme == :none
+        puts compiler_output
+      else 
+        begin
+          zipped = compiler_output.split($/).zip(error_descs)
+          zipped.each do |l,desc|
+            if desc.severity != 255
+              coloring = {}
+              if desc.severity == ErrorParser::SEVERITY_WARNING
+                printWarning(l)
+              elsif desc.severity == ErrorParser::SEVERITY_ERROR
+                printError(l)
+              else
+                printInfo(l)
+              end
+            else
+              puts l
+            end
+          end
+        rescue Exception => e
+          puts "Error while parsing output: #{e}"
+          puts e.backtrace if Bake.options.debug
+          puts compiler_output
+        end
+      end
+    end
+  end
+
+def self.formatter
+  @@formatter ||= ColorizingFormatter.new
+end
+
+    
+end