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

bake-toolkit 2.3.4 → 2.4.3

Files changed (22) hide show

checksums.yaml +4 -4
data/doc/further/change.html +13 -0
data/doc/index.html +1 -1
data/doc/syntax/syntax.html +6 -1
data/doc/vs/debug.html +1 -1
data/lib/bake/cache.rb +2 -13
data/lib/bake/config/loader.rb +2 -44
data/lib/bake/model/metamodel.rb +7 -0
data/lib/bake/options/options.rb +2 -1
data/lib/bake/subst.rb +12 -7
data/lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb +2 -2
data/lib/bake/toolchain/gcc_env.rb +55 -0
data/lib/bake/toolchain/msvc.rb +3 -2
data/lib/bake/toolchain/provider.rb +1 -0
data/lib/blocks/blockBase.rb +43 -2
data/lib/blocks/compile.rb +21 -5
data/lib/blocks/executable.rb +17 -6
data/lib/blocks/library.rb +17 -7
data/lib/common/version.rb +1 -1
data/lib/tocxx.rb +24 -2
metadata +3 -3
data/lib/bake/toolchain/gcc_param.rb +0 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b64fc98f1d57e95813caf1aa0b720befa42b89a
-  data.tar.gz: 019eaba3c441e8c9e4a3fce2ba48f30fab2e8c94
+  metadata.gz: 5988f843e875a56d7340d145eb04d2802ded9afc
+  data.tar.gz: a1385eaa3a37f33d7266790bea4ff5cb5d877fa0
 SHA512:
-  metadata.gz: d879d2b96339f55d99275a8bdba981c77cf647b6fa9146990e47a4dfcddc897c8ec1a2c5902e20e2ce25e9cc92b47bcd7f9fdeeed8a420d6d2d2d5725a6918a6
-  data.tar.gz: 098620c65ab6537b77fa7b8580a9b65a1aa7d6eea893c7fe3aeac7c65e7089ff86a48a0a91e4f41e2437d1edd8c95b6e755a51dbf19267d9aa456591048772a1
+  metadata.gz: 213f610952f6bcfacef10bbb4e8e27c877f6c3eadbdd590f419e483eb0c9b206a7136d255de5f8ce65bc311440745ea5ec361a866a98b8c024a5bf691799fa9f
+  data.tar.gz: 8f0c811eebcf0af7ebf827dbfc6dace9b221352dc5941ffd3be73cc2325b2369055a497269ba06d6da487acd1cb6362e7e820e1905832dce6d453c9b3e96ca7f

data/doc/further/change.html CHANGED Viewed

@@ -7,6 +7,19 @@
 <body>
 <h1>Changelog</h1>
+March 30, 2015 - bake-toolkit 2.4.3<br>
+<ul>
+<li><b>Added: If Project.meta files are updated, sources will only be recompiled if necessary</b>
+<li><b>Added: <i>Set</i> command in Project.meta has now an <i>env</i> attribute to store variables also in system environment which makes them accessible from user scripts</b>
+<li><b>Added: GCC_ENV toolchain (uses environment variables)</b>
+<li><b>Added: Improved MSVC support</b>
+</ul>
+March 16, 2015 - VS plugin 1.0.1 <br>
+<ul>
+<li><b>Added: Support for VS2013</b>
+</ul>
 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>

data/doc/index.html CHANGED Viewed

@@ -74,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.3.4</td><td align="right">March 12, 2015</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.4.3</td><td align="right">March 30, 2015</td></tr></table>
 </body>

data/doc/syntax/syntax.html CHANGED Viewed

@@ -81,7 +81,7 @@ z-index: 100;
 			  <span><span style="background-color:#EEEEEE;" class="show">
 &nbsp; &nbsp; <span class="mycomment"># Valid for all config types</span><br><br>
