rscons 1.6.0 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -19,6 +19,7 @@ module Rscons
19
19
  def default_variables(env)
20
20
  {
21
21
  'OBJSUFFIX' => '.o',
22
+ 'DEPFILESUFFIX' => '.mf',
22
23
 
23
24
  'CPPDEFPREFIX' => '-D',
24
25
  'INCPREFIX' => '-I',
@@ -87,7 +88,7 @@ module Rscons
87
88
  vars = vars.merge({
88
89
  '_TARGET' => target,
89
90
  '_SOURCES' => sources,
90
- '_DEPFILE' => Rscons.set_suffix(target, '.mf'),
91
+ '_DEPFILE' => Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars)),
91
92
  })
92
93
  com_prefix = KNOWN_SUFFIXES.find do |compiler, suffix_var|
93
94
  sources.first.end_with?(*env.expand_varref("${#{suffix_var}}"))
@@ -351,7 +351,8 @@ module Rscons
351
351
  #
352
352
  # @return [void]
353
353
  def depends(target, *user_deps)
354
- target = target.to_s
354
+ target = expand_varref(target.to_s)
355
+ user_deps = user_deps.map {|ud| expand_varref(ud)}
355
356
  @user_deps[target] ||= []
356
357
  @user_deps[target] = (@user_deps[target] + user_deps).uniq
357
358
  end
@@ -1,4 +1,4 @@
1
1
  module Rscons
2
2
  # gem version
3
- VERSION = "1.6.0"
3
+ VERSION = "1.6.1"
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rscons
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-06-18 00:00:00.000000000 Z
12
+ date: 2014-08-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: json
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
144
144
  version: '0'
145
145
  segments:
146
146
  - 0
147
- hash: 485166867
147
+ hash: 580700051
148
148
  required_rubygems_version: !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
153
153
  version: '0'
154
154
  segments:
155
155
  - 0
156
- hash: 485166867
156
+ hash: 580700051
157
157
  requirements: []
158
158
  rubyforge_project:
159
159
  rubygems_version: 1.8.23.2