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

Author: jun66j5
Date: Sat Oct 12 03:38:47 2024
New Revision: 1921267

URL: http://svn.apache.org/viewvc?rev=1921267&view=rev
Log:
Supress error messages from gen-make.py while auto-detections for perl and
ruby on Windows if the interpreter is unavailable.

* build/generator/gen_win_dependencies.py
  (_find_perl): Check the interpreter is existennt before retreiving build
  configurations.
  (_find_ruby): Ditto.

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=1921267&r1=1921266&r2=1921267&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sat Oct 12 03:38:47 2024
@@ -935,6 +935,11 @@ class GenDependenciesBase(gen_base.Gener
   def _find_perl(self, show_warnings):
     "Find the right perl library name to link swig bindings with"
 
+    try:
+      subprocess.run(['perl', '-v'], capture_output=True)
+    except OSError:
+      return  # not found, permission error, ...
+
     fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
                   'print "$Config{libperl}\\n"; '
                   'print "$Config{PERL_REVISION}.$Config{PERL_VERSION}.'
@@ -974,6 +979,11 @@ class GenDependenciesBase(gen_base.Gener
   def _find_ruby(self, show_warnings):
     "Find the right Ruby library name to link swig bindings with"
 
+    try:
+      subprocess.run(['ruby', '--version'], capture_output=True)
+    except OSError:
+      return  # not found, permission error, ...
+
     lib_dir = None
     inc_dirs = []