RubyGems - bake-toolkit - Versions diffs - 2.2.2 → 2.3.4 - Mend

bake-toolkit 2.2.2 → 2.3.4

Files changed (32) hide show

checksums.yaml +4 -4
data/doc/dyk/clang.html +50 -0
data/doc/further/change.html +13 -0
data/doc/index.html +3 -1
data/doc/vs/debug.html +50 -0
data/doc/vs/echse/echse.png +0 -0
data/lib/bake/config/loader.rb +3 -0
data/lib/bake/options/options.rb +2 -1
data/lib/bake/toolchain/clang.rb +3 -3
data/lib/bake/toolchain/clang_analyze.rb +31 -0
data/lib/bake/toolchain/errorparser/diab_compiler_error_parser.rb +1 -1
data/lib/bake/toolchain/errorparser/diab_linker_error_parser.rb +2 -2
data/lib/bake/toolchain/errorparser/gcc_compiler_error_parser.rb +1 -1
data/lib/bake/toolchain/errorparser/gcc_linker_error_parser.rb +2 -2
data/lib/bake/toolchain/errorparser/greenhills_compiler_error_parser.rb +1 -1
data/lib/bake/toolchain/errorparser/greenhills_linker_error_parser.rb +2 -2
data/lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb +1 -1
data/lib/bake/toolchain/errorparser/keil_linker_error_parser.rb +2 -2
data/lib/bake/toolchain/errorparser/lint_error_parser.rb +1 -1
data/lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb +63 -0
data/lib/bake/toolchain/errorparser/msvc_linker_error_parser.rb +42 -0
data/lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb +1 -1
data/lib/bake/toolchain/msvc.rb +57 -0
data/lib/bake/toolchain/provider.rb +13 -3
data/lib/blocks/blockBase.rb +11 -8
data/lib/blocks/compile.rb +30 -17
data/lib/blocks/executable.rb +8 -1
data/lib/blocks/library.rb +7 -1
data/lib/common/process.rb +0 -1
data/lib/common/version.rb +1 -1
data/lib/tocxx.rb +5 -3
metadata +9 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3204adfeb6e87ba1ad87e217e3a873c81e9b21db
-  data.tar.gz: 69d5e65f7a40485d903eb5440ea7890842bef298
+  metadata.gz: 0b64fc98f1d57e95813caf1aa0b720befa42b89a
+  data.tar.gz: 019eaba3c441e8c9e4a3fce2ba48f30fab2e8c94
 SHA512:
-  metadata.gz: 4dcccbf9cd13df565e27c6044cf10558945b79b6631e93d9ae37471a114daab40e3349d0d31ba478d1bf6017d394e15c9b7dd5038a14fca5ed9aedf22e63cfb3
-  data.tar.gz: c9b1a7423f45820a1ffc68be7b12cd16038a4faedae204f57127252de1af0c8754c16f93ef52649d439117eac0251ec32413ed19cc273bb563ca60365d534166
+  metadata.gz: d879d2b96339f55d99275a8bdba981c77cf647b6fa9146990e47a4dfcddc897c8ec1a2c5902e20e2ce25e9cc92b47bcd7f9fdeeed8a420d6d2d2d5725a6918a6
+  data.tar.gz: 098620c65ab6537b77fa7b8580a9b65a1aa7d6eea893c7fe3aeac7c65e7089ff86a48a0a91e4f41e2437d1edd8c95b6e755a51dbf19267d9aa456591048772a1

data/doc/dyk/clang.html ADDED

@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Documentation of the bake-tookit</title>
+<style type="text/css">
+#rundrum {
+  border-width:1px;
+  border-style:dashed;
+  border-color:blue;
+  padding:0.2cm;
+  text-align:justify; }
+}
+</style>
+</head>
+<body>
+<h1>Clang Analyze</h1>
+bake can be easily used to analyze source files with Clang. It works simliar to regular compiling, but instead of
+invoking the compiler, the Clang Analyzer will be called.
+Imagine you have a workspace with the following "main" project:
+<pre id="rundrum"><code>Project {
+  ...
+  ExecutableConfig Debug {
+    ...
+    DefaultToolchain GCC
+  }
+}</code></pre>
+Either edit this Project.meta or create a new "analyze" project:
+<pre id="rundrum"><code>Project {
+  CustomConfig Analyze {
+    Dependency main, config: Debug
+    DefaultToolchain CLANG_ANALYZE {
+      Compiler CPP {
+        Flags "-analyzer-checker=deadcode,security,alpha,unix,cplusplus"
+      }
+      Compiler C {
+        Flags "-analyzer-checker=deadcode,security,alpha,unix"
+      }
+    }
+  }
+}</code></pre>
+As you can see the DefaultToolchain GCC is replaced with CLANG_ANALYZE. Call bake like this:
+<pre id="rundrum"><code>bake Analyze -f .</code></pre>
+"-f" means that only the compilation step will take place. The "." means files with a "." in the name will be compiled (= all files). If you want to analyze only C++ files, you can write "-f .cpp"
+</body>
+</html>

