bake-toolkit 2.19.2 → 2.20.1

data/lib/bake/model/metamodel.rb

@@ -15,7 +15,7 @@ module Bake
         def fragment_ref=(fref)
           @fname = fref.fragment.location
         end
-        
+
         def file_name
           @fname
         end
@@ -50,11 +50,11 @@ module Bake
       class InternalIncludes < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
-      
+
       class InternalDefines < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
-  
+
       class Archiver < ModelElement
         has_attr 'command', String, :defaultValueLiteral => ""
         contains_many 'flags', Flags, 'parent'
@@ -77,12 +77,12 @@ module Bake
 
       class LintPolicy < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
-      end      
-      
+      end
+
       class Docu < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
-      end 
-         
+      end
+
       class DefaultToolchain < ModelElement
         has_attr 'basedOn', String, :defaultValueLiteral => ""
         has_attr 'outputDir', String, :defaultValueLiteral => ""
@@ -103,7 +103,7 @@ module Bake
         contains_many 'lintPolicy', LintPolicy, 'parent'
         contains_one 'docu', Docu, 'parent'
       end
-      
+
       class Person < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'email', String, :defaultValueLiteral => ""
@@ -112,12 +112,12 @@ module Bake
       class Description < ModelElement
         has_attr 'text', String, :defaultValueLiteral => ""
       end
-      
+
       class RequiredBakeVersion < ModelElement
         has_attr 'minimum', String, :defaultValueLiteral => ""
         has_attr 'maximum', String, :defaultValueLiteral => ""
       end
-      
+
       class Responsible < ModelElement
         contains_many "person", Person, 'parent'
       end
@@ -141,7 +141,7 @@ module Bake
 
       class LibStuff < ModelElement
       end
-      
+
       class ExternalLibrary < LibStuff
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'search', Boolean, :defaultValueLiteral => "true"
@@ -154,12 +154,22 @@ module Bake
       class UserLibrary < LibStuff
         has_attr 'name', String, :defaultValueLiteral => ""
       end
-      
+
       class Dependency < LibStuff
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'config', String, :defaultValueLiteral => ""
+        has_attr 'inject', String, :defaultValueLiteral => ""
+      end
+
+      class Except < ModelElement
+        has_attr 'name', String, :defaultValueLiteral => ""
+        has_attr 'config', String, :defaultValueLiteral => ""
+      end
+
+      class Prebuild < ModelElement
+        contains_many 'except', Except, 'parent'
       end
-    
+
       class Step < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'default', String, :defaultValueLiteral => "on"
@@ -188,11 +198,11 @@ module Bake
       class ExitSteps < ModelElement
         contains_many 'step', Step, 'parent'
       end
-      
+
       class StartupSteps < ModelElement
         contains_many 'step', Step, 'parent'
       end
-      
+
       class LinkerScript < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
@@ -200,17 +210,17 @@ module Bake
       class MapFile < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
       end
-      
+
       class ArtifactName < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
-      end 
-      
+      end
+
       class Set < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'value', String, :defaultValueLiteral => ""
         has_attr 'cmd', String, :defaultValueLiteral => ""
         has_attr 'env', Boolean, :defaultValueLiteral => "false"
-      end  
+      end
 
       class BaseConfig_INTERNAL < ModelElement
         has_attr 'name', String, :defaultValueLiteral => ""
@@ -227,32 +237,48 @@ module Bake
         contains_one 'toolchain', Toolchain, 'parent'
         contains_many 'set', Set, 'parent'
         contains_many 'includeDir', IncludeDir, 'parent'
-        
+        contains_many 'prebuild', Prebuild, 'parent'
+
         module ClassModule
           def ident
             s = file_name.split("/")
             s[s.length-2] + "/" + name
-          end         
+          end
         end
-                
+
       end
-      
+
       class BuildConfig_INTERNAL < BaseConfig_INTERNAL
         contains_many 'files', Files, 'parent'
         contains_many 'excludeFiles', ExcludeFiles, 'parent'
         contains_one 'artifactName', ArtifactName, 'parent'
-      end      
-      
+      end
+
       class ExecutableConfig < BuildConfig_INTERNAL
         contains_one 'linkerScript', LinkerScript, 'parent'
         contains_one 'mapFile', MapFile, 'parent'
+        module ClassModule
+          def color
+            "green"
+          end
+        end
       end
-      
+
       class LibraryConfig < BuildConfig_INTERNAL
+        module ClassModule
+          def color
+            "cyan"
+          end
+        end
       end
 
       class CustomConfig < BaseConfig_INTERNAL
         contains_one 'step', Step, 'parent'
+        module ClassModule
+          def color
+            "red"
+          end
+        end
       end
 
       class Project < ModelElement
@@ -261,21 +287,21 @@ module Bake
         contains_one 'requiredBakeVersion', RequiredBakeVersion, 'parent'
         contains_one 'responsible', Responsible, 'parent'
         contains_many 'config', BaseConfig_INTERNAL, 'parent'
-        
+
         module ClassModule
            def name
             splitted = file_name.split("/")
             x = splitted[splitted.length-2]
             x
-          end         
+          end
         end
-                
+
       end
 
      class Adapt < ModelElement
        contains_many 'config', BaseConfig_INTERNAL, 'parent'
      end
-      
+
   end
 
 end

data/lib/bake/options/options.rb

@@ -18,9 +18,9 @@ module Bake
 
   class Options < Parser
     attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
-    attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename, :bundleDir # String
+    attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename, :bundleDir, :buildDirDelimiter, :dot # 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, :oldLinkOrder # Boolean
+    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :compileOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro, :oldLinkOrder, :prebuild # Boolean
     attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
     attr_reader :vars # map
     attr_reader :verbose
@@ -30,6 +30,9 @@ module Bake
     def initialize(argv)
       super(argv)
 
+      @dot = nil
+      @prebuild = false
+      @buildDirDelimiter = "/"
       @oldLinkOrder = false
       @conversion_info = false
       @envToolchain = false
@@ -57,6 +60,7 @@ module Bake
       @show_includes = false
       @show_includes_and_defines = false
       @linkOnly = false
+      @compileOnly = false
       @no_autodir = false
       @threads = 8
       @lint_min = 0
@@ -81,6 +85,7 @@ module Bake
       add_option(["--rebuild"                                    ], lambda {     @rebuild = true                         })
       add_option(["--prepro"                                     ], lambda {     @prepro = true                          })
       add_option(["--link-only",          "--link_only"          ], lambda {     @linkOnly = true;                       })
+      add_option(["--compile-only",       "--compile_only"       ], lambda {     @compileOnly = true;                    })
       add_option(["--no-autodir",         "--no_autodir"         ], lambda {     @no_autodir = true                      })
       add_option(["--lint"                                       ], lambda {     @lint = true                            })
       add_option(["--lint-min",           "--lint_min"           ], lambda { |x| @lint_min = String === x ? x.to_i : x   })
@@ -107,10 +112,16 @@ module Bake
       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(["--dot",                                       ], lambda { |x| @dot = x                                })
       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(["--bundle"                                     ], lambda { |x| Bake::Usage.bundle                      })
+      add_option(["--bundle"                                     ], lambda {     Bake::Usage.bundle                      })
+#      add_option(["--bundle"                                     ], lambda { |x| set_bundle_dir(x)                       })
+# OLD flag renamed in case someone uses this feature
+      add_option(["--bundleDeprecated"                           ], lambda { |x| set_bundle_dir(x)                       })
+      add_option(["--prebuild"                                   ], lambda {     @prebuild = true                        })
 
       add_option(["-h",                   "--help"               ], lambda {     Bake::Usage.show                        })
 
@@ -122,6 +133,7 @@ module Bake
       add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
       add_option(["--writeCC2J"                                  ], lambda { |x| @cc2j_filename = x.gsub(/[\\]/,'/')     })
       add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
+      add_option(["--build_",                                    ], lambda {     @buildDirDelimiter = "_"                })
 
 
       # hidden
@@ -164,6 +176,10 @@ module Bake
           Bake.formatter.printError("Error: --conversion-info and --linkOnly not allowed at the same time")
           ExitHelper.exit(1)
         end
+        if @compileOnly
+          Bake.formatter.printError("Error: --conversion-info and --compileOnly not allowed at the same time")
+          ExitHelper.exit(1)
+        end
         if @lint
           Bake.formatter.printError("Error: --conversion-info and --lint not allowed at the same time")
           ExitHelper.exit(1)
@@ -191,6 +207,21 @@ module Bake
           Bake.formatter.printError("Error: --link-only and --prepro not allowed at the same time")
           ExitHelper.exit(1)
         end
