Makefile build-deps: use a fake package named 'tahoe-deps', to avoid a double-build of tahoe

This commit is contained in:
Brian Warner 2007-09-14 19:23:55 -07:00
parent afa03e875d
commit a4b00a6b2c
3 changed files with 22 additions and 8 deletions

View File

@ -80,6 +80,8 @@
^setuptools-.*.egg$ ^setuptools-.*.egg$
# creating a tahoe egg puts files here # creating a tahoe egg puts files here
^allmydata_tahoe.egg-info ^allmydata_tahoe.egg-info
# the 'build-deps' commands results in this directory:
^tahoe_deps.egg-info
# generated crypto extension modules # generated crypto extension modules
^src/allmydata/Crypto/[^/]*/.*\.so$ ^src/allmydata/Crypto/[^/]*/.*\.so$

View File

@ -55,9 +55,10 @@ endif
TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors $(REACTOROPT) TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors $(REACTOROPT)
build-deps: build-deps: build
mkdir -p "$(SUPPORTLIB)" mkdir -p "$(SUPPORTLIB)"
PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)" $(PYTHON) setup.py install \ PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)." \
$(PYTHON) misc/dependencies/build-deps-setup.py install \
--prefix="$(SUPPORT)" --prefix="$(SUPPORT)"
EGGSPATH = $(shell $(PYTHON) misc/find-dep-eggs.py) EGGSPATH = $(shell $(PYTHON) misc/find-dep-eggs.py)
@ -72,12 +73,12 @@ make-version:
build: make-version build: make-version
$(PYTHON) ./setup.py build_ext -i $(PYTHON) ./setup.py build_ext -i
chmod +x bin/allmydata-tahoe
# 'make install' will do the following: # 'make install' will do the following:
# build+install tahoe (probably to /usr/lib/pythonN.N/site-packages) # build+install tahoe (probably to /usr/lib/pythonN.N/site-packages)
# 'make install PREFIX=/usr/local/stow/tahoe-N.N' will do the same, but to
# 'make install PREFIX=/usr/local/stow/tahoe-N.N' will do the following: # a different location
# build+install tahoe to the given PREFIX
install: make-version install: make-version
ifdef PREFIX ifdef PREFIX
@ -178,10 +179,9 @@ clean:
rm -rf build rm -rf build
rm -f debian rm -f debian
rm -f `find src/allmydata -name '*.so' -or -name '*.pyc'` rm -f `find src/allmydata -name '*.so' -or -name '*.pyc'`
rm -rf allmydata_tahoe.egg-info rm -rf tahoe_deps.egg-info allmydata_tahoe.egg-info
rm -rf support rm -rf support
rm -rf setuptools*.egg rm -rf setuptools*.egg ez_setup.pyc
rm -f ez_setup.pyc

View File

@ -0,0 +1,12 @@
#! /usr/bin/python
from setuptools import setup
setup(name='tahoe-deps',
version="1",
install_requires=["zfec >= 1.0.3",
"foolscap >= 0.1.6", "simplejson >= 1.4",
#"nevow", # we need nevow, but it doesn't seem to be
# installable by easy_install
],
)