-&nbsp; &nbsp; <span class="help" onMouseover="showSet()" onMouseout="notip()">Set</span> &#60;variable&#62;, value: &#60;value&#62; | cmd: &#60;line&#62;<br>
+&nbsp; &nbsp; <span class="help" onMouseover="showSet()" onMouseout="notip()">Set</span> &#60;variable&#62;, value: &#60;value&#62; | cmd: &#60;line&#62;, <span class="help" onMouseover="showEnv()" onMouseout="notip()">env</span>: true|false<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showDependency()" onMouseout="notip()">Dependency</span> &#60;project&#62;,
               <span class="help" onMouseover="showDependencyConfig()" onMouseout="notip()">config</span>: &#60;name&#62;<br>
 &nbsp; &nbsp; <span class="help" onMouseover="showExternalLibrary()" onMouseout="notip()">ExternalLibrary</span> &#60;lib&#62;,
@@ -431,6 +431,11 @@ function showSet() {
 	ddrivetip("Set", "No","0..n","-",str)
 }
+function showEnv() {
+  str = 'Stores the variable also in system environment, which makes it available in everything which is executed by bake, e.g. in Pre- and PostSteps.'
+    ddrivetip("env", "No","-","false",str)
+}
 function showDependency() {
   str = 'Specifies another project to be built before this project.<br>'+
     'The archive, linker libs and search paths are imported from this project to the this project automatically.<br>'+

data/doc/vs/debug.html CHANGED Viewed

@@ -29,7 +29,7 @@ Add debug flags to the MSVC toolchain:
   }
 }</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>.
+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="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"

data/lib/bake/cache.rb CHANGED Viewed

@@ -13,15 +13,11 @@ module Bake
     attr_accessor :workspace_roots
     attr_accessor :include_filter
     attr_accessor :exclude_filter
-    attr_accessor :defaultToolchain
-    attr_accessor :defaultToolchainTime
     attr_accessor :no_autodir
     attr_accessor :build_config
   end
   class CacheAccess
-      attr_reader :defaultToolchain
-      attr_reader :defaultToolchainTime
       attr_reader :cacheFilename
       def initialize()
@@ -32,8 +28,6 @@ module Bake
         end
         FileUtils.mkdir_p(File.dirname(@cacheFilename))
-        @defaultToolchain = nil
-        @defaultToolchainTime = nil
       end
       def load_cache
@@ -48,10 +42,7 @@ module Bake
             if cache.version != Version.number
               Bake.formatter.printInfo("Info: cache version ("+cache.version+") does not match to bake version ("+Version.number+"), reloading meta information")
               cache = nil
-            else
-              @defaultToolchain = cache.defaultToolchain
-              @defaultToolchainTime = cache.defaultToolchainTime
-            end
+            end
             if cache != nil
               if cache.cache_file != @cacheFilename
@@ -138,7 +129,7 @@ module Bake
         return nil
       end
-      def write_cache(project_files, referencedConfigs, defaultToolchain, defaultToolchainTime)
+      def write_cache(project_files, referencedConfigs)
         cache = Cache.new
         cache.referencedConfigs = referencedConfigs
         cache.files = project_files
@@ -148,8 +139,6 @@ module Bake
         cache.no_autodir = Bake.options.no_autodir
         cache.exclude_filter = Bake.options.exclude_filter
         cache.workspace_roots = Bake.options.roots
-        cache.defaultToolchain = defaultToolchain
-        cache.defaultToolchainTime = defaultToolchainTime
         cache.build_config = Bake.options.build_config
         bbdump = Marshal.dump(cache)
         begin

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

@@ -4,13 +4,6 @@ module Bake
   class Config
     attr_reader :referencedConfigs
-    attr_reader :defaultToolchain
-    @@defaultToolchainTime = nil
-    def self.defaultToolchainTime
-      @@defaultToolchainTime
-    end
     def getFullProject(configs, configname) # note: configs is never empty
@@ -196,16 +189,6 @@ module Bake
         ExitHelper.exit(1)
       end
-      basedOn = config.defaultToolchain.basedOn
-      @basedOnToolchain = Bake::Toolchain::Provider[basedOn]
-      if @basedOnToolchain.nil?
-        Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", config.defaultToolchain)
-        ExitHelper.exit(1)
-      end
-      @defaultToolchain = Utils.deep_copy(@basedOnToolchain)
-      integrateToolchain(@defaultToolchain, config.defaultToolchain)
-      @@defaultToolchainTime = File.mtime(mainMeta)
       validateDependencies(config)
       @depsPending = config.dependency
     end
@@ -267,36 +250,11 @@ module Bake
         while dep = @depsPending.shift
           loadMeta(dep)
         end
-        if (cache.defaultToolchain)
-          if @defaultToolchain[:LINKER][:FLAGS]                   == cache.defaultToolchain[:LINKER][:FLAGS] and
-            @defaultToolchain[:LINKER][:LIB_PREFIX_FLAGS]         == cache.defaultToolchain[:LINKER][:LIB_PREFIX_FLAGS] and
-            @defaultToolchain[:LINKER][:LIB_POSTFIX_FLAGS]        == cache.defaultToolchain[:LINKER][:LIB_POSTFIX_FLAGS] and
-            @defaultToolchain[:ARCHIVER][:FLAGS]                  == cache.defaultToolchain[:ARCHIVER][:FLAGS] and
-            @defaultToolchain[:COMPILER][:CPP][:FLAGS]            == cache.defaultToolchain[:COMPILER][:CPP][:FLAGS] and
-            @defaultToolchain[:COMPILER][:CPP][:DEFINES].join("") == cache.defaultToolchain[:COMPILER][:CPP][:DEFINES].join("") and
-            @defaultToolchain[:COMPILER][:C][:FLAGS]              == cache.defaultToolchain[:COMPILER][:C][:FLAGS] and
-            @defaultToolchain[:COMPILER][:C][:DEFINES].join("")   == cache.defaultToolchain[:COMPILER][:C][:DEFINES].join("") and
-            @defaultToolchain[:COMPILER][:ASM][:FLAGS]            == cache.defaultToolchain[:COMPILER][:ASM][:FLAGS] and
-            @defaultToolchain[:COMPILER][:ASM][:DEFINES].join("") == cache.defaultToolchain[:COMPILER][:ASM][:DEFINES].join("") and
-            @defaultToolchain[:LINT_POLICY].join("")              == cache.defaultToolchain[:LINT_POLICY].join("")
-            @defaultToolchain[:DOCU]                              == cache.defaultToolchain[:DOCU]
-            @@defaultToolchainTime = cache.defaultToolchainTime
-          end
-        end
         filterSteps
-        cache.write_cache(@project_files, @referencedConfigs, @defaultToolchain, @@defaultToolchainTime)
-      else
-        @defaultToolchain = cache.defaultToolchain
-        @@defaultToolchainTime = cache.defaultToolchainTime
+        cache.write_cache(@project_files, @referencedConfigs)
       end
-      # todo: cleanup this hack
-      Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
     end

data/lib/bake/model/metamodel.rb CHANGED Viewed

@@ -142,6 +142,7 @@ module Bake
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'default', String, :defaultValueLiteral => "on"
         has_attr 'filter', String, :defaultValueLiteral => ""
+        has_many_attr 'validExitCodes', Integer, :defaultValueLiteral => ["0"]
       end
       class Makefile < Step
@@ -162,6 +163,10 @@ module Bake
         contains_many 'step', Step, 'parent'
       end
+      class ExitSteps < ModelElement
+        contains_many 'step', Step, 'parent'
+      end
       class UserLibrary < ModelElement
         has_attr 'lib', String, :defaultValueLiteral => ""
       end
@@ -182,6 +187,7 @@ module Bake
         has_attr 'name', String, :defaultValueLiteral => ""
         has_attr 'value', String, :defaultValueLiteral => ""
         has_attr 'cmd', String, :defaultValueLiteral => ""
+        has_attr 'env', Boolean, :defaultValueLiteral => "false"
       end
       class BaseConfig_INTERNAL < ModelElement
@@ -189,6 +195,7 @@ module Bake
         has_attr 'extends', String, :defaultValueLiteral => ""
         contains_one 'preSteps', PreSteps, 'parent'
         contains_one 'postSteps', PostSteps, 'parent'
+        contains_one 'exitSteps', ExitSteps, 'parent'
         contains_many 'userLibrary', UserLibrary, 'parent'
         contains_many 'exLib', ExternalLibrary, 'parent'
         contains_many 'exLibSearchPath', ExternalLibrarySearchPath, 'parent'

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

@@ -17,7 +17,7 @@ module Bake
   end
   class Options < Parser
-    attr_accessor :build_config, :nocache, :analyze
+    attr_accessor :build_config, :nocache, :analyze, :envToolchain
     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)
+      @envToolchain = false
       @analyze = false
       @showConfigs = false
       @consoleOutput_fullnames = false

data/lib/bake/subst.rb CHANGED Viewed

@@ -18,12 +18,14 @@ module Bake
         linkerCmd = @@config.toolchain.linker.command if @@config.toolchain.linker and @@config.toolchain.linker.command != ""
         archiverCmd = @@config.toolchain.archiver.command if @@config.toolchain.linker and @@config.toolchain.archiver.command != ""
         @@config.toolchain.compiler.each do |c|
-          if c.ctype == :CPP
-            cppCmd = c.command
-          elsif c.ctype == :C
-            cCmd = c.command
-          elsif c.ctype == :ASM
-            asmCmd = c.command
+          if c.command != ""
+            if c.ctype == :CPP
+              cppCmd = c.command
+            elsif c.ctype == :C
+              cCmd = c.command
+            elsif c.ctype == :ASM
+              asmCmd = c.command
+            end
           end
         end
       end
@@ -81,6 +83,7 @@ module Bake
             Bake.formatter.printWarning("Name of variable must not be empty - variable will be ignored", s)
           else
             @@userVarMap[s.name] = substString(s.value, s)
+            ENV[s.name] = @@userVarMap[s.name] if s.env
           end
         else
           cmd_result = false
@@ -90,6 +93,7 @@ module Bake
               cmd = [substString(s.cmd, s)]
               cmd_result, consoleOutput = ProcessHelper.run(cmd)
               @@userVarMap[s.name] = consoleOutput.chomp
+              ENV[s.name] = @@userVarMap[s.name] if s.env
             end
           rescue Exception=>e
             consoleOutput = e.message
@@ -97,6 +101,7 @@ module Bake
           if (cmd_result == false)
             Bake.formatter.printWarning("Command not successful, variable #{s.name} will be set to \"\" (#{consoleOutput.chomp}).", s)
             @@userVarMap[s.name] = ""
+            ENV[s.name] = "" if s.env
           end
         end
@@ -262,7 +267,7 @@ module Bake
       substStr << str[posSubst..-1]
       substStr
     end
     def self.substToolchain(elem)
       if Hash === elem
         elem.each do |k, e|

data/lib/bake/toolchain/errorparser/msvc_compiler_error_parser.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module Bake
   class MSVCCompilerErrorParser < ErrorParser
     def initialize()
-      @error_expression = /(.+)\(([0-9]+)\) : ([A-Za-z\._]+) (.+)/
+      @error_expression = /(.+)\(([0-9]+)\) : ([A-Za-z\._]+) (C[\d]+: .+)/
       @incEng = "Note: including file: "
       @incGer = "Hinweis: Einlesen der Datei: "
     end
@@ -28,7 +28,7 @@ module Bake
         filterLine = 100
         if l.include?@incEng
-          includeList << l[@incEng.length..-1]
+          includeList << l[@incEng.length..-1].strip
           next
         end
         if l.include?@incGer

