ryb 0.2.1.0 → 0.2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f669ebc63d3f7cd43065a2fa8f720c5e766d473d
-  data.tar.gz: b8173d293781e933906d75631e9e8d7d3ebf4724
+  metadata.gz: 967b64b65c0a4e6e0b55cf72f91ee5c12ee9c317
+  data.tar.gz: 3c5bc20bdc03baeed7642fcb17c6afc93738282f
 SHA512:
-  metadata.gz: b0e7d3cac2c0d76bfd21d46ec982aa7c1ccd24edf55703bcba05e69ed4c1fed78d4d8769ebfcd3dcd961ae92c5a7fee5e9229cc5c5dbbd14db5c6094cf076ea4
-  data.tar.gz: a00d6dee9ce6f61d26a97cb31d08a03cd9986cfffd0fac16a50b354acbc41d792868ea97cf9129243ef8cf764fb42e254713a8a1de8aed4500539fbe07349280
+  metadata.gz: 355d9136fb7b6242c4f2e6827917affcb14de3afe52d0e9cef2f60bf65bca23c928f069dc87ebdac99af9d99862aafafd4d73f9db71a737107a468038f924641
+  data.tar.gz: 433e4402f912ec821ea9a811549e89097989a18c4d5cf7fc20526cc8810e34bf0301e16bc95e243a0499949bacbccea1b1d2b01763d6e8182f25d3d9bf5a4763

data/TODO

@@ -1,4 +1,9 @@
+- Move `ninja-gen` to builder pattern.
+- Move everything to "manglers."
+ - Provide a default mangler class (`Ryb::Mangler`?) that allows declarative rewriting? (It just needs to override `#call`!)
+
 - How should we handle conflicts between say, a Ryb::Configuration and a Ryb::Platform?
+
 - Memoization.
  - http://www.justinweiss.com/articles/4-simple-memoization-patterns-in-ruby-and-one-gem/
  - http://gavinmiller.io/2013/basics-of-ruby-memoization/

data/lib/ryb.rb

@@ -6,34 +6,34 @@ require 'visual_studio'
 require 'ninja'
 
 module Ryb
-  require 'ryb/gem'
+  require_relative 'ryb/gem'
 
-  require 'ryb/helpers/defaults'
-  require 'ryb/helpers/pretty_string'
+  require_relative 'ryb/helpers/defaults'
+  require_relative 'ryb/helpers/pretty_string'
 
-  require 'ryb/name'
-  require 'ryb/paths'
-  require 'ryb/languages'
-  require 'ryb/source_file'
+  require_relative 'ryb/name'
+  require_relative 'ryb/paths'
+  require_relative 'ryb/languages'
+  require_relative 'ryb/source_file'
 
-  require 'ryb/environment'
-  require 'ryb/flags'
-  require 'ryb/preprocessor'
-  require 'ryb/code'
-  require 'ryb/dependency'
-  require 'ryb/dependencies'
-  require 'ryb/configuration'
-  require 'ryb/configurations'
-  require 'ryb/product'
-  require 'ryb/project'
+  require_relative 'ryb/environment'
+  require_relative 'ryb/flags'
+  require_relative 'ryb/preprocessor'
+  require_relative 'ryb/code'
+  require_relative 'ryb/dependency'
+  require_relative 'ryb/dependencies'
+  require_relative 'ryb/configuration'
+  require_relative 'ryb/configurations'
+  require_relative 'ryb/product'
+  require_relative 'ryb/project'
 
-  require 'ryb/dsl'
+  require_relative 'ryb/dsl'
 
-  require 'rybfile'
-  require 'rybfile/walker'
+  require_relative 'rybfile'
+  require_relative 'rybfile/walker'
 
-  require 'ryb/visual_studio'
-  require 'ryb/ninja'
+  require_relative 'ryb/visual_studio'
+  require_relative 'ryb/ninja'
 
-  require 'ryb/cli'
+  require_relative 'ryb/cli'
 end

data/lib/ryb/gem.rb

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

data/lib/ryb/ninja.rb

@@ -84,27 +84,32 @@ module Ryb
 
         @ninjafile.rule(
           "cc_#{namespace}",
-          "ninja -t msvc -e #{env_block} -- cl.exe $#{namespace}_cflags_sys $#{namespace}_cflags /Fd$#{namespace}_symbols /Fo$out /Tc$in"
+          "ninja -t msvc -e #{env_block} -- cl.exe /showIncludes $#{namespace}_cflags_sys $#{namespace}_cflags /Fd$#{namespace}_symbols /Fo$out /Tc$in",
+          dependencies: :msvc
         )
 
         @ninjafile.rule(
           "cxx_#{namespace}",
-          "ninja -t msvc -e #{env_block} -- cl.exe $#{namespace}_cxxflags_sys $#{namespace}_cxxflags /Fd$#{namespace}_symbols /Fo$out /Tp$in"
+          "ninja -t msvc -e #{env_block} -- cl.exe /showIncludes $#{namespace}_cxxflags_sys $#{namespace}_cxxflags /Fd$#{namespace}_symbols /Fo$out /Tp$in",
+          dependencies: :msvc
         )
 
         @ninjafile.rule(
           "ar_#{namespace}",
-          "ninja -t msvc -e #{env_block} -- lib.exe $#{namespace}_arflags /OUT:$out $in"
+          "ninja -t msvc -e #{env_block} -- lib.exe @$out.rsp",
+          response_file: "$#{namespace}_arflags /OUT:$out $in"
         )
 
         @ninjafile.rule(
           "ld_#{namespace}",
-          "ninja -t msvc -e #{env_block} -- link.exe $#{namespace}_ldflags_sys $#{namespace}_ldflags /OUT:$out $#{namespace}_deps $in"
+          "ninja -t msvc -e #{env_block} -- link.exe @$out.rsp",
+          response_file: "$#{namespace}_ldflags_sys $#{namespace}_ldflags /OUT:$out $#{namespace}_deps $in"
         )
 
         @ninjafile.rule(
           "so_#{namespace}",
-          "ninja -t msvc -e #{env_block} -- link.exe $#{namespace}_ldflags_sys $#{namespace}_ldflags /DLL /IMPLIB:$#{namespace}_as_linkable /OUT:$out $#{namespace}_deps $in"
+          "ninja -t msvc -e #{env_block} -- link.exe @$out.rsp",
+          response_file: "$#{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}"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ryb
 version: !ruby/object:Gem::Version
-  version: 0.2.1.0
+  version: 0.2.2.0
 platform: ruby
 authors:
 - Michael Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rubifiy your builds!