ryb 0.1.2 → 0.1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ryb/ninja.rb +7 -6
- data/lib/ryb/version.rb +1 -1
- data/lib/ryb/visual_studio.rb +3 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c37eb74ab4aa31a58071a356dff44041cfa4000d
|
|
4
|
+
data.tar.gz: 1116619e3d5385d7790a94dfe93ac20caa12f7a1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a8c98f3febbc6728f0b45dbf424c61cfcbcde68323fc6106768587dba05cb7297459f791a1db7f50d97c42ca3c97a7baa8ba294a135da9b6b742ea6905d79ecc
|
|
7
|
+
data.tar.gz: 481325cc2ffcd087664cf7137ca807a15cec70152013b50b32aa6c5d729d5b1804c7200ed61d1e2879b352429d65e458ffd4dc7d7228b00ad4fdcf839608821b
|
data/lib/ryb/ninja.rb
CHANGED
|
@@ -96,17 +96,18 @@ module Ryb
|
|
|
96
96
|
inputs = outputs_to_inputs.map{|object,_| object}
|
|
97
97
|
dependencies = []
|
|
98
98
|
buildable.dependencies.each do |dependency|
|
|
99
|
-
|
|
100
|
-
if
|
|
101
|
-
case
|
|
99
|
+
as_buildable = (project.libraries.select{|buildable| buildable.name == dependency}).first
|
|
100
|
+
if as_buildable
|
|
101
|
+
case as_buildable.linkage
|
|
102
102
|
when :static
|
|
103
|
-
dependencies.push("${built}/lib/#{
|
|
103
|
+
dependencies.push("${built}/lib/#{as_buildable.name}${#{as_buildable.name}_#{triplet}_suffix}.lib")
|
|
104
104
|
when :dynamic
|
|
105
105
|
# TODO(mtwilliams): Move import libraries to ${built}/lib.
|
|
106
|
-
dependencies.push("${built}/bin/#{
|
|
106
|
+
dependencies.push("${built}/bin/#{as_buildable.name}${#{as_buildable.name}_#{triplet}_suffix}.lib")
|
|
107
107
|
end
|
|
108
108
|
else
|
|
109
|
-
|
|
109
|
+
# TODO(mtwilliams): Check search paths for the existence of the library.
|
|
110
|
+
dependencies.push(dependency)
|
|
110
111
|
end
|
|
111
112
|
end
|
|
112
113
|
if buildable.is_a? Ryb::Application
|
data/lib/ryb/version.rb
CHANGED
data/lib/ryb/visual_studio.rb
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
module Ryb
|
|
2
2
|
module VisualStudio
|
|
3
3
|
POSSIBLE_INSTALL_DIRECTORY_REGISTRY_KEYS =
|
|
4
|
-
["SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\
|
|
4
|
+
["SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\14.0\\Setup\\VC",
|
|
5
|
+
"SOFTWARE\\Microsoft\\VisualStudio\\14.0\\Setup\\VC",
|
|
6
|
+
"SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\12.0\\Setup\\VC",
|
|
5
7
|
"SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC",
|
|
6
8
|
"SOFTWARE\\Wow6432Node\\Microsoft\\VCExpress\\12.0\\Setup\\VC",
|
|
7
9
|
"SOFTWARE\\Microsoft\\VCExpress\\12.0\\Setup\\VC",
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ryb
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michael Williams
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-08-
|
|
11
|
+
date: 2015-08-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: facets
|