svn commit: r1689721 - /subversion/trunk/build/generator/gen_win_dependencies.py

[br...@apache.org]

Author: brane
Date: Tue Jul  7 18:26:58 2015
New Revision: 1689721

URL: http://svn.apache.org/r1689721
Log:
Fix detection of Ruby on Windows for Ruby 2.2+.

* build/generator/gen_win_dependencies.py
  (SVNCommonLibrary._find_ruby): Use the RbConfig module, not the deprecated Config
   module; this aligns Ruby detection on Windows with the way it's done in swig.m4.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1689721&r1=1689720&r2=1689721&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Tue Jul  7 18:26:58 2015
@@ -925,11 +925,11 @@ class GenDependenciesBase(gen_base.Gener
     # Pass -W0 to stifle the "-e:1: Use RbConfig instead of obsolete
     # and deprecated Config." warning if we are using Ruby 1.9.
     fp = os.popen('ruby -rrbconfig -W0 -e ' + escape_shell_arg(
-                  "puts Config::CONFIG['ruby_version'];"
-                  "puts Config::CONFIG['LIBRUBY'];"
-                  "puts Config::CONFIG['libdir'];"
-                  "puts Config::CONFIG['rubyhdrdir'];"
-                  "puts Config::CONFIG['arch'];"), 'r')
+                  "puts RbConfig::CONFIG['ruby_version'];"
+                  "puts RbConfig::CONFIG['LIBRUBY'];"
+                  "puts RbConfig::CONFIG['libdir'];"
+                  "puts RbConfig::CONFIG['rubyhdrdir'];"
+                  "puts RbConfig::CONFIG['arch'];"), 'r')
     try:
       line = fp.readline()
       if line: