RubyGems - bake-toolkit - Versions diffs - 2.0.10 → 2.1.0 - Mend

bake-toolkit 2.0.10 → 2.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/doc/dyk/lint.html +11 -0
data/doc/further/change.html +16 -1
data/doc/index.html +1 -1
data/doc/syntax/syntax.html +4 -1
data/lib/bake/cache.rb +1 -1
data/lib/bake/config/loader.rb +24 -10
data/lib/bake/model/loader.rb +2 -2
data/lib/bake/options/options.rb +9 -9
data/lib/bake/options/usage.rb +2 -1
data/lib/bake/subst.rb +3 -2
data/lib/bake/toolchain/lint.rb +1 -1
data/lib/blocks/block.rb +6 -5
data/lib/blocks/blockBase.rb +8 -8
data/lib/blocks/compile.rb +21 -6
data/lib/blocks/executable.rb +2 -2
data/lib/blocks/has_execute_command.rb +3 -3
data/lib/blocks/library.rb +2 -2
data/lib/common/cleanup.rb +1 -0
data/lib/common/version.rb +1 -1
data/lib/tocxx.rb +15 -0
metadata +2 -3
data/lib/bake/process_output.rb +0 -10

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b793e0fe7bd1968ec00296fba84aa608ff3c1ad9
-  data.tar.gz: 8bd30d6498a53cdb10d81be6fc8a96836731f98d
+  metadata.gz: 55fd9b69d1c25ad937a08eaec9f8d12d055a1fbc
+  data.tar.gz: 269feb7487d2f484ce31f3fa6be8ca629b5c3de8
 SHA512:
-  metadata.gz: 82495dc61ad9c98b2dcf4c941e562ff6b0d0abf4f953d14a5e3fa7401d7aace13980bb9299433cf113b8c71e192316b23804af718720e940e530c37dad614ecf
-  data.tar.gz: fa22d24b19a3008809f3f9d2c2c956008278e3a01fdfbc15d7f344fb18d2f81273adcb7cd28eea2a71ef6a29cd7b6733b4c20ec387c6b30e9eef02d378f7c5d6
+  metadata.gz: 75783f20ffd0d0e08b453a2e3dc1394c32c2bb609c9c2873f49d6c18285541f1667e1ce6b9e0e0709562b66c404530e9873bc5b3a30501a98466f00499798f33
+  data.tar.gz: fdd3a74eace9ba8618e611306997846cf63d2c8aeb84d7fb2c0a0e504c58daafe3b689825043884d32a4a0f3e5918f2269be3884c4b921e3a92ce16497486f44

data/doc/dyk/lint.html CHANGED Viewed

@@ -53,6 +53,17 @@ To use in bake, add a LintPolicy in Project.meta:
 <pre id="rundrum"><code>LintPolicy ".../your.lnt"</code></pre>
