bake-toolkit 1.0.9 → 1.0.10

data/lib/bake/cache.rb

@@ -15,6 +15,7 @@ module Cxxproject
     attr_accessor :exclude_filter
     attr_accessor :defaultToolchain
     attr_accessor :defaultToolchainTime
+    attr_accessor :no_autodir
   end
   
   class CacheAccess
@@ -107,6 +108,13 @@ module Cxxproject
               end
             end 
             
+            if cache != nil
+              if (not @options.no_autodir.eql?(cache.no_autodir))
+                cache = nil
+                Printer.printInfo "Info: no_autodir option differs in cache, reloading meta information"
+              end
+            end             
+            
           else
             Printer.printInfo("Info: cache not found, reloading meta information")
           end
@@ -133,6 +141,7 @@ module Cxxproject
         cache.cache_file = @cacheFilename
         cache.version = Version.bake
         cache.include_filter = @options.include_filter
+        cache.no_autodir = @options.no_autodir
         cache.exclude_filter = @options.exclude_filter
         cache.workspace_roots = @options.roots
         cache.defaultToolchain = defaultToolchain

data/lib/bake/model/metamodel.rb

@@ -121,7 +121,7 @@ module Cxxproject
         has_attr 'lib', String, :defaultValueLiteral => ""
         has_attr 'target', String, :defaultValueLiteral => ""
         has_attr 'pathTo', String, :defaultValueLiteral => ""
-        has_attr 'flags', String, :defaultValueLiteral => ""
+        contains_many 'flags', Flags, 'parent'
       end
 
       class CommandLine < Step

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 # Boolean
+    attr_reader :clean, :rebuild, :single, :verbose, :nocache, :color, :show_includes, :linkOnly, :check_uninc, :printLess, :no_autodir # Boolean
     attr_reader :threads, :socket # Fixnum
 
     def initialize(argv)
@@ -28,6 +28,7 @@ module Cxxproject
       @show_includes = false
       @linkOnly = false
       @printLess = false
+      @no_autodir = false
       @threads = 8
       @roots = []
       @socket = 0
@@ -37,6 +38,8 @@ module Cxxproject
       @eclipse_version = ""
       @alias_filename = ""
       
+      add_default(Proc.new{ |x| set_build_config_default(x) })
+      
       add_option(Option.new("-m",true)                     { |x| set_main_dir(x)            })
       add_option(Option.new("-b",true)                     { |x| set_build_config(x)        })
       add_option(Option.new("-p",true)                     { |x| set_project(x); set_single })
@@ -48,6 +51,7 @@ module Cxxproject
       add_option(Option.new("--rebuild",false)             {     set_rebuild                })
       add_option(Option.new("--prepro",false)              {     set_prepro                 })
       add_option(Option.new("--link_only",false)           {     set_linkOnly               })
+      add_option(Option.new("--no_autodir",false)          {     set_no_autodir             })
       
       add_option(Option.new("-v0",false)                   {     set_v(0)                   })
       add_option(Option.new("-v1",false)                   {     set_v(1)                   })
@@ -57,7 +61,7 @@ module Cxxproject
       add_option(Option.new("--threads",true)              { |x| set_threads(x)             })
       add_option(Option.new("--socket",true)               { |x| set_socket(x)              })
       add_option(Option.new("--toolchain_info",true)       { |x| print_toolchain(x)         })
-      add_option(Option.new("--available_toolchain",false) {     print_toolchains           })
+      add_option(Option.new("--toolchain_names",false)     {     print_toolchains           })
       add_option(Option.new("--include_filter",true)       { |x| set_include_filter(x)      })
       add_option(Option.new("--exclude_filter",true)       { |x| set_exclude_filter(x)      })
       add_option(Option.new("--show_abs_paths",false)      {     set_show_fullnames         })
@@ -74,8 +78,8 @@ module Cxxproject
 
     def usage
       puts "\nUsage: bake [options]"
+      puts " [-b] <name>              Config name of main project"
       puts " -m <dir>                 Directory of main project (default is current directory)."
-      puts " -b <name>                Config name of main project"
       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."
@@ -99,6 +103,7 @@ module Cxxproject
       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 ""
       puts " -h, --help               Print this help."
       puts " --show_license           Print the license."      
@@ -143,7 +148,18 @@ module Cxxproject
       @exclude_filter << x
     end
     
+    def set_build_config_default(config)
+      index = config.index('-')
+      return false if (index != nil and index == 0) 
+      set_build_config(config)
+      return true
+    end
+
     def set_build_config(config)
+      if not @build_config.empty?
+        Printer.printError "Error: Cannot set build config '#{config}', because build config is already set to '#{@build_config}'"
+        ExitHelper.exit(1)
+      end
       @build_config = config
     end
     
@@ -184,6 +200,10 @@ module Cxxproject
       @linkOnly = true
       set_single()
     end
+    
+    def set_no_autodir()
+      @no_autodir = true
+    end    
 
     def set_v(num)
       if num == 0
@@ -198,14 +218,6 @@ module Cxxproject
       end
     end
         
-    def set_printLess()
-      @printLess = true
-    end    
-    def set_verbose()
-      @verbose = true
-    end
-    
-    
     def set_color(x)
       if (x != "black" and x != "white")
         Printer.printError "Error: color scheme must be 'black' or 'white'"

data/lib/bake/version.rb

@@ -1,11 +1,11 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.0.9"
+      "1.0.10"
     end
   end
     
-  expectedCxx = "0.5.61"
+  expectedCxx = "0.5.62"
   expectedRGen = "0.6.0"
   expectedRText = "0.2.0"
   

data/lib/option/parser.rb

@@ -21,33 +21,41 @@ class Parser
   def initialize(argv)
     @options = {}
     @argv = argv
+    @default = nil
   end
   
   def add_option(opt)
     @options[opt.param] = opt
   end
   
+  def add_default(opt)
+    @default = opt
+  end
+  
   def parse_internal(ignoreInvalid = true)
     pos = 0
     begin
       while pos < @argv.length do
         if not @options.include?@argv[pos]
-          if ignoreInvalid
-            pos = pos + 1
-            next
+          if @default
+            if not @default.call(@argv[pos])
+              raise "Option #{@argv[pos]} unknown"
+            end
+          elsif not ignoreInvalid 
+            raise "Option #{@argv[pos]} unknown"
           end
-          raise "Option #{@argv[pos]} unknown"
-        end
-        option = @options[@argv[pos]]
-        if option.arg
-          if pos+1 < @argv.length and @argv[pos+1][0] != "-"
-            option.block.call(@argv[pos+1])
-            pos = pos + 1
+        else
+          option = @options[@argv[pos]]
+          if option.arg
+            if pos+1 < @argv.length and @argv[pos+1][0] != "-"
+              option.block.call(@argv[pos+1])
+              pos = pos + 1
+            else
+              raise "Argument for option #{@argv[pos]} missing" 
+            end
           else
-            raise "Argument for option #{@argv[pos]} missing" 
+            option.block.call()
           end
-        else
-          option.block.call()
         end
         pos = pos + 1
       end

data/lib/tocxx.rb

@@ -81,7 +81,7 @@ module Cxxproject
     end
 
     # PRE and POST CONDITIONS
-    def addSteps(steps, bbModule, projDir, globalFilterStr = nil)
+    def addSteps(steps, bbModule, projDir, globalFilterStr, tcs)
       if steps
         array = (Metamodel::Step === steps ? [steps] : steps.step)
         array.reverse.each do |m|
@@ -131,7 +131,8 @@ module Cxxproject
               bb.set_path_to(pathHash)
               bb.pre_step = true if globalFilterStr
             end 
-            bb.set_flags(m.flags)
+            bb.set_flags(adjustFlags(tcs[:MAKE][:FLAGS],m.flags)) if m.flags
+            
             @lib_elements[m.line_number] = [HasLibraries::LIB_WITH_PATH, m.lib] if m.lib != ""
           elsif Cxxproject::Metamodel::CommandLine === m
             nameOfBB = m.name
@@ -154,6 +155,8 @@ module Cxxproject
       projDir = config.parent.get_project_dir
     
       d = dir.respond_to?("name") ? dir.name : dir
+      return d if @options.no_autodir
+      
       inc = d.split("/")
       if (inc[0] == projName)
         res = inc[1..-1].join("/") # within self
@@ -178,7 +181,7 @@ module Cxxproject
             end
           end
         else
-          Printer.printInfo "Info: #{projName} uses \"..\" in path name #{d}"
+          Printer.printInfo "Info: #{projName} uses \"..\" in path name #{d}" if @options.verbose
         end
         
         res = d # relative from self as last resort
@@ -358,7 +361,15 @@ module Cxxproject
         bbModule = ModuleBuildingBlock.new("Project "+projName)
         bbModule.contents = []
         
-        addSteps(config.postSteps, bbModule, projDir, "POST") if not @options.linkOnly
+        tcs = nil
+        if not Metamodel::CustomConfig === config
+          tcs = Utils.deep_copy(@defaultToolchain)
+          integrateToolchain(tcs, config.toolchain)
+        else
+          tcs = Utils.deep_copy(Cxxproject::Toolchain::Provider.default)
+        end          
+          
+        addSteps(config.postSteps, bbModule, projDir, "POST", tcs) if not @options.linkOnly
 
         # LIB, EXE
         if Metamodel::LibraryConfig === config
@@ -380,7 +391,7 @@ module Cxxproject
               Printer.printError "Error: #{config.file_name}(#{config.step.line_number}): attribute default not allowed here"
               ExitHelper.exit(1)
             end
-            addSteps(config.step, bbModule, projDir)
+            addSteps(config.step, bbModule, projDir, nil, tcs)
           end 
           bbModule.main_content = BinaryLibrary.new(projName, false)
         end
@@ -389,17 +400,7 @@ module Cxxproject
         bbModule.contents << bbModule.main_content
         
         # PRE CONDITIONS
-        addSteps(config.preSteps, bbModule, projDir, "PRE") if not @options.linkOnly       
-        
-        
-        tcs = nil
-        if not Metamodel::CustomConfig === config
-          tcs = Utils.deep_copy(@defaultToolchain)
-          integrateToolchain(tcs, config.toolchain)
-        else
-          tcs = Utils.deep_copy(Cxxproject::Toolchain::Provider.default)
-        end
-        
+        addSteps(config.preSteps, bbModule, projDir, "PRE", tcs) if not @options.linkOnly       
         
         ([bbModule] + bbModule.contents).each do |c|
           c.set_tcs(tcs)

metadata

@@ -2,7 +2,7 @@
 name: bake-toolkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors: 
 - Alexander Schaal
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-22 00:00:00 Z
+date: 2013-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cxxproject
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.61
+        version: 0.5.62
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency