rakeoe 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8600a75f67ce19ddd87476e7cbbd4f15df6fe9
-  data.tar.gz: 8199dc6180e67b9e054a5d3aece5881944b1f55f
+  metadata.gz: 3e86c7488b09a2adbd7eb607162e5301d0f9d5cc
+  data.tar.gz: 0e553eaa97e2a661b5cd994f702e084cd1ba96ff
 SHA512:
-  metadata.gz: a457a0c7f3d4077267f45440e3cae9c5bb7a38da56df25ba1832160f613efd07b3da1b15ab38467613fa5c72ce18e50accd107db57a69989295508ef0eea3366
-  data.tar.gz: 484f0b0c74a3060b2afe89659395971f2336a66669943f02ae370a996678dc5ee81100f6c04582ccee1c83e570908539540f7e1620774bd4c6e79b7e7ef9df62
+  metadata.gz: 07da39a5f073ec28a06cc956b7d2a5bef9b269daf380426506a1f2723626c86b3668c75c182660f92ec9aef1face0d923d356e45b3df2c2960d574c14bed5f63
+  data.tar.gz: 1474b08247648bc36072129cbd8a61c3358212ad32cd751ae77cf4145eabf98f182ae4bb2b829d8bbfa266259725831b33bda776a294d25b8c2c58236b5fadac

data/lib/rakeoe/binary_base.rb

@@ -28,7 +28,6 @@ module RakeOE
 
       @name = params[:name]
       @settings = params[:settings]
-      fixup_settings
       @src_dir = @settings['PRJ_HOME']
       @bin_dir = params[:bin_dir]
       @tc = params[:toolchain]
@@ -97,22 +96,6 @@ module RakeOE
     end
 
 
-    # Fixes any missing settings from project file
-    def fixup_settings
-      @settings['ADD_SOURCE_DIRS'] ||= ''
-      @settings['IGNORED_SOURCES'] ||= ''
-      @settings['EXPORTED_INC_DIRS'] ||= ''
-      @settings['ADD_INC_DIRS'] ||= ''
-      @settings['TEST_SOURCE_DIRS'] ||= ''
-      @settings['ADD_CFLAGS'] ||= ''
-      @settings['ADD_CXXFLAGS'] ||= ''
-      @settings['ADD_LIBS'] ||= ''
-      @settings['ADD_LDFLAGS'] ||= ''
-      @settings['USE_QT'] ||= ''
-      @settings['IGNORED_PLATFORMS'] ||= ''
-    end
-
-
     # Check params given to #initialize
     #
     # @param [Hash] params

data/lib/rakeoe/config.rb

@@ -24,7 +24,7 @@ module RakeOE
       #     :moc_header => '.h',                        Qt MOC file header
       #     :moc_source => '.cpp'                       Qt MOC file source
       # }
-      @suffixes=RakeOE::DEFAULT_SUFFIXES
+      @suffixes=RakeOE::Default.suffixes
       
       # Directories used for the project
       # This is a hash object with the following key => value mappings (examples):
@@ -33,7 +33,7 @@ module RakeOE
       #     :libs => %w[src/lib1 src/lib2],             Library top level directories
       #     :build => 'build'                           Build top level directory
       # }
-      @directories=RakeOE::DEFAULT_DIRS
+      @directories=RakeOE::Default.dirs
 
       # Platform configuration used for the project
       # This is the absolute path to the platform definition file
@@ -49,29 +49,32 @@ 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? ? RakeOE::DEFAULT_RELEASE : '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
       # library path.
       # RakeOE does not require a specific test framework, but CppUTest and CUnit are proposals
       # that have been tested to work fine.
-      @test_fw=RakeOE::DEFAULT_TEST_FW
+      @test_fw=RakeOE::Default.test_fw
 
       # Optimization levels used for compiling binaries (e.g. -O0, -O1, -O2, -O3, -Og).
       # Depending on the release mode, either @optimization_dbg or @optimization_release
       # is used
-      @optimization_dbg=RakeOE::DEFAULT_OPTIMIZATION_DBG
-      @optimization_release=RakeOE::DEFAULT_OPTIMIZATION_RELEASE
+      @optimization_dbg=RakeOE::Default.optimization_dbg
+      @optimization_release=RakeOE::Default.optimization_release
 
       # Language standard (e.g. -std=gnu99, -std=c++03, -std=c99, etc. )
