rakeoe 0.0.9 → 0.0.10

data/lib/rakeoe/app.rb

@@ -38,6 +38,7 @@ module RakeOE
       @app_main_dep = @app_main_obj.map {|obj| obj.ext('.d')}
       @app_lib_objs = objs - @app_main_obj
       @app_lib_deps = @app_lib_objs.map {|obj| obj.ext('.d')}
+      @prj_libs = search_libs(settings)
     end
 
 
@@ -54,20 +55,20 @@ module RakeOE
 
       binary_targets = paths_of_local_libs() + @app_main_dep + @app_main_obj
 
+      prj_libs = search_libs(settings)
+      linked_libs = prj_libs[:all]
+
       # This is only necessary if we have more than a single app main file
       if @app_lib_objs.any?
-        create_app_lib_rules(binary_targets)
+        create_app_lib_rules(binary_targets, linked_libs)
       end
 
-      prj_libs = search_libs(settings)
-      linked_libs = prj_libs[:all]
-
       file binary => binary_targets do
         tc.app(:libs => linked_libs,
-        :app => binary,
-        :objects => @app_main_obj,
-        :settings => @settings,
-        :includes => src_dirs)
+              :app => binary,
+              :objects => @app_main_obj,
+              :settings => @settings,
+              :includes => src_dirs)
       end
 
       if test_objs.any?
@@ -107,12 +108,13 @@ module RakeOE
       CLOBBER.include('*.d', build_dir)
     end
 
-    def create_app_lib_rules(binary_targets)
+    def create_app_lib_rules(binary_targets, libs)
       app_lib_targets = @app_lib_deps + @app_lib_objs + [@settings['PRJ_FILE']]
       file @app_lib => app_lib_targets do
         tc.lib(:objects => @app_lib_objs,
-        :lib => @app_lib,
-        :settings => @settings)
+               :lib => @app_lib,
+               :libs => libs,
+               :settings => @settings)
       end
 
       # add this to the dependent targets of app binary
@@ -138,13 +140,14 @@ module RakeOE
         # 'hidden' task just for building the test
         task "#{name}_build" => test_binary
 
-        file test_binary => [@test_fw.binary_path] + binary_targets + test_deps + test_objs do
+        test_binary_dependencies =  [@test_fw.binary_path] + binary_targets + test_deps + test_objs
+        file test_binary => test_binary_dependencies do
           tc.test(:objects => test_objs + [@app_lib],
-          :test => test_binary,
-          :libs => linked_libs,
-          :framework => @test_fw.name,
-          :settings => @settings,
-          :includes => test_dirs)
+                  :test => test_binary,
+                  :libs => linked_libs,
+                  :framework => @test_fw.name,
+                  :settings => @settings,
+                  :includes => test_dirs)
         end
         CLEAN.include(test_binary, build_dir)
         task :all => "#{name}"

data/lib/rakeoe/binary_base.rb

@@ -25,7 +25,8 @@ module RakeOE
     #
     def initialize(params)
       check_params(params)
-
+      @@all_libs ||= (PrjFileCache.project_names('LIB') + PrjFileCache.project_names('SOLIB')).uniq
+      @@all_libs_and_deps ||= PrjFileCache.search_recursive(:names => @@all_libs, :attribute => 'ADD_LIBS')
       @name = params[:name]
       @settings = params[:settings]
       @src_dir = @settings['PRJ_HOME']
@@ -274,14 +275,14 @@ module RakeOE
       end
     end
 
+
     # Checks if projects build prerequisites are met.
     #
     # If at least one of the following criteria are met, the method returns false:
     #   * project variable PRJ_TYPE == "DISABLED"
     #   * project variable IGNORED_PLATFORMS contains build platform
-    # @return   true    if project can be build on current platform
-    #           false   if project settings prohibit building
-
+    # @return   true    if project can be built on current platform
+    # @return   false   if project settings prohibit building
     def project_can_build?
       (settings['PRJ_TYPE'] != 'DISABLED') and (! tc.current_platform_any?(settings['IGNORED_PLATFORMS'].split))
     end
@@ -440,53 +441,52 @@ module RakeOE
       end
     end
 
-
-    # Returns unique list of dependent libraries for given parameter.
-    #
-    # @param [Array] libs     Libraries for using dependent libs
-    #
-    # @return [Set]           All dependent libs
-    #
-    def all_lib_deps(libs)
-      @lib_type ||= PrjFileCache.entries_reversed(['LIB', 'SOLIB'])
-      @dependent_libs ||= Set.new
-
-      libs.each do |name|
-        if (@lib_cache.has_key?(name))
-          unless @dependent_libs.contain?(name)
-            @dependent_libs += all_lib_deps(PrjFileCache.get(@lib_type[name], name, 'ADD_LIBS'))
-          end
-        end
-      end
-      @dependent_libs
-    end
-
-
     # Search dependent libraries as specified in ADD_LIBS setting
     # of prj.rake file
     #
     # @param [String] settings    The project settings definition
     #
-    # @return [Hash]                  Containing the following components mapped to an array:
-    # @option return [Array] :local   local libs found by toolchain
-    # @option return [Array] :all     local + external libs
+    # @return [Hash]                        Containing the following components mapped to an array:
+    # @option return [Array] :local         all local libs found by toolchain
+    # @option return [Array] :local_alibs   local static libs found by toolchain
+    # @option return [Array] :local_solibs  local shared libs found by toolchain
+    # @option return [Array] :all           local + external libs
     #
     def search_libs(settings)
       # get all libs specified in ADD_LIBS
-      libs = settings['ADD_LIBS'].split
+      search_libs =  settings['ADD_LIBS'].split
+      our_lib_deps = []
+      search_libs.each do |lib|
+        our_lib_deps << lib
+        deps_of_lib = @@all_libs_and_deps[lib]
+        if deps_of_lib
+          our_lib_deps += deps_of_lib
+        end
+      end
+      our_lib_deps.uniq!
 
       # match libs found by toolchain
-      local_libs = libs.each_with_object(Array.new) do |lib, arr|
-        arr << lib if (PrjFileCache.contain?('LIB', lib) || PrjFileCache.contain?('SOLIB', lib))
+      solibs_local = []
+      alibs_local = []
+      our_lib_deps.each do |lib|
+        if PrjFileCache.contain?('LIB', lib)
+          alibs_local << lib
+        elsif PrjFileCache.contain?('SOLIB', lib)
+          solibs_local << lib
+        end
       end
+      local_libs = (alibs_local + solibs_local) || []
 
       # return value is a hash
       {
-        :local => local_libs,
-        :all => libs
+        :local        => local_libs,
+        :local_alibs  => alibs_local,
+        :local_solibs => solibs_local,
+        :all          => our_lib_deps
       }
     end
 
+
     # Iterate over each local library and execute given block
     #
     # @param [Block]  block   The block that is executed
@@ -498,6 +498,24 @@ module RakeOE
       end
     end
 
+
+    #
+    # Returns absolute paths to given libraries, if they are local libraries
+    # of the current project.
+    #
+    def paths_of_libs(some_libs)
+      local_libs = Array.new
+
+      some_libs.each do |lib|
+        if PrjFileCache.contain?('LIB', lib)
+          local_libs << "#{tc.settings['LIB_OUT']}/lib#{lib}.a"
+        elsif PrjFileCache.contain?('SOLIB', lib)
+          local_libs << "#{tc.settings['LIB_OUT']}/lib#{lib}.so"
+        end
+      end
+
+      local_libs
+    end
     #
     # Returns absolute paths to dependend local libraries, i.e. libraries
     # of the current project.

data/lib/rakeoe/config.rb

@@ -95,7 +95,9 @@ module RakeOE
 
     # Dumps configuration to stdout
     def dump
-      puts 'RakeOE::Config:'
+      puts '******************'
+      puts '* RakeOE::Config *'
+      puts '******************'
       puts "Directories                 : #{@directories}"
       puts "Suffixes                    : #{@suffixes}"
       puts "Platform                    : #{@platform}"

data/lib/rakeoe/lib.rb

@@ -24,6 +24,9 @@ module RakeOE
 
 
     # Create all rules and tasks for the lib
+    # XXX DS: we have to make a consistent step by step approach for each binary type
+    # XXX DS: something like: 1.) search library dependencies, 2.)build paths, 3.) create main rule,
+    # XXX DS: 4.) make test rules, 5, make additional rules (clean/all, ...) etc.
     def create
       unless project_can_build?
         disable_build
@@ -32,10 +35,12 @@ module RakeOE
 
       desc "Create #{name}"
 
+      prj_libs = search_libs(settings)
+#puts "prj_libs for #{name}: #{prj_libs}"
       task name => [binary]
-
-      file binary => paths_of_local_libs + deps + objs do
-        prj_libs = search_libs(settings)
+      dependency_paths = paths_of_local_libs + deps + objs
+      file binary => dependency_paths do
+        tc.test_all_files_exist?(dependency_paths)
         tc.lib(:objects => objs,
                :lib => binary,
                :libs => prj_libs[:all],
@@ -43,7 +48,7 @@ module RakeOE
       end
 
       if test_objs.any? && (tc.config.test_fw.size > 0)
-        create_test_rules()
+        create_test_rules(:libs => prj_libs)
       end
 
       task name+'_clean' do
@@ -66,7 +71,7 @@ module RakeOE
 
 
     # Create all rules and tasks
-    def create_test_rules
+    def create_test_rules(params)
       namespace 'test' do
         # Build the library and execute tests
         desc "Test #{name}"
@@ -81,10 +86,10 @@ module RakeOE
 
         # 'hidden' task just for building the test
         task "#{name}_build" => test_binary
+        prj_libs = params[:libs]
 
         # main rule for the test binary
-        file test_binary => [@test_fw.binary_path] + [binary] + test_deps + test_objs do
-          prj_libs = search_libs(settings)
+        file test_binary => [@test_fw.binary_path] + paths_of_local_libs + [binary] + test_deps + test_objs do
           tc.test(:objects => test_objs,
                   :test => test_binary,
                   :libs => prj_libs[:all] + [name],

data/lib/rakeoe/prj_file_cache.rb

@@ -6,14 +6,25 @@ require 'rake'
 module RakeOE
 
   # Finds all project files and reads them into memory
-  # Maps project path => project file
+  # Maps found entries to the following hash format:
+  #
+  #  {"PRJ_TYPE1" => [{"NAME1"=>{"SETTING1" => "VALUE1", "SETTING2" => "VALUE2", ... },
+  #                   {"NAME2"=>{"SETTING1" => "VALUE1", "SETTING2" => "VALUE2", ... },
+  #                    ... ,
+  #                  ]
+  #  {"PRJ_TYPE2" => [{"NAME100"=>{"SETTING1" => "VALUE1", "SETTING2" => "VALUE2", ... },
+  #                   {"NAME101"=>{"SETTING1" => "VALUE1", "SETTING2" => "VALUE2", ... },
+  #                   ... ,
+  #                  ]
+  #  }
   # XXX DS: IDEA: generate all runtime dependencies at the beginning for each prj,
   # XXX DS: e.g. lib includes, source files, dependency files etc. and cache those as own variable in @prj_list
   class PrjFileCache
 
-    attr_accessor :prj_list
+    class << self; attr_accessor :prj_list end
 
-    # Introduce hash of projects. Contains list of project with key 'PRJ_TYPE'
+    # Introduce class instance variable: hash of projects.
+    # Contains list of project with key 'PRJ_TYPE'
     @prj_list = {}
 
     #
@@ -59,6 +70,21 @@ module RakeOE
     end
 
 
+    # Returns specific project library settings with given library names
+    #
+    # @param libs   Name of libraries
+    #
+    def self.get_lib_entries(libs)
+      rv = {}
+      self.entries_reversed(['ALIB', 'SOLIB']).each_pair do |entries, prj_name|
+        if libs.include?(prj_name)
+          rv[prj_name] = entries
+        end
+      end
+      rv
+    end
+
+
     # Returns specific value of a setting of the specified
     # project
     def self.get(prj_type, prj_name, setting)
@@ -67,6 +93,24 @@ module RakeOE
     end
 
 
+    # Returns specific value of a setting of the specified
+    # project
+    def self.get_with_name(prj_name, setting)
+      projects = @prj_list.values.flatten
+      projects.each do |project|
+        values = project[prj_name]
+        if values
+          value = values[setting].split
+          if value
+            return value
+          else
+            return []
+          end
+        end
+      end
+      []
+    end
+
     # Do we know anything about prj_name ?
     def self.contain?(prj_type, prj_name)
       return false unless @prj_list.has_key?(prj_type)
@@ -87,13 +131,56 @@ module RakeOE
       @prj_list[prj_type][prj_name]['PRJ_HOME']
     end
 
-
+    # iterate over each project with given project type
     def self.for_each(prj_type, &block)
       return unless @prj_list.has_key?(prj_type)
       @prj_list[prj_type].each_pair &block
     end
 
 
+    #
+    # Recursive function that uses each value of the array given via
+    # parameter 'values' and uses parameter 'setting' for accessing the
+    # values for next recursion step until all values have been traversed
+    # in all projects
+    def self.deps_recursive(values, setting, visited=Set.new)
+      return visited if values.nil?
+      values.each do |val|
+        next if (visited.include?(val))
+        visited << val
+        next_values = PrjFileCache.get_with_name(val, setting)
+        deps_recursive(next_values, setting, visited)
+      end
+      visited
+    end
+
+
+    # Searches recursively for all projects with name and associate
+    # Dependency with given attribute
+    #
+    # Returns a hash of the following form:
+    # { 'name1' => ['name2', 'name3', ...],
+    #   'name2' => ['name1', 'name3', ...],
+    #   'name3' => ['name1', 'name5', ...],
+    # }
+    #
+    def self.search_recursive(params={})
+      attribute = params[:attribute]
+      names = params[:names]
+      rv = {}
+      @prj_list.values.flatten.each do |projects|
+        projects.each_pair do |prj_name, prj_attributes|
+          if (names.include?(prj_name))
+            attr_values = prj_attributes[attribute].split
+            dependencies = deps_recursive(attr_values, attribute)
+            rv[prj_name] = dependencies.to_a
+          end
+        end
+      end
+      rv
+    end
+
+
     # Returns all entries for given project types as an array
     # of reversed prj_name => prj_type mappings
     #
@@ -103,13 +190,82 @@ module RakeOE
     #
     def self.entries_reversed(prj_types)
       prj_types.each_with_object(Hash.new) do |prj_type, h|
-        h.merge!(@prj_list[prj_type].reverse) if @prj_list.has_key?(prj_type)
+        h.merge!(@prj_list[prj_type].invert) if @prj_list.has_key?(prj_type)
       end
     end
 
+
+    #
+    # SEMANTIC METHODS, use specific attributes
+    #
+
+
+    # Checks if the project entries build prerequisites are met.
+    #
+    # If at least one of the following criteria are met, the method returns false:
+    #   * project variable PRJ_TYPE == "DISABLED"
+    #   * project variable IGNORED_PLATFORMS contains build platform
+    #
+    # @param    entry       The project name
+    # @param    platform    Current platform
+    #
+    # @return   true    if project can be built on current platform
+    # @return   false   if project settings prohibit building
+    #
+    def self.project_entry_buildable?(entry, platform)
+      (entry['IGNORED_PLATFORMS'].include?(platform)) &&
+          (entry['PRJ_TYPE'] != 'DISABLED')
+    end
+
+=begin
+    # Checks if projects build prerequisites are met.
+    #
+    # If at least one of the following criteria are met, the method returns false:
+    #   * project variable PRJ_TYPE == "DISABLED"
+    #   * project variable IGNORED_PLATFORMS contains build platform
+    #
+    # @param    prj_type  The project type
+    # @param    prj_name  The project name
+    # @param    platform  Current platform
+    #
+    # @return   true      if project can be built on current platform
+    # @return   false     if project settings prohibit building
+    #
+    def self.project_can_build?(prj_type, prj_name, platform)
+      self.project_entry_buildable?(@prj_list[prj_type][prj_name], platform)
+    end
+=end
+
+    # Joins all entries with keys that are appended with a regular expression that match
+    # the given match_string. Make them available via the base key name without the
+    # regular expression.
     #
-    # SEMANTIC METHODS
+    # @param a_string   String to be matched against key in all kvr with appended regular expression
     #
+    def self.join_regex_keys_for!(a_string)
+      @prj_list.each_pair do |prj_type, prj_names|
+        prj_names.each_pair do |prj_name, defs|
+          defs.each_pair do |property, value|
+            # split properties containing /../
+            base, key_regex = property.split(/\//)
+            if (key_regex)
+              if a_string.match(Regexp.new(key_regex))
+                if base.end_with?('_')
+                  base_key = base.chop
+                else
+                  base_key = base
+                end
+
+                # if base_key does not yet exist, create an empty string
+                @prj_list[prj_type][prj_name][base_key] ||= ''
+                @prj_list[prj_type][prj_name][base_key] += " #{@prj_list[prj_type][prj_name][property]}"
+              end
+            end
+          end
+        end
+      end
+    end
+
 
     # Returns exported include directories of a library project.
     # If given name does not exist in local library projects, an empty array

data/lib/rakeoe/toolchain.rb

@@ -186,8 +186,7 @@ class Toolchain
 
   # Set common build variables
   #
-  # @param [String] release_mode   Release mode used for the build, either 'release' or 'dbg'
-  def set_build_vars()
+  def set_build_vars
     warning_flags = ' -W -Wall'
     if 'release' == @config.release
       optimization_flags = " #{@config.optimization_release} -DRELEASE"
@@ -289,6 +288,10 @@ class Toolchain
   end
 
   # Generates linker line from given library list.
+  # The linker line normally will be like -l<lib1> -l<lib2>, ...
+  #
+  # If a library has specific platform specific setting in the platform file
+  # with a specific -l<lib> alternative, this will be used instead.
   #
   # @param [Array]  libs  Libraries to be used for linker line
   #
@@ -296,9 +299,10 @@ class Toolchain
   #
   def linker_line_for(libs)
     return '' if (libs.nil? || libs.empty?)
+
     libs.map do |lib|
       settings = platform_settings_for(lib)
-      if settings[:LDFLAGS].nil?
+      if settings[:LDFLAGS].nil? || settings[:LDFLAGS].empty?
         # automatic linker line if no platform specific LDFLAGS exist
         "-l#{lib}"
       else
@@ -308,11 +312,66 @@ class Toolchain
     end.join(' ').strip
   end
 
+
+  # Reduces the given list of libraries to bare minimum, i.e.
+  # the minimum needed for actual platform
+  #
+  # @libs   list of libraries
+  #
+  # @return reduced list of libraries
+  #
+  def reduce_libs_to_bare_minimum(libs)
+    rv = libs.clone
+    lib_entries = RakeOE::PrjFileCache.get_lib_entries(libs)
+    lib_entries.each_pair do |lib, entry|
+      rv.delete(lib) unless RakeOE::PrjFileCache.project_entry_buildable?(entry, @target)
+    end
+    rv
+  end
+
+
+  # Return array of library prerequisites for given file
+  def libs_for_binary(a_binary, visited=[])
+    return [] if visited.include?(a_binary)
+    visited << a_binary
+    pre = Rake::Task[a_binary].prerequisites
+    rv = []
+    pre.each do |p|
+
+      next if (File.extname(p) != '.a') && (File.extname(p) != '.so')
+      next if p =~ /\-app\.a/
+
+      rv << File.basename(p).gsub(/(\.a|\.so|^lib)/, '')
+      rv += libs_for_binary(p, visited)   # Recursive call
+    end
+
+    reduce_libs_to_bare_minimum(rv.uniq)
+  end
+
   # Touches a file
   def touch(file)
     sh "#{@settings['TOUCH']} #{file}"
   end
 
+
+  # Tests if all given files in given list exist
+  # @return true    all file exist
+  # @return false   not all file exist
+  def test_all_files_exist?(files)
+    files.each do |file|
+      raise "No such file: #{file}" unless File.exist?(file)
+    end
+  end
+
+  def diagnose_buildability(projects)
+    projects.each do |project|
+
+      RakeOE::PrjFileCache.project_entry_buildable?(entry, platform)
+    end
+
+  end
+
+
   # Returns platform specific settings of a resource (APP/LIB/SOLIB or external resource like e.g. an external library)
   # as a hash with the keys CFLAGS, CXXFLAGS and LDFLAGS. The values are empty if no such resource settings exist inside
   # the platform file. The resulting hash values can be used for platform specific compilation/linkage against the
@@ -419,7 +478,8 @@ class Toolchain
   def lib(params = {})
     ldflags   = params[:settings]['ADD_LDFLAGS'] + ' ' + @settings['LDFLAGS']
     objs      = params[:objects].join(' ')
-    libs      = linker_line_for(params[:libs])
+    dep_libs = (params[:libs] + libs_for_binary(params[:lib])).uniq
+    libs      = linker_line_for(dep_libs)
     extension = File.extname(params[:lib])
 
     case extension
@@ -448,7 +508,8 @@ class Toolchain
     incs    = compiler_incs_for(params[:includes])
     ldflags = params[:settings]['ADD_LDFLAGS'] + ' ' + @settings['LDFLAGS']
     objs    = params[:objects].join(' ')
-    libs    = linker_line_for(params[:libs])
+    dep_libs = (params[:libs] + libs_for_binary(params[:app])).uniq
+    libs    = linker_line_for(dep_libs)
 
     sh "#{@settings['SIZE']} #{objs} >#{params[:app]}.size" if @settings['SIZE']
     sh "#{@settings['CXX']} #{incs} #{objs} #{ldflags} #{libs} -o #{params[:app]} -Wl,-Map,#{params[:app]}.map"
@@ -470,13 +531,16 @@ class Toolchain
     ldflags = params[:settings]['ADD_LDFLAGS'] + ' ' +  @settings['LDFLAGS']
     objs    = params[:objects].join(' ')
     test_fw = linker_line_for([params[:framework]])
-    libs    = linker_line_for(params[:libs])
+    dep_libs = (params[:libs] + libs_for_binary(params[:test])).uniq
+    libs    = linker_line_for(dep_libs)
 
     sh "#{@settings['CXX']} #{incs} #{objs} #{test_fw} #{ldflags} #{libs} -o #{params[:test]}"
   end
 
   def dump
-    print "Platform configuration: "
+    puts '**************************'
+    puts '* Platform configuration *'
+    puts '**************************'
     @kvr.dump
   end
 

data/lib/rakeoe/version.rb

@@ -1,3 +1,3 @@
 module RakeOE
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/rakeoe.rb

@@ -29,7 +29,7 @@ module RakeOE
     RakeOE::PrjFileCache.sweep_recursive(config.directories[:apps] + config.directories[:libs])
 
     toolchain = RakeOE::Toolchain.new(config)
-    
+    RakeOE::PrjFileCache.join_regex_keys_for!(toolchain.target)
     #
     # Top level tasks
     #

data/rakeoe.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "factory_girl", "~> 4.0"
-  
+
+  spec.required_ruby_version = '>= 1.9.2'
+
   spec.add_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: