ryb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb707fc36a01b1334c37b6f5acbd1031223cc552
-  data.tar.gz: a27d120d06cf580cdca49645c7af9e6aa02379d0
+  metadata.gz: 8640199eb16f4e9ba71a9455cbe642ca4c3a8b2b
+  data.tar.gz: 5e8ab9305ada127d68496ceca96c3de4bffc47dc
 SHA512:
-  metadata.gz: 39ebe38e3177c44a97fb97e3e2b26fbe58c4a983102b6f91f027ed9c9b38b1d538f6a32034f06e4f29fa8b4a11ebc88689ec01d0e81ae3c888be374aa0063a6c
-  data.tar.gz: 6dbc2896494cd9f84917bec08617ade889dadb18fe7ee0fd7fe24280cfbc3b61639aa4d99d8dc702394daa4c6219d49fdbbd8cd6519b941ec38c4e9862e2d03a
+  metadata.gz: 9fea9b62733b7da8a3497243c6e8dd3cb59d27c31d8002758c11b729994b0ae73ddbf49990398de90a7aa325c86bcb3d0e0ee3572f28601f58e8bbdcdf4ec14d
+  data.tar.gz: 811921a91c99f17c1d45762c3e278e8eee1a9843d89444b915d40dba9227e0831e28f1f1263e05f6a4adb99f27573bde900f0962d77caf02e697cf8aa5c08b16

data/lib/ryb/ninja.rb

@@ -27,7 +27,7 @@ module Ryb
               [:windows].map{|target| project.targets[target]}.compact.each do |target|
                 [:x86, :x86_64].map{|arch| project.architectures[arch]}.compact.each do |arch|
                   triplet = "#{config.name}_#{target.name}_#{arch.name}"
-                  (project.applications + project.libraries).each do |buildable|
+                  (project.applications+project.libraries).each do |buildable|
                     name = "#{buildable.name.pretty||buildable.name.capitalize} (#{config.name.pretty||config.name.capitalize}) for #{target.name.pretty||target.name.capitalize} (#{arch.name.pretty||arch.name.capitalize})"
                     puts " Adding '#{name}'..."
                     quadruplet = "#{buildable.name}_#{triplet}"
@@ -93,16 +93,32 @@ module Ryb
                     outputs_to_inputs = Hash[sources.map{|source| ["${built}/obj/#{source.gsub(/\.[^.]+\z/,'')}.#{triplet}.obj", "${root}/#{source}"]}]
                     build "cc_#{quadruplet}", outputs_to_inputs
                     output = "#{buildable.name}${#{quadruplet}_suffix}"
+                    inputs = outputs_to_inputs.map{|object,_| object}
+                    dependencies = []
+                    buildable.dependencies.each do |dependency|
+                      dependency = (project.libraries.select{|buildable| buildable.name == dependency}).first
+                      if dependency
+                        case dependency.linkage
+                          when :static
+                            dependencies.push("${built}/lib/#{dependency.name}${#{dependency.name}_#{triplet}_suffix}.lib")
+                          when :dynamic
+                            # TODO(mtwilliams): Move import libraries to ${built}/lib.
+                            dependencies.push("${built}/bin/#{dependency.name}${#{dependency.name}_#{triplet}_suffix}.lib")
+                          end
+                      else
+                        raise "Not implemented, yet!"
+                      end
+                    end
                     if buildable.is_a? Ryb::Application
-                      build "ld_#{quadruplet}", "${built}/bin/#{output}.exe" => outputs_to_inputs.map{|object,_| object}
+                      build "ld_#{quadruplet}", "${built}/bin/#{output}.exe" => inputs+dependencies
                       defaults "${built}/bin/#{output}.exe"
                     elsif buildable.is_a? Ryb::Library
                       case buildable.linkage
                       when :static
-                        build "ar_#{quadruplet}", "${built}/lib/#{output}.lib" => outputs_to_inputs.map{|object,_| object}
+                        build "ar_#{quadruplet}", "${built}/lib/#{output}.lib" => inputs
                       when :dynamic
                         # TODO(mtwilliams): Specify -DLL.
-                        build "ld_#{quadruplet}", "${built}/bin/#{output}.dll" => outputs_to_inputs.map{|object,_| object}
+                        build "ld_#{quadruplet}", "${built}/bin/#{output}.dll" => inputs+dependencies
                       end
                     end
                   end

data/lib/ryb/version.rb

@@ -1,6 +1,6 @@
 module Ryb
   module VERSION #:nodoc:
-    MAJOR, MINOR, PATCH, PRE = [0, 1, 0]
+    MAJOR, MINOR, PATCH, PRE = [0, 1, 1]
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ryb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Williams