bake-toolkit 1.0.11 → 1.0.12

data/bin/bakery

@@ -18,32 +18,14 @@ require 'cxxproject/utils/printer'
 require 'tocxx'
 require "bakery/loader"
 require "bakery/options"
+require "bakery/toBake"
+require "bakery/buildPattern"
 require 'cxxproject/ext/stdout'
 require 'cxxproject/utils/cleanup'
 
 module Cxxproject
 
-  class BuildPattern
-    attr_reader :proj, :conf, :coll_p
-    def initialize(proj, conf, coll_p)
-      @proj = proj
-      @conf = conf
-      @coll_p = coll_p
-    end
-    def getId
-      proj + "*******" + conf
-    end
-    def hash
-      getId.hash
-    end
-    def eql?(comparee)
-      self == comparee
-    end
-    def ==(comparee)
-      self.getId == comparee.getId
-    end
-  end
-  
+ 
   @options = BakeryOptions.new(ARGV)
   @options.parse_options
 
@@ -56,7 +38,7 @@ module Cxxproject
   end 
 
   
-  if @options.collection_name.nil?
+  if @options.collection_name.empty? 
     puts "Please specify a collection name (with -b). Possible values are:"      
     env.find(:class => BakeryModel::Collection).each { |e|
       puts "* " + e.name
@@ -64,76 +46,25 @@ module Cxxproject
     ExitHelper.exit(0)
   end
 
-  cols = env.find(:class => BakeryModel::Collection, :name => @options.collection_name)
-  if (cols.length == 0)
-    Printer.printError "Collection #{@options.collection_name} not found in #{@options.collection_dir+"/Collection.meta"}"
-    ExitHelper.exit(1)
-  elsif (cols.length > 1)
-    Printer.printError "Collection #{@options.collection_name} found more than once in #{@options.collection_dir+"/Collection.meta"}"
-    ExitHelper.exit(1)
-  end
 
-  col = cols[0]
-  
-  col.project.each do |p|
-    if p.name == ""
-      Printer.printError "Error in #{@options.collection_dir+"/Collection.meta"} (line #{p.line_number}): Project name empty"
-      ExitHelper.exit(1)
-    end
-    if p.config == ""
-      Printer.printError "Error in #{@options.collection_dir+"/Collection.meta"} (line #{p.line_number}): Config name empty"
-      ExitHelper.exit(1)
-    end
-  end
-  
-  toBuildPattern = []
-  @options.roots.each do |r|
-    col.project.each do |p|
-      projs = Dir.glob(r+"/"+p.name+"/Project.meta")
-      if projs.length == 0
-        toBuildPattern << BuildPattern.new(nil, nil, p) # remember it for sorted info printout
+  def self.getCollections(env, name)
+    cols = env.find(:class => BakeryModel::Collection, :name => name)
+    @toBuild |= getBuildPattern(cols, name)
+    @colsAll |= cols
+    cols[0].collections.each do |cRef|
+      alreadyProcessed = false
+      @colsAll.each do |ca|
+        alreadyProcessed = true if ca.name == cRef.name 
       end
-      projs.each do |f|
-        toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p)
-      end
-    end
-  end
-
-  toBuild = []
-  toBuildPattern.each do |bp|
-    next unless bp.proj
-    contents = File.open(bp.proj, "r") {|io| io.read }
-    contents.split("\n").each do |c|
-      res = c.match("\\s*(Library|Executable|Custom){1}Config\\s*(\\w*)")
-      if res
-        if res[2].match(bp.conf) != nil
-          toBuild << BuildPattern.new(bp.proj, res[2], nil)
-          bp.coll_p.found
-        end
-      end
-    end
-  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
-  end
-  
-  col.exclude.each do |p|
-    p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
-    p.config = "^"+p.config.gsub("*","(\\w*)")+"$"
-  end
-  
-  toBuild.delete_if do |bp|
-    exclude = false
-    col.exclude.each do |p|
-      exclude = true if (bp.proj.match(p.name) != nil and bp.conf.match(p.config) != nil)
+      getCollections(env, cRef.name) unless alreadyProcessed
     end