+<h3>Output to xml</h3>
+This is an example how to redirect the output to single xml files placed into the main project folder.
+<pre id="rundrum"><code>DefaultToolchain GCC {
+  LintPolicy "-os($(MainProjectDir)/$(ProjectName)_$(ConfigName)_lintout.xml)"
+  LintPolicy "-v"
+  LintPolicy "+xml(doc)"
+  LintPolicy "-format=<message><file>%f</file> <line>%l</line> <type>%t</type> <code>%n</code> <desc>%m</desc></message>"
+  LintPolicy "-format_specific= "
+  LintPolicy "-pragma(message)"</code></pre>
 <h3>Notes</h3>
 In rare cases lint has problems if it has to open too many (include) files. If that is the case, use --lint_min and --lint_max command line option of bake. Example:
 <pre id="rundrum"><code>bake Debug -p MyLibraryProject --lint --lint_max 50                (lints the first 51 files)

data/doc/further/change.html CHANGED Viewed

@@ -7,13 +7,28 @@
 <body>
 <h1>Changelog</h1>
+January 23, 2015 - bake-toolkit 2.1.0<br>
+<ul>
+<li><b>Bugfix: fixed crash in warning output if setting variable via cmd did not work</b>
+<li><b>Workaround: dependent header files are now ignored on Windows if path starts with "/" and file cannot be found</b>
+<li><b>Changed: output of lint is now ignored, linting will only fails if it cannot be executed</b>
+<li><b>Changed: introduced new verbose mode <i>-v3</i>, shifted some output to this level</b>
+<li><b>Added: a dependency project can be specified with parent folders if it is ambiguous, e.g. <i>Dependency "my/folder/proj", config: lib</i></b>
+<li><b>Added: experimental CC2J output</b>
+</ul>
+January 23, 2015 - Eclipse plugin 1.2.1<br>
+<ul>
+<li><b>Bugfix: importing projects with existing .(c)project files may be placed in wrong folder</b>
+</ul>
 January 15, 2015 - bake-toolkit 2.0.10<br>
 <ul>
 <li><b>Bugfix: spaces in paths were not handled correctly in all cases</b>
 <li><b>Bugfix: dependency files of Keil compiler not treated correctly</b>
 <li><b>Added: showing why files are built in verbose mode <i>-v2</i></b>
 <li><b>Added: whole workspace can be linted now (projects will be linted separately)</b>
-<li><b>Changed: removed <i>bake-doc</i> command, use <i>bake --doc<i> instead</b>
+<li><b>Changed: removed <i>bake-doc</i> command, use <i>bake --doc</i> instead</b>
 <li><b>Changed: if no default project is specified, possible build configs are shown on command line again like in bake 1.x</b>
 </ul>

data/doc/index.html CHANGED Viewed

@@ -72,7 +72,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.0.10</td><td align="right">January 15, 2015</td></tr></table>
+<table width="100%" border="0"><tr><td align="left">Described bake-toolkit version: 2.1.0</td><td align="right">January 23, 2015</td></tr></table>
 </body>

data/doc/syntax/syntax.html CHANGED Viewed

@@ -435,7 +435,10 @@ 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>'+
     'If you omit the project, the current project will be used.<br>'+
-    'If you omit the config name, the default config will be used.'
+    'If you omit the config name, the default config will be used.<br>'+
+    '<b>Examples:</b><br>'+
+    '&nbsp;&nbsp; <i>Dependency gtest, config: lib<br>'+
+    '&nbsp;&nbsp; Dependency "my/folder/proj"</i>'
 	ddrivetip("Dependency", "No","0..n","-",str)
 }

data/lib/bake/cache.rb CHANGED Viewed

@@ -130,7 +130,7 @@ module Bake
         end
         if cache != nil
-          Bake.formatter.printInfo("Info: cache is up-to-date, loading cached meta information") if Bake.options.verboseHigh
+          Bake.formatter.printInfo("Info: cache is up-to-date, loading cached meta information") if Bake.options.verbose >= 3
           Bake.options.build_config = cache.build_config if Bake.options.build_config == ""
           return cache.referencedConfigs
         end

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

@@ -111,14 +111,20 @@ module Bake
     end
     def loadMeta(dep)
+      dep_subbed = dep.name.gsub(/\\/,"/")
+      if dep_subbed.include?":" or dep_subbed.include?"../" or dep_subbed.start_with?"/" or dep_subbed.end_with?"/"
+        Bake.formatter.printError("#{dep.name}  is invalid", dep)
+        ExitHelper.exit(1)
+      end
+      dep_path, dismiss, dep_name = dep_subbed.rpartition("/")
       # file not loaded yet
-      if not @loadedConfigs.include?dep.name
+      if not @loadedConfigs.include?dep_name
         pmeta_filenames = []
         @potentialProjs.each do |pp|
-          if pp.include?("/" + dep.name + "/Project.meta") or pp == (dep.name + "/Project.meta")
+          if pp.include?("/" + dep_subbed + "/Project.meta") or pp == (dep_subbed + "/Project.meta")
             pmeta_filenames << pp
           end
         end
@@ -137,17 +143,25 @@ module Bake
           end
         end
-        @loadedConfigs[dep.name] = loadProjMeta(pmeta_filenames[0])
+        @loadedConfigs[dep_name] = loadProjMeta(pmeta_filenames[0])
+      else
+        folder = @loadedConfigs[dep_name][0].get_project_dir
+        if not folder.include?dep_subbed
+          Bake.formatter.printError("Cannot load #{dep.name}, because #{folder} already loaded", dep)
+          ExitHelper.exit(1)
+        end
       end
       # get config
-      config, dep.config = getFullProject(@loadedConfigs[dep.name],dep.config)
+      config, dep.config = getFullProject(@loadedConfigs[dep_name], dep.config)
+      dep.name = dep_name
       # config not referenced yet
-      if not @referencedConfigs.include?dep.name
-        @referencedConfigs[dep.name] = [config]
-      elsif @referencedConfigs[dep.name].index { |c| c.name == dep.config } == nil
-        @referencedConfigs[dep.name] << config
+      if not @referencedConfigs.include?dep_name
+        @referencedConfigs[dep_name] = [config]
+      elsif @referencedConfigs[dep_name].index { |c| c.name == dep.config } == nil
+        @referencedConfigs[dep_name] << config
       else
         return
       end

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

@@ -50,13 +50,13 @@ module Bake
       loader.load(:before_load => proc {|fragment, kind|
         case kind
         when :load_update_cache
-          if Bake.options.verboseHigh
+          if Bake.options.verbose >= 3
             puts "Loading and caching #{fragment.location}"
           else
             puts "Loading #{fragment.location}"
           end
         when :load_cached
-          if Bake.options.verboseHigh
+          if Bake.options.verbose >= 3
             puts "Loading cached #{fragment.location}"
           else
             puts "Loading #{fragment.location}"

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

@@ -18,13 +18,12 @@ module Bake
   class Options < Parser
     attr_accessor :build_config, :nocache
-    attr_reader :main_dir, :project, :filename, :main_project_name # String
+    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
     attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
     attr_reader :vars # map
-    attr_reader :verboseLow
-    attr_reader :verboseHigh
+    attr_reader :verbose
     attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
@@ -36,13 +35,13 @@ module Bake
       @consoleOutput_visualStudio = false
       @prepro = false
       @stopOnFirstError = false
-      @verboseLow = false
-      @verboseHigh = false
+      @verbose = 1
       @vars = {}
       @build_config = ""
       @main_dir = nil
       @project = nil
       @filename = nil
+      @cc2j_filename = nil
       @clean = false
       @clobber = false
       @lint = false
@@ -84,9 +83,10 @@ module Bake
       add_option(Option.new("--docu",false)                {     @docu = true               })
-        add_option(Option.new("-v0",false)                   {     @verboseLow = true; @verboseHigh = false              })
-      add_option(Option.new("-v1",false)                   {     @verboseLow = false; @verboseHigh = false                   })
-      add_option(Option.new("-v2",false)                   {     @verboseLow = false; @verboseHigh = true                   })
+      add_option(Option.new("-v0",false)                   {     @verbose = 0      })
+      add_option(Option.new("-v1",false)                   {     @verbose = 1      })
+      add_option(Option.new("-v2",false)                   {     @verbose = 2      })
+      add_option(Option.new("-v3",false)                   {     @verbose = 3      })
       add_option(Option.new("--debug",false)               {     @debug = true              })
       add_option(Option.new("--set",true)                  { |x| set_set(x)                 })
@@ -109,7 +109,7 @@ module Bake
       add_option(Option.new("--doc",false)                 {     Doc.show              })
       add_option(Option.new("--version",false)             {     ExitHelper.exit(0)         })
       add_option(Option.new("--show_configs",false)        {     @showConfigs = true    })
+      add_option(Option.new("--writeCC2J",true)            { |x| @cc2j_filename = x.gsub(/[\\]/,'/')            })
     end

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

@@ -10,7 +10,7 @@ module Bake
       puts " -f <name>                Build/Clean this file only."
       puts " -c                       Clean the file/project."
       puts " -a <scheme>              Use ansi color sequences (console must support it). Possible values are 'white' and 'black'."
-      puts " -v<level>                Verbose level from 0 to 2, whereas -v0 is less, -v1 is normal (default) and -v2 is more verbose."
+      puts " -v<level>                Verbose level from 0 to 3, whereas -v0 is less, -v1 is normal (default) and -v2 and -v3 are more verbose."
       puts " -r                       Stop on first error."
       puts " -w <root>                Add a workspace root (can be used multiple times)."
       puts "                          If no root is specified, the parent directory of the main project is added automatically."
@@ -39,6 +39,7 @@ module Bake
       puts " --set <key>=<value>      Sets a variable. Overwrites variables defined in Project.metas (can be used multiple times)."
       puts " --show_include_paths     Used by IDEs plugins"
       puts " --show_incs_and_defs     Used by IDEs plugins"
+      puts " --writeCC2J <name>       Writes compiler command into a json file (experimental!)"
       puts ""
       puts " --version                Print version."
       puts " --doc                    Open documentation in browser"

data/lib/bake/subst.rb CHANGED Viewed

@@ -80,6 +80,7 @@ module Bake
           end
         else
           cmd_result = false
+          consoleOutput = ""
           begin
             Dir.chdir(@@projDir) do
               cmd = [substString(s.cmd, s)]
@@ -90,7 +91,7 @@ module Bake
             consoleOutput = e.message
           end
           if (cmd_result == false)
-            Bake.formatter.printWarning("Command not successful, variable #{s.name} wil be set to \"\" (#{consoleOutput.chomp}).", s)
+            Bake.formatter.printWarning("Command not successful, variable #{s.name} will be set to \"\" (#{consoleOutput.chomp}).", s)
             @@userVarMap[s.name] = ""
           end
         end
@@ -187,7 +188,7 @@ module Bake
         elsif ENV[var]
           substStr << ENV[var]
         else
-          if Bake.options.verboseHigh
+          if Bake.options.verbose >= 2
             msg = "Substitute variable '$(#{var})' with empty string"
             if elem
               Bake.formatter.printInfo(msg, elem)

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

@@ -11,7 +11,7 @@ module Bake
       :COMMAND => "lint-nt.exe",
       :DEFINE_FLAG => "-D",
       :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => ["-b","-\"format=%f%(:%l:%) %t %n: %m\"", "-width(0)", "-hF1"], # array, not string!
+      :COMPILE_FLAGS => ["-b","-\"format=%f%(:%l:%) %t %n: %m\"", "-width(0)", "-hF1", "-zero"], # array, not string!
     })
     LintChain[:COMPILER][:CPP][:ERROR_PARSER] = LintErrorParser.new

data/lib/blocks/block.rb CHANGED Viewed

@@ -9,6 +9,7 @@ module Bake
   module Blocks
+    CC2J = []
     ALL_BLOCKS = {}
     ALL_COMPILE_BLOCKS = {}
@@ -90,7 +91,7 @@ module Bake
                end
              end
            else
-             if elem and Bake.options.verboseHigh
+             if elem and Bake.options.verbose >= 2
                Bake.formatter.printInfo("\"..\" in path name found", elem)
              end
            end
@@ -166,7 +167,7 @@ module Bake
       def execute
         if (@inDeps)
-          if not Bake.options.verboseLow
+          if Bake.options.verbose >= 1
             Bake.formatter.printWarning("Circular dependency found including project #{@projectName} with config #{@configName}", @config)
           end
           return true
@@ -182,7 +183,7 @@ module Bake
         Bake::IDEInterface.instance.set_build_info(@projectName, @configName)
-        if not Bake.options.verboseLow
+        if Bake.options.verbose >= 1
           Bake.formatter.printAdditionalInfo "**** Building #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
@@ -197,7 +198,7 @@ module Bake
         depResult = callDeps(:clean)
         return false if not depResult and Bake.options.stopOnFirstError
-        if Bake.options.verboseHigh
+        if Bake.options.verbose >= 2
           Bake.formatter.printAdditionalInfo "**** Cleaning #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
@@ -206,7 +207,7 @@ module Bake
         if Bake.options.clobber
           Dir.chdir(@projectDir) do
             if File.exist?".bake"
-              puts "Deleting folder .bake" if Bake.options.verboseHigh
+              puts "Deleting folder .bake" if Bake.options.verbose >= 2
               FileUtils.rm_rf(".bake")
             end
           end

data/lib/blocks/blockBase.rb CHANGED Viewed

