visual_studio 0.1.0.2 → 0.1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae6d44fc02888d2b58eb780623555953300a5d3e
-  data.tar.gz: 5453ae213f25c12ea5b4caf335d14c455c6a2c24
+  metadata.gz: 9b96d8f75ac42d55c4d980ff6ee7c4d4647262e3
+  data.tar.gz: f595c1b74a1b1668af5a686ee1ac433840fcbf04
 SHA512:
-  metadata.gz: 323f2c681f5744af4acd25576bf769e33577bc6c623fe8372bdbf8328a34560c6634d96d31f7f890a23dac29714348b34c1c7e5c3fe4863fb022cb4374c7b4d2
-  data.tar.gz: b45b5568b66d4aaf52f218f2b8a6dbbde73d7ee473aeac414e1498c4e6b0b1c4f719e684edbdcc59d8c27e71f23851e83d99cfbca41d0f83e0ecbb4a53ac84b0
+  metadata.gz: 25da97f68cc5e58df1e967c0812b4b55484a1a43213beb44b27861e3278e8fd047df668a430b3185f52ec4984db7eae22a19c4cc11a4868b570d0a99eb8f9ea7
+  data.tar.gz: dd545f94acad51d0e08f20ba74717a36d87f54f4ece1a98bac22f02d130d3ef8b4b2094800243ca26e19af40ce7a95797bd4807fed5c51484845ff8c2438d115

data/lib/visual_studio.rb

@@ -1,9 +1,12 @@
 module VisualStudio
   NAMES        = ['vs2015', 'vs2013', 'vs2012', 'vs2010', 'vs2008', 'vs2005']
 
-  PRETTY_NAMES = ['Visual Studio 2015', 'Visual Studio 2013',
-                  'Visual Studio 2012', 'Visual Studio 2010',
-                  'Visual Studio 2008', 'Visual Studio 2005']
+  PRETTY_NAMES = ['Visual Studio 2015',
+                  'Visual Studio 2013',
+                  'Visual Studio 2012',
+                  'Visual Studio 2010',
+                  'Visual Studio 2008',
+                  'Visual Studio 2005']
 
   VERSIONS     = [14.0, 12.0, 11.0, 10.0, 9.0, 8.0].map(&:to_s)
 

data/lib/visual_studio/environment.rb

@@ -3,10 +3,14 @@ module VisualStudio
     SEARCH_DIRECTORIES = ['PATH', 'INCLUDE', 'LIB', 'LIBPATH']
 
     def self.merge(base, overlay)
+      # We merge case insensitively, because Windows. We treat |base| case as canonical
+      # unless the variable is only named by |overlay|.
+      cased = (overlay.keys + base.keys).uniq.map{|key| [key.upcase, key]}.to_h
+
       # TODO(mtwilliams): Verify match-up between VCInstallDir and VisualStudioVersion?
       # TODO(mtwilliams): Rederive environment variables based on VCInstallDir and/or WindowsSdkDir.
-      env = base.to_h.merge(overlay.to_h) do |variable, base, overlay|
-        if SEARCH_DIRECTORIES.include? variable
+      env = canonicalize(base).merge(canonicalize(overlay)) do |variable, base, overlay|
+        if SEARCH_DIRECTORIES.include? variable.upcase
           # TODO(mtwilliams): Detect new Visual Studio or Windows SDK related
           # paths and replace the old ones based on that.
           base    = base.split(';')
@@ -29,6 +33,15 @@ module VisualStudio
           overlay
         end
       end
+
+      env.map { |canonical, value|
+        [cased[canonical], value]
+      }.to_h
     end
+
+    private
+      def self.canonicalize(environment)
+        environment.to_h.map{|key, value| [key.upcase, value]}.to_h
+      end
   end
 end

data/lib/visual_studio/gem.rb

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

data/lib/visual_studio/product.rb

@@ -11,7 +11,8 @@ module VisualStudio
                 :libraries,
                 :binaries,
                 :sdks,
-                :supports
+                :supports,
+                :shared
 
     def initialize(desc)
       @name      = desc[:name]
@@ -22,33 +23,77 @@ module VisualStudio
       @binaries  = desc[:binaries]
       @sdks      = desc[:sdks]
       @supports  = desc[:supports]
+      @shared    = desc[:shared]
     end
 
     def environment(opts={})
       # TODO(mtwilliams): Raise an exception.
       return nil unless @name.to_s == 'VC'
 
-      # HACK(mtwilliams): We should reimplement this logic inside this gem.
-      require 'open3'
-      require 'json'
-
       target = opts[:target] || {platform: :windows,
                                  architecture: :x86}
+
       # TODO(mtwilliams): Handle other platforms.
+      # TODO(mtwilliams): Check if the architecture is supported.
       platform = :windows
       arch = {:x86 => 'x86', :x86_64 => 'amd64', :arm => 'arm'}[target[:architecture]]
-      # TODO(mtwilliams): Check if the architecture is supported.
-       # @supports.include?(target[:architecture])
 
