ryb 0.2.0.3 → 0.2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e105917adf373e3f300976e75698d67cfbfdf0c
-  data.tar.gz: 7ed7d76c858b36d4028d5fd024b0f74d8f5213ab
+  metadata.gz: f669ebc63d3f7cd43065a2fa8f720c5e766d473d
+  data.tar.gz: b8173d293781e933906d75631e9e8d7d3ebf4724
 SHA512:
-  metadata.gz: 42f190480119ca9191efcc91ac3ce6689c9b73f242e35b763b756e1c33c240708c3078f1dc7aa1f9a199b8fc885fefe4a6134d08eed1978e3e0543eeb69069b0
-  data.tar.gz: 40782b36d9c61193297dc6bdcec82172c17be5bc98af9501d35998611e97116abd369f9b2c75af69373bbfd0aea15fed59720693393a55bcedc636c272cddeb7
+  metadata.gz: b0e7d3cac2c0d76bfd21d46ec982aa7c1ccd24edf55703bcba05e69ed4c1fed78d4d8769ebfcd3dcd961ae92c5a7fee5e9229cc5c5dbbd14db5c6094cf076ea4
+  data.tar.gz: a00d6dee9ce6f61d26a97cb31d08a03cd9986cfffd0fac16a50b354acbc41d792868ea97cf9129243ef8cf764fb42e254713a8a1de8aed4500539fbe07349280

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ryb (0.2.0.1)
+    ryb (0.2.1.0)
       gli (~> 2)
       hashie
       ninja-gen
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.13.0)
+    aruba (0.14.0)
       childprocess (~> 0.5.6)
       contracts (~> 0.9)
       cucumber (>= 1.3.19)
@@ -41,7 +41,7 @@ GEM
     hashie (3.4.3)
     multi_json (1.11.2)
     multi_test (0.1.2)
-    ninja-gen (0.1.1.1)
+    ninja-gen (0.1.3.0)
     pour (0.0.3.1)
       typespec
     rspec (3.4.0)
@@ -58,7 +58,7 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     thor (0.19.1)
-    typespec (0.1.0.8)
+    typespec (0.1.1.1)
     visual_studio (0.1.0.2)
 
 PLATFORMS

data/lib/ryb/dependency.rb

@@ -17,13 +17,24 @@ module Ryb
 
   class ExternalDependency < Dependency
     property :lib_or_framework, Typespec.string
+    property :mangler, Typespec.or[Typespec.fn, Typespec.nothing]
 
-    def initialize(lib_or_framework)
+    def initialize(lib_or_framework, opts={})
       self.lib_or_framework = lib_or_framework
+      self.mangler = opts[:mangler]
+    end
+
+    def mangled(*triplet)
+      if self.mangler()
+        self.mangler.(triplet, self.lib_or_framework())
+      else
+        self.lib_or_framework
+      end
     end
 
     alias :eql? :==
     def ==(other)
+      return false unless self.mangler == other.mangler
       self.lib_or_framework == other.lib_or_framework
     end
   end

data/lib/ryb/dsl.rb

@@ -147,9 +147,19 @@ module Ryb
         @spec.dependencies = @spec.dependencies + [Ryb::InternalDependency.new(product)]
       end
 
-      def add_external_dependency(lib_or_framework)
+      def add_dependencies(products)
+        [*products].each(&self.add_dependency)
+      end
+
+      def add_external_dependency(lib_or_framework, opts={})
         @spec.dependencies ||= []
-        @spec.dependencies = @spec.dependencies + [Ryb::ExternalDependency.new(lib_or_framework)]
+        @spec.dependencies = @spec.dependencies + [Ryb::ExternalDependency.new(lib_or_framework, opts)]
+      end
+
+      def add_external_dependencies(libs_and_frameworks, opts={})
+        [*libs_and_frameworks].each do |lib_or_framework|
+          self.add_external_dependency(lib_or_framework, opts)
+        end
       end
     end
 

data/lib/ryb/gem.rb

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

data/lib/ryb/ninja.rb

@@ -18,6 +18,9 @@ module Ryb
       end
 
       def generate
+        @ninjafile.rule "mv", "move /Y $in $out"
+        @ninjafile.rule "cp", "move /Y /B $in $out"
+
         @ninjafile.save(@path)
       end
 
@@ -101,7 +104,7 @@ module Ryb
 
         @ninjafile.rule(
           "so_#{namespace}",
-          "ninja -t msvc -e #{env_block} -- link.exe $#{namespace}_ldflags_sys $#{namespace}_ldflags /DLL /OUT:$out $#{namespace}_deps $in"
+          "ninja -t msvc -e #{env_block} -- link.exe $#{namespace}_ldflags_sys $#{namespace}_ldflags /DLL /IMPLIB:$#{namespace}_as_linkable /OUT:$out $#{namespace}_deps $in"
         )
 
         c_sources = sources.select{|src| src.language == :c}.map(&:path).map{|src| "#@root/#{src}"}
@@ -115,12 +118,15 @@ module Ryb
         case product
           when Ryb::Application
             @ninjafile.build "ld_#{namespace}", {artifacts[0] => c_objects + cxx_objects}
+            @ninjafile.alias namespace, artifacts[0]
           when Ryb::Library
             case product.linkage
               when :static
                 @ninjafile.build "ar_#{namespace}", {artifacts[0] => c_objects + cxx_objects}
+                @ninjafile.alias namespace, artifacts[0]
               when :dynamic
                 @ninjafile.build "so_#{namespace}", {artifacts[1] => c_objects + cxx_objects}
+                @ninjafile.alias namespace, artifacts[1]
               end
           end
       end
@@ -144,7 +150,9 @@ module Ryb
               when Ryb::InternalDependency
                 "${#{dep.product}_#{tripletised.triplet.join('_')}_as_linkable}"
               when Ryb::ExternalDependency
-                dep.lib_or_framework
+                triplet = [tripletised.configuration, tripletised.platform, tripletised.architecture].map(&:name).map(&:to_sym)
+                mangled = dep.mangled(*triplet)
+                "#{mangled}.lib"
               end
           end
         end
@@ -174,6 +182,7 @@ module Ryb
                   cflags_for_configuration(tripletised.configuration) +
                   cflags_for_platform(tripletised.platform) +
                   cflags_for_architecture(tripletised.architecture)
+          flags += VisualStudio::Compiler.include_paths_to_flags(project.paths.includes) if project.paths
           flags += VisualStudio::Compiler.include_paths_to_flags(product.paths.includes) if product.paths
           flags += VisualStudio::Compiler.defines_to_flags(project.defines)
           flags += VisualStudio::Compiler.defines_to_flags(product.defines)
@@ -185,11 +194,13 @@ module Ryb
           %w{/nologo}
         end
 
-        def ldflags_for_product(_project, product, tripletised)
+        def ldflags_for_product(project, product, tripletised)
           flags = VisualStudio::Linker::STANDARD_FLAGS +
                   ldflags_for_configuration(tripletised.configuration) +
                   ldflags_for_platform(tripletised.platform) +
                   ldflags_for_architecture(tripletised.architecture)
+          flags += VisualStudio::Linker.library_paths_to_flags(project.paths.libraries) if project.paths
+          flags += VisualStudio::Linker.library_paths_to_flags(product.paths.libraries) if product.paths
           flags += VisualStudio::Linker.architecture_to_flags(tripletised.architecture.name.to_sym)
           # TODO: Linkage.
           flags

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ryb
 version: !ruby/object:Gem::Version
-  version: 0.2.0.3
+  version: 0.2.1.0
 platform: ruby
 authors:
 - Michael Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli