RubyGems - bake-toolkit - Versions diffs - 2.16.1 → 2.17.1 - Mend

bake-toolkit 2.16.1 → 2.17.1

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 (72) hide show

data/documentation/_build/html/tips_and_tricks/the_bakery.html CHANGED Viewed

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>The Bakery &mdash; bake 2.16.1 documentation</title>
+    <title>The Bakery &mdash; bake 2.17.1 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.16.1',
+        VERSION:     '2.17.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.16.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.17.1 documentation" href="../index.html" />
     <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
     <link rel="next" title="Static Code Analysis" href="static_code_analysis.html" />
     <link rel="prev" title="Tips and Tricks" href="tips_and_tricks.html" />

data/documentation/_build/html/tips_and_tricks/the_clang.html CHANGED Viewed

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Clang Analyze &mdash; bake 2.16.1 documentation</title>
+    <title>Clang Analyze &mdash; bake 2.17.1 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.16.1',
+        VERSION:     '2.17.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.16.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.17.1 documentation" href="../index.html" />
     <link rel="up" title="Tips and Tricks" href="tips_and_tricks.html" />
     <link rel="next" title="Bundle projects" href="bundle.html" />
     <link rel="prev" title="How to use bake with cygwin" href="how_to_use_bake_with_cygwin.html" />

data/documentation/_build/html/tips_and_tricks/tips_and_tricks.html CHANGED Viewed

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Tips and Tricks &mdash; bake 2.16.1 documentation</title>
+    <title>Tips and Tricks &mdash; bake 2.17.1 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.16.1',
+        VERSION:     '2.17.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.16.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.17.1 documentation" href="../index.html" />
     <link rel="next" title="The Bakery" href="the_bakery.html" />
     <link rel="prev" title="How to Debug in Visual Studio" href="../ide/vs/how_to_debug_in_vs.html" />
 <meta charset='utf-8'>

data/documentation/_build/html/why_bake/why_bake.html CHANGED Viewed

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Why you should use bake &mdash; bake 2.16.1 documentation</title>
+    <title>Why you should use bake &mdash; bake 2.17.1 documentation</title>
     <link rel="stylesheet" href="../_static/basic.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '2.16.1',
+        VERSION:     '2.17.1',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -29,9 +29,9 @@
     <script type="text/javascript" src="../_static/bootstrap-3.3.4/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
     <link rel="shortcut icon" href="../_static/logo_tiny_32.ico"/>
-    <link rel="top" title="bake 2.16.1 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.17.1 documentation" href="../index.html" />
     <link rel="next" title="Install bake" href="../install/install_bake.html" />
-    <link rel="prev" title="bake 2.16.1" href="../index.html" />
+    <link rel="prev" title="bake 2.17.1" href="../index.html" />
 <meta charset='utf-8'>
 <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
 <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
@@ -108,7 +108,7 @@
   <li>
-    <a href="../index.html" title="Previous Chapter: bake 2.16.1"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.16.1</span>
+    <a href="../index.html" title="Previous Chapter: bake 2.17.1"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.17.1</span>
     </a>
   </li>
   <li>

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

@@ -231,26 +231,24 @@ module Bake
       end
       @project_files = []
       configs = loadProjMeta(mainMeta)
       @loadedConfigs = {}
       @loadedConfigs[Bake.options.main_project_name] = configs
-      if (Bake.options.build_config == "" and configs[0].parent.default == "")
-        ConfigNames.print(configs, nil, mainMeta)
-      end
-      config, Bake.options.build_config = getFullProject(configs,Bake.options.build_config, true)
-      @referencedConfigs = {}
-      @referencedConfigs[Bake.options.main_project_name] = [config]
+      if not showConfigNames?
+        config, Bake.options.build_config = getFullProject(configs,Bake.options.build_config, true)
+        @referencedConfigs = {}
+        @referencedConfigs[Bake.options.main_project_name] = [config]
-      if config.defaultToolchain == nil
-        Bake.formatter.printError("Main project configuration must contain DefaultToolchain", config)
-        ExitHelper.exit(1)
+        validateDependencies(config)
+        @depsPending = config.dependency
+        if Bake.options.build_config != "" and config.defaultToolchain == nil
+          Bake.formatter.printError("Main project configuration must contain DefaultToolchain", config)
+          ExitHelper.exit(1)
+        end
       end
