rakeoe 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5b4889f8d03d07ad15a14a56daace5e4ff4022e
-  data.tar.gz: 1b73e5c46b144fc90f2c2d8ba348cc0eabc4f49f
+  metadata.gz: 16889146f1dfe6b18c54134600a1bb0d50cbcb73
+  data.tar.gz: 16f665ef351341f58ac49a24ba606ae5076347c8
 SHA512:
-  metadata.gz: 710af6324c7c75ecbf7f72165b6141e1a3613a4df8c2c62c3eac4f94d5e9819990ea3700cc246e643919ca55a75c1fe7b1b1b574c0832d00c15c3320af3c0b81
-  data.tar.gz: 9dfd5d613c237b0068a52aa349cf66cf1994b6c6fc9cf2ef937d22ba814ba8cb84577604913dd554f40a991e8de76abd4a43449094c234c337c0ac76728d1525
+  metadata.gz: 1799f93d02f059d70422b2ab668d7e9f25a2fcbcec36d34b6be561407ff4d826537bb4c492ec42e2b26d03696c8b2e971208d77947bbd7b8eafa9fbcc8551fd8
+  data.tar.gz: 0b4bafea9ed296b87b908bd993102d8ba65da52edb1dabf80ee3af10f5d115a2e5d0e470345f10a54be6b258606ec6f02594aaf46bc6e9276418edcb20d4a525

data/lib/rakeoe/binary_base.rb

@@ -366,21 +366,9 @@ module RakeOE
     # Create build rules for generating an object. Dependency to corresponding source file is made via proc
     # object
     def create_build_rules
+      platform_flags_fixup(search_libs(@settings))
 
       incs = inc_dirs
-      # find platform specific resource flags
-      libs = search_libs(@settings)
-      libs[:all].each do |name|
-        platform_settings = tc.res_platform_settings(name)
-        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
-
       # 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\//
@@ -391,9 +379,9 @@ module RakeOE
         end
 
         tc.obj(:source => t.source,
-        :object => t.name,
-        :settings => @settings,
-        :includes => incs.uniq)
+               :object => t.name,
+               :settings => @settings,
+               :includes => incs.uniq)
       end
 
       # map dependency to source file and make it dependent on creation of all object directories
@@ -412,16 +400,34 @@ module RakeOE
         end
 
         tc.dep(:source => t.source,
-        :dep => t.name,
-        :settings => @settings,
-        :includes => incs.uniq)
+               :dep => t.name,
+               :settings => @settings,
+               :includes => incs.uniq)
       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)
+               :moc => t.name,
+               :settings => @settings)
+      end
+    end
+
+    # Change ADD_CFLAGS, ADD_CXXFLAGS, ADD_LDFLAGS according to settings in platform file.
+    #
+    # @param libs [Array]   Array of libraries to be considered
+    #
+    def platform_flags_fixup(libs)
+      libs[:all].each do |lib|
+        ps = tc.platform_settings_for(lib)
+        unless ps.empty?
+          @settings['ADD_CFLAGS'] += " #{ps[:CFLAGS]}" if ps[:CFLAGS]
+          @settings['ADD_CXXFLAGS'] += " #{ps[:CXXFLAGS]}" if ps[:CXXFLAGS]
+
+          # remove all -lXX settings from ps[:LDFLAGS] and use rest for @settings['ADD_LDFLAGS'],
+          # -lXX is set in Toolchain#linker_line_for
+          @settings['ADD_LDFLAGS'] += ps[:LDFLAGS].gsub(/(\s|^)+-l\S+/, '') if ps[:LDFLAGS]
+        end
       end
     end
 

data/lib/rakeoe/lib.rb

@@ -84,11 +84,11 @@ module RakeOE
         file test_binary => [@test_fw.binary_path] + [binary] + test_deps + test_objs do
           prj_libs = search_libs(settings)
           tc.test(:objects => test_objs,
-          :test => test_binary,
-          :libs => prj_libs[:all] + [name],
-          :framework => @test_fw.name,
-          :settings => @settings,
-          :includes => test_dirs)
+                  :test => test_binary,
+                  :libs => prj_libs[:all] + [name],
+                  :framework => @test_fw.name,
+                  :settings => @settings,
+                  :includes => test_dirs)
         end
         CLEAN.include(test_binary, build_dir)
         task :all => "#{name}"

data/lib/rakeoe/toolchain.rb

@@ -287,7 +287,7 @@ class Toolchain
     paths.each_with_object('') {|path, str| str << " -I#{path}"}
   end
 
-  # Generates linker line from given library list
+  # Generates linker line from given library list.
   #
   # @param [Array]  libs  Libraries to be used for linker line
   #
@@ -295,12 +295,13 @@ class Toolchain
   #
   def linker_line_for(libs)
     libs.map do |lib|
-      settings = res_platform_settings(lib)
+      settings = platform_settings_for(lib)
       if settings[:LDFLAGS].nil?
         # automatic linker line if no platform specific LDFLAGS exist
         "-l#{lib}"
       else
-        settings[:LDFLAGS]
+        # only matches -l<libname> settings
+        /(\s|^)+-l\S+/.match(settings[:LDFLAGS]).to_s
       end
     end.join(' ').strip
   end
@@ -320,7 +321,7 @@ class Toolchain
   #                                 The returned hash has the following format:
   #                                 { :CFLAGS => '...', :CXXFLAGS => '...', :LDFLAGS => '...'}
   #
-  def res_platform_settings(resource_name)
+  def platform_settings_for(resource_name)
     return {} if resource_name.empty?
 
     rv = Hash.new

data/lib/rakeoe/version.rb

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

metadata

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