Makefile: update figleaf code to use INSTDIR instead of now-obsolete builddir.py

This commit is contained in:
Brian Warner 2007-03-05 19:46:06 -07:00
parent 04bbcb01a4
commit 0d31acf113
2 changed files with 5 additions and 14 deletions

View File

@ -22,6 +22,9 @@ clean-Crypto:
INSTDIR=$(BASE)/instdir/lib/python$(shell $(PYTHON) -c 'import sys;print sys.version_info[0]').$(shell $(PYTHON) -c 'import sys;print sys.version_info[1]')/site-packages
show-instdir:
@echo $(INSTDIR)
ifneq ($(PYTHONPATH),)
PP=PYTHONPATH=${PYTHONPATH}:$(INSTDIR)
else
@ -56,13 +59,13 @@ test-figleaf: build
$(PP) $(TRIAL) --reporter=bwverbose-figleaf $(TEST)
figleaf-output:
$(PP) $(PYTHON) misc/figleaf2html -d coverage-html -r `$(PYTHON) ./builddir.py`
$(PP) $(PYTHON) misc/figleaf2html -d coverage-html -r $(INSTDIR)
@echo "now point your browser at coverage-html/index.html"
# after doing test-figleaf and figleaf-output, point your browser at
# coverage-html/index.html
.figleaf.el: .figleaf
$(PP) $(PYTHON) misc/figleaf2el.py .figleaf `$(PYTHON) ./builddir.py`
$(PP) $(PYTHON) misc/figleaf2el.py .figleaf $(INSTDIR)
pyflakes:
pyflakes src/allmydata

View File

@ -1,12 +0,0 @@
#! /usr/bin/python
import sys, os.path
from distutils.util import get_platform
# because we use extension modules, we need a platform+version-specific
# libdir. If we were using a pure-python module, this would just be "lib".
plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
libdir = os.path.join("build", "lib" + plat_specifier)
if len(sys.argv) > 1 and sys.argv[1] == "-a":
libdir = os.path.abspath(libdir)
print libdir