@@ -25,14 +25,14 @@ module Bake
           begin
             FileUtils.touch(@config.file_name)
           rescue Exception=>e
-            if Bake.options.verboseHigh
+            if Bake.options.verbose >= 2
               Bake.formatter.printWarning("Could not touch #{@config.file_name}: #{e.message}", @config.file_name)
             end
           end
         end
       end
-      def prepareOutput(filename)
+      def self.prepareOutput(filename)
         begin
           if File.exists?(filename)
             FileUtils.rm(filename)
@@ -61,19 +61,19 @@ module Bake
       def printCmd(cmd, alternate, reason, forceVerbose)
         if (cmd == @lastCommand)
-          if (Bake.options.verboseHigh or (@printedCmdAlternate and not forceVerbose))
+          if (Bake.options.verbose >= 2 or (@printedCmdAlternate and not forceVerbose))
             return
           end
         end
         @lastCommand = cmd
-        return if Bake.options.verboseLow and not forceVerbose
+        return if Bake.options.verbose == 0 and not forceVerbose
-        if forceVerbose or Bake.options.verboseHigh or not alternate
+        if forceVerbose or Bake.options.verbose >= 2 or not alternate
           @printedCmdAlternate = false
-          if Bake.options.verboseHigh
-            puts "" # for A.K. :-)
+          puts "" if Bake.options.verbose >= 2 # for A.K. :-)
+          if Bake.options.verbose >= 3
             exedIn = "\n(executed in '#{@projectDir}')"
             because = reason ? "\n(#{reason})" : ""
           else
@@ -114,7 +114,7 @@ module Bake
               end
               if Bake.options.lint
-                ret = error_descs.any? { |e| e.severity != ErrorParser::SEVERITY_OK }
+                # ignore error output
               else
                 ret = error_descs.any? { |e| e.severity == ErrorParser::SEVERITY_ERROR }
               end

data/lib/blocks/compile.rb CHANGED Viewed

@@ -47,8 +47,19 @@ module Bake
           begin
             File.readlines(dep_filename_conv).map{|line| line.strip}.each do |dep|
-              return "because dependent header #{dep} does not exist" if not File.exist?(dep)
-              return "because dependent header #{dep} is newer than object" if oTime < File.mtime(dep)
+              dep = "/usr/bla"
+              if not File.exist?(dep)
+                # we need a hack here. with some windows configurations the compiler prints unix paths
+                # into the dep file which cannot be found easily. this will be true for system includes,
+                # e.g. /usr/lib/...xy.h
+                if Bake::Utils::OS.windows? and dep.start_with?"/"
+                  puts "Dependency header file #{dep} ignored!" if Bake.options.debug
+                else
+                  return "because dependent header #{dep} does not exist"
+                end
+              else
+                return "because dependent header #{dep} is newer than object" if oTime < File.mtime(dep)
+              end
             end
           rescue Exception => ex
             if Bake.options.debug
@@ -112,7 +123,7 @@ module Bake
           raise SystemCommandFailed.new
         end
-        prepareOutput(object)
+        BlockBase.prepareOutput(object)
         cmd = Utils.flagSplit(compiler[:COMMAND], false)
         cmd += compiler[:COMPILE_FLAGS].split(" ")
@@ -150,6 +161,10 @@ module Bake
         end
         cmd << source
+        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)
@@ -270,11 +285,11 @@ module Bake
               object = get_object_file(source)
               dep_filename = calcDepFile(object, type)
               if File.exist?object
-                puts "Deleting file #{object}" if Bake.options.verboseHigh
+                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.verboseHigh
+                puts "Deleting file #{dep_filename}" if Bake.options.verbose >= 2
                 FileUtils.rm_rf(dep_filename)
               end
             end
@@ -298,7 +313,7 @@ module Bake
             if not p.include?"*" and not p.include?"?"
               Bake.formatter.printError("Source file '#{p}' not found", sources)
               raise SystemCommandFailed.new
-            elsif not Bake.options.verboseLow
+            elsif Bake.options.verbose >= 1
               Bake.formatter.printInfo("Source file pattern '#{p}' does not match to any file", sources)
             end
           end

