bake-toolkit 2.23.12 → 2.24.0

data/lib/bakeclean/options/options.rb

@@ -0,0 +1,32 @@
+require 'common/options/parser'
+require 'common/version'
+
+module Bake
+
+  class BakecleanOptions < Parser
+    attr_reader :preview # Boolean
+
+    def initialize(argv)
+      super(argv)
+
+      @preview = false
+
+      add_option(["--preview"    ], lambda { @preview = true                                         })
+      add_option(["-h", "--help" ], lambda { usage; ExitHelper.exit(0)                               })
+      add_option(["--version"    ], lambda { Bake::Version.printBakecleanVersion; ExitHelper.exit(0) })
+    end
+
+    def usage
+      puts "\nUsage: bakeclean [options]"
+      puts " --preview        Only shows the folder which would be deleted."
+      puts " --version        Print version."
+      puts " -h, --help       Print this help."
+    end
+
+    def parse_options()
+      parse_internal(false)
+    end
+
+  end
+
+end

data/lib/bakeqac/options/options.rb

@@ -6,13 +6,14 @@ module Bake
 
   class BakeqacOptions < Parser
     attr_reader :rcf, :acf, :qacdata, :qacstep, :qac_home, :cct_append  # String
-    attr_reader :c11, :c14, :qacfilter, :qacnoformat, :qacunittest, :qacdoc # Boolean
+    attr_reader :c11, :c14, :qacfilter, :qacnoformat, :qacunittest, :qacdoc, :cct_patch # Boolean
     attr_reader :cct # Array
     attr_reader :qacretry # int
 
     def initialize(argv)
       super(argv)
 
+      @cct_patch = false
       @cct_append = nil
       @main_dir = nil
       @cVersion = ""
@@ -37,6 +38,7 @@ module Bake
       add_option(["--cct"                          ], lambda { |x| @cct << x.gsub(/\\/,"/")     })
       add_option(["--rcf"                          ], lambda { |x| @rcf = x.gsub(/\\/,"/")      })
       add_option(["--acf"                          ], lambda { |x| @acf = x.gsub(/\\/,"/")      })
+      add_option(["--qaccctpatch"                  ], lambda { @cct_patch = true                })
       add_option(["--qacdata"                      ], lambda { |x| @qacdata = x.gsub(/\\/,"/")  })
       add_option(["--qacstep"                      ], lambda { |x| @qacstep = x                 })
       add_option(["--qacnofilter"                  ], lambda { @qacfilter = false               })
@@ -58,6 +60,7 @@ module Bake
       puts "                  a file named qac.cct will be searched up to root and also used if found."
       puts " --rcf <file>     Set a specific rule config file. If not specified, $(QAC_HOME)/config/rcf/mcpp-1_5_1-en_US.rcf will be used."
       puts " --acf <file>     Set a specific analysis config file, otherwise $(QAC_HOME)/config/acf/default.acf will be used."
+      puts " --qaccctpatch    If specified, some adaptions to cct are made. Might improve the result - no guarantee."
       puts " --qacdata <dir>  QAC writes data into this folder. Default is <working directory>/.qacdata."
       puts " --qacstep admin|analyze|view   Steps can be ORed. Per default all steps will be executed."
       puts " --qacnofilter    Output will be printed immediately and unfiltered. Per default filters are used to reduce noise."

data/lib/blocks/block.rb

@@ -194,17 +194,19 @@ module Bake
         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
@@ -228,13 +230,11 @@ module Bake
         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
@@ -247,12 +247,10 @@ module Bake
         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

data/lib/blocks/blockBase.rb

@@ -99,10 +99,13 @@ module Bake
         if @tcs[:OUTPUT_DIR] != nil
           p = @block.convPath(@tcs[:OUTPUT_DIR])
           @output_dir = p
-        elsif isMainProject?
-          @output_dir = "build" + Bake.options.buildDirDelimiter + Bake.options.build_config
         else
-          @output_dir = "build" + Bake.options.buildDirDelimiter + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
+          qacPart = Bake.options.qac ? (".qac" + Bake.options.buildDirDelimiter) : ""
+          if isMainProject?
+            @output_dir = "build" + Bake.options.buildDirDelimiter + qacPart + Bake.options.build_config
+          else
+            @output_dir = "build" + Bake.options.buildDirDelimiter + qacPart + @config.name + "_" + Bake.options.main_project_name + "_" + Bake.options.build_config
+          end
         end
       end
 
@@ -199,6 +202,26 @@ module Bake
         incList
       end
 
+
+      def cleanProjectDir
+        Dir.chdir(@projectDir) do
+          if File.exist?@output_dir
+            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
+            FileUtils.rm_rf(@output_dir)
+
+            if (@tcs[:OUTPUT_DIR] == nil) && (Bake.options.buildDirDelimiter == "/") # in this case all builds are placed in a "build" folder
+              buildDir = File.dirname(@output_dir)
+              if (File.basename(buildDir) == "build") && (Dir.entries(buildDir).size == 2)# double check if it's really "build" and check if it's empty (except "." and "..")
+                puts "Deleting folder #{buildDir}" if Bake.options.verbose >= 2
+                FileUtils.rm_rf(buildDir)
+              end
+            end
+
+          end
+        end unless Bake.options.filename
+        return true
+      end
+
     end
   end
 end

