lib/blocks/block.rb in bake-toolkit-2.23.12 vs lib/blocks/block.rb in bake-toolkit-2.24.0

@@ -192,21 +192,23 @@
       def callSteps(method)
 
         preSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
-        end
+        end unless @prebuild
 
         mainSteps.each do |step|
-          @result = executeStep(step, method) if @result
+          if !@prebuild || (Library === step)
+            @result = executeStep(step, method) if @result
+          end
           return false if not @result and Bake.options.stopOnFirstError
         end
 
         postSteps.each do |step|
           @result = executeStep(step, method) if @result
           return false if not @result and Bake.options.stopOnFirstError
-        end
+        end unless @prebuild
 
         return @result
       end
 
       def execute
@@ -226,17 +228,15 @@
         return false if not depResult and Bake.options.stopOnFirstError
 
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
 
         if Bake.options.verbose >= 1
-          typeStr = @prebuild ? "Skipping" : "Building"
+          typeStr = @prebuild ? "Using" : "Building"
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
         puts "Project path: #{@projectDir}" if Bake.options.projectPaths
 
-        return depResult if @prebuild
-
         @result = callSteps(:execute)
         return (depResult && @result)
       end
 
       def clean
@@ -245,14 +245,12 @@
 
         depResult = callDeps(:clean)
         return false if not depResult and Bake.options.stopOnFirstError
 
         if Bake.options.verbose >= 2
-          typeStr = @prebuild ? "Skipping" : "Cleaning"
+          typeStr = @prebuild ? "Checking" : "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
           Dir.chdir(@projectDir) do
\ No newline at end of file