-      validateDependencies(config)
-      @depsPending = config.dependency
     end
     def checkRoots()
@@ -300,29 +298,59 @@ module Bake
       end
     end
+    def defaultConfigName
+      @loadedConfigs[Bake.options.main_project_name].first.parent.default
+    end
+    def showConfigNames?
+      Bake.options.showConfigs or (Bake.options.build_config == "" and defaultConfigName == "")
+    end
+    def printConfigNames
+      mainConfigName = Bake.options.build_config != "" ? Bake.options.build_config : defaultConfigName
+      configs = @loadedConfigs[Bake.options.main_project_name]
+      foundValidConfig = false
+      configs.each do |c|
+        config, tmp = getFullProject(configs, c.name, c.name == mainConfigName)
+        next if config.defaultToolchain.nil?
+        Kernel.print "* #{config.name}"
+        Kernel.print " (default)" if config.name == defaultConfigName
+        Kernel.print ": #{config.description.text}" if config.description
+        Kernel.print "\n"
+        foundValidConfig = true
+      end
+      Bake.formatter.printWarning("No configuration with a DefaultToolchain found", Bake.options.main_dir+"/Project.meta") unless foundValidConfig
+      ExitHelper.exit(0)
+    end
     def load(adaptConfigs)
       @adaptConfigs = adaptConfigs
       @loader = Loader.new
-      cache = CacheAccess.new()
-      @referencedConfigs = cache.load_cache unless Bake.options.nocache
-      # cache invalid or forced to reload
-      if @referencedConfigs.nil?
-        loadMainMeta
-        checkRoots
-        while dep = @depsPending.shift
-          loadMeta(dep)
+      if not Bake.options.showConfigs
+        cache = CacheAccess.new()
+        @referencedConfigs = cache.load_cache unless Bake.options.nocache
+        # cache invalid or forced to reload
+        if @referencedConfigs.nil?
+          loadMainMeta
+          printConfigNames if showConfigNames? # if neither config name nor default is set, list the configs with DefaultToolchain
+          checkRoots
+          while dep = @depsPending.shift
+            loadMeta(dep)
+          end
+          filterSteps
+          cache.write_cache(@project_files, @referencedConfigs)
+        else
+          if showConfigNames?
+            loadMainMeta # needed because in cache only needed configs are stored
+            printConfigNames
+          end
         end
-        filterSteps
-        cache.write_cache(@project_files, @referencedConfigs)
-      end
+      else
+        loadMainMeta # "--list" specified
+        printConfigNames
+      end
     end
   end
 end

data/lib/bake/libElement.rb CHANGED Viewed

@@ -52,7 +52,7 @@ module Bake
       prefix = nil
       if block.library
-        if (not block.library.compileBlock.objects.empty?) or block.library.compileBlock.calcSources(true)
+        if (not block.library.compileBlock.objects.empty?) or not block.library.compileBlock.calcSources(true, true).empty?
           adaptedPath, prefix = adaptPath(block.library.archive_name, block, prefix)
           @@linker_libs_array << adaptedPath
           @@source_libraries << adaptedPath

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

@@ -1,7 +1,6 @@
 require 'bake/toolchain/colorizing_formatter'
 require 'common/options/parser'
 require 'bake/options/showToolchains'
-require 'bake/options/showConfigNames'
 require 'bake/options/showLicense'
 require 'bake/options/showDoc'
 require 'bake/options/usage'
@@ -18,7 +17,7 @@ module Bake
   end
   class Options < Parser
-    attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain
+    attr_accessor :build_config, :nocache, :analyze, :eclipseOrder, :envToolchain, :showConfigs
     attr_reader :main_dir, :project, :filename, :main_project_name, :cc2j_filename, :bundleDir # String
     attr_reader :roots, :include_filter, :exclude_filter, :adapt # String List
     attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro # Boolean
