rakeoe 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a041a43c96d1045d474ca852ff42844cb5d52369
-  data.tar.gz: b5fbc1750c1f15a7b7f90805f25b250543bc1948
+  metadata.gz: 9717944f0f38cc7be538370c7f19245a4dc9a05f
+  data.tar.gz: 06a0a2466d02d5afb248dd0e378d87e631aedf6d
 SHA512:
-  metadata.gz: c550c305921b8d7d82f52e17a6c9dfb5f03c9e8b932da2319ed4244e672c7b729863a0a4fb1e4300fbe8e8cb8cea3df5cf9787f99c326749b67764a5155493b1
-  data.tar.gz: 4616fb9b9c2571223b572315b064bb7ab5312f7a11b8bde2904fdd618181842720eec1771adf95142be4dd2700c8c99e0dc115305aa528ff6c701f2d40589aed
+  metadata.gz: 0e65408d603b81beb5fb4b4cb392fe49013eb38b6044d689124f92616d78f81e9626ebff16c825d2a3abb5838d4d74652efc53e7db16e3e68d8a7d0c17c5bcb9
+  data.tar.gz: 6929a06b98572b38e3314c7f5c2fd9c49cc3a88e57ab3a4ff386995439c98a261a221604293c735e28d76cd87d0b61fa26c7015a6eee61033342f7c150d69c50

data/lib/rakeoe/config.rb

@@ -39,7 +39,7 @@ module RakeOE
       # This is the absolute path to the platform definition file
       #
       # This parameter can be overridden via environment variable TOOLCHAIN_ENV
-      @platform = ENV['TOOLCHAIN_ENV'].nil? ? RakeOE::DEFAULT_PLATFORM : ENV['TOOLCHAIN_ENV']
+      @platform = ENV['TOOLCHAIN_ENV'].nil? ? '' : ENV['TOOLCHAIN_ENV']
 
       # Release mode used for the project
       # It can take the values "dbg" or "release" and influences the build behaviour.
@@ -49,7 +49,7 @@ module RakeOE
       #
       # This parameter can be overridden via environment variable RELEASE. If the latter
       # is defined, this configuration variable has the value "release"
-      @release = ENV['RELEASE'].nil? ? 'release' : RakeOE::DEFAULT_RELEASE
+      @release = ENV['RELEASE'].nil? ? RakeOE::DEFAULT_RELEASE : 'release'
 
       # Test framework used for linking test case binaries
       # This takes the name of the test framework that has to be integrated into the project
@@ -75,15 +75,31 @@ module RakeOE
     end
 
 
+    # Checks configuration, e.g. if given files do exist or if vital configuration settings are missing
+    #
+    # @return [bool]    true if checks pass, false otherwise
+    #
+    def checks_pass?
+      rv = true
+      unless File.exist?(@platform)
+        puts "No platform or invalid platform configuration given: (#{@platform}) !"
+        puts "Use either property 'platform' via RakeOE::Config object in the Rakefile or environment variable TOOLCHAIN_ENV"
+        rv = false
+      end
+      rv
+    end
+
+
     # Dumps configuration to stdout
     def dump
+      puts 'RakeOE::Config:'
       puts "Directories                 : #{@directories}"
       puts "Suffixes                    : #{@suffixes}"
       puts "Platform                    : #{@platform}"
       puts "Release mode                : #{@release}"
       puts "Test framework              : #{@test_fw}"
-      puts "Optimazion dbg              : #{@optimization_dbg}"
-      puts "Optimazion release          : #{@optimization_release}"
+      puts "Optimization dbg            : #{@optimization_dbg}"
+      puts "Optimization release        : #{@optimization_release}"
       puts "Language Standard for C     : #{@language_std_c}"
       puts "Language Standard for C++   : #{@language_std_cpp}"
       puts "Software version string     : #{@sw_version}"

data/lib/rakeoe/defaults.rb

@@ -22,9 +22,6 @@ module RakeOE
     :build => 'build'
   }
 
-  # Default platform configuration used for the project
-  DEFAULT_PLATFORM = File.dirname(__FILE__)+'/toolchain/environment-arm-stm32f072-eabi.osx'
-
   # Default release mode used for the project if no such parameter given via Rakefile
   DEFAULT_RELEASE = 'dbg'
 

data/lib/rakeoe/key_value_reader.rb

@@ -19,6 +19,8 @@ class KeyValueReader
   attr_accessor :env
 
   def initialize(env_file)
+    raise "No such file #{env_file}" unless File.exist?(env_file)
+
     @file_name = env_file
     @env = self.class.read_file(@file_name)
     self.class.substitute_dollar_symbols!(@env)
@@ -154,7 +156,7 @@ class KeyValueReader
 
   # Dumps all parsed variables as debugging aid
   def dump
