You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/05/14 18:54:36 UTC
svn commit: r1482453 - in /subversion/branches/1.8.x: ./ Makefile.in STATUS
subversion/bindings/ctypes-python/setup.py
Author: breser
Date: Tue May 14 16:54:36 2013
New Revision: 1482453
URL: http://svn.apache.org/r1482453
Log:
Merge the r1479320 group from trunk:
* r1479320, r1479321, r1479323, r1479326, r1479329
Silence 'make -s clean distclean'.
Justification:
'make -s all install distclean' would spam stdout and issue irrelevant
warnings on stderr. (This is user-facing behaviour.)
Votes:
+1 (for 1.8.1): danielsh
+1: rhuijben, cmpilato
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/Makefile.in
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/ctypes-python/setup.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1479320-1479321,1479323,1479326,1479329
Modified: subversion/branches/1.8.x/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/Makefile.in?rev=1482453&r1=1482452&r2=1482453&view=diff
==============================================================================
--- subversion/branches/1.8.x/Makefile.in (original)
+++ subversion/branches/1.8.x/Makefile.in Tue May 14 16:54:36 2013
@@ -398,7 +398,6 @@ locale-gnu-po-update:
fast-clean: doc-clean
@list='$(BUILD_DIRS)'; for i in $$list; do \
if [ -d $$i ]; then \
- echo "Cleaning $$i ..." ; \
(cd $$i && rm -f *.o *.lo *.la *.la-a *.spo *.mo && \
rm -rf .libs); \
fi \
@@ -588,8 +587,10 @@ gcov-clean:
find . -name "*.gcda" -o -name "*.gcno" -print0 | xargs -0 rm -f --
check-clean: gcov-clean
- find subversion/tests/cmdline/svn-test-work -mindepth 1 -maxdepth 1 \
+ if [ -d subversion/tests/cmdline/svn-test-work ]; then \
+ find subversion/tests/cmdline/svn-test-work -mindepth 1 -maxdepth 1 \
-print0 | xargs -0 rm -rf --; \
+ fi
rm -rf subversion/tests/libsvn_fs/test-repo-* \
subversion/tests/libsvn_fs_base/test-repo-* \
subversion/tests/libsvn_fs_fs/test-repo-* \
@@ -880,10 +881,16 @@ 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.
clean-ctypes-python:
- cd $(CTYPES_PYTHON_SRC_DIR); \
- $(PYTHON) setup.py clean --all
-
+ cd $(CTYPES_PYTHON_SRC_DIR); \
+ for b in build csvn/core/functions.py svn_all.py svn_all2.py ; 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
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482453&r1=1482452&r2=1482453&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:54:36 2013
@@ -85,15 +85,6 @@ Approved changes:
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
- * r1479320, r1479321, r1479323, r1479326, r1479329
- Silence 'make -s clean distclean'.
- Justification:
- 'make -s all install distclean' would spam stdout and issue irrelevant
- warnings on stderr. (This is user-facing behaviour.)
- Votes:
- +1 (for 1.8.1): danielsh
- +1: rhuijben, cmpilato
-
* r1480077
Check separately for -flto and -Wno-clobbered with --enable-optimize.
Justification:
Modified: subversion/branches/1.8.x/subversion/bindings/ctypes-python/setup.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/ctypes-python/setup.py?rev=1482453&r1=1482452&r2=1482453&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/ctypes-python/setup.py (original)
+++ subversion/branches/1.8.x/subversion/bindings/ctypes-python/setup.py Tue May 14 16:54:36 2013
@@ -58,7 +58,7 @@ class clean(_clean):
if not self.dry_run:
os.remove(f)
else:
- log.warn("'%s' does not exist -- can't clean it", os.path.normpath(f))
+ log.debug("'%s' does not exist -- can't clean it", os.path.normpath(f))
# Run standard clean command
_clean.run(self)