bake-toolkit 2.13.1 → 2.14.0

data/lib/bake/model/language.rb

@@ -7,8 +7,8 @@ require 'rtext/language'
 module Bake
 
   class Idp
-    def call(e,unused)
-      e.respond_to?(:ident) ? e.ident() : nil # IdentifierProvider.qualified_name(e)
+    def call(e,notUsed1,notUsed2,notUsed3)
+      e.respond_to?(:ident) ? e.ident() : nil
     end
   end
 
@@ -29,8 +29,6 @@ module Bake
         ["str"]
       elsif c.name == "Flags" or c.name == "LibPostfixFlags" or c.name == "LibPrefixFlags"
         ["overwrite"]
-      elsif c.name == "UserLibrary"
-        ["lib"]
       elsif c.name == "DefaultToolchain"
         ["basedOn"]
       elsif c.name == "Description"

data/lib/bake/model/metamodel.rb

@@ -12,9 +12,16 @@ module Bake
         annotation :details => {'internal' => 'true'}
       end
       module ClassModule
-        attr_accessor :fragment_ref
+        def fragment_ref=(fref)
+          @fname = fref.fragment.location
+        end
+        
         def file_name
-          @fragment_ref.fragment.location
+          @fname
+        end
+
+        def file_name=(name)
+          @fname = name
         end
       end
     end
@@ -132,15 +139,27 @@ module Bake
         has_attr 'inherit', Boolean, :defaultValueLiteral => "false"
       end
 
-      class ExternalLibrary < ModelElement
+      class LibStuff < ModelElement
+      end
+      
+      class ExternalLibrary < LibStuff
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'search', Boolean, :defaultValueLiteral => "true"
       end
 
-      class ExternalLibrarySearchPath < ModelElement
+      class ExternalLibrarySearchPath < LibStuff
         has_attr 'name', String, :defaultValueLiteral => ""
       end
 
+      class UserLibrary < LibStuff
+        has_attr 'name', String, :defaultValueLiteral => ""
+      end
+      
+      class Dependency < LibStuff
+        has_attr 'name', String, :defaultValueLiteral => ""
+        has_attr 'config', String, :defaultValueLiteral => ""
+      end
+    
       class Step < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'default', String, :defaultValueLiteral => "on"
@@ -174,10 +193,6 @@ module Bake
         contains_many 'step', Step, 'parent'
       end
       
-      class UserLibrary < ModelElement
-        has_attr 'lib', String, :defaultValueLiteral => ""
-      end
-
       class LinkerScript < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
@@ -200,17 +215,18 @@ module Bake
       class BaseConfig_INTERNAL < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'extends', String, :defaultValueLiteral => ""
+        has_attr 'type', String, :defaultValueLiteral => ""
+        has_attr 'project', String, :defaultValueLiteral => ""
         contains_one 'description', Description, 'parent'
         contains_one 'startupSteps', StartupSteps, 'parent'
         contains_one 'preSteps', PreSteps, 'parent'
         contains_one 'postSteps', PostSteps, 'parent'
         contains_one 'exitSteps', ExitSteps, 'parent'
-        contains_many 'userLibrary', UserLibrary, 'parent'
-        contains_many 'exLib', ExternalLibrary, 'parent'
-        contains_many 'exLibSearchPath', ExternalLibrarySearchPath, 'parent'
+        contains_many 'libStuff', LibStuff, 'parent'
         contains_one 'defaultToolchain', DefaultToolchain, 'parent'
         contains_one 'toolchain', Toolchain, 'parent'
         contains_many 'set', Set, 'parent'
+        contains_many 'includeDir', IncludeDir, 'parent'
         
         module ClassModule
           def ident
@@ -224,7 +240,6 @@ module Bake
       class BuildConfig_INTERNAL < BaseConfig_INTERNAL
         contains_many 'files', Files, 'parent'
         contains_many 'excludeFiles', ExcludeFiles, 'parent'
-        contains_many 'includeDir', IncludeDir, 'parent'
       end      
       
       class ExecutableConfig < BuildConfig_INTERNAL
@@ -257,13 +272,10 @@ module Bake
                 
       end
 
