bake-toolkit 2.15.0 → 2.16.1

data/lib/bake/bundle.rb

@@ -0,0 +1,159 @@
+require 'fileutils'
+require 'common/ext/rtext'
+
+
+module Bake
+
+  class Bundle
+  
+    def initialize()
+      cleanup()
+    end
+    
+    def cleanup
+      @outputDir = nil
+      @result = true
+      @sources = []
+      @libs = []
+      @ls = nil
+    end
+    
+    def self.instance
+      @@bundle ||= Bundle.new
+    end
+    
+    def setOutputDir(dir)
+      @outputDir = dir
+      FileUtils.mkdir_p(@outputDir)
+    end
+    
+    def addLib(lib, mainConfig)
+      return unless @outputDir
+      dir = @outputDir+"/lib"
+      FileUtils.mkdir_p(dir)
+      FileUtils.cp(lib, dir)
+      @libs << "lib/" + File.basename(lib) unless mainConfig
+      createProjectMeta(mainConfig)
+    end
+    
+    def addBinary(exe, ls, mainConfig)
+      return unless @outputDir
+      
+      dir = @outputDir+"/bin"
+      FileUtils.mkdir_p(dir)
+      FileUtils.cp(exe, dir)
+      
+      if (ls and mainConfig)
+        lsDir = @outputDir+"/ls"
+        FileUtils.mkdir_p(lsDir)
+        FileUtils.cp(ls, lsDir)
+        @ls = "ls/" + File.basename(ls)
+      end
+      
+      createProjectMeta(mainConfig)
+    end
+
+    def addSource(source, includeList, depFilename)
+      return unless @outputDir
+      if File.is_absolute?(source)
+        Bake.formatter.printWarning("Warning: '#{source}' is an absolute filename, this is not supported by bundle feature. File will be ignored.")
+        return
+      end
+      sdir = File.dirname(source)
+      dir = @outputDir
+      dir = dir + "/" + sdir unless sdir.empty?
+      FileUtils.mkdir_p(dir)
+      FileUtils.cp(source, dir)
+      @sources << source
+      
+      addHeaders(makeAbsolute(includeList), parseDepFile(depFilename))
+    end
+    
+    def addHeaders(absIncs, deps)
+      deps.each do |d|
+        absIncs.each do |a|
+          if d.start_with?a
+            filename = d[a.length+1..-1]
+            hdir = File.dirname(filename)
+            dir = @outputDir + "/inc"
+            dir = dir + "/" + hdir unless hdir.empty?
+            FileUtils.mkdir_p(dir)
+            FileUtils.cp(d, dir)            
+            next
+          end          
+        end
+      end
+    end
+    
+    def makeAbsolute(includeList)
+      includeList.map { |x| File.expand_path(x) }
+    end
+    
+    def parseDepFile(depFilename)
+      res = []
+      begin
+        File.readlines(depFilename).map{|line| line.strip}.each do |dep|
+          if File.exist?(dep)
+            res << File.expand_path(dep)
+          end
+        end
+      rescue Exception => ex
+      end
+      res
+    end
+    
+    def createProjectMeta(mainConfig)
+      return unless mainConfig
+      
+      project = Bake::Metamodel::Project.new
+      project.setDefault("bundle")
+      project.file_name = ""
+      
+      config = mainConfig.class.new
+      config.setName("bundle")
+      
+      project.setConfig([config])
+      
+      sourceElements = @sources.map do |s|
+        source = Bake::Metamodel::Files.new
+        source.setName(s)
+        source
+      end
+      config.setFiles(sourceElements)
+      
+      idir = Bake::Metamodel::IncludeDir.new
+      idir.setName("inc")  
+      config.setIncludeDir([idir])
+      
+      exLibs = @libs.map do |s|
+        lib = Bake::Metamodel::ExternalLibrary.new
+        lib.setName(s)
+        lib.setSearch(false)
+        lib
+      end
+      config.setLibStuff(exLibs)
+      
+      if (mainConfig.toolchain)
+        config.setToolchain(Bake::MergeConfig.clone(mainConfig.toolchain)) 
+      end
+      
+      if (mainConfig.defaultToolchain)
+        config.setDefaultToolchain(Bake::MergeConfig.clone(mainConfig.defaultToolchain)) 
+      end
+      
+      if (@ls)
+        ls = Bake::Metamodel::LinkerScript.new
+        ls.setName(@ls)
+        config.setLinkerScript(ls)
+      end
+      
+      s = StringIO.new
+      ser = RText::Serializer.new(Language)
+      ser.serialize(project, s)      
+      File.write(@outputDir + "/Project.meta", s.string)
+            
+    end
+    
+  end
+
+end

data/lib/bake/mergeConfig.rb

@@ -1,4 +1,4 @@
-require 'rtext/serializer'
+require 'common/ext/rtext'
 
 module Bake
 
@@ -9,7 +9,7 @@ module Bake
       @parent = parent
     end
     
-    def clone(obj)
+    def self.clone(obj)
       if obj.is_a?(Metamodel::ModelElement)
         cloneModelElement(obj)
       elsif Array === obj
@@ -19,7 +19,7 @@ module Bake
       end
     end
     
-    def cloneModelElement(obj)
+    def self.cloneModelElement(obj)
       cpy = obj.class.new
       cpy.file_name = obj.file_name
       obj.class.ecore.eAllStructuralFeatures.each do |f|
@@ -184,11 +184,11 @@ module Bake
       elsif (type == :replace)
         replace
       elsif (type == :extend)
-        c = clone(@child)
+        c = MergeConfig.clone(@child)
         extend(c, @parent)
         copyChildToParent(c, @parent)
       elsif (type == :merge)
-        extend(@child, clone(@parent))
+        extend(@child, MergeConfig.clone(@parent))
       end
 
       if Bake.options.debug

data/lib/bake/model/loader.rb

@@ -28,20 +28,8 @@ module Bake
       @model = RGen::Fragment::FragmentedModel.new(:env => @env)
     end
     
-    def load(filename)
-      sumErrors = 0
-
-      if Bake.options.nocache
-        def @DumpFileCache.load(fragment)
-          :invalid
-        end
-      end
-            
-      if not File.exists?filename
-        Bake.formatter.printError("Error: #{filename} does not exist")
-        ExitHelper.exit(1) 
-      end
-    
+    def load_internal(filename, silent = false)
+      silent = false if Bake.options.debug
       loader = RText::DefaultLoader.new(
         Bake::Language,
         @model,
@@ -51,36 +39,60 @@ module Bake
         case kind
         when :load_update_cache
           if Bake.options.verbose >= 3
-            puts "Loading and caching #{fragment.location}"
+            puts "Loading and caching #{fragment.location}" unless silent
           else
-            puts "Loading #{fragment.location}"
+            puts "Loading #{fragment.location}" unless silent
           end
         when :load_cached
           if Bake.options.verbose >= 3
-            puts "Loading cached #{fragment.location}"
+            puts "Loading cached #{fragment.location}" unless silent
           else
-            puts "Loading #{fragment.location}"
+            puts "Loading #{fragment.location}" unless silent
           end
         when :load
-          puts "Loading #{fragment.location}"
+          puts "Loading #{fragment.location}" unless silent
         else
           Bake.formatter.printError("Error: Could not load #{fragment.location}")
           ExitHelper.exit(1)     
         end
       })
     
-      f = @model.fragments[0]
-      @model.remove_fragment(f)
+      frag = @model.fragments[0]
+      @model.remove_fragment(frag)
+      frag
+    end
+    
+    
+    def load(filename)
+      sumErrors = 0
+
+      if not File.exists?filename
+        Bake.formatter.printError("Error: #{filename} does not exist")
+        ExitHelper.exit(1) 
+      end
+      
+      frag = nil
+      if not Bake.options.nocache
+        frag = load_internal(filename) # regular load
+        frag = nil if frag.root_elements.length > 0 and filename != frag.root_elements[0].file_name
+      end
+      
+      if frag.nil?
+        def @DumpFileCache.load(fragment)
+          :invalid
+        end
+        frag = load_internal(filename, !Bake.options.nocache)
+      end
     
-      f.data[:problems].each do |p|
+      frag.data[:problems].each do |p|
         Bake.formatter.printError(p.message, p.file, p.line)
       end
       
-      if f.data[:problems].length > 0
+      if frag.data[:problems].length > 0
         ExitHelper.exit(1) 
       end
       
-      return f
+      return frag
     
     end
   

data/lib/bake/options/options.rb

@@ -6,6 +6,7 @@ require 'bake/options/showLicense'
 require 'bake/options/showDoc'
 require 'bake/options/usage'
 require 'bake/options/create'
+require 'bake/bundle'
 
 module Bake
 
@@ -18,7 +19,7 @@ module Bake
     
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain
-    attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename # String
+    attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename, :bundleDir # String
     attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro # Boolean
     attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
@@ -67,6 +68,7 @@ module Bake
       @def_roots = []
       @main_project_name = ""
       @adapt = []
+      @bundleDir = nil
       
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
@@ -101,13 +103,14 @@ module Bake
         
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
       add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
-      add_option(["--threads"                                    ], lambda { |x| set_threads(x)                          })
+      add_option(["-j",                   "--threads"            ], lambda { |x| set_threads(x)                          })
       add_option(["--socket"                                     ], lambda { |x| @socket = String === x ? x.to_i : x     })
       add_option(["--toolchain-info",     "--toolchain_info"     ], lambda { |x| ToolchainInfo.showToolchain(x)          })
       add_option(["--toolchain-names",    "--toolchain_names"    ], lambda {     ToolchainInfo.showToolchainList         })
       add_option(["--do",                 "--include_filter"     ], lambda { |x| @include_filter << x                    })
       add_option(["--omit",               "--exclude_filter"     ], lambda { |x| @exclude_filter << x                    })
       add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @consoleOutput_fullnames = true         })
+      add_option(["--bundle"                                     ], lambda { |x| set_bundle_dir(x)                       })
                                                                  
       add_option(["-h",                   "--help"               ], lambda {     Bake::Usage.show                        })
 
@@ -128,6 +131,7 @@ module Bake
     end
 
     def parse_options()
+      Bake::Bundle.instance.cleanup()
       parse_internal(false)
       set_main_dir(Dir.pwd) if @main_dir.nil?
       @roots = @def_roots if @roots.length == 0
@@ -232,6 +236,12 @@ module Bake
       @def_roots = calc_def_roots(@main_dir)
     end
     
+    def set_bundle_dir(dir)
+      d = File.expand_path(dir.gsub(/[\\]/,'/'))
+      Bake::Bundle.instance.setOutputDir(d)
+    end
+    
+    
     def set_root(dir)
       check_valid_dir(dir)
       r = File.expand_path(dir.gsub(/[\\]/,'/'))

data/lib/bake/options/usage.rb

@@ -26,7 +26,7 @@ module Bake
       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 " -j <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."
@@ -40,6 +40,7 @@ module Bake
       puts " --adapt <name>           Specifies an adapt project to manipulate the configs (can be used multiple times)"
       puts " --incs-and-defs          Used by IDEs plugins"
       puts " --conversion-info        Prints infos for an external tool which converts bake configs for other build systems"
+      puts " --bundle <dir>           Bundles the output (experimental, description will follow)"
       puts " --writeCC2J <name>       Writes compiler command into a json file (experimental!)"
       puts " --create exe|lib|custom  Creates a project with exe, lib or custom template"
       puts ""

data/lib/blocks/blockBase.rb

@@ -1,3 +1,5 @@
+require 'bake/bundle'
+
 module Bake
   module Blocks
     
@@ -89,11 +91,15 @@ module Bake
         end
       end
       
+      def isMainProject?
+        @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 @projectName == Bake.options.main_project_name and @config.name == Bake.options.build_config 
+        elsif isMainProject?
           @output_dir = "build_" + Bake.options.build_config
         else
           @output_dir = "build_" + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config

data/lib/blocks/compile.rb

@@ -103,7 +103,7 @@ module Bake
                 
       def compileFile(source)
         type = get_source_type(source)
-        return true if type.nil?
+        return if type.nil?
         
         object = @object_files[source]
         
@@ -113,14 +113,12 @@ module Bake
         cmdLineCheck = false
         cmdLineFile = calcCmdlineFile(object)
 
-        return true if ignore?(type)
+        return if ignore?(type)
         reason = needed?(source, object, type, dep_filename_conv)
         if not reason
           cmdLineCheck = true
-          # currently this returns always != nil
           reason = config_changed?(cmdLineFile)
         end
-        return true unless reason
 
         if @fileTcs.include?(source)
           compiler = @fileTcs[source][:COMPILER][type]
@@ -181,20 +179,23 @@ module Bake
           Blocks::CC2J << { :directory => @projectDir, :command => cmd, :file => source }
         end
         
-        return true if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+        if not (cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile))
+          BlockBase.prepareOutput(object)
+          BlockBase.writeCmdLineFile(cmd, cmdLineFile)
+          success, consoleOutput = ProcessHelper.run(cmd, false, false)
+          
+          outputType = Bake.options.analyze ? "Analyzing" : (Bake.options.prepro ? "Preprocessing" : "Compiling")
+          incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "#{outputType} #{source}", reason, success)
+     
+          if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
+            incList = Compile.read_depfile(dep_filename, @projectDir, @tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
+            Compile.write_depfile(incList, dep_filename_conv) 
+          end
+          check_config_file
+        end
         
-        BlockBase.prepareOutput(object)
-        BlockBase.writeCmdLineFile(cmd, cmdLineFile)
-        success, consoleOutput = ProcessHelper.run(cmd, false, false)
+        Bake::Bundle.instance.addSource(source, @include_list, dep_filename_conv) if isMainProject?
         
-        outputType = Bake.options.analyze ? "Analyzing" : (Bake.options.prepro ? "Preprocessing" : "Compiling")
-        incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "#{outputType} #{source}", reason, success)
-   
-        if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
-          incList = Compile.read_depfile(dep_filename, @projectDir, @tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
-          Compile.write_depfile(incList, dep_filename_conv) 
-        end
-        check_config_file
       end
 
       def self.read_depfile(dep_filename, projDir, singeLine)