data/doc/further/change.html CHANGED

@@ -7,6 +7,19 @@
 <body>
 <h1>Changelog</h1>
+March 12, 2015 - bake-toolkit 2.3.4<br>
+<ul>
+<li><b>Changed: Clang command is now "clang" per default instead of llvm-gcc</b>
+<li><b>Added: CLANG_ANALYZE toolchain</b>
+<li><b>Added: MSVC toolchain</b>
+<li><b>Bugfix: some minor fixes</b>
+</ul>
+February 27, 2015 - Eclipse plugin 1.3.0<br>
+<ul>
+<li><b>Added: bake projects with equal names can be imported now</b>
+</ul>
 February 19, 2015 - bake-toolkit 2.2.2<br>
 <ul>
 <li><b>Changed: output dirs are now prefixed with "build_" per default</b>

data/doc/index.html CHANGED

@@ -45,6 +45,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
 <li><a href="vs/install.html">How to install bake Visual Studio integration</a>
 <li><a href="vs/use.html">How to use bake in Visual Studio</a>
 <li><a href="vs/create.html">How to create a solution / projects in Visual Studio</a>
+<li><a href="vs/debug.html">How to debug in Visual Studio</a>
 </ul>
 <h3>Syntax</h3>
@@ -57,6 +58,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
 <h3>Did you know?</h3>
 <ul>
 <li><a href="dyk/lint.html">Lint</a>
+<li><a href="dyk/clang.html">Clang Analyze</a>
 <li><a href="dyk/tipps.html">Tipps and Tricks</a>
 </ul>
@@ -72,7 +74,7 @@ bake is used to build software <font color="#009900"><b>fast</b></font> and <fon
 <p>
 <hr>
-<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.2.2</td><td align="right">February 19, 2015</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.3.4</td><td align="right">March 12, 2015</td></tr></table>
 </body>

data/doc/vs/debug.html ADDED

@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>Documentation of the bake-tookit</title>
+<style type="text/css">
+#rundrum {
+  border-width:1px;
+  border-style:dashed;
+  border-color:blue;
+  padding:0.2cm;
+  text-align:justify; }
+}
+</style>
+</head>
+<body>
+<h1>How to debug in Visual Studio</h1>
+Natively you can only debug the output from the Microsoft VC compiler with Visual Studio. There are some plugins available for e.g.
+debugging gcc output. Another option is to use the MSVC toolchain from bake, which is described on this help page.
+<p>
+Add debug flags to the MSVC toolchain:
+<pre id="rundrum"><code>DefaultToolchain MSVC {
+  Compiler CPP {
+    Flags "-Zi"
+  }
+  Linker {
+    Flags "-Debug"
+  }
+}</code></pre>
+Start Visual Studio with e.g. a batch file shown below and choose the appropriate solution. If you don't have a solution yet, check out <a href="vs/create.html">How to create a solution / projects in Visual Studio</a>.
+<pre id="rundrum"><code>set PATH=%PATH%;C:\tools\Microsoft Visual Studio 11.0\VC\bin
+call "C:\tools\Microsoft Visual Studio 11.0\VC\vcvarsall.bat"
+"C:\tools\Microsoft Visual Studio 11.0\Common7\IDE\devenv.exe"</code></pre>
+<p>
+This adds the compiler, linker, etc. to the path. <i>vcvarsall.bat</i> setups the environment and the last line
+starts Visual Studio. As a test, just execute the first two lines and check if "cl.exe" can be executed without any errors.
+In Visual Studio, you have to define the executable you like to debug. Add the executable in the project properties:
+<p>
+<img src="echse/echse.png"/>
+<p>
+You can also define command line arguments here.<p>
+Start debugging as usual...
+</body>
+</html>

data/doc/vs/echse/echse.png ADDED

Binary file

data/lib/bake/config/loader.rb CHANGED

@@ -294,6 +294,9 @@ module Bake
         @defaultToolchain = cache.defaultToolchain
         @@defaultToolchainTime = cache.defaultToolchainTime
       end
+      # todo: cleanup this hack
+      Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
     end

data/lib/bake/options/options.rb CHANGED

@@ -17,7 +17,7 @@ module Bake
   end
   class Options < Parser
-    attr_accessor :build_config, :nocache
+    attr_accessor :build_config, :nocache, :analyze
     attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename # String
     attr_reader :roots, :include_filter, :exclude_filter # String List
     attr_reader :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro # Boolean
@@ -30,6 +30,7 @@ module Bake
     def initialize(argv)
       super(argv)
+      @analyze = false
       @showConfigs = false
       @consoleOutput_fullnames = false
       @consoleOutput_visualStudio = false

data/lib/bake/toolchain/clang.rb CHANGED

@@ -11,7 +11,7 @@ module Bake
     CLANG_CHAIN = Provider.add("CLANG")
     CLANG_CHAIN[:COMPILER][:CPP].update({
-      :COMMAND => "llvm-g++",
+      :COMMAND => "clang++",
       :DEFINE_FLAG => "-D",
       :OBJECT_FILE_FLAG => "-o",
       :OBJ_FLAG_SPACE => true,
@@ -23,7 +23,7 @@ module Bake
     CLANG_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:CPP])
     CLANG_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "llvm-gcc"
+    CLANG_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
     CLANG_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_CHAIN[:COMPILER][:C])
     CLANG_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
@@ -32,7 +32,7 @@ module Bake
     CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
     CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
-    CLANG_CHAIN[:LINKER][:COMMAND] = "llvm-g++"
+    CLANG_CHAIN[:LINKER][:COMMAND] = "clang++"
     CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
     CLANG_CHAIN[:LINKER][:USER_LIB_FLAG] = "-l:"
     CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"

data/lib/bake/toolchain/clang_analyze.rb ADDED

@@ -0,0 +1,31 @@
+require 'common/utils'
+require 'bake/toolchain/provider'
+module Bake
+  module Toolchain
+    CLANG_ANALYZE_CHAIN = Provider.add("CLANG_ANALYZE")
+    CLANG_ANALYZE_CHAIN[:COMPILER][:CPP].update({
+      :COMMAND => "clang++",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :OBJECT_FILE_ENDING => ".plist",
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-cc1 -analyze -analyzer-output=plist ",
+      :DEP_FLAGS => "",
+      :DEP_FLAGS_FILENAME  => false,
+      :ERROR_PARSER => nil
+    })
+    CLANG_ANALYZE_CHAIN[:COMPILER][:C] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:CPP])
+    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    CLANG_ANALYZE_CHAIN[:COMPILER][:C][:COMMAND] = "clang"
+    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM] = Utils.deep_copy(CLANG_ANALYZE_CHAIN[:COMPILER][:C])
+    CLANG_ANALYZE_CHAIN[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    CLANG_ANALYZE_CHAIN[:ARCHIVER][:COMMAND] = ""
+    CLANG_ANALYZE_CHAIN[:LINKER][:COMMAND] = ""
+  end
+end

data/lib/bake/toolchain/errorparser/diab_compiler_error_parser.rb CHANGED

@@ -12,7 +12,7 @@ module Bake
       res = []
       error_severity = 255
       consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         lstripped = l.rstrip
         scan_res = lstripped.scan(@error_expression_start)

data/lib/bake/toolchain/errorparser/diab_linker_error_parser.rb CHANGED

@@ -11,7 +11,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
       error_severity = 255
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         l.rstrip!
         d = ErrorDesc.new
         scan_res = l.scan(@error_expression)
@@ -34,7 +34,7 @@ module Bake
         end
         res << d
       end
-      [res, consoleOutput]
+      [res, consoleOutput[0]]
     end
   end

data/lib/bake/toolchain/errorparser/gcc_compiler_error_parser.rb CHANGED

@@ -10,7 +10,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
       consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
         if scan_res.length > 0

data/lib/bake/toolchain/errorparser/gcc_linker_error_parser.rb CHANGED

@@ -12,7 +12,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         l.rstrip!
         d = ErrorDesc.new
         d.file_name = proj_dir
@@ -27,7 +27,7 @@ module Bake
         end
         res << d
       end
-      [res, consoleOutput]
+      [res, consoleOutput[0]]
     end

data/lib/bake/toolchain/errorparser/greenhills_compiler_error_parser.rb CHANGED

@@ -12,7 +12,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
       consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
         if scan_res.length > 0

data/lib/bake/toolchain/errorparser/greenhills_linker_error_parser.rb CHANGED

@@ -21,7 +21,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
       error_severity = 255
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         l.rstrip!
         d = ErrorDesc.new
         scan_res = l.scan(@error_expression)
@@ -37,7 +37,7 @@ module Bake
         end
         res << d
       end
-      [res, consoleOutput]
+      [res, consoleOutput[0]]
     end
   end

data/lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb CHANGED

@@ -12,7 +12,7 @@ module Bake
       res = []
       error_severity = 255
       consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         lstripped = l.rstrip
         scan_res = lstripped.scan(@error_expression_start)

data/lib/bake/toolchain/errorparser/keil_linker_error_parser.rb CHANGED

@@ -9,7 +9,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         l.rstrip!
         d = ErrorDesc.new
         scan_res = l.scan(@error_expression)
@@ -22,7 +22,7 @@ module Bake
         end
         res << d
       end
-      [res, consoleOutput]
+      [res, consoleOutput[0]]
     end

data/lib/bake/toolchain/errorparser/lint_error_parser.rb CHANGED

@@ -10,7 +10,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
       consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
         if scan_res.length > 0

data/lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb ADDED

@@ -0,0 +1,63 @@
+require 'bake/toolchain/errorparser/error_parser'
+module Bake
+  class MSVCCompilerErrorParser < ErrorParser
+    def initialize()
+      @error_expression = /(.+)\(([0-9]+)\) : ([A-Za-z\._]+) (.+)/
+      @incEng = "Note: including file: "
+      @incGer = "Hinweis: Einlesen der Datei: "
+    end
+    def scan_lines(consoleOutput, proj_dir)
+      includeList = []
+      res = []
+      consoleOutputFiltered = ""
+      consoleOutputFullnames = ""
+      filterLine = 0
+      consoleOutput[0].each_line do |l|
+        filterLine = filterLine + 1
+        next if (filterLine == 1 and l.include?"Assembling: ")
+        if (filterLine <= 2 and l.include?"Microsoft (R)")
+          filterLine = 1
+          next
+        end
+        next if (filterLine == 2 and l.include?"Copyright (C)")
+        next if (filterLine == 3 and l.strip.empty?)
+        next if (filterLine == 4 and not l.include?" : " and l.include?".") # the source file
+        filterLine = 100
+        if l.include?@incEng
+          includeList << l[@incEng.length..-1]
+          next
+        end
+        if l.include?@incGer
+          includeList << l[@incGer.length..-1].strip
+          next
+        end
+        d = ErrorDesc.new
+        scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
+        lFull = l
+        if scan_res.length > 0
+          d.file_name = File.expand_path(scan_res[0][0])
+          d.line_number = scan_res[0][1].to_i
+          d.message = scan_res[0][3]
+          if (scan_res[0][2].include?".")
+            d.severity = SEVERITY_ERROR
+            d.message = scan_res[0][2] + ": " + d.message
+          else
+            d.severity = get_severity(scan_res[0][2])
+          end
+          lFull = l.gsub(scan_res[0][0],d.file_name)
+        end
+        res << d
+        consoleOutputFiltered << l
+        consoleOutputFullnames << lFull
+      end
+      consoleOutput[0] = consoleOutputFiltered
+      [res, consoleOutputFullnames, includeList.uniq]
+    end
+  end
+end

data/lib/bake/toolchain/errorparser/msvc_linker_error_parser.rb ADDED

@@ -0,0 +1,42 @@
+require 'bake/toolchain/errorparser/error_parser'
+module Bake
+  class MSVCLinkerErrorParser < ErrorParser
+    def initialize()
+      # todo: is every line an error?
+    end
+    def scan_lines(consoleOutput, proj_dir)
+      res = []
+      consoleOutputFiltered = ""
+      filterLine = 0
+      consoleOutput[0].each_line do |l|
+      filterLine = filterLine + 1
+        next if (filterLine == 1 and l.include?"Microsoft (R)")
+        next if (filterLine == 2 and l.include?"Copyright (C)")
+        next if (filterLine == 3 and l.strip.empty?)
+        l.rstrip!
+        d = ErrorDesc.new
+        d.file_name = proj_dir
+        d.line_number = 0
+        d.message = l
+        if l.length == 0
+          d.severity = SEVERITY_OK
+        elsif l.include?" Warning:"
+          d.severity = SEVERITY_WARNING
+        else
+          d.severity = SEVERITY_ERROR
+        end
+        consoleOutputFiltered << l
+        res << d
+      end
+      consoleOutput[0] = consoleOutputFiltered
+      [res, consoleOutput[0]]
+    end
+  end
+end

data/lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb CHANGED

@@ -10,7 +10,7 @@ module Bake
     def scan_lines(consoleOutput, proj_dir)
       res = []
       consoleOutputFullnames = ""
-      consoleOutput.each_line do |l|
+      consoleOutput[0].each_line do |l|
         d = ErrorDesc.new
         scan_res = l.gsub(/\r\n?/, "").scan(@error_expression)
         if scan_res.length > 0

data/lib/bake/toolchain/msvc.rb ADDED

@@ -0,0 +1,57 @@
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/msvc_compiler_error_parser'
+require 'bake/toolchain/errorparser/msvc_linker_error_parser'
+module Bake
+  module Toolchain
+    MSVCChain = Provider.add("MSVC")
+    MSVCChain[:COMPILER][:CPP].update({
+      :COMMAND => "cl",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-Fo",
+      :OBJ_FLAG_SPACE => false,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c -EHsc",
+      :DEP_FLAGS_FILENAME => false,
+      :DEP_FLAGS => "-showIncludes",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => "-P",
+      :PREPRO_FILE_FLAG => "-Fi"
+    })
+    MSVCChain[:COMPILER][:C] = Utils.deep_copy(MSVCChain[:COMPILER][:CPP])
+    MSVCChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
+    MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"
+    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c"
+    MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    MSVCChain[:ARCHIVER][:COMMAND] = "lib"
+    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-out:"
+    MSVCChain[:ARCHIVER][:ARCHIVE_FLAGS_SPACE] = false
+    MSVCChain[:LINKER][:COMMAND] = "link"
+    MSVCChain[:LINKER][:USER_LIB_FLAG] = ""
+    MSVCChain[:LINKER][:EXE_FLAG] = "-out:"
+    MSVCChain[:LINKER][:EXE_FLAG_SPACE] = false
+    MSVCChain[:LINKER][:LIB_FLAG] = ""
+    MSVCChain[:LINKER][:LIB_PATH_FLAG] = "-libpath:"
+    MSVCChain[:LINKER][:MAP_FILE_FLAG] = "-map:"
+    MSVCChain[:LINKER][:MAP_FILE_PIPE] = false
+    MSVCChain[:LINKER][:SCRIPT] = "Linkerscript option not supported for MSVC"
+    msvcCompilerErrorParser =                   MSVCCompilerErrorParser.new
+    MSVCChain[:COMPILER][:C][:ERROR_PARSER] =   msvcCompilerErrorParser
+    MSVCChain[:COMPILER][:CPP][:ERROR_PARSER] = msvcCompilerErrorParser
+    MSVCChain[:COMPILER][:ASM][:ERROR_PARSER] = msvcCompilerErrorParser
+    MSVCChain[:ARCHIVER][:ERROR_PARSER] =       msvcCompilerErrorParser
+    MSVCChain[:LINKER][:ERROR_PARSER] =         MSVCLinkerErrorParser.new
+  end
+end

data/lib/bake/toolchain/provider.rb CHANGED

@@ -10,6 +10,7 @@ module Bake
             :COMMAND => "",
             :DEFINE_FLAG => "",
             :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
             :OBJ_FLAG_SPACE => false,
             :INCLUDE_PATH_FLAG => "",
             :COMPILE_FLAGS => "",
@@ -20,12 +21,14 @@ module Bake
             :DEP_FLAGS_SPACE => false,
             :DEP_FLAGS_FILENAME => true,
             :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => ""
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
           },
           :C => {
             :COMMAND => "",
             :DEFINE_FLAG => "",
             :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
             :OBJ_FLAG_SPACE => false,
             :INCLUDE_PATH_FLAG => "",
             :COMPILE_FLAGS => "",
@@ -36,12 +39,14 @@ module Bake
             :DEP_FLAGS_SPACE => false,
             :DEP_FLAGS_FILENAME => true,
             :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => ""
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
           },
           :ASM => {
             :COMMAND => "",
             :DEFINE_FLAG => "",
             :OBJECT_FILE_FLAG => "",
+            :OBJECT_FILE_ENDING => ".o",
             :OBJ_FLAG_SPACE => false,
             :INCLUDE_PATH_FLAG => "",
             :COMPILE_FLAGS => "",
@@ -52,7 +57,8 @@ module Bake
             :DEP_FLAGS_SPACE => false,
             :DEP_FLAGS_FILENAME => true,
             :ERROR_PARSER => nil,
-            :PREPRO_FLAGS => ""
+            :PREPRO_FLAGS => "",
+            :PREPRO_FILE_FLAG => nil
           }
         },
@@ -60,6 +66,7 @@ module Bake
         {
           :COMMAND => "",
           :ARCHIVE_FLAGS => "",
+          :ARCHIVE_FLAGS_SPACE => true,
           :FLAGS => "",
           :ERROR_PARSER => nil
         },
@@ -71,6 +78,7 @@ module Bake
           :SCRIPT => "",
           :USER_LIB_FLAG => "",
           :EXE_FLAG => "",
+          :EXE_FLAG_SPACE => true,
           :LIB_FLAG => "",
           :LIB_PATH_FLAG => "",
           :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
@@ -131,6 +139,8 @@ require 'bake/toolchain/diab'
 require 'bake/toolchain/gcc'
 require 'bake/toolchain/lint'
 require 'bake/toolchain/clang'
+require 'bake/toolchain/clang_analyze'
 require 'bake/toolchain/ti'
 require 'bake/toolchain/greenhills'
 require 'bake/toolchain/keil'
+require 'bake/toolchain/msvc'

data/lib/blocks/blockBase.rb CHANGED

@@ -59,7 +59,6 @@ module Bake
       end
       def printCmd(cmd, alternate, reason, forceVerbose)
         if (cmd == @lastCommand)
           if (Bake.options.verbose >= 2 or (@printedCmdAlternate and not forceVerbose))
             return
