bake-toolkit 1.8.0.1 → 2.0.10

data/lib/bakery/buildPattern.rb

@@ -1,4 +1,4 @@
-module Cxxproject
+module Bake
 
   class BuildPattern
     attr_reader :proj, :conf, :coll_p

data/lib/bakery/model/language.rb

@@ -1,7 +1,7 @@
 require 'bake/model/metamodel'
 require 'rtext/language'
 
-module Cxxproject
+module Bake
 
   BakeryLanguage =
   RText::Language.new(BakeryModel.ecore,

data/lib/bakery/model/loader.rb

@@ -0,0 +1,56 @@
+require 'bakery/model/metamodel'
+require 'bakery/model/language'
+require 'common/version'
+
+require 'rgen/environment'
+require 'rgen/fragment/fragmented_model'
+
+require 'rtext/default_loader'
+
+require 'common/exit_helper'
+require 'bake/toolchain/colorizing_formatter'
+
+module Bake
+
+  class BakeryLoader
+    
+    attr_reader :model
+    
+    def initialize
+      @env = RGen::Environment.new
+      @model = RGen::Fragment::FragmentedModel.new(:env => @env)
+    end
+    
+    def load(filename)
+    
+      sumErrors = 0
+      
+      if not File.exists?filename
+        Bake.formatter.printError("Error: #{filename} does not exist")
+        ExitHelper.exit(1) 
+      end
+    
+      loader = RText::DefaultLoader.new(
+        Bake::BakeryLanguage,
+        @model,
+        :file_provider => proc { [filename] },
+        :cache => @DumpFileCache)
+      loader.load()
+    
+      f = @model.fragments[0]
+      
+      f.data[:problems].each do |p|
+        Bake.formatter.printError(p.message, p.file, p.line)
+      end
+      
+      if f.data[:problems].length > 0
+        ExitHelper.exit(1) 
+      end
+      
+      return @env
+    
+    end
+  
+  
+  end
+end

data/lib/bakery/model/metamodel.rb

@@ -1,7 +1,7 @@
 require 'rgen/metamodel_builder'
 require 'rgen/metamodel_builder/data_types'
 
-module Cxxproject
+module Bake
 
   module BakeryModel
     extend RGen::MetamodelBuilder::ModuleExtension

data/lib/bakery/options/options.rb

@@ -0,0 +1,87 @@
+require 'bake/toolchain/colorizing_formatter'
+require 'common/options/parser'
+
+module Bake
+
+  class BakeryOptions < Parser
+    attr_reader :collection_name, :collection_dir # String
+    attr_reader :roots # String List
+    attr_reader :color, :error # Boolean
+    attr_reader :socket # Fixnum
+
+    def initialize(argv)
+      super(argv)
+      
+      @collection_name = ""
+      @collection_dir = nil      
+      @color = nil
+      @error = false
+      @roots = []
+      @socket = 0
+      @def_roots = []
+            
+      add_option(Option.new("-b",true)        { |x| set_collection_name(x)     })
+      add_option(Option.new("-m",true)        { |x| set_collection_dir(x)     })
+      add_option(Option.new("-r",false)       {     @error = true                 })
+      add_option(Option.new("-a",true)        { |x|Bake.formatter.setColorScheme(x.to_sym)               })
+      add_option(Option.new("-w",true)        { |x| set_root(x)               })
+      add_option(Option.new("--socket",true)  { |x| @socket = String === x ? x.to_i : x             })
+      add_option(Option.new("-h",false)       {     usage; ExitHelper.exit(0) })
+    end
+    
+    def usage
+      puts "\nUsage: bake <name> [options]"
+      puts " -b <name>       Name of the collection to build."
+      puts " -m <dir>        Directory containing the collection file (default is current directory)."
+      puts " -r              Stop on first error."
+      puts " -a <scheme>     Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
+      puts " -h              Print this help."
+      puts " -w <root>       Add a workspace root (can be used multiple times)."
+      puts "                 If no root is specified, the parent directory of Collection.meta is added automatically."
+      puts " --socket <num>  Set socket for sending errors, receiving commands, etc. - used by e.g. Eclipse."
+      puts "Note: all parameters except -b, -m and -h will be passed to bake - see bake help for more options." 
+    end
+  
+    def parse_options()
+      parse_internal(true)
+      set_collection_dir(Dir.pwd) if @collection_dir.nil?
+      if @roots.length == 0
+        @roots = @def_roots 
+      end
+    end
+    
+    def check_valid_dir(dir)
+     if not File.exists?(dir)
+        Bake.formatter.printError("Error: Directory #{dir} does not exist")
+        ExitHelper.exit(1)
+      end
+      if not File.directory?(dir)
+        Bake.formatter.printError("Error: #{dir} is not a directory")
+        ExitHelper.exit(1)
+      end      
+    end
+    
+    def set_collection_name(collection_name)
+      if not @collection_name.empty?
+        Bake.formatter.printError("Error: Cannot set collection name '#{collection_name}', because collection name is already set to '#{@collection_name}'")
+        ExitHelper.exit(1)
+      end      
+      @collection_name = collection_name
+    end
+    
+    def set_collection_dir(dir)
+      check_valid_dir(dir)
+      @collection_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
+      @def_roots = calc_def_roots(@collection_dir)
+    end
+
+    def set_root(dir)
+      check_valid_dir(dir)
+      r = File.expand_path(dir.gsub(/[\\]/,'/'))
+      @roots << r if not @roots.include?r
+    end
+
+  
+  end
+
+end

data/lib/bakery/toBake.rb

@@ -1,14 +1,16 @@
 require "bakery/buildPattern"
 
-module Cxxproject
+module Bake
 
   def self.getBuildPattern(cols, name)
 
+    colMeta = @options.collection_dir+"/Collection.meta"
+    
     if (cols.length == 0)
-      Printer.printError "Collection #{name} not found in #{@options.collection_dir+"/Collection.meta"}"
+      Bake.formatter.printError("Collection #{name} not found", colMeta)
       ExitHelper.exit(1)
     elsif (cols.length > 1)
-      Printer.printError "Collection #{name} found more than once in #{@options.collection_dir+"/Collection.meta"}"
+      Bake.formatter.printError("Collection #{name} found more than once", colMeta)
       ExitHelper.exit(1)
     end
 
@@ -16,11 +18,11 @@ module Cxxproject
 
     col.project.each do |p|
       if p.name == ""
-        Printer.printError "Error in #{@options.collection_dir+"/Collection.meta"} (line #{p.line_number}): Project name empty"
+        Bake.formatter.printError("Project name empty", p) 
         ExitHelper.exit(1)
       end
       if p.config == ""
-        Printer.printError "Error in #{@options.collection_dir+"/Collection.meta"} (line #{p.line_number}): Config name empty"
+        Bake.formatter.printError("Config name empty", p)
         ExitHelper.exit(1)
       end
     end
@@ -54,7 +56,9 @@ module Cxxproject
     end
 
     toBuildPattern.each do |bp|
-      Printer.printInfo "Info in #{@options.collection_dir+"/Collection.meta"} (line #{bp.coll_p.line_number}): No match for project #{bp.coll_p.name} with config #{bp.coll_p.config}" unless bp.coll_p.isFound
+      if not bp.coll_p.isFound
+        Bake.formatter.printInfo("No match for project #{bp.coll_p.name} with config #{bp.coll_p.config}", @options.collection_dir+"/Collection.meta", bp.coll_p.line_number) 
+      end
     end
 
     col.exclude.each do |p|

data/lib/blocks/block.rb

@@ -0,0 +1,225 @@
+require 'bake/libElement'
+require 'common/abortException'
+
+module Bake
+
+  BUILD_PASSED = 0
+  BUILD_FAILED = 1
+  BUILD_ABORTED = 2
+  
+  module Blocks
+
+    ALL_BLOCKS = {}
+    ALL_COMPILE_BLOCKS = {}
+
+    class Block
+
+      attr_reader :lib_elements, :projectDir, :library, :config
+      attr_accessor :visited, :inDeps, :result
+  
+      def preSteps
+        @preSteps ||= []
+      end
+      
+      def mainSteps
+        @mainSteps ||= []
+      end      
+      
+      def postSteps
+        @postSteps ||= []
+      end
+
+      def dependencies
+        @dependencies ||= []
+      end
+      
+      def set_library(library)
+        @library = library
+      end
+      
+      def initialize(config, referencedConfigs)
+        @inDeps = false
+        @visited = false
+        @library = nil
+        @config = config
+        @referencedConfigs = referencedConfigs
+        @projectName = config.parent.name
+        @configName = config.name
+        @projectDir = config.get_project_dir
+        @@block_counter = 0
+        @result = false
+        
+        @lib_elements = Bake::LibElements.calcLibElements(self)
+      end
+      
+      def add_lib_element(elem)
+        @lib_elements[2000000000] = [elem]
+      end
+      
+      def convPath(dir, elem=nil)
+         if dir.respond_to?("name")
+           d = dir.name
+           elem = dir
+         else
+           d = dir
+         end
+         
+         return d if Bake.options.no_autodir
+         
+         inc = d.split("/")
+         if (inc[0] == @projectName)
+           res = inc[1..-1].join("/") # within self
+           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)
+           postfix = inc[1..-1].join("/")
+           res = res + "/" + postfix if postfix != ""
+         else
+           if (inc[0] != "..")
+             return d if File.exists?(@projectDir + "/" + d) # e.g. "include"
+           
+             # check if dir exists without Project.meta entry
+             Bake.options.roots.each do |r|
+               absIncDir = r+"/"+d
+               if File.exists?(absIncDir)
+                 res = File.rel_from_to_project(@projectDir,absIncDir,false)
+                 if not res.nil?
+                   return res
+                 end 
+               end
+             end
+           else
+             if elem and Bake.options.verboseHigh
+               Bake.formatter.printInfo("\"..\" in path name found", elem)
+             end
+           end
+           
+           res = d # relative from self as last resort
+         end
+         res
+       end      
+      
+      
+      def self.block_counter
+        @@block_counter += 1
+      end
+
+      def self.reset_block_counter
+        @@block_counter = 0
+      end
+      
+      def self.set_num_projects(num)
+        @@num_projects = num
+      end
+
+      def executeStep(step, method)
+        result = false
+        begin
+          step.send method
+          result = true
+        rescue Bake::SystemCommandFailed => scf
+        rescue SystemExit => exSys
+          ProcessHelper.killProcess(true)
+        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 
+        
+        if Bake::IDEInterface.instance.get_abort
+          raise AbortException.new
+        end
+        
+        return result
+      end
+
+      def callDeps(method)
+        depResult = true
+        dependencies.each do |dep|
+          depResult = (ALL_BLOCKS[dep].send(method) and depResult)
+          break if not depResult and Bake.options.stopOnFirstError
+        end
+        return depResult
+      end
+      
+      def callSteps(method)
+        result = true
+        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        
+      end
+      
+      def execute
+        if (@inDeps)
+          if not Bake.options.verboseLow
+            Bake.formatter.printWarning("Circular dependency found including project #{@projectName} with config #{@configName}", @config)
+          end
+          return true
+        end
+
+        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 not Bake.options.verboseLow
+          Bake.formatter.printAdditionalInfo "**** Building #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"     
+        end
+
+        @result = callSteps(:execute)
+        return (depResult && result)
+      end
+
+      def clean
+        return true if (@visited)
+        @visited = true
+
+        depResult = callDeps(:clean)
+        return false if not depResult and Bake.options.stopOnFirstError
+        
+        if Bake.options.verboseHigh
+          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" 
+              puts "Deleting folder .bake" if Bake.options.verboseHigh
+              FileUtils.rm_rf(".bake")
+            end
+          end          
+        end
+        
+        return (depResult && result)
+      end      
+            
+    end
+    
+    
+    
+  end
+  
+  
+end

data/lib/blocks/blockBase.rb

@@ -0,0 +1,155 @@
+module Bake
+  module Blocks
+    
+    class BlockBase
+
+      attr_reader :tcs
+      
+      def initialize(block, config, referencedConfigs, tcs)
+        @block = block
+        @config = config
+        @referencedConfigs = referencedConfigs
+        @projectName = config.parent.name
+        @projectDir = config.get_project_dir
+        @tcs = tcs
+        @config_date = Time.now
+        
+        @printedCmdAlternate = false
+        @lastCommand = nil
+        
+        calcOutputDir
+      end
+
+      def check_config_file()
+        if File.exists?(@config.file_name) and File.mtime(@config.file_name) > @config_date
+          begin
+            FileUtils.touch(@config.file_name)
+          rescue Exception=>e
+            if Bake.options.verboseHigh
+              Bake.formatter.printWarning("Could not touch #{@config.file_name}: #{e.message}", @config.file_name)              
+            end
+          end
+        end
+      end
+            
+      def prepareOutput(filename)
+        begin
+          if File.exists?(filename)
+            FileUtils.rm(filename)
+          else 
+            FileUtils.mkdir_p(File.dirname(filename))
+          end
+        rescue Exception => e
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end        
+      end
+      
+      def calcOutputDir
+        if @tcs[:OUTPUT_DIR] != nil
+          p = @block.convPath(@tcs[:OUTPUT_DIR])
+          @output_dir = p
+        elsif @projectName == Bake.options.main_project_name and @config.name == Bake.options.build_config 
+          @output_dir = Bake.options.build_config
+        else
+          @output_dir = @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.verboseHigh or (@printedCmdAlternate and not forceVerbose))
+            return
+          end
+        end
+        
+        @lastCommand = cmd
+        
+        return if Bake.options.verboseLow and not forceVerbose
+
+        if forceVerbose or Bake.options.verboseHigh or not alternate
+          @printedCmdAlternate = false
+          if Bake.options.verboseHigh
+            puts "" # for A.K. :-)  
+            exedIn = "\n(executed in '#{@projectDir}')"
+            because = reason ? "\n(#{reason})" : ""
+          else
+            exedIn = ""
+            because = ""
+          end
+          
+          if cmd.is_a?(Array)
+            puts cmd.join(' ') + exedIn + because
+          else
+            puts cmd + exedIn + because
+          end
+        else
+          @printedCmdAlternate = true
+          puts alternate
+        end
+
+      end
+      
+      def process_console_output(console_output, error_parser)
+        ret = false
+        if not console_output.empty?
+          if error_parser
+            begin
+              error_descs, console_output_full = error_parser.scan_lines(console_output, @projectDir)
+  
+              console_output = console_output_full if Bake.options.consoleOutput_fullnames
+              
+              if Bake.options.consoleOutput_visualStudio
+                console_output_VS = ""
+                descCounter = 0
+                console_output.each_line do |l|
+                  d = error_descs[descCounter]
+                  console_output_VS << error_parser.makeVsError(l.rstrip, d) << "\n"
+                  descCounter = descCounter + 1
+                end
+                console_output = console_output_VS
+              end
+  
+              if Bake.options.lint
+                ret = error_descs.any? { |e| e.severity != ErrorParser::SEVERITY_OK }
+              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)
+  
+              Bake::IDEInterface.instance.set_errors(error_descs)
+            rescue Exception => e
+              Bake.formatter.printWarning("Parsing output failed (maybe language not set to English?): " + e.message)
+              Bake.formatter.printWarning("Original output:")
+              Bake.formatter.printWarning(console_output)
+              raise e
+            end
+          else
+            puts console_output # fallback
+          end
+        end
+        ret
+      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))
+        errorPrinted = process_console_output(console_output, error_parser)
+        
+        if hasError and not errorPrinted
+          Bake.formatter.printError("System command failed", @projectDir)
+        end
+        if hasError or errorPrinted
+          raise SystemCommandFailed.new
+        end
+      end      
+      
+    end
+    
+  end
+end