bake-toolkit 2.28.1 → 2.29.0

data/lib/bake/model/metamodel.rb

@@ -205,6 +205,10 @@ module Bake
         contains_many 'step', Step, 'parent'
       end
 
+      class CleanSteps < ModelElement
+        contains_many 'step', Step, 'parent'
+      end
+
       class StartupSteps < ModelElement
         contains_many 'step', Step, 'parent'
       end
@@ -239,6 +243,7 @@ module Bake
         contains_one 'preSteps', PreSteps, 'parent'
         contains_one 'postSteps', PostSteps, 'parent'
         contains_one 'exitSteps', ExitSteps, 'parent'
+        contains_one 'cleanSteps', CleanSteps, 'parent'
         contains_many 'baseElement', BaseElement, 'parent'
         contains_one 'defaultToolchain', DefaultToolchain, 'parent'
         contains_one 'toolchain', Toolchain, 'parent'

data/lib/bake/options/usage.rb

@@ -38,9 +38,9 @@ module Bake
       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 "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' includes all according steps."
       puts " --omit <name>            Excludes steps with this filter name (can be used multiple times)."
-      puts "                          'PRE', 'POST', 'STARTUP' or 'EXIT' excludes all according steps."
+      puts "                          'PRE', 'POST', 'STARTUP', 'EXIT' or 'CLEAN' excludes all according steps."
       puts " --abs-paths              Compiler prints absolute filename paths instead of relative paths."
       puts " --Wparse                 The error parser result is also taken into account, not only the return value of compiler, archiver and linker."
       puts " --no-autodir             Disable auto completion of paths like in IncludeDir"

data/lib/blocks/block.rb

@@ -38,6 +38,10 @@ module Bake
         @exitSteps ||= []
       end
 
+      def cleanSteps
+        @cleanSteps ||= []
+      end
+
       def dependencies
         @dependencies ||= []
       end
@@ -262,7 +266,7 @@ module Bake
         depResult = callDeps(:clean)
         return false if not depResult and Bake.options.stopOnFirstError
 
-        if Bake.options.verbose >= 2
+        if Bake.options.verbose >= 2 or cleanSteps.length > 0
           typeStr = @prebuild ? "Checking" : "Cleaning"
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
@@ -278,6 +282,11 @@ module Bake
           end
         end
 
+        cleanSteps.each do |step|
+          @result = executeStep(step, :cleanStep) if @result
+          return false if not @result and Bake.options.stopOnFirstError
+        end unless @prebuild
+
         return (depResult && @result)
       end
 

data/lib/blocks/commandLine.rb

@@ -12,19 +12,25 @@ module Bake
         @projectDir = config.get_project_dir
       end
 
-      def execute
+      def run
         return true if Bake.options.linkOnly
         return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
       end
 
+      def execute
+        return run()
+      end
+
       def startupStep
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+        return run()
       end
 
       def exitStep
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+        return run()
+      end
+
+      def cleanStep
+        return run()
       end
 
       def clean

data/lib/blocks/makefile.rb

@@ -74,26 +74,36 @@ module Bake
 
       end
 
-      def execute
+      def run
         return true if Bake.options.linkOnly
         return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+      end
+
+      def execute
+        return run()
        end
 
       def startupStep
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+        return run()
       end
 
       def exitStep
-        return true if Bake.options.linkOnly
-        return executeCommand(@commandLine, nil, @config.validExitCodes, @config.echo)
+        return run()
       end
 
-      def clean
+      def do_clean
         return true if Bake.options.linkOnly
         return executeCommand(@cleanLine, "No rule to make target 'clean'.", @config.validExitCodes, @config.echo) unless Bake.options.filename
       end
 
+      def clean
+        return do_clean()
+      end
+
+      def cleanStep
+        return do_clean()
+      end
+
     end
 
   end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.28.1"
+      "2.29.0"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -300,8 +300,9 @@ module Bake
           addSteps(block, block.exitSteps,  config.exitSteps)
 
           if not Bake.options.prepro and not Bake.options.conversion_info and not Bake.options.file_list and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
-            addSteps(block, block.preSteps,  config.preSteps)
-            addSteps(block, block.postSteps, config.postSteps)
+            addSteps(block, block.preSteps,   config.preSteps)
+            addSteps(block, block.postSteps,  config.postSteps)
+            addSteps(block, block.cleanSteps, config.cleanSteps)
           end
 
           if Bake.options.docu

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.28.1
+  version: 2.29.0
 platform: ruby
 authors:
 - Alexander Schaal