@@ -95,13 +94,16 @@ module Bake
       def process_console_output(console_output, error_parser)
         ret = false
-        if not console_output.empty?
+        incList = nil
+        #if not console_output.empty?
           if error_parser
             begin
-              error_descs, console_output_full = error_parser.scan_lines(console_output, @projectDir)
+              x = [console_output]
+              error_descs, console_output_full, incList = error_parser.scan_lines(x, @projectDir)
+              console_output = x[0]
               console_output = console_output_full if Bake.options.consoleOutput_fullnames
               if Bake.options.consoleOutput_visualStudio
                 console_output_VS = ""
                 descCounter = 0
@@ -132,14 +134,14 @@ module Bake
           else
             puts console_output # fallback
           end
-        end
-        ret
+        #end
+        [ret, incList]
       end
       def process_result(cmd, console_output, error_parser, alternate, reason, success)
         hasError = (success == false)
         printCmd(cmd, alternate, reason, (hasError and not Bake.options.lint))
-        errorPrinted = process_console_output(console_output, error_parser)
+        errorPrinted, incList = process_console_output(console_output, error_parser)
         if hasError and not errorPrinted
           Bake.formatter.printError("System command failed", @projectDir)
@@ -147,6 +149,7 @@ module Bake
         if hasError or errorPrinted
           raise SystemCommandFailed.new
         end
+        incList
       end
     end

data/lib/blocks/compile.rb CHANGED

@@ -24,7 +24,9 @@ module Bake
       end
       def get_object_file(source)
-        adaptedSource = source.chomp(File.extname(source)).gsub(/\.\./, "##") + (Bake.options.prepro ? ".i" : ".o")
+        # until now all OBJECT_FILE_ENDING are equal in all three types
+        adaptedSource = source.chomp(File.extname(source)).gsub(/\.\./, "##") + (Bake.options.prepro ? ".i" : @tcs[:COMPILER][:CPP][:OBJECT_FILE_ENDING])
         return adaptedSource if File.is_absolute?source
         File.join([@output_dir, adaptedSource])
       end
@@ -32,7 +34,12 @@ module Bake
       def needed?(source, object, type, dep_filename_conv)
         return false if Bake.options.linkOnly
-        return "because prepro was specified" if Bake.options.prepro
+        return "because analyzer toolchain is configured" if Bake.options.analyze
+        if Bake.options.prepro
+          return "because prepro was specified and source is no assembler file" if type != :ASM
+          return false
+        end
         return "because object does not exist" if not File.exist?(object)
         oTime = File.mtime(object)
@@ -41,7 +48,7 @@ module Bake
         return "Compiling #{source} because DefaultToolchain has been changed" if oTime < Bake::Config.defaultToolchainTime
         return "because source is newer than object" if oTime < File.mtime(source)
         if type != :ASM
           return "because dependency file does not exist" if not File.exist?(dep_filename_conv)