-      @language_std_c=RakeOE::DEFAULT_LANGUAGE_STD_C
-      @language_std_cpp=RakeOE::DEFAULT_LANGUAGE_STD_CPP
+      @language_std_c=RakeOE::Default.lang_std_c
+      @language_std_cpp=RakeOE::Default.lang_std_cpp
 
       # Software version string
       #
       # 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']
+      @sw_version = ENV['SW_VERSION_ENV'].nil? ? "#{RakeOE::Default.sw_version}-#{@release}" : ENV['SW_VERSION_ENV']
+
+      # Project settings as specified in prj.rake file
+      @prj_settings = RakeOE::Default.prj_settings
     end
 
 

data/lib/rakeoe/defaults.rb

@@ -39,5 +39,63 @@ module RakeOE
 
   # Default software version string
   DEFAULT_SW_VERSION = 'unversioned'
+
+
+  class Default
+
+    def self.suffixes
+      RakeOE::DEFAULT_SUFFIXES
+    end
+
+    def self.dirs
+      RakeOE::DEFAULT_DIRS
+    end
+
+    def self.release
+      RakeOE::DEFAULT_RELEASE
+    end
+
+    def self.test_fw
+      RakeOE::DEFAULT_TEST_FW
+    end
+
+    def self.optimization_dbg
+      RakeOE::DEFAULT_OPTIMIZATION_DBG
+    end
+
+    def self.optimization_release
+      RakeOE::DEFAULT_OPTIMIZATION_RELEASE
+    end
+
+    def self.lang_std_c
+      RakeOE::DEFAULT_LANGUAGE_STD_C
+    end
+
+    def self.lang_std_cpp
+      RakeOE::DEFAULT_LANGUAGE_STD_CPP
+    end
+
+    def self.sw_version
+      RakeOE::DEFAULT_SW_VERSION
+    end
+
+    def self.prj_settings
+      {
+        'ADD_SOURCE_DIRS'   => '',
+        'IGNORED_SOURCES'   => '',
+        'EXPORTED_INC_DIRS' => 'include/',
+        'ADD_INC_DIRS'      => '',
+        'TEST_SOURCE_DIRS'  => 'test/ tests/',
+        'ADD_CFLAGS'        => '',
+        'ADD_CXXFLAGS'      => '',
+        'ADD_LIBS'          => '',
+        'ADD_LDFLAGS'       => '',
+        'USE_QT'            => '',
+        'IGNORED_PLATFORMS' => ''
+      }
+    end
+
+
+  end
 end
 

data/lib/rakeoe/key_value_reader.rb

@@ -139,6 +139,15 @@ class KeyValueReader
     @env[key] = value
   end
 
+  # Merges a hash of key value pairs without actually overwriting existing entries.
+  # This is similar as the ||= operator on a key => value basis.
+  #
+  # @param a_hash   Hash of Key/Value pairs
+  #
+  # @return the
+  def merge(a_hash)
+    @env.merge!(a_hash) { |key, v1, v2| v1 }
+  end
 
   # Adds a value for key
   #

data/lib/rakeoe/prj_file_cache.rb

@@ -20,6 +20,11 @@ module RakeOE
     # GENERIC METHODS
     #
 
+    # Sets default properties that should be included for every found project file
+    def self.set_defaults(properties)
+      @defaults = properties
+    end
+
     # Search, read and parse all project files in given directories and add them to prj_list according
     # to their PRJ_TYPE setting.
     # @param dirs   List of directories to search recursively for prj.rake files
@@ -34,6 +39,8 @@ module RakeOE
         dir = File.dirname(file)
         name = File.basename(dir)
         kvr = KeyValueReader.new(file)
+        kvr.merge(@defaults)
+
         prj_type = kvr.get('PRJ_TYPE')
 
         raise "Attribute PRJ_TYPE not set in #{dir}/prj.rake" if prj_type.empty?

data/lib/rakeoe/version.rb

@@ -1,3 +1,3 @@
 module RakeOE
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/rakeoe.rb

@@ -25,6 +25,7 @@ module RakeOE
   # @return [RakeOE::Toolchain]         Toolchain object
   def init(config)
 
+    RakeOE::PrjFileCache.set_defaults(RakeOE::Default.prj_settings)
     RakeOE::PrjFileCache.sweep_recursive(config.directories[:apps] + config.directories[:libs])
 
     toolchain = RakeOE::Toolchain.new(config)
@@ -68,6 +69,9 @@ module RakeOE
         namespace 'test' do
           desc "Run all #{type} tests"
           task :all
+
+          desc "Run all #{type} tests and create junit xml output"
+          task :junit
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rakeoe
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Daniel Schnell