data/lib/blocks/executable.rb CHANGED Viewed

@@ -92,7 +92,7 @@ module Bake
           reason = needed?(libs)
           return unless reason
-          prepareOutput(@exe_name)
+          BlockBase.prepareOutput(@exe_name)
           linker = @tcs[:LINKER]
@@ -131,7 +131,7 @@ module Bake
       def clean
         Dir.chdir(@projectDir) do
           if File.exist?@output_dir
-            puts "Deleting folder #{@output_dir}" if Bake.options.verboseHigh
+            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
             FileUtils.rm_rf(@output_dir)
           end
         end unless Bake.options.filename

data/lib/blocks/has_execute_command.rb CHANGED Viewed

@@ -5,8 +5,8 @@ module Bake
     module HasExecuteCommand
       def executeCommand(commandLine, ignoreStr=nil)
-        puts commandLine if not Bake.options.verboseLow
-        puts "(executed in '#{@projectDir}')" if Bake.options.verboseHigh
+        puts commandLine if Bake.options.verbose >= 1
+        puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
         cmd_result = false
         output = ""
         begin
@@ -20,7 +20,7 @@ module Bake
         if (cmd_result == false and (not ignoreStr or not output.include?ignoreStr))
           Bake.formatter.printError("Command \"#{commandLine}\" failed", @config)
-          puts "(executed in '#{@projectDir}')" if not Bake.options.verboseHigh
+          puts "(executed in '#{@projectDir}')" if Bake.options.verbose >= 3
           raise SystemCommandFailed.new
         end
       end

data/lib/blocks/library.rb CHANGED Viewed

@@ -45,7 +45,7 @@ module Bake
           reason = needed?
           return unless reason
-          prepareOutput(archive_name)
+          BlockBase.prepareOutput(archive_name)
           archiver = @tcs[:ARCHIVER]
@@ -65,7 +65,7 @@ module Bake
       def clean
         Dir.chdir(@projectDir) do
           if File.exist?@output_dir
-            puts "Deleting folder #{@output_dir}" if Bake.options.verboseHigh
+            puts "Deleting folder #{@output_dir}" if Bake.options.verbose >= 2
             FileUtils.rm_rf(@output_dir)
           end
         end unless Bake.options.filename

data/lib/common/cleanup.rb CHANGED Viewed

@@ -3,6 +3,7 @@ module Bake
     def self.cleanup()
       Blocks::ALL_BLOCKS.clear
       Blocks::ALL_COMPILE_BLOCKS.clear
+      Blocks::CC2J.clear
       Bake::IDEInterface.instance.set_abort(false)
     end

data/lib/common/version.rb CHANGED Viewed

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

data/lib/tocxx.rb CHANGED Viewed

@@ -254,6 +254,21 @@ module Bake
           ExitHelper.set_exit_code(1)
           return
         end
+        if Bake.options.cc2j_filename
+          Blocks::BlockBase.prepareOutput(Bake.options.cc2j_filename)
+          File.open(Bake.options.cc2j_filename, 'w') do |f|
+            f.puts "["
+            noComma = Blocks::CC2J.length - 1
+            Blocks::CC2J.each_with_index do |c, index|
+              cmd = c[:command].is_a?(Array) ? c[:command].join(' ') : c[:command]
+              f.puts "  { \"directory\": \"" + c[:directory] +  "\","
+              f.puts "    \"command\": \"" + cmd +  "\","
+              f.puts "    \"file\": \"" + c[:file] +  "\" }#{index == noComma ? "" : ","}"
+            end
+            f.puts "]"
+          end
+        end
         if result == false
           Bake.formatter.printError("\n#{taskType} failed.")

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -89,7 +89,6 @@ files:
 - lib/bake/options/showLicense.rb
 - lib/bake/options/showToolchains.rb
 - lib/bake/options/usage.rb
-- lib/bake/process_output.rb
 - lib/bake/subst.rb
 - lib/bake/toolchain/clang.rb
 - lib/bake/toolchain/colorizing_formatter.rb

data/lib/bake/process_output.rb DELETED Viewed

@@ -1,10 +0,0 @@
-module Bake
-  class ProcessOutput
-  end
-end