@@ -149,14 +156,17 @@ module Bake
         cmd += includes
         cmd += defines
+        offlag = compiler[:OBJECT_FILE_FLAG]
+        offlag = compiler[:PREPRO_FILE_FLAG] if compiler[:PREPRO_FILE_FLAG] and Bake.options.prepro
         if compiler[:OBJ_FLAG_SPACE]
-          cmd << compiler[:OBJECT_FILE_FLAG]
+          cmd << offlag
           cmd << object
         else
           if object.include?" "
-            cmd << compiler[:OBJECT_FILE_FLAG] + "\"" + object + "\""
+            cmd << offlag + "\"" + object + "\""
           else
-            cmd << compiler[:OBJECT_FILE_FLAG] + object
+            cmd << offlag + object
           end
         end
         cmd << source
@@ -164,12 +174,14 @@ module Bake
         if Bake.options.cc2j_filename
           Blocks::CC2J << { :directory => @projectDir, :command => cmd, :file => source }
         end
         success, consoleOutput = ProcessHelper.run(cmd, false, false)
-        outputType = Bake.options.prepro ? "Preprocessing" : "Compiling"
-        process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "#{outputType} #{source}", reason, success)
+        outputType = Bake.options.analyze ? "Analyzing" : (Bake.options.prepro ? "Preprocessing" : "Compiling")
+        incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "#{outputType} #{source}", reason, success)
-        Compile.convert_depfile(dep_filename, dep_filename_conv, @projectDir, @tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if type != :ASM
+        if type != :ASM and not Bake.options.analyze and not Bake.options.prepro
+          incList = Compile.read_depfile(dep_filename, @projectDir, @tcs[:COMPILER][:DEP_FILE_SINGLE_LINE]) if incList.nil?
+          Compile.write_depfile(incList, dep_filename_conv)
+        end
         check_config_file
       end
@@ -195,8 +207,7 @@ module Bake
       end
       # todo: move to toolchain util file
-      def self.convert_depfile(dep_filename, dep_filename_conv, projDir, singleLine)
-        deps = read_depfile(dep_filename, projDir, singleLine)
+      def self.write_depfile(deps, dep_filename_conv)
         if deps
           begin
             File.open(dep_filename_conv, 'wb') do |f|
@@ -275,7 +286,7 @@ module Bake
       end
       def clean
-        if Bake.options.filename
+        if Bake.options.filename or Bake.options.analyze
           Dir.chdir(@projectDir) do
             calcSources(true)
             @source_files.each do |source|
@@ -283,14 +294,16 @@ module Bake
               type = get_source_type(source)
               next if type.nil?
               object = get_object_file(source)
-              dep_filename = calcDepFile(object, type)
               if File.exist?object
                 puts "Deleting file #{object}" if Bake.options.verbose >= 2
                 FileUtils.rm_rf(object)
               end
-              if File.exist?dep_filename
-                puts "Deleting file #{dep_filename}" if Bake.options.verbose >= 2
-                FileUtils.rm_rf(dep_filename)
+              if not Bake.options.analyze
+                dep_filename = calcDepFile(object, type)
+                if dep_filename and File.exist?dep_filename
+                  puts "Deleting file #{dep_filename}" if Bake.options.verbose >= 2
+                  FileUtils.rm_rf(dep_filename)
+                end
               end
             end
           end

data/lib/blocks/executable.rb CHANGED

@@ -99,8 +99,15 @@ module Bake
           cmd = Utils.flagSplit(linker[:COMMAND], false) # g++
           cmd += linker[:MUST_FLAGS].split(" ")
           cmd += Bake::Utils::flagSplit(linker[:FLAGS],true)
           cmd << linker[:EXE_FLAG]
-          cmd << @exe_name # -o debug/x.exe
+          if linker[:EXE_FLAG_SPACE]
+            cmd << @exe_name
+          else
+            cmd[cmd.length-1] += @exe_name
+          end
           cmd += @compileBlock.objects
           cmd << linker[:SCRIPT] if @linker_script # -T
           cmd << @linker_script if @linker_script # xy/xy.dld

data/lib/blocks/library.rb CHANGED

@@ -52,7 +52,13 @@ module Bake
           cmd = Utils.flagSplit(archiver[:COMMAND], false) # ar
           cmd += Bake::Utils::flagSplit(archiver[:FLAGS],true) # --all_load
           cmd += archiver[:ARCHIVE_FLAGS].split(" ")
-          cmd << archive_name
+          if archiver[:ARCHIVE_FLAGS_SPACE]
+            cmd << archive_name
+          else
+            cmd[cmd.length-1] += archive_name
+          end
           cmd += @compileBlock.objects
           success, consoleOutput = ProcessHelper.run(cmd, false, false)

data/lib/common/process.rb CHANGED

@@ -42,7 +42,6 @@ module Bake
       pid, status = Process.wait2(pid)
       @@pid = nil
       @@rd = nil
-      cmdLineArray.pop
       return [false, output] if status.nil?
       [status.success?, output]
     end

data/lib/common/version.rb CHANGED

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.2.2"
+      "2.3.4"
     end
   end

data/lib/tocxx.rb CHANGED

@@ -102,7 +102,7 @@ module Bake
           Blocks::ALL_BLOCKS[config.qname] = block
-          if not Bake.options.linkOnly and not Bake.options.prepro and not Bake.options.lint and not Bake.options.docu and not Bake.options.filename
+          if not Bake.options.linkOnly and not Bake.options.prepro and not Bake.options.lint 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)
           end