-    exclude
-  end
+  end  
   
-  toBuild.uniq!
+  @toBuild = []
+  @colsAll = []
+  getCollections(env, @options.collection_name)
   
-  maxRuns = toBuild.length
+  maxRuns = @toBuild.length
   currentRun = 0
   failedRuns = 0
   
@@ -144,7 +75,7 @@ module Cxxproject
       excludeParam = true
       next
     end
-    if excludeParam 
+    if excludeParam or x == @options.collection_name
       excludeParam = false
       next
     end
@@ -161,7 +92,7 @@ module Cxxproject
   
   exitValue = 0
   abort = false
-  toBuild.each do |bp|
+  @toBuild.each do |bp|
     currentRun += 1
     p = File.dirname(bp.proj)
     cmd = (["-m #{p} -b #{bp.conf}"] + passedParams).join(" ")

data/lib/bake/cache.rb

@@ -25,6 +25,9 @@ module Cxxproject
   
       def initialize(pm_filename, config_name, options)
         @cacheFilename = File.dirname(pm_filename)+"/.bake/"+File.basename(pm_filename)+"."+sanitize_filename(config_name)+".cache"
+        
+        CLOBBER.include(File.dirname(pm_filename)+"/.bake")
+          
         FileUtils.mkdir_p(File.dirname(@cacheFilename))
         @options = options
         @defaultToolchain = nil
@@ -128,6 +131,11 @@ module Cxxproject
         
         if cache != nil
           Printer.printInfo "Info: cache is up-to-date, loading cached meta information" if @options.verbose
+          
+          cache.files.each do |c|
+            CLOBBER.include(File.dirname(c)+"/.bake")
+          end          
+          
           return cache.project2config
         end
         return nil
@@ -152,6 +160,11 @@ module Cxxproject
         rescue
         end
         File.open(@cacheFilename, 'wb') {|file| file.write(bbdump) }
+          
+        project_files.each do |f|
+          CLOBBER.include(File.dirname(f)+"/.bake")
+        end
+
       end
       
   end

data/lib/bake/options.rb

@@ -8,7 +8,7 @@ module Cxxproject
   class Options < Parser
     attr_reader :build_config, :main_dir, :project, :filename, :eclipse_version, :alias_filename # String
     attr_reader :roots, :include_filter, :exclude_filter # String List
-    attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir # Boolean
+    attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir, :clobber # Boolean
     attr_reader :threads, :socket # Fixnum
 
     def initialize(argv)
@@ -20,6 +20,7 @@ module Cxxproject
       @filename = nil
       @single = false
       @clean = false
+      @clobber = false
       @rebuild = false
       @verbose = false
       @nocache = false
@@ -57,6 +58,7 @@ module Cxxproject
       add_option(Option.new("-v1",false)                   {     set_v(1)                   })
       add_option(Option.new("-v2",false)                   {     set_v(2)                   })
         
+      add_option(Option.new("--clobber",false)             {     set_clobber                })
       add_option(Option.new("--ignore_cache",false)        {     set_nocache                })
       add_option(Option.new("--threads",true)              { |x| set_threads(x)             })
       add_option(Option.new("--socket",true)               { |x| set_socket(x)              })
@@ -89,9 +91,9 @@ module Cxxproject
       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 " --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 executable - doesn't update objects and archives or start PreSteps and PostSteps"
-      puts " --print_less             Some progression logs will be suppressed"
       puts " --ignore_cache           Rereads the original meta files - usefull if workspace structure has been changed."
       puts " --check_uninc            Checks for unnecessary includes (only done for successful project builds)."
       puts " --threads <num>          Set NUMBER of parallel compiled files (default is 8)."
@@ -183,6 +185,10 @@ module Cxxproject
     def set_clean()
       @clean = true
     end
+    def set_clobber()
+      @clobber = true
+      set_clean
+    end
     def set_rebuild()
       @clean = true
       @rebuild = true
