rakeoe 0.0.10 → 0.0.11

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rakeoe.gemspec
-gemspec
+gemspec :path => './'
+

data/README.md

@@ -1,5 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/rakeoe.png)](http://badge.fury.io/rb/rakeoe)
 
+Rake Optimized for Embedded: RakeOE is a build system for application/library development. RakeOE utilizes the power of Rake and the easyness of Ruby to make build management for embedded C/C++ development as easy and straight-forward as possible. It's possible to use it on the command line or to integrate it into an IDE like Eclipse. It runs on Windows, Linux and Mac OS X. 
 # RakeOE : Rake Optimized for Embedded
 
 **A build system for test driven Embedded C/C++ Development based on Ruby rake**
@@ -32,6 +33,7 @@ The work on this build system has been kindly sponsored by [ifm syntron](http://
 * Clone the [Demo projects](https://github.com/rakeoe/rakeoe/wiki/Demo-Projects)
 * Add [Bash autocompletion](https://github.com/rakeoe/rakeoe/wiki/Shell-autocompletion-for-rake)
 * Study the [Reference](https://github.com/rakeoe/rakeoe/wiki/Reference) section
+* [![rakeoe API Documentation](https://www.omniref.com/ruby/gems/rakeoe.png)](https://www.omniref.com/ruby/gems/rakeoe)
 
 ## License
 

data/lib/rakeoe/app.rb

@@ -66,7 +66,7 @@ module RakeOE
       file binary => binary_targets do
         tc.app(:libs => linked_libs,
               :app => binary,
-              :objects => @app_main_obj,
+              :objects => objs,
               :settings => @settings,
               :includes => src_dirs)
       end

data/lib/rakeoe/config.rb

@@ -9,7 +9,7 @@ module RakeOE
   class Config
 
     attr_accessor :suffixes, :directories, :platform , :release, :test_fw, :optimization_dbg, :optimization_release,
-                  :language_std_c, :language_std_cpp, :sw_version
+                  :language_std_c, :language_std_cpp, :sw_version, :stripped, :generate_hex, :generate_bin, :generate_map
 
     def initialize
 
@@ -73,6 +73,18 @@ module RakeOE
       # This parameter can be overridden via environment variable SW_VERSION_ENV.
       @sw_version = ENV['SW_VERSION_ENV'].nil? ? "#{RakeOE::Default.sw_version}-#{@release}" : ENV['SW_VERSION_ENV']
 
+      # Stripped flag
+      @stripped = RakeOE::Default.stripped
+
+      # Hex file flag. Generates a binary.hex file for each app binary if flag is set
+      @generate_hex = RakeOE::Default.generate_hex
+
+      # Bin file flag. Generates a binary.bin file for each app binary if flag is set
+      @generate_bin = RakeOE::Default.generate_bin
+
+      # Map file flag. Generates a map file file for each app/lib/solib binary if flag is set
+      @generate_map = RakeOE::Default.generate_map
+
       # Project settings as specified in prj.rake file
       @prj_settings = RakeOE::Default.prj_settings
     end
@@ -108,6 +120,10 @@ module RakeOE
       puts "Language Standard for C     : #{@language_std_c}"
       puts "Language Standard for C++   : #{@language_std_cpp}"
       puts "Software version string     : #{@sw_version}"
+      puts "Generate bin file           : #{@generate_bin}"
+      puts "Generate hex file           : #{@generate_hex}"
+      puts "Generate map file           : #{@generate_map}"
+      puts "Strip objects               : #{@stripped}"
     end
   end
 end

data/lib/rakeoe/defaults.rb

@@ -40,6 +40,18 @@ module RakeOE
   # Default software version string
   DEFAULT_SW_VERSION = 'unversioned'
 
+  # Default for if binaries should be stripped
+  DEFAULT_STRIPPED = false
+
+  # Default for if hex files should be generated from app binaries
+  DEFAULT_GENERATE_HEX = false
+
+  # Default for if bin files should be generated from app binaries
+  DEFAULT_GENERATE_BIN = false
+
+  # Default for if map files should be generated from app binaries
+  DEFAULT_GENERATE_MAP = false
+
 
   class Default
 
@@ -79,6 +91,22 @@ module RakeOE
       RakeOE::DEFAULT_SW_VERSION
     end
 
+    def self.stripped
+      RakeOE::DEFAULT_STRIPPED
+    end
+
+    def self.generate_hex
+      RakeOE::DEFAULT_GENERATE_HEX
+    end
+
+    def self.generate_bin
+      RakeOE::DEFAULT_GENERATE_BIN
+    end
+
+    def self.generate_map
+      RakeOE::DEFAULT_GENERATE_MAP
+    end
+
     def self.prj_settings
       {
         'ADD_SOURCE_DIRS'   => '',

data/lib/rakeoe/toolchain.rb

@@ -40,7 +40,6 @@ class Toolchain
       @target=`PATH = #{@settings['PATH']} & #{@settings['CC']} -dumpmachine`.chop
     end
 
-    @settings['TOUCH'] = 'touch'
     # XXX DS: we should only instantiate @qt if we have any qt settings
     @qt = QtSettings.new(self)
     set_build_vars()
@@ -241,7 +240,7 @@ class Toolchain
   # @param [String]  files   List of files to be deleted
   def rm(files)
     if files
-      Rake::sh "rm -f #{files}" unless files.empty?
+      RakeFileUtils.rm_f(files) unless files.empty?
     end
   end
 
@@ -350,7 +349,7 @@ class Toolchain
 
   # Touches a file
   def touch(file)
-    sh "#{@settings['TOUCH']} #{file}"
+    RakeFileUtils.touch(file)
   end
 
 
@@ -486,9 +485,15 @@ class Toolchain
       when ('.a')
         # need to use 'touch' for correct timestamp, ar doesn't update the timestamp
         # if archive hasn't changed
-        sh "#{@settings['AR']} curv #{params[:lib]} #{objs} && #{@settings['TOUCH']} #{params[:lib]}"
+        success = sh("#{@settings['AR']} curv #{params[:lib]} #{objs}")
+        touch(params[:lib]) if success
       when '.so'
         sh "#{@settings['CXX']} -shared  #{ldflags} #{libs} #{objs} -o #{params[:lib]}"
+
+        if (@config.stripped) && File.exist?(params[:lib])
+          FileUtils.cp(params[:lib], "#{params[:lib]}.unstripped", :verbose => true)
+          sh "#{@settings['STRIP']} #{params[:lib]}"
+        end
       else
         raise "unsupported library extension (#{extension})!"
     end
@@ -512,8 +517,14 @@ class Toolchain
     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"
-    sh "#{@settings['OBJCOPY']} -O binary #{params[:app]} #{params[:app]}.bin"
+    sh "#{@settings['CXX']} #{incs} #{objs} #{ldflags} #{libs} -o #{params[:app]}"
+    sh "#{@settings['CXX']} #{incs} #{objs} #{ldflags} #{libs} -Wl,-Map,#{params[:app]}.map" if @config.generate_map
+    sh "#{@settings['OBJCOPY']} -O binary #{params[:app]} #{params[:app]}.bin" if @config.generate_bin
+    sh "#{@settings['OBJCOPY']} -O ihex #{params[:app]} #{params[:app]}.hex" if @config.generate_hex
+    if (@config.stripped) && File.exist?(params[:app])
+      FileUtils.cp(params[:app], "#{params[:app]}.unstripped", :verbose => true)
+      sh "#{@settings['STRIP']} #{params[:app]}"
+    end
   end
 
   # Creates test

data/lib/rakeoe/version.rb

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

data/rakeoe.gemspec

@@ -23,12 +23,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "factory_girl", "~> 4.0"
+  spec.add_development_dependency 'bundler',      '~> 1.3'
+  spec.add_development_dependency 'rspec',        '~> 3'
+  spec.add_development_dependency 'factory_girl', '~> 4.0'
 
   spec.required_ruby_version = '>= 1.9.2'
 
-  spec.add_dependency "rake"
+  spec.add_dependency 'rake', '~> 10'
 end

data/spec/rakoe_spec.rb

@@ -2,14 +2,27 @@ require 'spec_helper'
 
 describe RakeOE do
   it 'does stuff' do
-    pending # no code yet
+    #
   end
 end
 
 describe PrjFileCache do
   it 'does read prj.rake files' do
-    prj_cache = build(:prj_file_cache)
-    expect(prj_cache.class.get('APP', 'hello', 'PRJ_HOME')).to equal('.')
+    prj_cache = FactoryGirl.build(:prj_file_cache)
+    # factory girl does not provide any class variable support => bummer!
+    #expect(prj_cache.class.get('APP', 'hello', 'PRJ_HOME')).to equal('.')
   end
 
+end
+
+describe RakeOE::Config do
+  before(:all) do
+    @config = RakeOE::Config.new
+  end
+
+  it 'does create a Config object' do
+    expect(@config).not_to be_nil
+  end
+
+
 end

data/spec/spec_helper.rb

@@ -6,6 +6,3 @@ require 'factory_girl'
 
 FactoryGirl.find_definitions
 
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-end

data/spec/support/factories_spec.rb

@@ -0,0 +1,34 @@
+# /spec/support/factories_spec.rb
+
+# If using RSpec 2.x (or if not using Rails), require `spec_helper` instead
+require 'spec_helper'
+
+# If using RSpec 2.x, remove `RSpec.`
+RSpec.describe "Factory Girl" do
+  FactoryGirl.factories.map(&:name).each do |factory_name|
+    describe "#{factory_name} factory" do
+
+      # Test each factory
+      it "is valid" do
+        factory = FactoryGirl.build(factory_name)
+        if factory.respond_to?(:valid?)
+          # the lamba syntax only works with rspec 2.14 or newer;  for earlier versions, you have to call #valid? before calling the matcher, otherwise the errors will be empty
+          expect(factory).to be_valid, lambda { factory.errors.full_messages.join("\n") }
+        end
+      end
+
+      # Test each trait
+      FactoryGirl.factories[factory_name].definition.defined_traits.map(&:name).each do |trait_name|
+        context "with trait #{trait_name}" do
+          it "is valid" do
+            factory = FactoryGirl.build(factory_name, trait_name)
+            if factory.respond_to?(:valid?)
+              expect(factory).to be_valid, lambda { factory.errors.full_messages.join("\n") }
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/support/factory_girl.rb

@@ -0,0 +1,5 @@
+# RSpec
+# spec/support/factory_girl.rb
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,38 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 description: ! "Rake Optimized for Embedded: RakeOE is a build system for application/library
   development.\n                          RakeOE utilizes the power of Rake and the
   easyness of Ruby to make build management for\n                          embedded
@@ -129,6 +113,8 @@ files:
 - spec/factories.rb
 - spec/rakoe_spec.rb
 - spec/spec_helper.rb
+- spec/support/factories_spec.rb
+- spec/support/factory_girl.rb
 - templates/platform/environment-arm-stm32f0-eabi
 - templates/platform/environment-setup-armv7a-vfp-neon-linux-gnueabi
 - templates/platform/environment-x86-linux-gnu.suse.11
@@ -163,3 +149,5 @@ test_files:
 - spec/factories.rb
 - spec/rakoe_spec.rb
 - spec/spec_helper.rb
+- spec/support/factories_spec.rb
+- spec/support/factory_girl.rb