@@ -110,7 +110,7 @@ module Bake
           if Bake.options.docu
             block.mainSteps << Blocks::Docu.new(config, @configTcMap[config])
           elsif Metamodel::CustomConfig === config
-            if not Bake.options.linkOnly and not Bake.options.prepro and not Bake.options.lint and not Bake.options.docu and not Bake.options.filename
+            if not Bake.options.linkOnly and not Bake.options.prepro and not Bake.options.lint and not Bake.options.docu and not Bake.options.filename and not Bake.options.analyze
               addSteps(block, block.mainSteps, config) if config.step
             end
           elsif Bake.options.lint
@@ -119,7 +119,7 @@ module Bake
             compile = Blocks::Compile.new(block, config, @loadedConfig.referencedConfigs, @configTcMap[config])
             (Blocks::ALL_COMPILE_BLOCKS[projName] ||= []) << compile
             block.mainSteps << compile
-            if not Bake.options.filename
+            if not Bake.options.filename and not Bake.options.analyze
               if Metamodel::LibraryConfig === config
                 block.mainSteps << Blocks::Library.new(block, config, @loadedConfig.referencedConfigs, @configTcMap[config], compile)
               else
@@ -219,6 +219,8 @@ module Bake
         @loadedConfig = Config.new
         @loadedConfig.load
+        taskType = "Analyzing" if Bake.options.analyze
         @mainConfig = @loadedConfig.referencedConfigs[Bake.options.main_project_name].select { |c| c.name == Bake.options.build_config }.first
         if Bake.options.lint

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.4
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -91,6 +91,7 @@ files:
 - lib/bake/options/usage.rb
 - lib/bake/subst.rb
 - lib/bake/toolchain/clang.rb
+- lib/bake/toolchain/clang_analyze.rb
 - lib/bake/toolchain/colorizing_formatter.rb
 - lib/bake/toolchain/diab.rb
 - lib/bake/toolchain/errorparser/diab_compiler_error_parser.rb
@@ -103,6 +104,8 @@ files:
 - lib/bake/toolchain/errorparser/keil_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/keil_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/lint_error_parser.rb
+- lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb
+- lib/bake/toolchain/errorparser/msvc_linker_error_parser.rb
 - lib/bake/toolchain/errorparser/process_output.rb
 - lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/ti_linker_error_parser.rb
@@ -111,6 +114,7 @@ files:
 - lib/bake/toolchain/greenhills.rb
 - lib/bake/toolchain/keil.rb
 - lib/bake/toolchain/lint.rb
+- lib/bake/toolchain/msvc.rb
 - lib/bake/toolchain/provider.rb
 - lib/bake/toolchain/ti.rb
 - lib/bake/util.rb
@@ -157,6 +161,7 @@ files:
 - doc/concepts/hier.png
 - doc/concepts/mainproject.html
 - doc/deployDoc.bat
+- doc/dyk/clang.html
 - doc/dyk/keys.png
 - doc/dyk/lint.html
 - doc/dyk/tipps.html
@@ -201,6 +206,8 @@ files:
 - doc/syntax/syntax.html
 - doc/vs/create.html
 - doc/vs/create/cvsp.png
+- doc/vs/debug.html
+- doc/vs/echse/echse.png
 - doc/vs/install.html
 - doc/vs/install/install1.png
 - doc/vs/install/install2010.png