@@ -206,8 +205,6 @@ module Bake
         Bake.formatter.printError("Error: --lint and --docu not allowed at the same time")
         ExitHelper.exit(1)
       end
-      ConfigNames.show if @showConfigs
     end
     def check_valid_dir(dir)

data/lib/blocks/block.rb CHANGED Viewed

@@ -16,7 +16,7 @@ module Bake
     class Block
       attr_reader :lib_elements, :projectDir, :library, :config, :projectName, :warnConvValid
-      attr_accessor :visited, :inDeps, :result, :circularCheck
+      attr_accessor :visited, :inDeps, :result
       def startupSteps
         @startupSteps ||= []
@@ -56,7 +56,6 @@ module Bake
       def initialize(config, referencedConfigs)
         @inDeps = false
-        @circularCheck
         @visited = false
         @library = nil
         @config = config
@@ -70,6 +69,10 @@ module Bake
         @lib_elements = Bake::LibElements.calcLibElements(self)
       end
+      def getCompileBlocks()
+        mainSteps.select { |m| Compile === m }
+      end
       def convPath(dir, elem=nil, warnIfLocal=false)
          if dir.respond_to?("name")
            d = dir.name

data/lib/blocks/blockBase.rb CHANGED Viewed

@@ -198,8 +198,22 @@ module Bake
         end
         incList
       end
+      def getSubBlocks(b, method)
+        b.send(method).each do |child_b|
+          if not @otherBlocks.include?child_b
+            @otherBlocks << child_b
+            getSubBlocks(child_b, method)
+          end
+        end
+      end
+      def getBlocks(method)
+        @otherBlocks = []
+        getSubBlocks(@block, method)
+        return @otherBlocks
+      end
     end
   end
 end

data/lib/blocks/compile.rb CHANGED Viewed

@@ -347,7 +347,8 @@ module Bake
         end
       end
-      def calcSources(cleaning = false)
+      def calcSources(cleaning = false, keep = false)
+        return @source_files if @source_files and not @source_files.empty?
         Dir.chdir(@projectDir) do
           @source_files = []
@@ -405,24 +406,9 @@ module Bake
             end
           end
         end
-        return (not @source_files.empty?)
+        @source_files
       end
-      def getSubBlocks(b, method)
-        b.send(method).each do |child_b|
-          if not @otherBlocks.include?child_b
-            @otherBlocks << child_b
-            getSubBlocks(child_b, method)
-          end
-        end
-      end
-      def getBlocks(method)
-        @otherBlocks = []
-        getSubBlocks(@block, method)
-        return @otherBlocks
-      end
       def mapInclude(inc, orgBlock)
         if inc.name == "___ROOTS___"

data/lib/blocks/executable.rb CHANGED Viewed

@@ -44,18 +44,6 @@ module Bake
         end
       end
-      def depHasError(block)
-        return false if block.circularCheck
-        block.circularCheck = true
-        block.dependencies.each do |dep|
-          subBlock, name = Blocks::ALL_BLOCKS[dep]
-          return true unless subBlock.result
-          return true if depHasError(subBlock)
-        end
-        return false
-      end
       def ignore?
         Bake.options.prepro
       end
@@ -90,9 +78,22 @@ module Bake
       def execute
         Dir.chdir(@projectDir) do
-          Blocks::ALL_BLOCKS.each { |n,b| b.circularCheck = false }
-          return false if depHasError(@block)
+          childs = getBlocks(:childs)
+          return false if childs.any? { |b| b.result == false }
+          allSources = []
+          (childs + [@block]).each do |b|
+            Dir.chdir(b.projectDir) do
+              b.getCompileBlocks.each do |c|
+                allSources += c.calcSources(true, true).map { |s| File.expand_path(s) }
+              end
+            end
+          end
+          duplicateSources = allSources.group_by{ |e| e }.select { |k, v| v.size > 1 }.map(&:first)
+          duplicateSources.each do |d|
+            Bake.formatter.printWarning("Source compiled more than once: #{d}")
+          end
           libs, linker_libs_array = LibElements.calc_linker_lib_string(@block, @tcs)
           cmdLineCheck = false

data/lib/common/exit_helper.rb CHANGED Viewed

@@ -24,5 +24,15 @@ module Bake
 end
 at_exit do
-  exit(Bake::ExitHelper.exit_code)
+  if Bake::ExitHelper.exit_code != 0
+    exit(Bake::ExitHelper.exit_code)
+  elsif not $!.nil?
+    if $!.respond_to?("success")
+      exit($!.success? ? 0 : 1)
+    else
+      exit(1)
+    end
+  else
+    exit(0)
+  end
 end

data/lib/common/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -66,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: See documentation for more details
 email: alexander.schaal@esrlabs.com
 executables:
@@ -89,7 +117,6 @@ files:
 - lib/bake/model/metamodel_ext.rb
 - lib/bake/options/create.rb
 - lib/bake/options/options.rb
-- lib/bake/options/showConfigNames.rb
 - lib/bake/options/showDoc.rb
 - lib/bake/options/showLicense.rb
 - lib/bake/options/showToolchains.rb
@@ -181,6 +208,11 @@ files:
 - documentation/_build/html/_images/cygwin_mount.png
 - documentation/_build/html/_images/cygwin_ruby.png
 - documentation/_build/html/_images/cygwin_tty.png
+- documentation/_build/html/_images/debug_app.png
+- documentation/_build/html/_images/debug_debug.png
+- documentation/_build/html/_images/debug_flag.png
+- documentation/_build/html/_images/debug_map.png
+- documentation/_build/html/_images/debug_path.png
 - documentation/_build/html/_images/keys.png
 - documentation/_build/html/_images/logo_conformant_1024.png
 - documentation/_build/html/_images/logo_conformant_48.png
@@ -206,6 +238,7 @@ files:
 - documentation/_build/html/_sources/ide/eclipse/how_to_convert_existing_cdt_workspace.txt
 - documentation/_build/html/_sources/ide/eclipse/how_to_create_a_new_project_in_eclipse.txt
 - documentation/_build/html/_sources/ide/eclipse/how_to_create_a_workspace_in_eclipse.txt
+- documentation/_build/html/_sources/ide/eclipse/how_to_debug_in_eclipse.txt
 - documentation/_build/html/_sources/ide/eclipse/how_to_install_eclipse_plugin.txt
 - documentation/_build/html/_sources/ide/eclipse/how_to_use_bake_in_eclipse.txt
 - documentation/_build/html/_sources/ide/ide_integrations.txt
@@ -339,6 +372,16 @@ files:
 - documentation/_build/html/_static/cygwin_mount.png
 - documentation/_build/html/_static/cygwin_ruby.png
 - documentation/_build/html/_static/cygwin_tty.png
+- documentation/_build/html/_static/debugEclipse/app.png
+- documentation/_build/html/_static/debugEclipse/debug.png
+- documentation/_build/html/_static/debugEclipse/flag.png
+- documentation/_build/html/_static/debugEclipse/map.png
+- documentation/_build/html/_static/debugEclipse/path.png
+- documentation/_build/html/_static/debug_app.png
+- documentation/_build/html/_static/debug_debug.png
+- documentation/_build/html/_static/debug_flag.png
+- documentation/_build/html/_static/debug_map.png
+- documentation/_build/html/_static/debug_path.png
 - documentation/_build/html/_static/doctools.js
 - documentation/_build/html/_static/down-pressed.png
 - documentation/_build/html/_static/down.png
@@ -400,6 +443,7 @@ files:
 - documentation/_build/html/ide/eclipse/how_to_convert_existing_cdt_workspace.html
 - documentation/_build/html/ide/eclipse/how_to_create_a_new_project_in_eclipse.html
 - documentation/_build/html/ide/eclipse/how_to_create_a_workspace_in_eclipse.html
+- documentation/_build/html/ide/eclipse/how_to_debug_in_eclipse.html
 - documentation/_build/html/ide/eclipse/how_to_install_eclipse_plugin.html
 - documentation/_build/html/ide/eclipse/how_to_use_bake_in_eclipse.html
 - documentation/_build/html/ide/ide_integrations.html