[David James]
> Does your patch work if autogen.sh was run in release mode? I believe
> that, if autogen.py was run in release mode, the SWIG-generated .py
> files are in the source dir and included in the tarball.
Good point.  Try this one.  The [ -f "$$f" ] logic accounts for the
shell passing literal "*.py" if the wildcard doesn't match anything.
The negated test is to make sure the shell line as a whole returns true
unless cp actually fails.
Also, I think you can 'svn rm subversion/bindings/swig/python/__init__.py'
now.  It is not meaningful in its present location.
[[[
* Makefile.in
  (copy-swig-py): Copy .py files to bindings/swig/python/libsvn/ from
    both source and build dirs.  Also ensure that __init__.py exists.
Patch by: Peter Samuelson <peter_at_p12n.org>
]]]
--- a/Makefile.in
+++ b/Makefile.in
@@ -680,7 +680,10 @@
         mkdir $(SWIG_PY_DIR)/libsvn
 
 copy-swig-py: autogen-swig-py $(SWIG_PY_DIR)/libsvn
-	@cp -pf $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/libsvn
+	@for f in $(SWIG_PY_SRC_DIR)/*.py $(SWIG_PY_DIR)/*.py; do \
+	  ! [ -f "$$f" ] || cp -pf "$$f" $(SWIG_PY_DIR)/libsvn; \
+	done
+	@touch $(SWIG_PY_DIR)/libsvn/__init__.py
 
 swig-py: autogen-swig-py copy-swig-py
 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-20 22:02:05 CEST