You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2022/11/16 04:00:03 UTC
svn commit: r1905330 - in /subversion/branches/1.14.x: ./ Makefile.in STATUS
Author: svn-role
Date: Wed Nov 16 04:00:03 2022
New Revision: 1905330
URL: http://svn.apache.org/viewvc?rev=1905330&view=rev
Log:
Merge the 1.14.x-r1903267 branch:
* r1903267
Makefile.in (fast-clean, clean-swig-py): Remove __pycache__ directory
as well as *.pyc
Justification:
We don't want that the release tarballs contains extra directories.
Branch:
1.14.x-r1903267
Votes:
+1: futatuki, jamessan, rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/Makefile.in
subversion/branches/1.14.x/STATUS
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1903267
Merged /subversion/branches/1.14.x-r1903267:r1903268-1905329
Modified: subversion/branches/1.14.x/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/Makefile.in?rev=1905330&r1=1905329&r2=1905330&view=diff
==============================================================================
--- subversion/branches/1.14.x/Makefile.in (original)
+++ subversion/branches/1.14.x/Makefile.in Wed Nov 16 04:00:03 2022
@@ -457,8 +457,9 @@ fast-clean: doc-clean
done
echo $(CLEAN_FILES) | xargs rm -f --
find $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
- $(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest \
- -name "*.pyc" -exec rm {} ';'
+ $(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline \
+ '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+ -exec rm -rf {} ';'; \
# clean everything, returning to before './configure' was run.
SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
@@ -959,7 +960,9 @@ clean-swig-py:
do \
cd $$d && rm -rf *.lo *.la *.o *.pyc .libs; \
done
- find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
+ find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
+ '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+ -exec rm -rf {} ';'
extraclean-swig-py: clean-swig-py
$(EXTRACLEAN_SWIG_PY)
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905330&r1=1905329&r2=1905330&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 16 04:00:03 2022
@@ -28,16 +28,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1903267
- Makefile.in (fast-clean, clean-swig-py): Remove __pycache__ directory
- as well as *.pyc
- Justification:
- We don't want that the release tarballs contains extra directories.
- Branch:
- 1.14.x-r1903267
- Votes:
- +1: futatuki, jamessan, rhuijben
-
* r1904198, r1904287
swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release
Justification: