rakeoe 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9717944f0f38cc7be538370c7f19245a4dc9a05f
-  data.tar.gz: 06a0a2466d02d5afb248dd0e378d87e631aedf6d
+  metadata.gz: 2fbe6da29cfe5dab5316240a65e92968b05474db
+  data.tar.gz: afaab703e8c86e60895de7ba6dc67029a1217755
 SHA512:
-  metadata.gz: 0e65408d603b81beb5fb4b4cb392fe49013eb38b6044d689124f92616d78f81e9626ebff16c825d2a3abb5838d4d74652efc53e7db16e3e68d8a7d0c17c5bcb9
-  data.tar.gz: 6929a06b98572b38e3314c7f5c2fd9c49cc3a88e57ab3a4ff386995439c98a261a221604293c735e28d76cd87d0b61fa26c7015a6eee61033342f7c150d69c50
+  metadata.gz: e70fd91f6c122104d154ea3337a90235dd3a5c2f52d721fae846380d272e75a6b0b8b782330074e6cdb7e36c328558582e18cf47f3504379c21eaa63ac7bb0b4
+  data.tar.gz: 541a1010dbed2d44915fbcada5c10f376f34372870410dfe20c1a772abd13fc8c99d3e16e6ec7755850ef6fac179c0adede5a24f2df4807167a3f89298af4a03

data/lib/rakeoe/binary_base.rb

@@ -82,7 +82,7 @@ module RakeOE
       end
 
       @test_binary =  "#{bin_dir}/#{name}-test"
-      @test_inc_dirs = @test_fw.include
+      @test_inc_dirs = @test_fw.include.join(' ')
 
       handle_prj_type
       handle_qt if '1' == @settings['USE_QT']
@@ -378,115 +378,111 @@ module RakeOE
 
       # map object to source file and make it dependent on creation of all object directories
       rule /#{build_dir}\/.*\.o/ => [ proc {|tn| obj_to_source(tn, src_dir, build_dir)}] + obj_dirs do |t|
+        if t.name =~ /\/tests\//
+          # test framework additions
+          incs << @test_inc_dirs unless incs.include?(@test_inc_dirs)
+          @settings['ADD_CXXFLAGS'] += @test_fw.cflags
+          @settings['ADD_CFLAGS'] += @test_fw.cflags
+        end
 
-
-      if t.name =~ /\/tests\//
-        # test framework additions
-        incs += [@test_fw.include]
-        @settings['ADD_CXXFLAGS'] += @test_fw.cflags
-        @settings['ADD_CFLAGS'] += @test_fw.cflags
+        tc.obj(:source => t.source,
+        :object => t.name,
+        :settings => @settings,
+        :includes => incs.uniq)
       end
 
-      tc.obj(:source => t.source,
-      :object => t.name,
-      :settings => @settings,
-      :includes => incs)
-    end
+      # map dependency to source file and make it dependent on creation of all object directories
+      rule /#{build_dir}\/.*\.d/ => [ proc {|tn| dep_to_source(tn, src_dir, build_dir)}] + obj_dirs do |t|
+        # don't generate dependencies for assembler files XXX DS: use tc.file_extensions[:as_sources]
+        if (t.source.end_with?('.S') || t.source.end_with?('.s'))
+          tc.touch(t.name)
+          next
+        end
 
-    # map dependency to source file and make it dependent on creation of all object directories
-    rule /#{build_dir}\/.*\.d/ => [ proc {|tn| dep_to_source(tn, src_dir, build_dir)}] + obj_dirs do |t|
+        if t.name =~ /\/tests\//
+          # test framework additions
+          incs << @test_inc_dirs unless incs.include?(@test_inc_dirs)
+          @settings['ADD_CXXFLAGS'] += @test_fw.cflags
+          @settings['ADD_CFLAGS'] += @test_fw.cflags
+        end
 
-    # don't generate dependencies for assembler files XXX DS: use tc.file_extensions[:as_sources]
-    if (t.source.end_with?('.S') || t.source.end_with?('.s'))
-      tc.touch(t.name)
-      next
-    end
+        tc.dep(:source => t.source,
+        :dep => t.name,
+        :settings => @settings,
+        :includes => incs.uniq)
+      end
 
-    if t.name =~ /\/tests\//
-      # test framework additions
-      incs += [@test_fw.include]
-      @settings['ADD_CXXFLAGS'] += @test_fw.cflags
-      @settings['ADD_CFLAGS'] += @test_fw.cflags
+      # make moc source file dependent on corresponding header file, XXX DS: only if project uses QT
+      rule /#{src_dir}\/.*moc_.*#{Regexp.escape(tc.moc_source)}$/ => [ proc {|tn| tn.gsub(/moc_/, '').ext(tc.moc_header_extension) } ] do |t|
+        tc.moc(:source => t.source,
+        :moc => t.name,
+        :settings => @settings)
+      end
     end
 
-    tc.dep(:source => t.source,
-    :dep => t.name,
-    :settings => @settings,
-    :includes => incs)
-  end
-
-  # make moc source file dependent on corresponding header file, XXX DS: only if project uses QT
-  rule /#{src_dir}\/.*moc_.*#{Regexp.escape(tc.moc_source)}$/ => [ proc {|tn| tn.gsub(/moc_/, '').ext(tc.moc_header_extension) } ] do |t|
-  tc.moc(:source => t.source,
-  :moc => t.name,
-  :settings => @settings)
-end
-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
+    #
+    def search_libs(settings)
+      # get all libs specified in ADD_LIBS
+      libs = settings['ADD_LIBS'].split
 
-# 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
-#
-def search_libs(settings)
-# get all libs specified in ADD_LIBS
-libs = settings['ADD_LIBS'].split
-
-# 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))
-end
+      # 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))
+      end
 
-# return value is a hash
-{
-  :local => local_libs,
-  :all => libs
-}
-end
+      # return value is a hash
+      {
+        :local => local_libs,
+        :all => libs
+      }
+    end
 
-# Iterate over each local library and execute given block
-#
-# @param [Block]  block   The block that is executed
-#
-def each_local_lib(&block)
-libs = search_libs(@settings)
-libs[:local].each do |lib|
-  yield(lib)
-end
-end
+    # Iterate over each local library and execute given block
+    #
+    # @param [Block]  block   The block that is executed
+    #
+    def each_local_lib(&block)
+      libs = search_libs(@settings)
+      libs[:local].each do |lib|
+        yield(lib)
+      end
+    end
 
-#
-# Returns absolute paths to dependend local libraries, i.e. libraries
-# of the current project.
-#
-def paths_of_local_libs
-local_libs = Array.new
-
-each_local_lib() 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
+    #
+    # Returns absolute paths to dependend local libraries, i.e. libraries
+    # of the current project.
+    #
+    def paths_of_local_libs
+      local_libs = Array.new
 
-local_libs
-end
+      each_local_lib() 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
 
-# Greps for a string in a file
-#
-# @param [String] file    Filename to be used for operation
-# @param [String] string  String to be searched for in file
-#
-# @return [boolean]  true if string found inside file, false otherwise
-#
-def fgrep(file, string)
-open(file) { |f| f.grep(/#{string}/) }
-end
-end
+      local_libs
+    end
 
+    # Greps for a string in a file
+    #
+    # @param [String] file    Filename to be used for operation
+    # @param [String] string  String to be searched for in file
+    #
+    # @return [boolean]  true if string found inside file, false otherwise
+    #
+    def fgrep(file, string)
+      open(file).grep(/#{string}/).any?
+    end
+  end
 end

data/lib/rakeoe/defaults.rb

@@ -19,7 +19,8 @@ module RakeOE
   DEFAULT_DIRS = {
     :apps => %w[src/app],
     :libs => %w[src/lib src/3rdparty],
-    :build => 'build'
+    :build => 'build',
+    :deploy => 'deploy'
   }
 
   # Default release mode used for the project if no such parameter given via Rakefile

data/lib/rakeoe/test_framework.rb

@@ -27,6 +27,8 @@ module RakeOE
 
     # Returns test framework include path
     def include
+      raise 'No test framework include directory exported!' if @params[:include_dir].empty?
+
       @params[:include_dir]
     end
 

data/lib/rakeoe/toolchain.rb

@@ -68,7 +68,7 @@ class Toolchain
 
   # returns the build directory
   def build_dir
-    @config.directories[:build]
+    "#{@config.directories[:build]}/#{@target}/#{@config.release}"
   end
 
 
@@ -200,10 +200,12 @@ class Toolchain
     @settings['LIB_SRC_DIR'] = 'src/lib'
 
     # derived settings
-    @settings['BUILD_DIR'] = "#{build_dir}/#{@target}/#{@config.release}"
+    @settings['BUILD_DIR'] = "#{build_dir}"
     @settings['LIB_OUT'] = "#{@settings['BUILD_DIR']}/libs"
     @settings['APP_OUT'] = "#{@settings['BUILD_DIR']}/apps"
-    @settings['SYS_LFLAGS'] = "-L#{@settings['OECORE_TARGET_SYSROOT']}/lib -L#{@settings['OECORE_TARGET_SYSROOT']}/usr/lib"
+    unless @settings['OECORE_TARGET_SYSROOT'].nil? || @settings['OECORE_TARGET_SYSROOT'].empty?
+      @settings['SYS_LFLAGS'] = "-L#{@settings['OECORE_TARGET_SYSROOT']}/lib -L#{@settings['OECORE_TARGET_SYSROOT']}/usr/lib"
+    end
 
     # set LD_LIBRARY_PATH
     @settings['LD_LIBRARY_PATH'] = @settings['LIB_OUT']
@@ -333,13 +335,7 @@ class Toolchain
     object    = params[:object]
     source    = params[:source]
     incs      = compiler_incs_for(params[:includes]) + " #{@settings['LIB_INC']}"
-=begin
-puts
-puts "incs for #{object}: #{incs}"
-puts
-puts "params[:includes]:#{params[:includes]}"
-puts
-=end
+
     case
       when cpp_source_extensions.include?(extension)
         flags = @settings['CXXFLAGS'] + ' ' + params[:settings]['ADD_CXXFLAGS']

data/lib/rakeoe/version.rb

@@ -1,3 +1,3 @@
 module RakeOE
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rakeoe.rb

@@ -22,6 +22,7 @@ module RakeOE
   #
   # @param config [RakeOE::Config]      Configuration as provided by project Rakefile
   #
+  # @return [RakeOE::Toolchain]         Toolchain object
   def init(config)
 
     RakeOE::PrjFileCache.sweep_recursive(config.directories[:apps] + config.directories[:libs])
@@ -71,7 +72,30 @@ module RakeOE
       end
     end
 
-    desc 'Dumps configuration & toolchain variables'
+    desc 'Deploys apps and dynamic objects to deploy_dir/bin, deploy_dir/lib'
+    task :deploy, [:deploy_dir] => :all do |t, args|
+      args.with_defaults(:deploy_dir => config.directories[:deploy])
+      puts "Copy binaries from #{toolchain.build_dir} => #{args.deploy_dir}"
+      begin
+        FileUtils.mkdir_p("#{args.deploy_dir}/bin")
+        FileUtils.mkdir_p("#{args.deploy_dir}/lib")
+      rescue
+        raise
+      end
+
+      # deploy binaries
+      Dir.glob("#{toolchain.build_dir}/apps/*").each do |file|
+        next if file.end_with?('.bin')
+        FileUtils.cp(file, "#{args.deploy_dir}/bin/#{File.basename(file)}") if File.executable?(file)
+      end
+      # deploy dynamic libraries
+      Dir.glob("#{toolchain.build_dir}/libs/*.so").each do |file|
+        next if file.end_with?('.bin')
+        FileUtils.cp(file, "#{args.deploy_dir}/lib/")
+      end
+    end
+
+    desc 'Dump configuration & toolchain variables'
     task :dump do
       puts
       config.dump
@@ -88,6 +112,8 @@ module RakeOE
 
     # kind of mrproper/realclean
     CLOBBER.include('*.tmp', "#{config.directories[:build]}/*")
+
+    toolchain
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel Schnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler