ryb 0.2.2.0 → 0.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 967b64b65c0a4e6e0b55cf72f91ee5c12ee9c317
-  data.tar.gz: 3c5bc20bdc03baeed7642fcb17c6afc93738282f
+  metadata.gz: b3a0798e444f9bbea1b7dcae4c18a8c238faaff2
+  data.tar.gz: 5985a2218e703b9736338ba85ca4da10bf769182
 SHA512:
-  metadata.gz: 355d9136fb7b6242c4f2e6827917affcb14de3afe52d0e9cef2f60bf65bca23c928f069dc87ebdac99af9d99862aafafd4d73f9db71a737107a468038f924641
-  data.tar.gz: 433e4402f912ec821ea9a811549e89097989a18c4d5cf7fc20526cc8810e34bf0301e16bc95e243a0499949bacbccea1b1d2b01763d6e8182f25d3d9bf5a4763
+  metadata.gz: 98eab62ee6529b19c35bb0a0b19b3e6ed2cce830fb5cc866175c00b10c42dae28d13a3e6a96d729a3c318db0f468b77bedf716da1498aac0d97afdf9c0ae77a3
+  data.tar.gz: 92d73b5b190dd663408ee39b5985895fd877e0cfc24d30f204f11659e36d11042aeb859fe0a39fd7177e6aba2db55f9a0183561c2de43e68e5da85ff779461c8

data/lib/ryb/dsl.rb

@@ -117,24 +117,24 @@ module Ryb
     end
 
     module Code
-      def add_source_file(file)
+      def add_source_file(file, **options)
         case file
           when SourceFile
             @spec.sources ||= []
             @spec.sources = @spec.sources + [file]
           when String
-            add_source_file(SourceFile.new(file))
+            add_source_file(SourceFile.new(file, options))
           end
       end
 
-      def add_source_files(*files_and_patterns)
+      def add_source_files(*files_and_patterns, **options)
         [*files_and_patterns].each do |file_or_pattern|
           case file_or_pattern
             when SourceFile
-              add_source_file(file_or_pattern)
+              add_source_file(file_or_pattern, options)
             when String
               [*(Dir.glob(file_or_pattern))].each do |file|
-                add_source_file(file)
+                add_source_file(file, options)
               end
             end
         end

data/lib/ryb/gem.rb

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

data/lib/ryb/ninja.rb

@@ -48,11 +48,12 @@ module Ryb
         name = product.name.canonicalize
         namespace = "#{name}_#{tripletised.triplet.join('_')}"
 
-        sdk = @vc.sdks[:windows].select{|sdk| sdk.version == '7.1'}.first
+        sdk = @vc.sdks[:windows].select{|sdk| sdk.version.to_f >= 7.1}.first
         sys_include_paths = @vc.includes + sdk.includes
         sys_lib_paths = @vc.libraries[arch] + sdk.libraries[arch]
 
         @ninjafile.variable "#{namespace}_cflags_sys", VisualStudio::Compiler.include_paths_to_flags(sys_include_paths).join(' ')
+        @ninjafile.variable "#{namespace}_cxxflags_sys", "$#{namespace}_cflags_sys"
         @ninjafile.variable "#{namespace}_ldflags_sys", VisualStudio::Linker.library_paths_to_flags(sys_lib_paths).join(' ')
 
         cflags = cflags_for_product(project, product, tripletised)
@@ -76,9 +77,8 @@ module Ryb
         @ninjafile.variable "#{namespace}_symbols", artifacts[0].gsub(/\.(exe|lib|dll)/, ".pdb")
 
         # https://github.com/ninja-build/ninja/blob/d1763746b65cc7349d4ed9478befdb651aa24589/src/msvc_helper_main-win32.cc#L38
-        # ninja -t msvc -e _build/#{namespace}.env -- cl.exe ...
         env_block = "#@build/#{namespace}.env_block"
-        env = @vc.environment(target: {platform: :windows, architecture: arch})
+        env = @vc.environment(target: {platform: :windows, architecture: arch}, base: environment)
         # "PATH=#{(@vc.binaries[arch] + sdk.binaries[arch]).join(';')}\0"
         File.write(env_block, env.map{|env_var, value| "#{env_var}=#{value}"}.join("\0"))
 
@@ -137,6 +137,49 @@ module Ryb
       end
 
       private
+        def environment
+          variables = [
+            'ALLUSERSPROFILE',
+            'APPDATA',
+            'CommonProgramFiles',
+            'CommonProgramFiles(x86)',
+            'CommonProgramW6432',
+            'ComSpec',
+            'HOMEDRIVE',
+            'HOMEPATH',
+            'LOCALAPPDATA',
+            'Path',
+            'PATHEXT',
+            'ProgramData',
+            'ProgramFiles',
+            'ProgramFiles(x86)',
+            'ProgramW6432',
+            'PUBLIC',
+            'SystemDrive',
+            'SystemRoot',
+            'TEMP',
+            'TMP',
+            'USERDOMAIN',
+            'USERNAME',
+            'USERPROFILE',
+            'windir'
+          ]
+
+          @environment ||= begin
+            require 'win32/registry'
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment", ::Win32::Registry::KEY_READ) do |originals|
+              variables.map { |variable|
+                value = begin
+                  originals[variable]
+                rescue
+                  ENV[variable]
+                end
+                [variable, value]
+              }.to_h
+            end
+          end
+        end
+
         def sources_for_product(product, tripletised)
           sources = [*product.sources] |
                     [*tripletised.configuration.sources] |

data/lib/ryb/visual_studio.rb

@@ -41,6 +41,8 @@ module Ryb
       end
 
       def self.generate_debug_symbols_to_flag(enabled)
+        # TODO(mtwilliams): Don't link to debug runtime.
+         # Do I need to expose another flag?
         # HACK(mtwilliams): Force writes to PDBs to be serialized.
         # Refer to https://msdn.microsoft.com/en-us/library/dn502518.aspx.
         enabled ? %w{/MDd /Zi /FS} : %w{/MD}

metadata

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