cxxproject 0.6.26 → 0.6.27

data/Gemfile

@@ -3,3 +3,4 @@ gem 'rspec'
 gem 'grit'
 gem 'roodi'
 gem 'builder'
+gem 'frazzle'

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     builder (3.0.0)
     diff-lcs (1.1.3)
+    frazzle (0.1.3)
     grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -28,6 +29,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder
+  frazzle
   grit
   roodi
   rspec

data/lib/cxxproject/buildingblocks/executable.rb

@@ -66,7 +66,7 @@ module Cxxproject
       ret
     end
 
-    def adaptPath(v, d, prefix)
+    def adapt_path(v, d, prefix)
       tmp = nil
       if File.is_absolute?(v)
         tmp = v
@@ -77,48 +77,47 @@ module Cxxproject
       [tmp, prefix]
     end
 
-    def linker_lib_string()
-      @lib_path_set = Set.new
-      @dep_set = Set.new
-      calc_linker_lib_string_recursive(self)
-    end
-
-    def calc_linker_lib_string_recursive(d)
+    def linker_lib_string(linker)
+      lib_path_set = Set.new
+      deps = collect_dependencies
       res = []
-      return res if @dep_set.include?(d)
-      @dep_set << d
-
-      if HasLibraries === d
-        prefix = nil
-        linker = @tcs[:LINKER]
-
-        d.lib_elements.each do |elem|
-          case elem[0]
+      deps.each do |d|
+        handle_whole_archive(d, res, linker, :START_OF_WHOLE_ARCHIVE)
+        if HasLibraries === d
+          d.lib_elements.each do |elem|
+            case elem[0]
             when HasLibraries::LIB
-              res << "#{linker[:LIB_FLAG]}#{elem[1]}"
+              res.push("#{linker[:LIB_FLAG]}#{elem[1]}")
             when HasLibraries::USERLIB
-              res << "#{linker[:USER_LIB_FLAG]}#{elem[1]}"
+              res.push("#{linker[:USER_LIB_FLAG]}#{elem[1]}")
             when HasLibraries::LIB_WITH_PATH
-              tmp, prefix = adaptPath(elem[1], d, prefix)
-              res <<  tmp
+              tmp, prefix = adapt_path(elem[1], d, prefix)
+              res.push(tmp)
             when HasLibraries::SEARCH_PATH
-              tmp, prefix = adaptPath(elem[1], d, prefix)
-              if not @lib_path_set.include?(tmp)
-                @lib_path_set << tmp
-                res << "#{linker[:LIB_PATH_FLAG]}#{tmp}"
-              end
-            when HasLibraries::DEPENDENCY
-              if ALL_BUILDING_BLOCKS.include?(elem[1])
-                bb = ALL_BUILDING_BLOCKS[elem[1]]
-                res += calc_linker_lib_string_recursive(bb)
+              tmp, prefix = adapt_path(elem[1], d, prefix)
+              if not lib_path_set.include?(tmp)
+                lib_path_set << tmp
+                res.push("#{linker[:LIB_PATH_FLAG]}#{tmp}")
               end
+            end
           end
         end
+        handle_whole_archive(d, res, linker, :END_OF_WHOLE_ARCHIVE)
       end
-
       res
     end
 
+    # res the array with command line arguments that is used as result
+    # linker the linker hash
+    # sym the symbol that is used to fish out a value from the linker
+    def handle_whole_archive(building_block, res, linker, sym)
+      if building_block.instance_of?(SourceLibrary)
+        if building_block.whole_archive
+          res.push(linker[sym]) if linker[sym]
+        end
+      end
+    end
+
     # create a task that will link an executable from a set of object files
     #
     def convert_to_rake()
@@ -138,9 +137,9 @@ module Cxxproject
           cmd << linker[:SCRIPT] if @linker_script # -T
           cmd << @linker_script if @linker_script # xy/xy.dld
           cmd << linker[:MAP_FILE_FLAG] if @mapfile # -Wl,-m6
