RubyGems - bake-toolkit - Versions diffs - 2.17.4 → 2.18.0 - Mend

bake-toolkit 2.17.4 → 2.18.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 (54) hide show

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

@@ -5,7 +5,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Tips and Tricks &mdash; bake 2.17.4 documentation</title>
+    <title>Tips and Tricks &mdash; bake 2.18.0 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.17.4',
+        VERSION:     '2.18.0',
         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.17.4 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.18.0 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

@@ -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.17.4 documentation</title>
+    <title>Why you should use bake &mdash; bake 2.18.0 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.17.4',
+        VERSION:     '2.18.0',
         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.17.4 documentation" href="../index.html" />
+    <link rel="top" title="bake 2.18.0 documentation" href="../index.html" />
     <link rel="next" title="Install bake" href="../install/install_bake.html" />
-    <link rel="prev" title="bake 2.17.4" href="../index.html" />
+    <link rel="prev" title="bake 2.18.0" 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.17.4"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.17.4</span>
+    <a href="../index.html" title="Previous Chapter: bake 2.18.0"><span class="glyphicon glyphicon-chevron-left visible-sm"></span><span class="hidden-sm hidden-tablet">&laquo; bake 2.18.0</span>
     </a>
   </li>
   <li>

data/lib/bake/libElement.rb CHANGED

@@ -1,7 +1,7 @@
 module Bake
   class LibElement
     LIB = 1
     USERLIB = 2
     LIB_WITH_PATH = 3
@@ -9,15 +9,15 @@ module Bake
     DEPENDENCY = 5
     attr_reader :type, :value
     def initialize(type, value)
       @type = type
       @value = value
     end
   end
-  class LibElements
+  class LibElements
     def self.calc_linker_lib_string(block, tcs)
       @@lib_path_set = []
       @@dep_set = Set.new
@@ -25,16 +25,25 @@ module Bake
       @@projectDir = block.projectDir
       @@source_libraries = []
       @@linker_libs_array = []
       collect_recursive(block)
-      if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
-        @@linker_libs_array << (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
+      if Bake.options.oldLinkOrder
+        if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
+          @@linker_libs_array << (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
+        end
+      else
+        @@source_libraries.reverse!
+        @@lib_path_set.reverse!
+        if @@linker[:LIST_MODE] and not @@lib_path_set.empty?
+          @@linker_libs_array.unshift (@@linker[:LIB_PATH_FLAG] + @@lib_path_set.join(","));
+        end
+        @@linker_libs_array.reverse!
       end
-      return [@@source_libraries, @@linker_libs_array]
+      return [@@source_libraries, @@linker_libs_array]
     end
     def self.adaptPath(path, block, prefix)
       adaptedPath = path
       if not File.is_absolute?(path)
@@ -44,23 +53,31 @@ module Bake
       #adaptedPath = "\"" + adaptedPath + "\"" if adaptedPath.include?(" ")
       [adaptedPath, prefix]
     end
-    def self.collect_recursive(block)
-      return if @@dep_set.include?block
-      @@dep_set << block
-      prefix = nil
-      if block.library
+    def self.addOwnLib(block)
+      if block.library
         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
         end
       end
-      block.lib_elements.each do |elem|
+    end
+    def self.collect_recursive(block)
+      return if @@dep_set.include?block
+      @@dep_set << block
+      prefix = nil
+      if Bake.options.oldLinkOrder
+        addOwnLib(block)
+        elems = block.lib_elements
+      else
+        elems = block.lib_elements.reverse
+      end
+      elems.each do |elem|
         case elem.type
         when LibElement::LIB
           @@linker_libs_array << "#{@@linker[:LIB_FLAG]}#{elem.value}"
@@ -71,10 +88,29 @@ module Bake
           @@linker_libs_array <<  adaptedPath
         when LibElement::SEARCH_PATH
           adaptedPath, prefix = adaptPath(elem.value, block, prefix)
-          if not @@lib_path_set.include?adaptedPath
+          lpf = "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}"
+          if not Bake.options.oldLinkOrder
+            if not @@lib_path_set.include?adaptedPath
+              @@lib_path_set << adaptedPath
+              @@linker_libs_array << lpf if @@linker[:LIST_MODE] == false
+            end
+          end
+          if not Bake.options.oldLinkOrder
+            # must be moved to the end, so delete it...
+            ind1 = @@lib_path_set.index(adaptedPath)
+            ind2 = @@linker_libs_array.index(lpf)
+            @@lib_path_set.delete_at(ind1)      if not ind1.nil?
+            @@linker_libs_array.delete_at(ind2) if not ind2.nil?
+          end
+          if (not Bake.options.oldLinkOrder) or (not @@lib_path_set.include?adaptedPath)
+            # end place it at the end again
             @@lib_path_set << adaptedPath
-            @@linker_libs_array << "#{@@linker[:LIB_PATH_FLAG]}#{adaptedPath}" if @@linker[:LIST_MODE] == false
+            @@linker_libs_array << lpf if @@linker[:LIST_MODE] == false
           end
         when LibElement::DEPENDENCY
           if Blocks::ALL_BLOCKS.include?elem.value
             bb = Blocks::ALL_BLOCKS[elem.value]
@@ -84,16 +120,19 @@ module Bake
           end
         end
       end
-    end
+      addOwnLib(block) if not Bake.options.oldLinkOrder
+    end
     def self.calcLibElements(block)
       lib_elements = [] # value = array pairs [type, name/path string]
       block.config.libStuff.each do |l|
         if (Metamodel::UserLibrary === l)
           ln = l.name
           ls = nil
@@ -120,16 +159,16 @@ module Bake
           else
             ln = ls + "/" + ln unless ls.nil?
             lib_elements << LibElement.new(LibElement::LIB_WITH_PATH, ln)
-          end
+          end
         elsif (Metamodel::Dependency === l)
           lib_elements << LibElement.new(LibElement::DEPENDENCY, l.name+","+l.config)
         end
       end
       return lib_elements
-    end
+    end
   end
 end

data/lib/bake/mergeConfig.rb CHANGED

@@ -3,12 +3,12 @@ require 'common/ext/rtext'
 module Bake
   class MergeConfig
     def initialize(child, parent)
       @child = child
       @parent = parent
     end
     def self.clone(obj)
       if obj.is_a?(Metamodel::ModelElement)
         cloneModelElement(obj)
@@ -18,7 +18,7 @@ module Bake
         obj # no clone, should not happen
       end
     end
     def self.cloneModelElement(obj)
       cpy = obj.class.new
       cpy.file_name = obj.file_name
@@ -36,14 +36,14 @@ module Bake
       end
       cpy
     end
     def replace()
       @child.class.ecore.eAllReferences.each do |f|
         next unless @parent.class.ecore.eAllReferences.include?f
         next unless f.containment
         childData = @child.getGeneric(f.name)
-        if Metamodel::ModelElement === childData
+        if Metamodel::ModelElement === childData
           @parent.setGeneric(f.name,childData) if !childData.nil?
         elsif Array === childData
           if !childData.empty?
@@ -56,7 +56,7 @@ module Bake
         end
       end
     end
     def hasSubNodes(elem)
       elem.class.ecore.eAllReferences.each do |f|
         next unless f.containment
@@ -68,31 +68,35 @@ module Bake
     end
     def sameAttr(childData, parentData)
-      childData.class.ecore.eAllAttributes.all? { |a|
+      childData.class.ecore.eAllAttributes.all? { |a|
         a.eAnnotations.each do |x| x.details.each do |y|
           return true if (y.key == :internal and y.value == true)
         end; end
         a.name == "line_number" || (not childData.eIsSet(a.name)) || (childData.getGeneric(a.name) == parentData.getGeneric(a.name))
       }
     end
     def removeChilds(childElem, parentElem)
       return if childElem.nil? or parentElem.nil?
       childElem.class.ecore.eAllReferences.each do |f|
         next unless f.containment
-        childData = childElem.getGeneric(f.name)
-        parentData = parentElem.getGeneric(f.name)
+        begin
+          childData = childElem.getGeneric(f.name)
+          parentData = parentElem.getGeneric(f.name)
+        rescue Exception => ex
+          next # how to check fast if f.name is valid?
+        end
         next if childData.nil? or parentData.nil?
         if (Array === childData)
           if !parentData.empty? && !childData.empty?
             childData.each do |c|
-              cN = hasSubNodes(c)
+              cN = hasSubNodes(c)
               toRemove = []
               parentData.each do |p|
                 next if p.class != c.class
                 if (not cN)
-                  if sameAttr(c, p)
+                  if sameAttr(c, p)
                     toRemove << p
                   end
                 else
@@ -116,24 +120,24 @@ module Bake
         end
       end
     end
     def extendAttributes(childData, parentData)
-       parentData.class.ecore.eAllAttributes.each do |a|
+       parentData.class.ecore.eAllAttributes.each do |a|
          childData.setGeneric(a.name, parentData.getGeneric(a.name)) if !childData.eIsSet(a.name) && parentData.eIsSet(a.name)
        end
      end
      def extend(child, parent)
        (parent.class.ecore.eAllReferences & child.class.ecore.eAllReferences).each do |f|
          next unless f.containment
          parentData = parent.getGeneric(f.name)
          next if parentData.nil? or (Array === parentData && parentData.empty?)
          childData = child.getGeneric(f.name)
          if Array === parentData
            if f.name == "compiler"
              extendedParentData = []
-             parentData.each do |p|
+             parentData.each do |p|
                c = childData.find { |c| p.ctype == c.ctype }
                if c
                  extendAttributes(c, p)
@@ -144,7 +148,7 @@ module Bake
                end
              end
              restOfChildData = childData.find_all { |c| parentData.find {|p| p.ctype != c.ctype } }
-             child.setGeneric(f.name, extendedParentData + restOfChildData)
+             child.setGeneric(f.name, extendedParentData + restOfChildData)
            else
              child.setGeneric(f.name, parentData + childData)
            end
@@ -157,17 +161,17 @@ module Bake
            end
          end
        end
-     end
+     end
      def copyChildToParent(c, p)
        (p.class.ecore.eAllReferences & c.class.ecore.eAllReferences).each do |f|
          next unless f.containment
          childData = c.getGeneric(f.name)
          next if childData.nil? || (Array === childData && childData.empty?)
          p.setGeneric(f.name, childData)
-       end
+       end
      end
     def merge(type)
       s = StringIO.new
       ser = RText::Serializer.new(Language)
@@ -178,7 +182,7 @@ module Bake
         s.puts "\n>>>> parent <<<<"
         ser.serialize(@parent, s)
       end
       if (type == :remove)
         removeChilds(@child, @parent)
       elsif (type == :replace)
@@ -197,9 +201,9 @@ module Bake
         puts "#{s.string}"
       end
     end
   end
 end

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

@@ -15,35 +15,36 @@ module Bake
   def self.options=(options)
     @@options = options
   end
   class Options < Parser
     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
+    attr_reader :conversion_info, :stopOnFirstError, :clean, :rebuild, :show_includes, :show_includes_and_defines, :linkOnly, :no_autodir, :clobber, :lint, :docu, :debug, :prepro, :oldLinkOrder # Boolean
     attr_reader :threads, :socket, :lint_min, :lint_max # Fixnum
     attr_reader :vars # map
     attr_reader :verbose
     attr_reader :consoleOutput_fullnames, :consoleOutput_visualStudio
     def initialize(argv)
       super(argv)
+      @oldLinkOrder = false
       @conversion_info = false
       @envToolchain = false
       @analyze = false
       @eclipseOrder = false
       @showConfigs = false
       @consoleOutput_fullnames = false
-      @consoleOutput_visualStudio = false
+      @consoleOutput_visualStudio = false
       @prepro = false
       @stopOnFirstError = false
       @verbose = 1
       @vars = {}
       @build_config = ""
       @main_dir = nil
-      @project = nil
+      @project = nil
       @filename = nil
       @cc2j_filename = nil
       @clean = false
@@ -68,7 +69,7 @@ module Bake
       @main_project_name = ""
       @adapt = []
       @bundleDir = nil
       add_option(["-b",                   ""                     ], lambda { |x| set_build_config(x)                     })
       add_option(["-m"                                           ], lambda { |x| set_main_dir(x)                         })
       add_option(["-p"                                           ], lambda { |x| @project = x                            })
@@ -84,22 +85,22 @@ module Bake
       add_option(["--lint"                                       ], lambda {     @lint = true                            })
       add_option(["--lint-min",           "--lint_min"           ], lambda { |x| @lint_min = String === x ? x.to_i : x   })
       add_option(["--lint-max",           "--lint_max"           ], lambda { |x| @lint_max = String === x ? x.to_i : x   })
-      add_option(["--create"                                     ], lambda { |x| Bake::Create.proj(x)                    })
-      add_option(["--conversion-info",    "--conversion_info"    ], lambda {     @conversion_info = true                 })
+      add_option(["--create"                                     ], lambda { |x| Bake::Create.proj(x)                    })
+      add_option(["--conversion-info",    "--conversion_info"    ], lambda {     @conversion_info = true                 })
       add_option(["--generate-doc",       "--docu"               ], lambda {     @docu = true                            })
-      add_option(["--adapt"                                      ], lambda { |x| set_adapt(x)                            })
+      add_option(["--adapt"                                      ], lambda { |x| set_adapt(x)                            })
       add_option(["-v0"                                          ], lambda {     @verbose = 0                            })
       add_option(["-v1"                                          ], lambda {     @verbose = 1                            })
       add_option(["-v2"                                          ], lambda {     @verbose = 2                            })
       add_option(["-v3"                                          ], lambda {     @verbose = 3                            })
       add_option(["--debug"                                      ], lambda {     @debug = true                           })
       add_option(["--set"                                        ], lambda { |x| set_set(x)                              })
       add_option(["--clobber"                                    ], lambda {     @clobber = true; @clean = true          })
       add_option(["--ignore-cache",       "--ignore_cache"       ], lambda {     @nocache = true                         })
       add_option(["-j",                   "--threads"            ], lambda { |x| set_threads(x)                          })
@@ -110,7 +111,7 @@ module Bake
       add_option(["--omit",               "--exclude_filter"     ], lambda { |x| @exclude_filter << x                    })
       add_option(["--abs-paths",          "--show_abs_paths"     ], lambda {     @consoleOutput_fullnames = true         })
       add_option(["--bundle"                                     ], lambda { |x| set_bundle_dir(x)                       })
       add_option(["-h",                   "--help"               ], lambda {     Bake::Usage.show                        })
       add_option(["--incs-and-defs",      "--show_incs_and_defs" ], lambda {     @show_includes_and_defines = true       })
@@ -120,10 +121,12 @@ module Bake
       add_option(["--version"                                    ], lambda {     ExitHelper.exit(0)                      })
       add_option(["--list",               "--show_configs"       ], lambda {     @showConfigs = true                     })
       add_option(["--writeCC2J"                                  ], lambda { |x| @cc2j_filename = x.gsub(/[\\]/,'/')     })
+      add_option(["--link-2-17",          "--link_2_17"          ], lambda {     @oldLinkOrder = true                    })
       # hidden
       add_option(["--visualStudio"                               ], lambda {     @consoleOutput_visualStudio = true      })
       # deprecated and not replaced by new command
       add_option(["--show_include_paths"                         ], lambda {     @show_includes = true                   })
@@ -136,19 +139,19 @@ module Bake
       @roots = @def_roots if @roots.length == 0
       @roots.uniq!
       @adapt.uniq!
       if @project
         if @project.split(',').length > 2
           Bake.formatter.printError("Error: only one comma allowed for -p")
           ExitHelper.exit(1)
         end
       end
       if @conversion_info
         if @rebuild
           Bake.formatter.printError("Error: --conversion-info and --rebuild not allowed at the same time")
           ExitHelper.exit(1)
-        end
+        end
         if @clean
           Bake.formatter.printError("Error: --conversion-info and -c not allowed at the same time")
           ExitHelper.exit(1)
@@ -174,7 +177,7 @@ module Bake
           ExitHelper.exit(1)
         end
       end
       if @linkOnly
         if @rebuild
           Bake.formatter.printError("Error: --link-only and --rebuild not allowed at the same time")
@@ -200,13 +203,13 @@ module Bake
           ExitHelper.exit(1)
         end
       end
       if @lint and @docu
         Bake.formatter.printError("Error: --lint and --docu not allowed at the same time")
         ExitHelper.exit(1)
       end
     end
     def check_valid_dir(dir)
      if not File.exists?(dir)
         Bake.formatter.printError("Error: Directory #{dir} does not exist")
@@ -215,8 +218,8 @@ module Bake
       if not File.directory?(dir)
         Bake.formatter.printError("Error: #{dir} is not a directory")
         ExitHelper.exit(1)
-      end
-    end
+      end
+    end
     def set_build_config(config)
       if not @build_config.empty?
@@ -225,30 +228,30 @@ module Bake
       end
       @build_config = config
     end
     def set_main_dir(dir)
       check_valid_dir(dir)
       @main_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
       @main_project_name = File::basename(@main_dir)
       @def_roots = calc_def_roots(@main_dir)
     end
     def set_bundle_dir(dir)
       d = File.expand_path(dir.gsub(/[\\]/,'/'))
       Bake::Bundle.instance.setOutputDir(d)
     end
     def set_root(dir)
       check_valid_dir(dir)
       r = File.expand_path(dir.gsub(/[\\]/,'/'))
       @roots << r if not @roots.include?r
     end
     def set_adapt(name)
       @adapt << name if not @adapt.include?name
     end
     def set_threads(num)
       @threads = String === num ? num.to_i : num
       if @threads <= 0
@@ -256,7 +259,7 @@ module Bake
         ExitHelper.exit(1)
       end
     end
     def set_set(str)
       ar = str.split("=")
       if not str.include?"=" or ar[0].length == 0
@@ -265,7 +268,7 @@ module Bake
       end
       @vars[ar[0]] = ar[1..-1].join("=")
     end
   end
 end