bake-toolkit 2.20.4 → 2.21.0

data/lib/bake/bundle.rb

@@ -1,159 +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
-
+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/cache.rb

@@ -1,180 +1,179 @@
-require 'common/exit_helper'
-require 'bake/toolchain/colorizing_formatter'
-require 'common/options/parser'
-require 'common/version'
-require 'adapt/config/loader'
-
-module Bake
-
-  class Cache
-    attr_accessor :referencedConfigs
-    attr_accessor :files # project_files
-    attr_accessor :cache_file
-    attr_accessor :version
-    attr_accessor :workspace_roots
-    attr_accessor :include_filter
-    attr_accessor :exclude_filter
-    attr_accessor :no_autodir
-    attr_accessor :build_config
-    attr_accessor :adapt_filenames
-  end
-  
-  class CacheAccess
-      attr_reader :cacheFilename
-  
-      def initialize()
-        if Bake.options.build_config == ""
-          @cacheFilename = Bake.options.main_dir+"/.bake/Default.Project.meta.cache"
-        else
-          @cacheFilename = Bake.options.main_dir+"/.bake/Project.meta." + sanitize_filename(Bake.options.build_config) + ".cache"
-        end
-        
-        FileUtils.mkdir_p(File.dirname(@cacheFilename))
-      end
-      
-      def load_cache
-        cache = nil
-        begin
-          allFiles = Dir.glob(File.dirname(@cacheFilename)+"/*.cache")
-          if allFiles.include?(@cacheFilename)
-            cacheTime = File.mtime(@cacheFilename)
-            contents = File.open(@cacheFilename, "rb") {|io| io.read }
-            cache = Marshal.load(contents)
-            
-            if cache.version != Version.number
-              Bake.formatter.printInfo("Info: cache version ("+cache.version+") does not match to bake version ("+Version.number+"), reloading meta information")
-              cache = nil
-            end
-              
-            if cache != nil
-              if cache.cache_file != @cacheFilename
-                Bake.formatter.printInfo("Info: cache filename changed, reloading meta information")
-                cache = nil
-              end
-            end
-            
-            if cache != nil
-              cache.files.each do |c|
-                if (not File.exists?(c))
-                  Bake.options.nocache = true
-                  Bake.formatter.printInfo("Info: cached meta file #{c} renamed or deleted, reloading meta information")
-                  cache = nil
-                  break
-                end
-              end
-            end
-            
-            if cache != nil
-              cache.referencedConfigs.each do |pname,configs|
-                configs.each do |config|
-                  if not File.exists?(config.file_name)
-                    Bake.options.nocache = true
-                    Bake.formatter.printInfo("Info: cached meta file #{config.file_name} renamed or deleted, reloading meta information")
-                    cache = nil
-                  end
-                end
-              end  
-            end
-              
-            if cache != nil
-              cache.files.each do |c|
-                if File.mtime(c) > cacheTime + 1
-                  Bake.formatter.printInfo("Info: #{c} has been changed, reloading meta information")
-                  cache = nil
-                  break
-                end
-              end
-            end
-            
-            if (cache != nil)
-              if (not AdaptConfig.filenames.eql?(cache.adapt_filenames))
-                Bake.formatter.printInfo("Info: adapt config filenames have been changed, reloading meta information")
-                cache = nil
-              end
-            end
-            
-            if (cache != nil and not AdaptConfig.filenames.empty?)
-              AdaptConfig.filenames.each do |f|
-                adaptTime = File.mtime(f)
-                if adaptTime > cacheTime + 1
-                  Bake.formatter.printInfo("Info: #{f} has been changed, reloading meta information")
-                  cache = nil
-                end
-              end
-            end            
-
-            if cache != nil
-              if cache.workspace_roots.length == Bake.options.roots.length
-                cache.workspace_roots.each do |r|
-                  if not Bake.options.roots.include?r
-                    cache = nil
-                    break
-                  end
-                end  
-              else
-                cache = nil
-              end
-              Bake.formatter.printInfo("Info: specified roots differ from cached roots, reloading meta information") if cache.nil?
-            end
-            
-            if cache != nil
-              if (not Bake.options.include_filter.eql?(cache.include_filter)) or (not Bake.options.exclude_filter.eql?(cache.exclude_filter))
-                cache = nil
-                Bake.formatter.printInfo("Info: specified filters differ from cached filters, reloading meta information")
-              end
-            end 
-            
-            if cache != nil
-              if (not Bake.options.no_autodir.eql?(cache.no_autodir))
-                cache = nil
-                Bake.formatter.printInfo("Info: no_autodir option differs in cache, reloading meta information")
-              end
-            end
-            
-          else
-            Bake.formatter.printInfo("Info: cache not found, reloading meta information")
-          end
-        rescue Exception => e
-          Bake.formatter.printWarning("Warning: cache file corrupt, reloading meta information (cache might be written by an older bake version)")
-          if Bake.options.debug
-            puts e.message
-            puts e.backtrace
-          end
-          cache = nil
-        end      
-        
-        if cache != nil
-          Bake.formatter.printInfo("Info: cache is up-to-date, loading cached meta information") if Bake.options.verbose >= 3
-          Bake.options.build_config = cache.build_config if Bake.options.build_config == ""
-          return cache.referencedConfigs
-        end
-
-        return nil
-      end
-      
-      def write_cache(project_files, referencedConfigs)
-        cache = Cache.new
-        cache.referencedConfigs = referencedConfigs
-        cache.files = project_files
-        cache.cache_file = @cacheFilename
-        cache.version = Version.number
-        cache.include_filter = Bake.options.include_filter
-        cache.no_autodir = Bake.options.no_autodir
-        cache.exclude_filter = Bake.options.exclude_filter
-        cache.workspace_roots = Bake.options.roots
-        cache.build_config = Bake.options.build_config
-        cache.adapt_filenames = AdaptConfig.filenames
-        bbdump = Marshal.dump(cache)
-        begin
-          File.delete(@cacheFilename)
-        rescue
-        end
-        File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
-        Bake.options.nocache = false
-      end
-      
-  end
-  
- 
-end
-  
+require 'common/exit_helper'
+require 'bake/toolchain/colorizing_formatter'
+require 'common/options/parser'
+require 'common/version'
+require 'adapt/config/loader'
+
+module Bake
+
+  class Cache
+    attr_accessor :referencedConfigs
+    attr_accessor :files # project_files
+    attr_accessor :cache_file
+    attr_accessor :version
+    attr_accessor :workspace_roots
+    attr_accessor :include_filter
+    attr_accessor :exclude_filter
+    attr_accessor :no_autodir
+    attr_accessor :build_config
+    attr_accessor :adapt_filenames
+  end
+
+  class CacheAccess
+      attr_reader :cacheFilename
+
+      def initialize()
+        if Bake.options.build_config == ""
+          @cacheFilename = Bake.options.main_dir+"/.bake/Default.Project.meta.cache"
+        else
+          @cacheFilename = Bake.options.main_dir+"/.bake/Project.meta." + sanitize_filename(Bake.options.build_config) + ".cache"
+        end
+
+        FileUtils.mkdir_p(File.dirname(@cacheFilename))
+      end
+
+      def load_cache
+        cache = nil
+        begin
+          allFiles = Dir.glob(File.dirname(@cacheFilename)+"/*.cache")
+          if allFiles.include?(@cacheFilename)
+            cacheTime = File.mtime(@cacheFilename)
+            contents = File.open(@cacheFilename, "rb") {|io| io.read }
+            cache = Marshal.load(contents)
+
+            if cache.version != Version.number
+              Bake.formatter.printInfo("Info: cache version ("+cache.version+") does not match to bake version ("+Version.number+"), reloading meta information")
+              cache = nil
+            end
+
+            if cache != nil
+              if cache.cache_file != @cacheFilename
+                Bake.formatter.printInfo("Info: cache filename changed, reloading meta information")
+                cache = nil
+              end
+            end
+
+            if cache != nil
+              cache.files.each do |c|
+                if (not File.exists?(c))
+                  Bake.options.nocache = true
+                  Bake.formatter.printInfo("Info: cached meta file #{c} renamed or deleted, reloading meta information")
+                  cache = nil
+                  break
+                end
+              end
+            end
+
+            if cache != nil
+              cache.referencedConfigs.each do |pname,configs|
+                configs.each do |config|
+                  if not File.exists?(config.file_name)
+                    Bake.options.nocache = true
+                    Bake.formatter.printInfo("Info: cached meta file #{config.file_name} renamed or deleted, reloading meta information")
+                    cache = nil
+                  end
+                end
+              end
+            end
+
+            if cache != nil
+              cache.files.each do |c|
+                if File.mtime(c) > cacheTime + 1
+                  Bake.formatter.printInfo("Info: #{c} has been changed, reloading meta information")
+                  cache = nil
+                  break
+                end
+              end
+            end
+
+            if (cache != nil)
+              if (not AdaptConfig.filenames.eql?(cache.adapt_filenames))
+                Bake.formatter.printInfo("Info: adapt config filenames have been changed, reloading meta information")
+                cache = nil
+              end
+            end
+
+            if (cache != nil and not AdaptConfig.filenames.empty?)
+              AdaptConfig.filenames.each do |f|
+                adaptTime = File.mtime(f)
+                if adaptTime > cacheTime + 1
+                  Bake.formatter.printInfo("Info: #{f} has been changed, reloading meta information")
+                  cache = nil
+                end
+              end
+            end
+
+            if cache != nil
+              if cache.workspace_roots.length == Bake.options.roots.length
+                cache.workspace_roots.each do |r|
+                  if not Bake.options.roots.include?r
+                    cache = nil
+                    break
+                  end
+                end
+              else
+                cache = nil
+              end
+              Bake.formatter.printInfo("Info: specified roots differ from cached roots, reloading meta information") if cache.nil?
+            end
+
+            if cache != nil
+              if (not Bake.options.include_filter.eql?(cache.include_filter)) or (not Bake.options.exclude_filter.eql?(cache.exclude_filter))
+                cache = nil
+                Bake.formatter.printInfo("Info: specified filters differ from cached filters, reloading meta information")
+              end
+            end
+
+            if cache != nil
+              if (not Bake.options.no_autodir.eql?(cache.no_autodir))
+                cache = nil
+                Bake.formatter.printInfo("Info: no_autodir option differs in cache, reloading meta information")
+              end
+            end
+
+          else
+            Bake.formatter.printInfo("Info: cache not found, reloading meta information")
+          end
+        rescue Exception => e
+          Bake.formatter.printWarning("Warning: cache file corrupt, reloading meta information (cache might be written by an older bake version)")
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+          cache = nil
+        end
+
+        if cache != nil
+          Bake.formatter.printInfo("Info: cache is up-to-date, loading cached meta information") if Bake.options.verbose >= 3
+          Bake.options.build_config = cache.build_config if Bake.options.build_config == ""
+          return cache.referencedConfigs
+        end
+
+        return nil
+      end
+
+      def write_cache(project_files, referencedConfigs)
+        cache = Cache.new
+        cache.referencedConfigs = referencedConfigs
+        cache.files = project_files
+        cache.cache_file = @cacheFilename
+        cache.version = Version.number
+        cache.include_filter = Bake.options.include_filter
+        cache.no_autodir = Bake.options.no_autodir
+        cache.exclude_filter = Bake.options.exclude_filter
+        cache.workspace_roots = Bake.options.roots
+        cache.build_config = Bake.options.build_config
+        cache.adapt_filenames = AdaptConfig.filenames
+        bbdump = Marshal.dump(cache)
+        begin
+          File.delete(@cacheFilename)
+        rescue
+        end
+        File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
+        Bake.options.nocache = false
+      end
+
+  end
+
+
+end