@@ -209,10 +215,13 @@ module Cxxproject
       if num == 0
         @printLess = true
         @verbose = false
+        Rake::application.options.silent = true
       elsif num == 1
+        Rake::application.options.silent = false
         @printLess = false
         @verbose = false
       elsif num == 2
+        Rake::application.options.silent = false
         @printLess = false
         @verbose = true
       end

data/lib/bake/version.rb

@@ -1,11 +1,11 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.0.11"
+      "1.0.12"
     end
   end
     
-  expectedCxx = "0.5.63"
+  expectedCxx = "0.5.64"
   expectedRGen = "0.6.0"
   expectedRText = "0.2.0"
   

data/lib/bakery/buildPattern.rb

@@ -0,0 +1,24 @@
+module Cxxproject
+
+  class BuildPattern
+    attr_reader :proj, :conf, :coll_p
+    def initialize(proj, conf, coll_p)
+      @proj = proj
+      @conf = conf
+      @coll_p = coll_p
+    end
+    def getId
+      proj + "*******" + conf
+    end
+    def hash
+      getId.hash
+    end
+    def eql?(comparee)
+      self == comparee
+    end
+    def ==(comparee)
+      self.getId == comparee.getId
+    end
+  end
+  
+end

data/lib/bakery/model/metamodel.rb

@@ -24,10 +24,14 @@ module Cxxproject
       has_attr 'name', String, :defaultValueLiteral => ""
       has_attr 'config', String, :defaultValueLiteral => ""
     end
+    class SubCollection < ModelElement
+      has_attr 'name', String, :defaultValueLiteral => ""
+    end
     class Collection < ModelElement
       has_attr 'name', String, :defaultValueLiteral => ""
       contains_many 'project', Project, 'collection'
       contains_many 'exclude', Exclude, 'collection'
+      contains_many 'collections', SubCollection, 'collection'
     end
 
     module Project::ClassModule

data/lib/bakery/options.rb

@@ -13,7 +13,7 @@ module Cxxproject
     def initialize(argv)
       super(argv)
       
-      @collection_name = nil
+      @collection_name = ""
       @collection_dir = nil      
       @color = nil
       @error = false
@@ -21,7 +21,9 @@ module Cxxproject
       @socket = 0
       @def_root = nil
             
-      add_option(Option.new("-b",true)        { |x| set_collection_name(x)    })
+      add_default(Proc.new{ |x| set_collection_name_default(x) })
+      
+      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)       {     set_error                 })
       add_option(Option.new("-a",true)        { |x| set_color(x)              })
@@ -31,8 +33,8 @@ module Cxxproject
     end
     
     def usage
-      puts "\nUsage: bake [options]"
-      puts " -b <name>         Name of the collection to build."
+      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'."
@@ -60,7 +62,18 @@ module Cxxproject
       end      
     end    
     
+    def set_collection_name_default(collection_name)
+      index = collection_name.index('-')
+      return false if (index != nil and index == 0) 
+      set_collection_name(collection_name)
+      return true
+    end    
+    
     def set_collection_name(collection_name)
+      if not @collection_name.empty?
+        Printer.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
     

data/lib/bakery/toBake.rb

@@ -0,0 +1,78 @@
+require "bakery/buildPattern"
+
+module Cxxproject
+
+  def self.getBuildPattern(cols, name)
+
+    if (cols.length == 0)
+      Printer.printError "Collection #{name} not found in #{@options.collection_dir+"/Collection.meta"}"
+      ExitHelper.exit(1)
+    elsif (cols.length > 1)
+      Printer.printError "Collection #{name} found more than once in #{@options.collection_dir+"/Collection.meta"}"
+      ExitHelper.exit(1)
+    end
+
+    col = cols[0]
+
+    col.project.each do |p|
+      if p.name == ""
+        Printer.printError "Error in #{@options.collection_dir+"/Collection.meta"} (line #{p.line_number}): Project name empty"
+        ExitHelper.exit(1)
+      end
+      if p.config == ""
+        Printer.printError "Error in #{@options.collection_dir+"/Collection.meta"} (line #{p.line_number}): Config name empty"
+        ExitHelper.exit(1)
+      end
+    end
+
+    toBuildPattern = []
+    @options.roots.each do |r|
+      col.project.each do |p|
+        projs = Dir.glob(r+"/"+p.name+"/Project.meta")
+        if projs.length == 0
+          toBuildPattern << BuildPattern.new(nil, nil, p) # remember it for sorted info printout
+        end
+        projs.each do |f|
+          toBuildPattern << BuildPattern.new(f, "^"+p.config.gsub("*","(\\w*)")+"$", p)
+        end
+      end
+    end
+
+    toBuild = []
+    toBuildPattern.each do |bp|
+      next unless bp.proj
+      contents = File.open(bp.proj, "r") {|io| io.read }
+      contents.split("\n").each do |c|
+        res = c.match("\\s*(Library|Executable|Custom){1}Config\\s*(\\w*)")
+        if res
+          if res[2].match(bp.conf) != nil
+            toBuild << BuildPattern.new(bp.proj, res[2], nil)
+            bp.coll_p.found
+          end
+        end
+      end
+    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
+    end
+
+    col.exclude.each do |p|
+      p.name = "/"+p.name.gsub("*","(\\w*)")+"/Project.meta"
+      p.config = "^"+p.config.gsub("*","(\\w*)")+"$"
+    end
+
+    toBuild.delete_if do |bp|
+      exclude = false
+      col.exclude.each do |p|
+        exclude = true if (bp.proj.match(p.name) != nil and bp.conf.match(p.config) != nil)
+      end
+      exclude
+    end
+
+    toBuild.uniq!
+
+    return toBuild
+  end
+
+end

data/lib/option/parser.rb

@@ -38,11 +38,10 @@ class Parser
       while pos < @argv.length do
         if not @options.include?@argv[pos]
           if @default
-            if not @default.call(@argv[pos])
+            res = @default.call(@argv[pos])
+            if (not res and not ignoreInvalid)
               raise "Option #{@argv[pos]} unknown"
             end
-          elsif not ignoreInvalid 
-            raise "Option #{@argv[pos]} unknown"
           end
         else
           option = @options[@argv[pos]]

data/lib/tocxx.rb

@@ -812,18 +812,24 @@ module Cxxproject
             FileUtils.rm @parseBB.get_dep_file(object), :force => true
           end 
         else
-          cleanTask = Rake.application["clean"]
+          if @options.clobber
+            cleanTask = Rake.application[:clobber]
+            cleanType = "Clobber"
+          else
+            cleanTask = Rake.application[:clean]
+            cleanType = "Clean"
+          end
           cleanTask.invoke
         end
         
         if Rake.application.idei and Rake.application.idei.get_abort
-          Printer.printError "\nClean aborted."
+          Printer.printError "\#{cleanType} aborted."
           return false          
         elsif cleanTask != nil and cleanTask.failure
-          Printer.printError "\nClean failed."
+          Printer.printError "\n#{cleanType} failed."
           return false
         elsif not @options.rebuild
-          Printer.printSuccess "\nClean done."
+          Printer.printSuccess "\n#{cleanType} done."
           return true          
         end
           

metadata

@@ -2,7 +2,7 @@
 name: bake-toolkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors: 
 - Alexander Schaal
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-04 00:00:00 Z
+date: 2013-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cxxproject
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.63
+        version: 0.5.64
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -68,10 +68,12 @@ files:
 - lib/bake/subst.rb
 - lib/bake/util.rb
 - lib/bake/version.rb
+- lib/bakery/buildPattern.rb
 - lib/bakery/loader.rb
 - lib/bakery/model/language.rb
 - lib/bakery/model/metamodel.rb
 - lib/bakery/options.rb
+- lib/bakery/toBake.rb
 - lib/option/parser.rb
 - lib/tocxx.rb
 - lib/vs/options.rb