avoid the shell checks involving __init__.py

This commit is contained in:
Mike Romberg 2016-06-03 03:17:19 -06:00
commit f3c373a584

View file

@ -10,10 +10,12 @@ import_packages_subdirs = \
from_init3 \ from_init3 \
relativeimport1 \ relativeimport1 \
relativeimport2 \ relativeimport2 \
relativeimport3 \ relativeimport3
split_modules
check: build check: build
cd split_modules && $(MAKE) check
cd namespace_pkg && $(MAKE) check
if test "x$(SRCDIR)" != x; then \ if test "x$(SRCDIR)" != x; then \
for file in `cd $(SRCDIR) && find . -type f -name __init__.py`; do \ for file in `cd $(SRCDIR) && find . -type f -name __init__.py`; do \
cp "${SRCDIR}$$file" "$$file" || exit 1; \ cp "${SRCDIR}$$file" "$$file" || exit 1; \
@ -24,6 +26,8 @@ check: build
done done
build: build:
cd split_modules && $(MAKE) SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' build
cd namespace_pkg && $(MAKE) SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' build
for s in $(import_packages_subdirs); do \ for s in $(import_packages_subdirs); do \
(cd $$s && $(MAKE) SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' build); \ (cd $$s && $(MAKE) SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' build); \
done done
@ -34,6 +38,8 @@ static:
done done
clean: clean:
cd split_modules && $(MAKE) clean
cd namespace_pkg && $(MAKE) clean
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_clean $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_clean
if test "x$(SRCDIR)" != x; then \ if test "x$(SRCDIR)" != x; then \
for file in `cd $(SRCDIR) && find . -type f -name __init__.py`; do \ for file in `cd $(SRCDIR) && find . -type f -name __init__.py`; do \