data/lib/blocks/executable.rb

@@ -24,7 +24,7 @@ module Bake
         if not @config.artifactName.nil? and @config.artifactName.name != ""
           baseFilename = @config.artifactName.name
         else
-          baseFilename = "#{@projectName}#{@tcs[:LINKER][:OUTPUT_ENDING]}"
+          baseFilename = "#{@projectName}#{Bake::Toolchain.outputEnding(@tcs)}"
         end
         @exe_name ||= File.join([@output_dir, baseFilename])
       end
@@ -160,13 +160,7 @@ module Bake
       end
 
       def clean
-        Dir.chdir(@projectDir) do
-          if File.exist?@output_dir
-            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
-            FileUtils.rm_rf(@output_dir)
-          end
-        end unless Bake.options.filename
-        return true
+        return cleanProjectDir()
       end
 
     end

data/lib/blocks/library.rb

@@ -41,7 +41,7 @@ module Bake
         aTime = File.mtime(@archive_name)
 
         # sources
-        @compileBlock.objects.each do |obj|
+        @objects.each do |obj|
           return "because object #{obj} does not exist" if not File.exists?(obj)
           return "because object #{obj} is newer than executable" if aTime < File.mtime(obj)
         end
@@ -52,9 +52,21 @@ module Bake
       def execute
 
         Dir.chdir(@projectDir) do
-          if @compileBlock.objects.empty?
-            puts "No source files, library won't be created" if Bake.options.verbose >= 2
-            return true
+
+          @objects = @compileBlock.objects
+          if !@block.prebuild
+            if @objects.empty?
+              puts "No source files, library won't be created" if Bake.options.verbose >= 2
+              return true
+            end
+          else
+            @objects = Dir.glob("#{@output_dir}/**/*.o")
+            if @objects.empty?
+              if !File.exists?(@archive_name)
+                puts "No object files, library won't be created" if Bake.options.verbose >= 2
+              end
+              return true
+            end
           end
 
           cmdLineCheck = false
@@ -78,7 +90,7 @@ module Bake
             cmd[cmd.length-1] += @archive_name
           end
 
-          cmd += @compileBlock.objects
+          cmd += @objects
 
           if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
             success = true
@@ -99,17 +111,19 @@ module Bake
       end
 
       def clean
-        Dir.chdir(@projectDir) do
-          if File.exist?@output_dir
-            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
-            FileUtils.rm_rf(@output_dir)
+        if @block.prebuild
+          Dir.chdir(@projectDir) do
+            @objects = Dir.glob("#{@output_dir}/**/*.o")
+            if !@objects.empty? && File.exist?(@archive_name)
+              puts "Deleting file #{@archive_name}" if Bake.options.verbose >= 2
+              FileUtils.rm_rf(@archive_name)
+            end
           end
-        end unless Bake.options.filename
-        return true
+        else
+          return cleanProjectDir()
+        end
       end
 
-
     end
-
   end
 end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.23.12"
+      "2.24.0"
     end
 
     def self.printBakeVersion(ry = "")
@@ -15,6 +15,10 @@ module Bake
     def self.printBakeqacVersion()
       printBakeVersion("qac")
     end
+
+    def self.printBakecleanVersion()
+      printBakeVersion("clean")
+    end
   end
 
   expectedRGen = "0.8.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.23.12
+  version: 2.24.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -102,12 +102,14 @@ executables:
 - createVSProjects
 - bake-doc
 - bakeqac
+- bakeclean
 extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile.rb
 - bin/bake
 - bin/bake-doc
+- bin/bakeclean
 - bin/bakeqac
 - bin/bakery
 - bin/createVSProjects
@@ -193,6 +195,7 @@ files:
 - documentation/_build/html/_sources/syntax/project_meta_syntax.txt
 - documentation/_build/html/_sources/syntax/syntax.txt
 - documentation/_build/html/_sources/syntax/variable_substitutions.txt
+- documentation/_build/html/_sources/tips_and_tricks/bakeclean.txt
 - documentation/_build/html/_sources/tips_and_tricks/dot.txt
 - documentation/_build/html/_sources/tips_and_tricks/how_to_use_bake_with_cygwin.txt
 - documentation/_build/html/_sources/tips_and_tricks/qac.txt
@@ -380,6 +383,7 @@ files:
 - documentation/_build/html/syntax/project_meta_syntax.html
 - documentation/_build/html/syntax/syntax.html
 - documentation/_build/html/syntax/variable_substitutions.html
+- documentation/_build/html/tips_and_tricks/bakeclean.html
 - documentation/_build/html/tips_and_tricks/dot.html
 - documentation/_build/html/tips_and_tricks/how_to_use_bake_with_cygwin.html
 - documentation/_build/html/tips_and_tricks/qac.html
@@ -434,6 +438,7 @@ files:
 - lib/bake/toolchain/provider.rb
 - lib/bake/toolchain/ti.rb
 - lib/bake/util.rb
+- lib/bakeclean/options/options.rb
 - lib/bakeqac/options/options.rb
 - lib/bakery/buildPattern.rb
 - lib/bakery/model/language.rb