-      class Dependency < ModelElement
-        has_attr 'name', String, :defaultValueLiteral => ""
-        has_attr 'config', String, :defaultValueLiteral => ""
-      end
-
-      BaseConfig_INTERNAL.contains_many 'dependency', Dependency, 'parent'
-
+     class Adapt < ModelElement
+       contains_many 'config', BaseConfig_INTERNAL, 'parent'
+     end
+      
   end
 
 end

data/lib/bake/model/metamodel_ext.rb

@@ -14,7 +14,10 @@ module Bake
         def qname
           @qname ||= parent.name + "," + name
         end
+        def dependency
+          libStuff.find_all { |l| Dependency === l }
+        end
       end      
-
+      
   end
 end

data/lib/bake/options/options.rb

@@ -19,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 :roots, :include_filter, :exclude_filter # String List
+    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
     attr_reader :vars # map
@@ -66,6 +66,7 @@ module Bake
       @exclude_filter = []
       @def_roots = []
       @main_project_name = ""
+      @adapt = []
       
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
@@ -84,10 +85,12 @@ module Bake
       add_option(["--lint-max",           "--lint_max"           ], lambda { |x| @lint_max = String === x ? x.to_i : x   })
                                                                                                                          
       add_option(["--create"                                     ], lambda { |x| Bake::Create.proj(x)                    })     
-      add_option(["--conversion-info",    "--conversion_info"    ], lambda { @conversion_info = true                     }) 
+      add_option(["--conversion-info",    "--conversion_info"    ], lambda {     @conversion_info = true                 }) 
                                                                                                                          
       add_option(["--generate-doc",       "--docu"               ], lambda {     @docu = true                            })
-                                                                                                                         
+             
+      add_option(["--adapt"                                      ], lambda { |x| set_adapt(x)                            })     
+                                                                                                                    
       add_option(["-v0"                                          ], lambda {     @verbose = 0                            })
       add_option(["-v1"                                          ], lambda {     @verbose = 1                            })
       add_option(["-v2"                                          ], lambda {     @verbose = 2                            })
@@ -128,6 +131,8 @@ module Bake
       parse_internal()
       set_main_dir(Dir.pwd) if @main_dir.nil?
       @roots = @def_roots if @roots.length == 0
+      @roots.uniq!
+      @adapt.uniq!
       
       if @project
         if @project.split(',').length > 2
@@ -232,6 +237,10 @@ module Bake
       r = File.expand_path(dir.gsub(/[\\]/,'/'))
       @roots << r if not @roots.include?r
     end
+    
+    def set_adapt(name)
+      @adapt << name if not @adapt.include?name
+    end
         
     def set_threads(num)
       @threads = String === num ? num.to_i : num

data/lib/bake/options/usage.rb

@@ -37,6 +37,7 @@ module Bake
       puts " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
       puts " --no-autodir             Disable auto completion of paths like in IncludeDir"
       puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."
+      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 " --writeCC2J <name>       Writes compiler command into a json file (experimental!)"

data/lib/blocks/block.rb

@@ -70,10 +70,6 @@ module Bake
         @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

data/lib/blocks/blockBase.rb

@@ -4,6 +4,7 @@ module Bake
     class BlockBase
 
       attr_reader :tcs
+      attr_reader :projectDir
       
       def initialize(block, config, referencedConfigs, tcs)
         @block = block
@@ -56,7 +57,7 @@ module Bake
         cmdTime = File.mtime(cmdLineFile)
         return "because config file has been changed" if cmdTime < File.mtime(@config.file_name)
         return "because DefaultToolchain has been changed" if cmdTime < defaultToolchainTime
-        return "because command line has been changed (IncludeDir inherit/inject, environment variables, ...)"
+        return "because command line has been changed"
       end
       
       def self.isCmdLineEqual?(cmd, cmdLineFile)       

data/lib/blocks/compile.rb

@@ -365,25 +365,25 @@ module Bake
             end
             res.each do |f|
               next if exclude_files.include?(f)
+              next if source_files.include?(f)
               source_files << f
+              @source_files << f
             end
           end
           
           if Bake.options.filename
-            source_files.keep_if do |source|
+            @source_files.keep_if do |source|
               source.include?Bake.options.filename
             end
-            if source_files.length == 0 and cleaning == false
+            if @source_files.length == 0 and cleaning == false
               Bake.formatter.printInfo("#{Bake.options.filename} does not match to any source", @config)
             end
           end
           
-          @source_files = source_files.sort.to_a
-          
           if Bake.options.eclipseOrder # directories reverse order, files in directories in alphabetical order
             dirs = []
             filemap = {}
-            @source_files.reverse.each do |o|
+            @source_files.sort.reverse.each do |o|
               d = File.dirname(o)
               if filemap.include?(d)
                 filemap[d] << o

data/lib/blocks/makefile.rb

@@ -22,7 +22,7 @@ module Bake
         calcCommandLine
         calcCleanLine
 
-        block.lib_elements[config.line_number] = [LibElement.new(LibElement::LIB_WITH_PATH, config.lib)] if config.lib != ""
+        block.lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, config.lib) if config.lib != ""
       end
       
       def calcCommandLine

data/lib/blocks/showIncludes.rb

@@ -21,7 +21,14 @@ module Bake
         Blocks::ALL_COMPILE_BLOCKS.sort.each do |projName, blocks|
           print projName
           incs = []
-          blocks.each { |block| incs += block.include_list }
+          blocks.each do |block|
+            if Bake.options.consoleOutput_fullnames
+              incs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
+            else
+              incs += block.include_list
+            end
+          end
+          
           incs.uniq.each { |inc| print "##{inc}" }
           print "\n"
         end
@@ -92,7 +99,11 @@ module Bake
           blockIncs = []
           blockDefs = {:CPP => [], :C => [], :ASM => []}
           blocks.each do |block|
-            blockIncs += block.include_list 
+            if Bake.options.consoleOutput_fullnames
+              blockIncs += block.include_list.map { |i| File.expand_path(i, block.projectDir)  }
+            else
+              blockIncs += block.include_list
+            end            
             [:CPP, :C, :ASM].each { |type| blockDefs[type] += block.tcs[:COMPILER][type][:DEFINES] }
           end
           

data/lib/common/version.rb

@@ -1,12 +1,12 @@
 module Bake
   class Version
     def self.number
-      "2.13.1"
+      "2.14.0"
     end
   end
     
-  expectedRGen = "0.6.0"
-  expectedRText = "0.2.0"
+  expectedRGen = "0.8.0"
+  expectedRText = "0.8.1"
   
   begin
     gem "rgen", "=#{expectedRGen}"

data/lib/tocxx.rb

@@ -34,6 +34,8 @@ require 'socket'
 require 'blocks/showIncludes'
 require 'common/abortException'
 
+require 'adapt/config/loader'
+
 module Bake
 
   class SystemCommandFailed < Exception
@@ -254,8 +256,11 @@ module Bake
       end      
       
       begin      
+        al = AdaptConfig.new
+        adaptConfigs = al.load()
+        
         @loadedConfig = Config.new
-        @loadedConfig.load
+        @loadedConfig.load(adaptConfigs)
         
         taskType = "Analyzing" if Bake.options.analyze
                   
@@ -267,7 +272,7 @@ module Bake
           basedOn =  @mainConfig.defaultToolchain.basedOn
           basedOnToolchain = Bake::Toolchain::Provider[basedOn]
           if basedOnToolchain.nil?
-            Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", config.defaultToolchain)
+            Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", @mainConfig.defaultToolchain)
             ExitHelper.exit(1)
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/adapt/config/loader.rb
 - lib/bake/cache.rb
+- lib/bake/config/checks.rb
 - lib/bake/config/loader.rb
 - lib/bake/libElement.rb
 - lib/bake/mergeConfig.rb
@@ -217,6 +219,7 @@ files:
 - documentation/_build/html/_sources/license.txt
 - documentation/_build/html/_sources/performance/performance.txt
 - documentation/_build/html/_sources/quickstart/quickstart.txt
+- documentation/_build/html/_sources/syntax/adapt_configs.txt
 - documentation/_build/html/_sources/syntax/derive_configs.txt
 - documentation/_build/html/_sources/syntax/project_meta_syntax.txt
 - documentation/_build/html/_sources/syntax/syntax.txt
@@ -412,6 +415,7 @@ files:
 - documentation/_build/html/quickstart/quickstart.html
 - documentation/_build/html/search.html
 - documentation/_build/html/searchindex.js
+- documentation/_build/html/syntax/adapt_configs.html
 - documentation/_build/html/syntax/derive_configs.html
 - documentation/_build/html/syntax/project_meta_syntax.html
 - documentation/_build/html/syntax/syntax.html