rscons 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6ab9f61dc793cbbd24e94de699b62fad0c5f7d7da1d09e4ed117d6660b8ed77
-  data.tar.gz: 8bb4e4698a8cc54941c9e2757857de1ccc8914b95596a2f6fc308f7b717e7db8
+  metadata.gz: d1c35c3bc6732619150b8db82fef940d7b52158928e840d1476b50e67ac1bc12
+  data.tar.gz: 8a7824b24ddc5b8f0f0a137f90614e1f07c34aaba6a155b7ff3aad4025481cea
 SHA512:
-  metadata.gz: 18d50b38e720459b289e51b0fd3a101294ff9bb5ac168c5923145ff39bd38eacefe9fef9d140bd252bf0f4eb1342ba9dc1e7e9569c9a5d641447b0d79b02d64f
-  data.tar.gz: 82d2339ac692f1338da75d2d1def8e817f13cfba1373f98be9e785016d03c55a183cc8775dc827b2174d70a1ca8883026202264c9d94f5c225dcfb2d2a44c1c0
+  metadata.gz: 49f2d855f39126acd3a1776211971b7605f8a391dad8aa85cce9f6951b12ee02abe94564ac2332d1fdbe1f25a2beae0b79d8035fb0af46f2b79543b7105d69a5
+  data.tar.gz: 549b3b08fee0046a7f210fa42b3a0a51cb3eb61e79ad172c720007ee187ebe781ac69dca2693dde8646b8b7d49739cdf277465b44f1305eaf803ed57d444ce64

data/lib/rscons/builders/object.rb

@@ -30,7 +30,7 @@ module Rscons
           'ASSUFFIX' => ['.S'],
           'ASPPPATH' => '${CPPPATH}',
           'ASPPFLAGS' => '${CPPFLAGS}',
-          'ASDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}', '-MT', 'TARGET'],
+          'ASDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
           'ASCMD' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '${INCPREFIX}${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'],
 
           'CPPFLAGS' => ['${CPPDEFPREFIX}${CPPDEFINES}'],
@@ -42,19 +42,19 @@ module Rscons
           'CC' => 'gcc',
           'CFLAGS' => [],
           'CSUFFIX' => ['.c'],
-          'CCDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}', '-MT', 'TARGET'],
+          'CCDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
           'CCCMD' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${CCFLAGS}', '${_SOURCES}'],
 
           'CXX' => 'g++',
           'CXXFLAGS' => [],
           'CXXSUFFIX' => ['.cc', '.cpp', '.cxx', '.C'],
-          'CXXDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}', '-MT', 'TARGET'],
+          'CXXDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
           'CXXCMD' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '${INCPREFIX}${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${CCFLAGS}', '${_SOURCES}'],
 
           'DC' => 'gdc',
           'DFLAGS' => [],
           'DSUFFIX' => ['.d'],
-          'DDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}', '-MT', 'TARGET'],
+          'DDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'],
           'D_IMPORT_PATH' => [],
           'DCCMD' => ['${DC}', '-c', '-o', '${_TARGET}', '${DDEPGEN}', '${INCPREFIX}${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'],
         }
@@ -115,7 +115,7 @@ module Rscons
         if options[:command_status]
           target, deps, cache, env, vars = options.values_at(:target, :sources, :cache, :env, :vars)
           if File.exists?(vars['_DEPFILE'])
-            deps += Environment.parse_makefile_deps(vars['_DEPFILE'], 'TARGET')
+            deps += Environment.parse_makefile_deps(vars['_DEPFILE'])
             FileUtils.rm_f(vars['_DEPFILE'])
           end
           cache.register_build(target, options[:tc].command, deps.uniq, env)

data/lib/rscons/builders/preprocess.rb

@@ -55,7 +55,7 @@ module Rscons
         if options[:command_status]
           target, deps, cache, env, vars = options.values_at(:target, :sources, :cache, :env, :vars)
           if File.exists?(vars['_DEPFILE'])
-            deps += Environment.parse_makefile_deps(vars['_DEPFILE'], nil)
+            deps += Environment.parse_makefile_deps(vars['_DEPFILE'])
             FileUtils.rm_f(vars['_DEPFILE'])
           end
           cache.register_build(target, options[:tc].command, deps.uniq, env)

data/lib/rscons/builders/shared_object.rb

@@ -100,7 +100,7 @@ module Rscons
         if options[:command_status]
           target, deps, cache, env, vars = options.values_at(:target, :sources, :cache, :env, :vars)
           if File.exists?(vars['_DEPFILE'])
-            deps += Environment.parse_makefile_deps(vars['_DEPFILE'], 'TARGET')
+            deps += Environment.parse_makefile_deps(vars['_DEPFILE'])
             FileUtils.rm_f(vars['_DEPFILE'])
           end
           cache.register_build(target, options[:tc].command, deps.uniq, env)

data/lib/rscons/environment.rb

@@ -385,12 +385,12 @@ module Rscons
 
     # Expand a construction variable reference.
     #
-    # @param varref [Array, String] Variable reference to expand.
+    # @param varref [nil, String, Array, Proc, Symbol, TrueClass, FalseClass] Variable reference to expand.
     # @param extra_vars [Hash, VarSet]
     #   Extra variables to use in addition to (or replace) the Environment's
     #   construction variables when expanding the variable reference.
     #
-    # @return [Array, String] Expansion of the variable reference.
+    # @return [nil, String, Array, Symbol, TrueClass, FalseClass] Expansion of the variable reference.
     def expand_varref(varref, extra_vars = nil)
       vars = if extra_vars.nil?
                @varset
@@ -1065,16 +1065,14 @@ module Rscons
       end
     end
 
-    # Parse dependencies for a given target from a Makefile.
+    # Parse dependencies from a Makefile.
     #
     # This method is used internally by Rscons builders.
     #
     # @param mf_fname [String] File name of the Makefile to read.
-    # @param target [String, nil]
-    #   Name of the target to gather dependencies for, nil for any/all.
     #
     # @return [Array<String>] Paths of dependency files.
-    def self.parse_makefile_deps(mf_fname, target)
+    def self.parse_makefile_deps(mf_fname)
       deps = []
       buildup = ''
       File.read(mf_fname).each_line do |line|
@@ -1082,11 +1080,9 @@ module Rscons
           buildup += ' ' + $1
         else
           buildup += ' ' + line
-          if buildup =~ /^(.*): (.*)$/
-            mf_target, mf_deps = $1.strip, $2
-            if target.nil? or mf_target == target
-              deps += mf_deps.split(' ').map(&:strip)
-            end
+          if buildup =~ /^.*: (.*)$/
+            mf_deps = $1
+            deps += mf_deps.split(' ').map(&:strip)
           end
           buildup = ''
         end

data/lib/rscons/varset.rb

@@ -86,12 +86,12 @@ module Rscons
     # Replace "$!{var}" variable references in varref with the expanded
     # variables' values, recursively.
     #
-    # @param varref [nil, String, Array, Proc]
+    # @param varref [nil, String, Array, Proc, Symbol, TrueClass, FalseClass]
     #   Value containing references to variables.
     # @param lambda_args [Array]
     #   Arguments to pass to any lambda variable values to be expanded.
     #
-    # @return [nil, String, Array]
+    # @return [nil, String, Array, Symbol, TrueClass, FalseClass]
     #   Expanded value with "$!{var}" variable references replaced.
     def expand_varref(varref, lambda_args)
       if varref.is_a?(String)
@@ -118,6 +118,10 @@ module Rscons
         nil
       elsif varref.is_a?(Symbol)
         varref
+      elsif varref.is_a?(TrueClass)
+        varref
+      elsif varref.is_a?(FalseClass)
+        varref
       else
         raise "Unknown varref type: #{varref.class} (#{varref.inspect})"
       end

data/lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # gem version
-  VERSION = "1.16.0"
+  VERSION = "1.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rscons
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Josh Holtrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json