Author: stsp
Date: Wed Nov 25 20:51:14 2009
New Revision: 884264
URL: http://svn.apache.org/viewvc?rev=884264&view=rev
Log:
Avoid the GNU-specific "mindepth" and "maxdepth" options to "find".
* Makefile.in: CLEAN_FILES can be a long list, so use an "echo | xargs"
construct which is less likely to cause a "too many arguments" error
since the maximum length of the argument list is limited by the shell
rather than the kernel.
Don't use find to locate .pyc files created by running the test suite,
gen_make.py now puts them into CLEAN_FILES. Clean .pyc files in
tests/cmdline/svntest explicitly since they are not in the scripts
list known to gen_make.py.
* build/generator/gen_make.py: Add .pyc files potentially created by
running the test suite to the CLEAN_FILES list.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build/generator/gen_make.py
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=884264&r1=884263&r2=884264&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed Nov 25 20:51:14 2009
@@ -366,10 +366,9 @@
rm -rf .libs); \
fi \
done
- rm -f $(CLEAN_FILES)
+ echo $(CLEAN_FILES) | xargs rm -f
find $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
- $(abs_srcdir)/build -name "*.pyc" -exec rm {} ';'
- find $(abs_srcdir)/subversion/tests/ -mindepth 2 -maxdepth 3 \
+ $(abs_srcdir)/build
$(top_srcdir)/subversion/tests/cmdline/svntest \
-name "*.pyc" -exec rm {} ';'
# clean all but bulky test output, returning to before './configure' was run.
Modified: subversion/trunk/build/generator/gen_make.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=884264&r1=884263&r2=884264&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Wed Nov 25 20:51:14 2009
@@ -156,6 +156,9 @@
and not target.external_lib \
and target.filename[-3:] != '.la':
cfiles.append(target.filename)
+ for script in self.scripts:
+ if script.endswith('.py'):
+ cfiles.append(script + 'c')
data.cfiles = sorted(cfiles)
# here are all the SQL files and their generated headers. the Makefile