-          cmd += linker[:LIB_PREFIX_FLAGS].split(" ") # "-Wl,--whole-archive "
-          cmd += linker_lib_string
-          cmd += linker[:LIB_POSTFIX_FLAGS].split(" ") # "-Wl,--no-whole-archive "
+          cmd += linker[:LIB_PREFIX_FLAGS].split(" ") # TODO ... is this still needed e.g. for diab
+          cmd += linker_lib_string(@tcs[:LINKER])
+          cmd += linker[:LIB_POSTFIX_FLAGS].split(" ") # TODO ... is this still needed e.g. for diab
 
           mapfileStr = @mapfile ? " >#{@mapfile}" : ""
           if Cxxproject::Utils.old_ruby?

data/lib/cxxproject/buildingblocks/has_dependencies_mixin.rb

@@ -9,7 +9,7 @@ module Cxxproject
       @helper_dependencies ||= []
     end
 
-   def set_dependencies(deps)
+    def set_dependencies(deps)
       @dependencies = deps.map { |dep| dep.instance_of?(String) ? dep : dep.name }
       self
     end
@@ -53,6 +53,32 @@ module Cxxproject
       @direct_deps
     end
 
+    def collect_dependencies()
+#      puts "collect for #{name}"
+      res = []
+      res << self
+      todo = dependencies
+      while not todo.empty?
+#        p todo
+        bb = resolve_by_name(todo.pop)
+        add_unique(res, bb)
+        todo += bb.dependencies
+      end
+#      puts "result of collect for #{name} -> #{res}"
+      res
+    end
+
+    def add_unique(res, bb)
+      res.delete(bb)
+      res.push(bb)
+    end
+
+    def resolve_by_name(name)
+      res = ALL_BUILDING_BLOCKS[name]
+      raise "BuildingBlock #{name} not defined" unless res
+      res
+    end
+
     def all_dependencies()
       return @all_dependencies if @all_deps_calculated
 

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -76,9 +76,13 @@ module Cxxproject
         all_dependencies.each_with_index do |d,i|
           next if not HasIncludes === d
           next if i == 0
-          prefix = File.rel_from_to_project(@project_dir,d.project_dir)
-          next if not prefix
-         @incArray.concat(d.includes.map {|inc| File.add_prefix(prefix,inc)})
+          if BinaryLibrary === d
+            @incArray.concat(d.includes)
+          else
+            prefix = File.rel_from_to_project(@project_dir,d.project_dir)
+            next if not prefix
+            @incArray.concat(d.includes.map {|inc| File.add_prefix(prefix,inc)})
+          end
         end
         @incArray.uniq!
       end
@@ -94,7 +98,11 @@ module Cxxproject
     end
 
     def get_define_string(tcs, type)
-      tcs[:COMPILER][type][:DEFINES].map {|k| "#{tcs[:COMPILER][type][:DEFINE_FLAG]}#{k}"}
+      if (has_tcs?)
+        return tcs[:COMPILER][type][:DEFINES].map {|k| "#{tcs[:COMPILER][type][:DEFINE_FLAG]}#{k}"}
+      else
+        return 'only needed for spec'
+      end
     end
 
     def get_object_file(sourceRel)
@@ -167,7 +175,6 @@ module Cxxproject
     end
 
     def create_object_file_tasks()
-
       sources_to_build = {}
 
       exclude_files = Set.new

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -11,8 +11,11 @@ module Cxxproject
     include HasSources
     include HasIncludes
 
-    def initialize(name)
+    attr_reader :whole_archive
+
+    def initialize(name, whole_archive=false)
       super(name)
+      @whole_archive = whole_archive
     end
 
     def complete_init()

data/lib/cxxproject/toolchain/provider.rb

@@ -73,7 +73,9 @@ module Cxxproject
           :FLAGS => [],
           :MAP_FILE_FLAG => "",
           :OUTPUT_ENDING => ".exe", # or .elf
