rakeoe 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fbe6da29cfe5dab5316240a65e92968b05474db
-  data.tar.gz: afaab703e8c86e60895de7ba6dc67029a1217755
+  metadata.gz: e5b4889f8d03d07ad15a14a56daace5e4ff4022e
+  data.tar.gz: 1b73e5c46b144fc90f2c2d8ba348cc0eabc4f49f
 SHA512:
-  metadata.gz: e70fd91f6c122104d154ea3337a90235dd3a5c2f52d721fae846380d272e75a6b0b8b782330074e6cdb7e36c328558582e18cf47f3504379c21eaa63ac7bb0b4
-  data.tar.gz: 541a1010dbed2d44915fbcada5c10f376f34372870410dfe20c1a772abd13fc8c99d3e16e6ec7755850ef6fac179c0adede5a24f2df4807167a3f89298af4a03
+  metadata.gz: 710af6324c7c75ecbf7f72165b6141e1a3613a4df8c2c62c3eac4f94d5e9819990ea3700cc246e643919ca55a75c1fe7b1b1b574c0832d00c15c3320af3c0b81
+  data.tar.gz: 9dfd5d613c237b0068a52aa349cf66cf1994b6c6fc9cf2ef937d22ba814ba8cb84577604913dd554f40a991e8de76abd4a43449094c234c337c0ac76728d1525

data/lib/rakeoe/app.rb

@@ -52,7 +52,7 @@ module RakeOE
       # create build directory
       directory build_dir
 
-      binary_targets = paths_of_local_libs() + @app_main_dep + @app_main_obj + [@settings['PRJ_FILE']]
+      binary_targets = paths_of_local_libs() + @app_main_dep + @app_main_obj
 
       # This is only necessary if we have more than a single app main file
       if @app_lib_objs.any?

data/lib/rakeoe/binary_base.rb

@@ -67,7 +67,6 @@ module RakeOE
 
       @objs = @srcs.map {|file| source_to_obj(file, @src_dir, @build_dir)}
       @test_objs = @test_srcs.map {|file| source_to_obj(file, @src_dir, @build_dir)}
-
       @deps = @objs.map {|obj| obj.ext('.d')}
       @test_deps = @test_objs.map {|obj| obj.ext('.d')}
 
@@ -75,6 +74,11 @@ module RakeOE
       load_deps(@deps)
       load_deps(@test_deps)
 
+      # all objs are dependent on project file and platform file
+      (@objs+@test_objs).each do |obj|
+        file obj => [@settings['PRJ_FILE'], @tc.config.platform]
+      end
+
       if (@settings['TEST_FRAMEWORK'].nil? or @settings['TEST_FRAMEWORK'].empty?)
         @test_fw = @tc.default_test_framework        
       else
@@ -365,14 +369,15 @@ module RakeOE
 
       incs = inc_dirs
       # find platform specific resource flags
-      # XXX DS
       libs = search_libs(@settings)
       libs[:all].each do |name|
         platform_settings = tc.res_platform_settings(name)
-        if platform_settings.values.any?
-          @settings['ADD_CFLAGS'] += " #{platform_settings['CFLAGS']}" if platform_settings['CFLAGS']
-          @settings['ADD_CXXFLAGS'] += " #{platform_settings['CXXFLAGS']}" if platform_settings['CXXFLAGS']
-          @settings['ADD_LDFLAGS'] += " #{platform_settings['LDFLAGS']}" if platform_settings['LDFLAGS']
+        unless platform_settings.empty?
+          @settings['ADD_CFLAGS'] += " #{platform_settings[:CFLAGS]}" if platform_settings[:CFLAGS]
+          @settings['ADD_CXXFLAGS'] += " #{platform_settings[:CXXFLAGS]}" if platform_settings[:CXXFLAGS]
+          # platform_settings[:LDFLAGS] is set in Toolchain#linker_line_for
+          # XXX: remove all -lXX settings from platform_settings[:LDFLAGS] and add rest to @settings['ADD_LDFLAGS'],
+          # XXX: use all -lXX in Toolchain#linker_line_for
         end
       end
 

data/lib/rakeoe/lib.rb

@@ -34,7 +34,7 @@ module RakeOE
 
       task name => [binary]
 
-      file binary => paths_of_local_libs + deps + objs + [@settings['PRJ_FILE']] do
+      file binary => paths_of_local_libs + deps + objs do
         tc.lib(:objects => objs,
         :lib => binary,
         :settings => @settings)

data/lib/rakeoe/toolchain.rb

@@ -294,7 +294,15 @@ class Toolchain
   # @return [String]      Linker line
   #
   def linker_line_for(libs)
-    libs.map { |lib| "-l#{lib}" }.join(' ').strip
+    libs.map do |lib|
+      settings = res_platform_settings(lib)
+      if settings[:LDFLAGS].nil?
+        # automatic linker line if no platform specific LDFLAGS exist
+        "-l#{lib}"
+      else
+        settings[:LDFLAGS]
+      end
+    end.join(' ').strip
   end
 
   # Touches a file
@@ -310,15 +318,16 @@ class Toolchain
   # @param resource_name  [String]  name of resource
   # @return [Hash]                  Hash of compilation/linkage flags or empty hash if no settings are defined
   #                                 The returned hash has the following format:
-  #                                 { 'CFLAGS' => '...', 'CXXFLAGS' => '...', 'LDFLAGS' => '...'}
+  #                                 { :CFLAGS => '...', :CXXFLAGS => '...', :LDFLAGS => '...'}
   #
   def res_platform_settings(resource_name)
     return {} if resource_name.empty?
 
     rv = Hash.new
-    rv['CFLAGS'] = @settings["#{resource_name}_CFLAGS"]
-    rv['CXXFLAGS'] = @settings["#{resource_name}_CXXFLAGS"]
-    rv['LDFLAGS'] = @settings["#{resource_name}_LDFLAGS"]
+    rv[:CFLAGS]  = @settings["#{resource_name}_CFLAGS"]
+    rv[:CXXFLAGS]= @settings["#{resource_name}_CXXFLAGS"]
+    rv[:LDFLAGS] = @settings["#{resource_name}_LDFLAGS"]
+    rv = {} if rv.values.empty?
     rv
   end
 

data/lib/rakeoe/version.rb

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

metadata

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