+        if @filename
+          Bake.formatter.printError("Error: --link-only and --filename not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+      end
+
+      if @compileOnly
+        if @linkOnly
+          Bake.formatter.printError("Error: --compile-only and --link-only not allowed at the same time")
+          ExitHelper.exit(1)
+        end
+        if @filename
+          Bake.formatter.printError("Error: --compile-only and --filename not allowed at the same time")
+          ExitHelper.exit(1)
+        end
       end
 
       if @prepro
@@ -208,6 +239,9 @@ module Bake
         Bake.formatter.printError("Error: --lint and --docu not allowed at the same time")
         ExitHelper.exit(1)
       end
+
+      @filename = "." if @compileOnly
+
     end
 
     def check_valid_dir(dir)

data/lib/bake/options/usage.rb

@@ -9,7 +9,7 @@ module Bake
       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."
-      puts " -a <scheme>              Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
+      puts " -a <scheme>              Use ansi color sequences (console must-- support it). Possible values are 'white' and 'black'."
       puts " -v<level>                Verbose level from 0 to 3, whereas -v0 is less, -v1 is normal (default) and -v2 and -v3 are more verbose."
       puts " -r                       Stop on first error."
       puts " -w <root>                Add a workspace root (can be used multiple times)."
@@ -20,6 +20,7 @@ module Bake
       puts " --prepro                 Stop after preprocessor."
       puts " --link-only              Only link executables - doesn't update objects and archives or start PreSteps and PostSteps."
       puts "                          Forces executables to be relinked."
+      puts " --compile-only           Only the compile steps are executed, equivalent to -f '.'"
       puts " --generate-doc           Builds docu instead of compiling sources."
       puts " --lint                   Performs Lint checks instead of compiling sources."
       puts " --lint-min <num>         If number of files in a project is too large for lint to handle, it is possible"
@@ -30,6 +31,7 @@ module Bake
       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."
+      puts " --dot <filename>         Creates a .dot file of the config dependencies."
       puts " --do <name>              Includes steps with this filter name (can be used multiple times)."
       puts "                          'PRE', 'POST', 'STARTUP' or 'EXIT' includes all according steps."
       puts " --omit <name>            Excludes steps with this filter name (can be used multiple times)."
@@ -40,10 +42,12 @@ 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 " --bundle <dir>           Bundles the output (experimental, description will follow)"
+      puts "--prebuild                Does not build configs which are marked as 'prebuild', this feature is used for distributions."
       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 " --link-2-17              Using link order of libraries which was used until bake 2.17"
+      puts " --link-2-17              DEPRECATED: Using link order of libraries which was used until bake 2.17"
+      puts " --build_                 DEPRECATED: build directories will be build_<name> instead of build/<name>"
 
       puts ""
       puts " --version                Print version."
@@ -55,6 +59,11 @@ module Bake
       ExitHelper.exit(0)
     end
 
+    def self.bundle
+      puts "\nOption --bundle not supported anymore, please contact the author via github if still needed."
+      ExitHelper.exit(1)
+    end
+
   end
 
 end

data/lib/bake/subst.rb

@@ -45,6 +45,7 @@ module Bake
       @@toolchain = toolchain
       @@loadedConfig = loadedConfig
       @@configTcMap = configTcMap
+      @@toolchainName = config.defaultToolchain.basedOn if isMainProj
 
       @@configName = config.name
       @@projDir = config.parent.get_project_dir
@@ -167,6 +168,8 @@ module Bake
           substStr << Bake.options.main_dir
         elsif var == "ConfigName"
          substStr << @@configName
+        elsif var == "ToolchainName" and defined?@@toolchainName
+         substStr << @@toolchainName
         elsif var == "ProjectName"
           substStr << @@projName
         elsif var == "ProjectDir"
@@ -191,9 +194,9 @@ module Bake
               end
               if not out_dir
                 if out_proj_name == Bake.options.main_project_name and out_conf_name == Bake.options.build_config
-                  out_dir = "build/" + Bake.options.build_config
+                  out_dir = "build" + Bake.options.buildDirDelimiter + Bake.options.build_config
                 else
-                  out_dir = "build/" + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
+                  out_dir = "build" + Bake.options.buildDirDelimiter + out_conf_name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
                 end
               end
               out_dir = substString(out_dir, elem)

data/lib/blocks/block.rb

@@ -15,7 +15,7 @@ module Bake
 
     class Block
 
-      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :warnConvValid
+      attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :warnConvValid, :prebuild
       attr_accessor :visited, :inDeps, :result
 
       def startupSteps
@@ -54,8 +54,9 @@ module Bake
         @library = library
       end
 
-      def initialize(config, referencedConfigs)
+      def initialize(config, referencedConfigs, prebuild)
         @inDeps = false
+        @prebuild = prebuild
         @visited = false
         @library = nil
         @config = config
@@ -210,8 +211,8 @@ module Bake
 
       def execute
         if (@inDeps)
-          if Bake.options.verbose >= 1
-            Bake.formatter.printWarning("Circular dependency found including project #{@projectName} with config #{@configName}", @config)
+          if Bake.options.verbose >= 3
+            Bake.formatter.printWarning("While calculating next config, a circular dependency was found including project #{@projectName} with config #{@configName}", @config)
           end
           return true
         end
@@ -227,9 +228,12 @@ module Bake
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
 
         if Bake.options.verbose >= 1
-          Bake.formatter.printAdditionalInfo "**** Building #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
+          typeStr = @prebuild ? "Skipping" : "Building"
+          Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 
+        return depResult if @prebuild
+
         @result = callSteps(:execute)
         return (depResult && @result)
       end
@@ -242,9 +246,12 @@ module Bake
         return false if not depResult and Bake.options.stopOnFirstError
 
         if Bake.options.verbose >= 2
-          Bake.formatter.printAdditionalInfo "**** Cleaning #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
+          typeStr = @prebuild ? "Skipping" : "Cleaning"
+          Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 
+        return depResult if @prebuild
+
         @result = callSteps(:clean)
 
         if Bake.options.clobber
@@ -293,6 +300,20 @@ module Bake
         return (depResult && @result)
       end
 
+      def getSubBlocks(b, method)
+        b.send(method).each do |child_b|
+          if not @otherBlocks.include?child_b and not child_b == self
+            @otherBlocks << child_b
+            getSubBlocks(child_b, method)
+          end
+        end
+      end
+
+      def getBlocks(method)
+        @otherBlocks = []
+        getSubBlocks(self, method)
+        return @otherBlocks
+      end
 
     end