From 70be8d6a8addeac022a09a68c8f5d6474bbd0759 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Tue, 1 Jan 2008 01:49:21 -0700 Subject: [PATCH] setup: rename build-deps to build-auto-deps --- Makefile | 6 +++--- README | 6 +++--- calcdeps.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f6ef76da..cfa43f81 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ endif TRIAL=PYTHONUNBUFFERED=1 $(TRIALCMD) --rterrors $(REACTOROPT) -build-deps: check-deps +build-auto-deps: check-deps mkdir -p "$(SUPPORTLIB)" PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \ $(PYTHON) misc/dependencies/build-deps-setup.py install \ @@ -72,7 +72,7 @@ make-version: $(MAKE) build touch .built -simple-build: build-deps build +simple-build: build-auto-deps build build: $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG) @@ -112,7 +112,7 @@ see the README for help on installing dependencies." signal-error-twisted-dep: @echo @echo - @echo "ERROR: Before running \"make build-deps\" you have to ensure that \ + @echo "ERROR: Before running \"make build-auto-deps\" you have to ensure that \ Twisted is installed (including its zope.interface dependency). Twisted and \ zope.interface are required for the automatic installation of certain other \ libraries that Tahoe requires). Please see the README for details." diff --git a/README b/README index 72b73cb8..7c3d3cf4 100644 --- a/README +++ b/README @@ -147,18 +147,18 @@ choose the easy_install way. 1. Get the source code (see above). - 2. Run "make build-deps" to install the easy_install-able dependencies + 2. Run "make build-auto-deps" to install the easy_install-able dependencies (setuptools, zfec, foolscap, simplejson, nevow, and pycryptopp) into a local subdirectory of the Tahoe source distribution. (Note that when the dependent libraries are updated, you should use "make clean" before - "make build-deps" to make sure you will get the newest versions). + "make build-auto-deps" to make sure you will get the newest versions). 3. Build Tahoe by running "make". 4. Once you've built it then you can execute "./bin/tahoe". (When the tahoe script is in a Tahoe source distribution, it adds the necessary directory to the Python "sys.path". It also looks for any dependencies - that you installed by "make build-deps" and includes them in the + that you installed by "make build-auto-deps" and includes them in the sys.path.) See the RUNNING section, below. The Debian Way: diff --git a/calcdeps.py b/calcdeps.py index af0f3293..3705ad52 100644 --- a/calcdeps.py +++ b/calcdeps.py @@ -29,10 +29,10 @@ except ImportError: # Ubuntu Dapper includes nevow-0.6.0 and twisted-2.2.0, both of which work. # However, setuptools doesn't know about them, so our install_requires= -# dependency upon nevow causes our 'build-deps' step to try and build the +# dependency upon nevow causes our 'build-auto-deps' step to try and build the # latest version (nevow-0.9.18), which *doesn't* work with twisted-2.2.0 . To # work around this, remove nevow from our dependency list if we detect that -# we've got nevow-0.6.0 installed. This will allow build-deps (and everything +# we've got nevow-0.6.0 installed. This will allow build-auto-deps (and everything # else) to work on dapper systems that have the python-nevow package # installed, and shouldn't hurt any other systems. Dapper systems *without* # python-nevow will try to build it (and will fail unless they also have a -- 2.45.2