svn commit: r1922014 - in /subversion/branches/1.14.x: ./ STATUS build/generator/gen_win_dependencies.py

Author: svn-role
Date: Fri Nov 22 08:54:05 2024
New Revision: 1922014

URL: http://svn.apache.org/viewvc?rev=1922014&view=rev
Log:
Merge r1921267 from trunk:

 * r1921267
   Suppress error messages from gen-make.py while auto-detections for perl and
   ruby on Windows.
   Justification:
     Avoid noisy messages.
   Votes:
     +1: jun66j5, jcorvel
     Concept +1: dsahlberg

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/build/generator/gen_win_dependencies.py

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1921267

Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1922014&r1=1922013&r2=1922014&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Fri Nov 22 08:54:05 2024
@@ -34,12 +34,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1921267
-   Suppress error messages from gen-make.py while auto-detections for perl and
-   ruby on Windows.
-   Justification:
-     Avoid noisy messages.
-   Votes:
-     +1: jun66j5, jcorvel
-     Concept +1: dsahlberg

Modified: subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_win_dependencies.py?rev=1922014&r1=1922013&r2=1922014&view=diff
==============================================================================
--- subversion/branches/1.14.x/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/1.14.x/build/generator/gen_win_dependencies.py Fri Nov 22 08:54:05 2024
@@ -920,6 +920,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}.'
@@ -959,6 +964,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 = []