-          :ERROR_PARSER => nil
+          :ERROR_PARSER => nil,
+          :START_OF_WHOLE_ARCHIVE => '',
+          :END_OF_WHOLE_ARCHIVE => ''
         },
 
         :MAKE =>

data/lib/cxxproject/version.rb

@@ -1,5 +1,5 @@
 module Cxxproject
-  VERSION = "0.6.26"
+  VERSION = '0.6.27'
 
   class Version
     def self.cxxproject

data/spec/building_block_spec.rb

@@ -10,26 +10,35 @@ describe Cxxproject::BuildingBlock do
   before(:each) do
     Cxxproject::Utils.cleanup_rake
   end
+
   after(:each) do
     Cxxproject::Utils.cleanup_rake
   end
 
-  it 'should build the right dependency-chain' do
+  it 'should collect the dependencies for a single lib' do
+    lib1 = Cxxproject::SourceLibrary.new('1')
+    lib1.collect_dependencies().should == [lib1]
+  end
+
+  it 'should collect the dependencies for a single lib with one dep' do
     lib1 = Cxxproject::SourceLibrary.new('1')
     lib2 = Cxxproject::SourceLibrary.new('2').set_dependencies(['1'])
-    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1'])
-    lib4 = Cxxproject::SourceLibrary.new('4').set_dependencies(['2', '3'])
-    deps = lib4.all_dependencies.map { |d| d.name }
-    deps.should == ['4', '2', '3', '1']
+    lib2.collect_dependencies().should == [lib2, lib1]
+  end
+
+  it 'should build the right dependency-chain' do
+    lib1 = Cxxproject::SourceLibrary.new('1').set_dependencies(['2'])
+    lib2 = Cxxproject::SourceLibrary.new('2')
+    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['2', '1'])
+    lib3.collect_dependencies().should == [lib3, lib1, lib2]
   end
 
   it 'should build the right dependency-chain for custom blocks' do
     lib1 = Cxxproject::SourceLibrary.new('1')
-    lib2 = Cxxproject::CustomBuildingBlock.new('2').set_dependencies(['1'])
-    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1'])
-    lib4 = Cxxproject::CustomBuildingBlock.new('4').set_dependencies(['2', '3'])
-    deps = lib4.all_dependencies.map { |d| d.name }
-    deps.should == ['4', '2', '3', '1']
+    lib2 = Cxxproject::SourceLibrary.new('2').set_dependencies(['1'])
+    lib3 = Cxxproject::SourceLibrary.new('3').set_dependencies(['1', '2'])
+    lib4 = Cxxproject::SourceLibrary.new('4').set_dependencies(['1', '2', '3'])
+    lib4.collect_dependencies().should == [lib4, lib3, lib2, lib1]
   end
 
   it 'should generate an error if building block names conflict' do
@@ -51,6 +60,22 @@ describe Cxxproject::BuildingBlock do
     }.should raise_exception
   end
 
+  it 'should handle whole archive' do
+    # TODO ... clean up api and also this test
+    l1 = Cxxproject::SourceLibrary.new('1', true)
+    l1.output_dir = 'out'
+    l1.complete_init
+    l2 = Cxxproject::SourceLibrary.new('2', true)
+    l2.output_dir = 'out'
+    l2.complete_init
+    exe = Cxxproject::Executable.new('test')
+    deps = ['1', '2']
+    exe.set_dependencies(deps)
+    exe.complete_init
+    exe.linker_lib_string({:START_OF_WHOLE_ARCHIVE => 'start', :END_OF_WHOLE_ARCHIVE => 'end'}).should == ['start', 'out/lib2.a', 'end', 'start', 'out/lib1.a', 'end']
+    # TODO add a test for recursive whole archive libs a lib that should be whole and that has dependencies to whole libs
+  end
+
 =begin
   it 'should have the right output-directory' do
     lib1 = Cxxproject::SourceLibrary.new('lib1').set_sources(['test.cc'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxxproject
 version: !ruby/object:Gem::Version
-  version: 0.6.26
+  version: 0.6.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -220,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4608833184588443303
+      hash: -319442458633377301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: