subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1479326 - /subversion/trunk/Makefile.in
Date Sun, 05 May 2013 14:11:28 GMT
Author: danielsh
Date: Sun May  5 14:11:27 2013
New Revision: 1479326

URL: http://svn.apache.org/r1479326
Log:
Silence 'make -s clean'.

Since distutils spam stdout with "I'm running!" and stderr with "I can't remove
a file because it doesn't exist!", just work around them altogether and don't
clean ctypes if they hadn't been built.

* Makefile.in
  (CTYPES_BUILD_OUTPUTS): New
  (clean-ctypes-python): Only run setup.py if a built output exists.

Modified:
    subversion/trunk/Makefile.in

Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1479326&r1=1479325&r2=1479326&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Sun May  5 14:11:27 2013
@@ -890,10 +890,17 @@ check-ctypes-python: ctypes-python
 	cd $(CTYPES_PYTHON_SRC_DIR); \
 	  $(LT_EXECUTE) $(PYTHON) test/run_all.py
 
+# If any of those files exists, run ctypes' 'setup.py clean'.  We don't run
+# it otherwise because it spams stdout+stderr; see r1479326.
+CTYPES_BUILD_OUTPUTS="build csvn/core/functions.py svn_all.py svn_all2.py"
 clean-ctypes-python:
-	cd $(CTYPES_PYTHON_SRC_DIR); \
-	  $(PYTHON) setup.py clean --all
-
+	cd $(CTYPES_PYTHON_SRC_DIR);            \
+	  for b in $(CTYPES_BUILD_OUTPUTS) ; do \
+	    if [ -e "$$b" ] ; then              \
+	      $(PYTHON) setup.py clean --all;   \
+	      break;                            \
+	    fi;                                 \
+	  done
 
 # manually describe a dependency, which we won't otherwise detect
 subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql



Mime
View raw message