data/lib/bake/toolchain/gcc_env.rb ADDED Viewed

@@ -0,0 +1,55 @@
+require 'common/utils'
+require 'bake/toolchain/provider'
+require 'bake/toolchain/errorparser/error_parser'
+require 'bake/toolchain/errorparser/gcc_compiler_error_parser'
+require 'bake/toolchain/errorparser/gcc_linker_error_parser'
+module Bake
+  module Toolchain
+    GCCENVChain = Provider.add("GCC_ENV")
+    GCCENVChain[:COMPILER][:CPP].update({
+      :COMMAND => "$(CXX)",
+      :DEFINE_FLAG => "-D",
+      :OBJECT_FILE_FLAG => "-o",
+      :OBJ_FLAG_SPACE => true,
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "-MD -MF",
+      :DEP_FLAGS_SPACE => true,
+      :PREPRO_FLAGS => "-E -P",
+      :FLAGS => "$(CXXFLAGS)"
+    })
+    GCCENVChain[:COMPILER][:C] = Utils.deep_copy(GCCENVChain[:COMPILER][:CPP])
+    GCCENVChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+    GCCENVChain[:COMPILER][:C][:COMMAND] = "$(CC)"
+    GCCENVChain[:COMPILER][:C][:FLAGS] = "$(CFLAGS)"
+    GCCENVChain[:COMPILER][:ASM] = Utils.deep_copy(GCCENVChain[:COMPILER][:C])
+    GCCENVChain[:COMPILER][:ASM][:COMMAND] = "$(AS)"
+    GCCENVChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    GCCENVChain[:COMPILER][:ASM][:FLAGS] = "$(ASFLAGS)"
+    GCCENVChain[:ARCHIVER][:COMMAND] = "$(AR)"
+    GCCENVChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-rc"
+    GCCENVChain[:ARCHIVER][:FLAGS] = "$(ARFLAGS)"
+    GCCENVChain[:LINKER][:COMMAND] = "$(CXX)"
+    GCCENVChain[:LINKER][:SCRIPT] = "-T"
+    GCCENVChain[:LINKER][:USER_LIB_FLAG] = "-l:"
+    GCCENVChain[:LINKER][:EXE_FLAG] = "-o"
+    GCCENVChain[:LINKER][:LIB_FLAG] = "-l"
+    GCCENVChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    GCCENVChain[:LINKER][:FLAGS] = "$(LDFLAGS)"
+    gccCompilerErrorParser =                      GCCCompilerErrorParser.new
+    GCCENVChain[:COMPILER][:C][:ERROR_PARSER] =   gccCompilerErrorParser
+    GCCENVChain[:COMPILER][:CPP][:ERROR_PARSER] = gccCompilerErrorParser
+    GCCENVChain[:COMPILER][:ASM][:ERROR_PARSER] = gccCompilerErrorParser
+    GCCENVChain[:ARCHIVER][:ERROR_PARSER] =       gccCompilerErrorParser
+    GCCENVChain[:LINKER][:ERROR_PARSER] =         GCCLinkerErrorParser.new
+  end
+end

data/lib/bake/toolchain/msvc.rb CHANGED Viewed

@@ -15,7 +15,7 @@ module Bake
       :OBJECT_FILE_FLAG => "-Fo",
       :OBJ_FLAG_SPACE => false,
       :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c -EHsc",
+      :COMPILE_FLAGS => "-c -EHsc $(MSVC_FORCE_SYNC_PDB_WRITES)",
       :DEP_FLAGS_FILENAME => false,
       :DEP_FLAGS => "-showIncludes",
       :DEP_FLAGS_SPACE => true,
@@ -28,7 +28,7 @@ module Bake
     MSVCChain[:COMPILER][:ASM] = Utils.deep_copy(MSVCChain[:COMPILER][:C])
     MSVCChain[:COMPILER][:ASM][:COMMAND] = "ml"
-    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c"
+    MSVCChain[:COMPILER][:ASM][:COMPILE_FLAGS] = "-c $(MSVC_FORCE_SYNC_PDB_WRITES)"
     MSVCChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
     MSVCChain[:ARCHIVER][:COMMAND] = "lib"
@@ -45,6 +45,7 @@ module Bake
     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

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

@@ -144,3 +144,4 @@ require 'bake/toolchain/ti'
 require 'bake/toolchain/greenhills'
 require 'bake/toolchain/keil'
 require 'bake/toolchain/msvc'
+require 'bake/toolchain/gcc_env'

data/lib/blocks/blockBase.rb CHANGED Viewed

@@ -47,6 +47,48 @@ module Bake
         end
       end
+      def defaultToolchainTime
+        @defaultToolchainTime ||= File.mtime(Bake.options.main_dir+"/Project.meta")
+      end
+      def config_changed?(cmdLineFile)
+        return "because command line file does not exist" if not File.exist?(cmdLineFile)
+        cmdTime = File.mtime(cmdLineFile)
+        return "because config file has been changed" if cmdTime < File.mtime(@config.file_name)
+        return "because DefaultToolchain has been changed" if cmdTime < defaultToolchainTime
+        return "because environment variables used for toolchain have been changed" if (Bake.options.envToolchain)
+        false
+      end
+      def self.isCmdLineEqual?(cmd, cmdLineFile)
+        begin
+          if File.exist?cmdLineFile
+            lastCmdLineArray = File.readlines(cmdLineFile)[0];
+            if lastCmdLineArray == cmd.join(" ")
+              FileUtils.touch(cmdLineFile)
+              return true
+            end
+          end
+        rescue Exception => e
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+        return false
+      end
+      def self.writeCmdLineFile(cmd, cmdLineFile)
+        begin
+          File.write(cmdLineFile, cmd.join(" "))
+        rescue Exception => e
+          if Bake.options.debug
+            puts e.message
+            puts e.backtrace
+          end
+        end
+      end
       def calcOutputDir
         if @tcs[:OUTPUT_DIR] != nil
           p = @block.convPath(@tcs[:OUTPUT_DIR])
@@ -122,7 +164,7 @@ module Bake
               end
               console_output.gsub!(/[\r]/, "")
-              Bake.formatter.format(console_output, error_descs, error_parser)
+              Bake.formatter.format(console_output, error_descs, error_parser) unless console_output.empty?
               Bake::IDEInterface.instance.set_errors(error_descs)
             rescue Exception => e
@@ -142,7 +184,6 @@ module Bake
         hasError = (success == false)
         printCmd(cmd, alternate, reason, (hasError and not Bake.options.lint))
         errorPrinted, incList = process_console_output(console_output, error_parser)
         if hasError and not errorPrinted
           Bake.formatter.printError("System command failed", @projectDir)
         end

data/lib/blocks/compile.rb CHANGED Viewed

@@ -44,9 +44,6 @@ module Bake
         return "because object does not exist" if not File.exist?(object)
         oTime = File.mtime(object)
-        return "because config file has been changed" if oTime < File.mtime(@config.file_name)
-        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
@@ -81,6 +78,10 @@ module Bake
         false
       end
+      def calcCmdlineFile(object)
+        object[0..-3] + ".cmdline"
+      end
       def calcDepFile(object, type)
         dep_filename = nil
         if type != :ASM
@@ -111,7 +112,13 @@ module Bake
         dep_filename = calcDepFile(object, type)
         dep_filename_conv = calcDepFileConv(dep_filename) if type != :ASM
+        cmdLineCheck = false
+        cmdLineFile = calcCmdlineFile(object)
         reason = needed?(source, object, type, dep_filename_conv)
+        if not reason
+          cmdLineCheck = true
+          reason = config_changed?(cmdLineFile)
+        end
         return true unless reason
         if @fileTcs.include?(source)
@@ -130,8 +137,6 @@ module Bake
           raise SystemCommandFailed.new
         end
-        BlockBase.prepareOutput(object)
         cmd = Utils.flagSplit(compiler[:COMMAND], false)
         cmd += compiler[:COMPILE_FLAGS].split(" ")
@@ -174,7 +179,13 @@ module Bake
         if Bake.options.cc2j_filename
           Blocks::CC2J << { :directory => @projectDir, :command => cmd, :file => source }
         end
+        return if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+        BlockBase.prepareOutput(object)
         success, consoleOutput = ProcessHelper.run(cmd, false, false)
+        BlockBase.writeCmdLineFile(cmd, cmdLineFile) if success
         outputType = Bake.options.analyze ? "Analyzing" : (Bake.options.prepro ? "Preprocessing" : "Compiling")
         incList = process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "#{outputType} #{source}", reason, success)
@@ -304,6 +315,11 @@ module Bake
                   puts "Deleting file #{dep_filename}" if Bake.options.verbose >= 2
                   FileUtils.rm_rf(dep_filename)
                 end
+                cmdLineFile = calcCmdlineFile(object)
+                if File.exist?cmdLineFile
+                  puts "Deleting file #{cmdLineFile}" if Bake.options.verbose >= 2
+                  FileUtils.rm_rf(cmdLineFile)
+                end
               end
             end
           end

data/lib/blocks/executable.rb CHANGED Viewed

@@ -29,6 +29,10 @@ module Bake
         @exe_name ||= File.join([@output_dir, baseFilename])
       end
+      def calcCmdlineFile()
+        @exe_name + ".cmdline"
+      end
       def calcMapFile
         @mapfile = nil
         if (not Bake.options.docu) and (not Bake.options.lint) and (not @config.mapFile.nil?)
@@ -50,7 +54,6 @@ module Bake
       end
       def needed?(libs)
-        return false if depHasError(@block)
         return false if Bake.options.prepro
         return "because linkOnly was specified" if Bake.options.linkOnly
@@ -58,10 +61,6 @@ module Bake
         return "because executable does not exist" if not File.exists?(@exe_name)
         eTime = File.mtime(@exe_name)
-        # config
-        return "because config file has been changed" if eTime < File.mtime(@config.file_name)
-        return "because DefaultToolchain has been changed" if eTime < Bake::Config.defaultToolchainTime
         # linkerscript
         if @linker_script
@@ -86,13 +85,20 @@ module Bake
       def execute
         Dir.chdir(@projectDir) do
+          return false if depHasError(@block)
           libs, linker_libs_array = LibElements.calc_linker_lib_string(@block, @tcs)
+          cmdLineCheck = false
+          cmdLineFile = calcCmdlineFile()
           reason = needed?(libs)
+          if not reason
+            cmdLineCheck = true
+            reason = config_changed?(cmdLineFile)
+          end
           return unless reason
-          BlockBase.prepareOutput(@exe_name)
           linker = @tcs[:LINKER]
@@ -126,8 +132,13 @@ module Bake
           outPipe = (@mapfile and linker[:MAP_FILE_PIPE]) ? "#{@mapfile}" : nil
           cmdLinePrint << "> #{outPipe}" if outPipe
+          return if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+          BlockBase.prepareOutput(@exe_name)
           printCmd(cmdLinePrint, "Linking #{@exe_name}", reason, false)
           success, consoleOutput = ProcessHelper.run(cmd, false, false, outPipe)
+          BlockBase.writeCmdLineFile(cmd, cmdLineFile) if success
           process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, reason, success)
           check_config_file()

data/lib/blocks/library.rb CHANGED Viewed

@@ -17,6 +17,10 @@ module Bake
         @archive_name ||= File.join([@output_dir, "lib#{@projectName}.a"])
       end
+      def calcCmdlineFile()
+        archive_name + ".cmdline"
+      end
       def needed?
         return false if Bake.options.linkOnly
         return false if Bake.options.prepro
@@ -25,10 +29,6 @@ module Bake
         return "because library does not exist" if not File.exists?(archive_name)
         aTime = File.mtime(archive_name)
-        # config
-        return "because config file has been changed" if aTime < File.mtime(@config.file_name)
-        return "because DefaultToolchain has been changed" if aTime < Bake::Config.defaultToolchainTime
         # sources
         @compileBlock.objects.each do |obj|
@@ -42,10 +42,15 @@ module Bake
       def execute
         Dir.chdir(@projectDir) do
+          cmdLineCheck = false
+          cmdLineFile = calcCmdlineFile()
           reason = needed?
+          if not reason
+            cmdLineCheck = true
+            reason = config_changed?(cmdLineFile)
+          end
           return unless reason
-          BlockBase.prepareOutput(archive_name)
           archiver = @tcs[:ARCHIVER]
@@ -58,10 +63,15 @@ module Bake
           else
             cmd[cmd.length-1] += archive_name
           end
           cmd += @compileBlock.objects
+          return if cmdLineCheck and BlockBase.isCmdLineEqual?(cmd, cmdLineFile)
+          BlockBase.prepareOutput(archive_name)
           success, consoleOutput = ProcessHelper.run(cmd, false, false)
+          BlockBase.writeCmdLineFile(cmd, cmdLineFile) if success
           process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{archive_name}", reason, success)
           check_config_file()

data/lib/common/version.rb CHANGED Viewed

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

data/lib/tocxx.rb CHANGED Viewed

@@ -225,11 +225,33 @@ module Bake
         if Bake.options.lint
           @defaultToolchain = Utils.deep_copy(Bake::Toolchain::Provider["Lint"])
-          integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
         else
-          @defaultToolchain = @loadedConfig.defaultToolchain
+          basedOn =  @mainConfig.defaultToolchain.basedOn
+          basedOnToolchain = Bake::Toolchain::Provider[basedOn]
+          if basedOnToolchain.nil?
+            Bake.formatter.printError("DefaultToolchain based on unknown compiler '#{basedOn}'", config.defaultToolchain)
+            ExitHelper.exit(1)
+          end
+          # The flag "-FS" must only be set for VS2013 and above
+          ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = ""
+          if basedOn == "MSVC"
+            begin
+              res = `cl.exe 2>&1`
+              scan_res = res.scan(/ersion (\d+).(\d+).(\d+)/)
+              ENV["MSVC_FORCE_SYNC_PDB_WRITES"] = "-FS" if scan_res.length > 0 and scan_res[0][0].to_i >= 18 # 18 is the compiler major version in VS2013
+            rescue Exception
+            end
+          end
+          @defaultToolchain = Utils.deep_copy(basedOnToolchain)
+          Bake.options.envToolchain = true if (basedOn.include?"_ENV")
         end
+        integrateToolchain(@defaultToolchain, @mainConfig.defaultToolchain)
+        # todo: cleanup this hack
+        Bake.options.analyze = @defaultToolchain[:COMPILER][:CPP][:COMPILE_FLAGS].include?"analyze"
         createBaseTcsForConfig
         substVars
         createTcsForConfig

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.3
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -110,7 +110,7 @@ files:
 - lib/bake/toolchain/errorparser/ti_compiler_error_parser.rb
 - lib/bake/toolchain/errorparser/ti_linker_error_parser.rb
 - lib/bake/toolchain/gcc.rb
-- lib/bake/toolchain/gcc_param.rb
+- lib/bake/toolchain/gcc_env.rb
 - lib/bake/toolchain/greenhills.rb
 - lib/bake/toolchain/keil.rb
 - lib/bake/toolchain/lint.rb

data/lib/bake/toolchain/gcc_param.rb DELETED Viewed

@@ -1,7 +0,0 @@
-module Bake
-  module Toolchain
-  end
-end