-    puts "#{@file_name}:"
+    puts "#{@file_name}"
     @env.each_pair do |key, value|
       puts "[#{key}]: #{value}"
     end

data/lib/rakeoe/toolchain.rb

@@ -19,9 +19,17 @@ class Toolchain
   # @param  [RakeOE::Config] config     Project wide configurations
   #
   def initialize(config)
+    raise 'Configuration failure' unless config.checks_pass?
+
     @config = config
 
-    @kvr = KeyValueReader.new(config.platform)
+    begin
+      @kvr = KeyValueReader.new(config.platform)
+    rescue Exception => e
+      puts e.message
+      raise
+    end
+
     @settings = @kvr.env
     fixup_env
 
@@ -46,6 +54,16 @@ class Toolchain
   def sanity
     # TODO DS: check if libs and apps directories exist
     # TODO DS: check if test frameworks exist
+    # check if target is valid
+
+    if @settings['CC'].empty?
+      raise "No Compiler specified. Either add platform configuration via RakeOE::Config object in Rakefile or use TOOLCHAIN_ENV environment variable"
+    end
+
+    if @target.nil? || @target.empty?
+      raise "Compiler #{@settings['CC']} does not work. Fix platform settings or use TOOLCHAIN_ENV environment variable "
+    end
+
   end
 
   # returns the build directory
@@ -449,6 +467,7 @@ puts
   end
 
   def dump
+    print "Platform configuration: "
     @kvr.dump
   end
 

data/lib/rakeoe/version.rb

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

data/lib/rakeoe.rb

@@ -71,7 +71,7 @@ module RakeOE
       end
     end
 
-    desc 'Dumps toolchain environment variables'
+    desc 'Dumps configuration & toolchain variables'
     task :dump do
       puts
       config.dump

data/rakeoe.gemspec

@@ -8,12 +8,13 @@ Gem::Specification.new do |spec|
   spec.version       = RakeOE::VERSION
   spec.authors       = ["Daniel Schnell"]
   spec.email         = ["dschnell@skerpa.com"]
-  spec.description   = %q{RakeOE : Rake Optimized for Embedded
-                          A build system for test driven Embedded C/C++ Development based on Ruby Rake.
-                          RakeOE is a build system for application development. It can parse OpenEmbedded/Yocto environment files.
-                          In this way it knows how to cross compile in whatever target platform the cross compiler builds.
-                          It uses automatically the appropriate include paths and libraries of the given platform.}
-  spec.summary       = %q{RakeOE : Rake Optimized for Embedded. A build system for test driven Embedded C/C++ Development}
+  spec.description   = %q{Rake Optimized for Embedded: build system for test driven Embedded C/C++ Development based on Ruby Rake.
+                          RakeOE can be used for application and library development on Windows, Mac OSX and Linux.
+                          It uses OpenEmbedded/Yocto compatible platform files to compile in whatever target platform the compiler builds. It is
+                          used for MicroControllers and Linux-flavored systems alike. It's possible to combine multiple platforms in one
+                          common project. RakeOE is easy to use while maintaining strict dependency tracking.
+                         }
+  spec.summary       = %q{Rake Optimized for Embedded: build system for test driven Embedded C/C++ Development based on Ruby Rake.}
   spec.homepage      = "http://rakeoe.github.io/rakeoe/"
   spec.license       = "GPLv3"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel Schnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,12 +66,14 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  RakeOE : Rake Optimized for Embedded
-                            A build system for test driven Embedded C/C++ Development based on Ruby Rake.
-                            RakeOE is a build system for application development. It can parse OpenEmbedded/Yocto environment files.
-                            In this way it knows how to cross compile in whatever target platform the cross compiler builds.
-                            It uses automatically the appropriate include paths and libraries of the given platform.
+description: "Rake Optimized for Embedded: build system for test driven Embedded C/C++
+  Development based on Ruby Rake.\n                          RakeOE can be used for
+  application and library development on Windows, Mac OSX and Linux.\n                          It
+  uses OpenEmbedded/Yocto compatible platform files to compile in whatever target
+  platform the compiler builds. It is\n                          used for MicroControllers
+  and Linux-flavored systems alike. It's possible to combine multiple platforms in
+  one\n                          common project. RakeOE is easy to use while maintaining
+  strict dependency tracking.\n                         "
 email:
 - dschnell@skerpa.com
 executables: []
@@ -121,9 +123,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: 'RakeOE : Rake Optimized for Embedded. A build system for test driven Embedded
-  C/C++ Development'
+summary: 'Rake Optimized for Embedded: build system for test driven Embedded C/C++
+  Development based on Ruby Rake.'
 test_files: []