visual_studio 0.1.0.0 → 0.1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/visual_studio/gem.rb +1 -1
- data/lib/visual_studio/product.rb +3 -4
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c957a6d1c02f808242afecab8c3354124319099b
|
4
|
+
data.tar.gz: fb37acaf249a250e5f21927049e42594713f66be
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b57a167ad532f99541175ba0037212415c8232cd7e910df012767b241fe4ce36620aa4d684799cf195d3e1802b1612aee71b8255134686e6c1b3c5895a5782f2
|
7
|
+
data.tar.gz: 5173d073542e36c83a46bdaaf5ea8714bb41d2081ffafcbc659198029c5b5fb4e7e443263909c8c59890731c23143643cdfe2d49ab89c6a993d75735a30d5b11
|
data/lib/visual_studio/gem.rb
CHANGED
@@ -40,13 +40,12 @@ module VisualStudio
|
|
40
40
|
# TODO(mtwilliams): Check if the architecture is supported.
|
41
41
|
# @supports.include?(target[:architecture])
|
42
42
|
|
43
|
-
delim = "d33b66512b1a01e9e3ee46e5f96a8036"
|
44
43
|
cmd = "call \"#{File.join(@root, 'vcvarsall.bat')}\" #{arch} & " +
|
45
|
-
"echo
|
46
|
-
out, _, status = Open3.capture3(
|
44
|
+
"echo require('json'); print JSON.generate(ENV.to_h); | ruby\n"
|
45
|
+
out, _, status = Open3.capture3(ENV.to_h, "cmd.exe /C \"#{cmd}\"")
|
47
46
|
return nil unless status == 0
|
48
47
|
|
49
|
-
env = JSON.parse(out
|
48
|
+
env = VisualStudio::Environment.merge(opts[:base] || {}, JSON.parse(out))
|
50
49
|
env = VisualStudio::Environment.merge(env, opts[:overlay] || {})
|
51
50
|
|
52
51
|
env
|