-      cmd   = "call \"#{File.join(@root, 'vcvarsall.bat')}\" #{arch} & " +
-              "echo require('json'); print JSON.generate(ENV.to_h); | ruby\n"
-      out, _, status = Open3.capture3(ENV.to_h, "cmd.exe /C \"#{cmd}\"")
-      return nil unless status == 0
+      # TODO(mtwilliams): Raise an exception.
+      return nil unless arch
+
+      if @shared
+        # HACK(mtwilliams): Microsoft shipped a broken `vcvarsall.bat`, so
+        # we need to build the envrionment ourself.
+
+        root = File.expand_path(File.join(@root, ".."))
+
+        # TODO(mtwilliams): Insert missing variables into environment.
+         # WindowsSdkDir
+         # WindowsLibPath
+         # WindowsSDKVersion
+         # UCRTVersion
+         # UniversalCRTSdkDir
+         # DevEnvDir
+         # INCLUDE
+         # LIB
+         # LIBPATH
+
+        path = []
+
+        # TODO(mtwilliams): Inject latest Windows SDK into PATH.
+        case arch
+          when 'x86'
+            path << File.join(@root, "bin")
+          else
+            path << File.join(@root, "bin", arch)
+          end
+
+        env = {
+          "VS140COMNTOOLS" => File.join(root, "Common7", "Tools"),
+          "VSINSTALLDIR"   => root,
+          "VCINSTALLDIR"   => File.join(root, "VC"),
+          "PATH"           => path.join(';')
+        }
+
+        env = VisualStudio::Environment.merge(opts[:base] || {}, env)
+        env = VisualStudio::Environment.merge(env, opts[:overlay] || {})
+
+        env
+      else
+        # HACK(mtwilliams): We should reimplement this logic inside this gem.
+        require 'open3'
+        require 'json'
 
-      env = VisualStudio::Environment.merge(opts[:base] || {}, JSON.parse(out))
-      env = VisualStudio::Environment.merge(env, opts[:overlay] || {})
+        cmd   = "call \"#{File.join(@root, 'vcvarsall.bat')}\" #{arch} & " +
+                "echo require('json'); print JSON.generate(ENV.to_h); | ruby\n"
+        out, _, status = Open3.capture3(ENV.to_h, "cmd.exe /C \"#{cmd}\"")
+        return nil unless status == 0
 
-      env
+        env = VisualStudio::Environment.merge(opts[:base] || {}, JSON.parse(out))
+        env = VisualStudio::Environment.merge(env, opts[:overlay] || {})
+
+        env
+      end
     end
 
     def self.find(product, version)
@@ -59,6 +104,10 @@ module VisualStudio
         root = self._find_via_registry(product, version)
         return nil if root.nil?
 
+        # If shared, indicates everything is fucked up and Microsoft can't be
+        # trusted. As such, we need to unfuck things downstream.
+        shared = root.downcase.include? 'shared'
+
         includes, libraries, binaries =
           case product
             when 'VC'
@@ -120,7 +169,8 @@ module VisualStudio
                                   binaries: binaries,
                                   sdks: ({windows: sdks}),
                                   supports: ({platforms: platforms,
-                                              architectures: architectures}))
+                                              architectures: architectures}),
+                                  shared: shared)
       else
         # TODO(mtwilliams): Raise an exception.
         # raise VisualStudio::InvalidVersion.new(...)
@@ -129,22 +179,27 @@ module VisualStudio
 
     private
       def self._find_via_registry(product, version)
-        # We try to find a full version of Visual Studio. If we can't, then
-        # we look for standalone verions, i.e. Express Editions. This is only
-        # required for 2005-2010 so this logic can be removed when we drop
-        # support for them.
-        keys = ["SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\#{version}\\Setup\\#{product}",
-                "SOFTWARE\\Microsoft\\VisualStudio\\#{version}\\Setup\\#{product}",
-                "SOFTWARE\\Wow6432Node\\Microsoft\\VCExpress\\#{version}\\Setup\\#{product}",
-                "SOFTWARE\\Microsoft\\VCExpress\\#{version}\\Setup\\#{product}"]
-        installs = keys.map do |key|
-          begin
-            require 'win32/registry'
-            return File.expand_path(::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, ::Win32::Registry::KEY_READ)['ProductDir']).to_s
-          rescue
-          end
-        end
-        installs.compact.first
+        case version.to_f
+          when 8.0..14.0
+            # We try to find a full version of Visual Studio. If we can't, then
+            # we look for standalone verions, i.e. Express Editions. This is only
+            # required for 2005-2010 so this logic can be removed when we drop
+            # support for them.
+            keys = ["SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\#{version}\\Setup\\#{product}",
+                    "SOFTWARE\\Microsoft\\VisualStudio\\#{version}\\Setup\\#{product}",
+                    "SOFTWARE\\Wow6432Node\\Microsoft\\VCExpress\\#{version}\\Setup\\#{product}",
+                    "SOFTWARE\\Microsoft\\VCExpress\\#{version}\\Setup\\#{product}"]
+            installs = keys.map do |key|
+              begin
+                require 'win32/registry'
+                return File.expand_path(::Win32::Registry::HKEY_LOCAL_MACHINE.open(key, ::Win32::Registry::KEY_READ)['ProductDir']).to_s
+              rescue
+              end
+            end
+            installs.compact.first
+          when 15.0
+            raise "Not supported yet!"
+          end        
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual_studio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.2
+  version: 0.1.0.3
 platform: ruby
 authors:
 - Michael Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -93,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Inspect Visual Studio installs and generate Visual Studio project files.
 test_files: []
-has_rdoc: