From 09758871ce37d63c263b9fa7f6f377cc67b2ac9c Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Wed, 18 Apr 2007 10:11:23 -0700 Subject: [PATCH] rename "pyfec" to "zfec" within tahoe build system and source code --- GNUmakefile | 16 ++++++++-------- README | 6 +++--- dapper/debian/rules | 2 +- feisty/debian/rules | 2 +- sid/debian/rules | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 40d48463..486dd21d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -44,17 +44,17 @@ show-instdir: PP=PYTHONPATH=$(PYTHONPATH) .PHONY: build -build: build-pyfec build-Crypto +build: build-zfec build-Crypto $(PYTHON) setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts" -build-pyfec: - cd src/pyfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts" +build-zfec: + cd src/zfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts" -test-pyfec: - $(PP) $(PYTHON) src/pyfec/fec/test/test_pyfec.py +test-zfec: + $(PP) $(PYTHON) src/zfec/fec/test/test_zfec.py -clean-pyfec: - -cd src/pyfec && python ./setup.py clean ; /bin/rm -rf build +clean-zfec: + -cd src/zfec && python ./setup.py clean ; /bin/rm -rf build build-Crypto: @@ -124,7 +124,7 @@ count-lines: check-memory: $(PP) $(PYTHON) src/allmydata/test/check_memory.py -clean: clean-pyfec clean-Crypto +clean: clean-zfec clean-Crypto rm -rf build rm -f debian rm -rf instdir diff --git a/README b/README index 9be2ad99..0ef5618b 100644 --- a/README +++ b/README @@ -11,7 +11,7 @@ The main application code is in the 'allmydata' package, under src/allmydata/ src/Crypto/ which gets installed to the 'allmydata.Crypto' package (since the API is different than the normal Crypto package). It also includes Zooko's PyFEC library, a fast python wrapper around the Rizzo 'fec' C library, -installed to the 'pyfec' package and located in src/pyfec/ . +installed to the 'zfec' package and located in src/zfec/ . DEPENDENCIES: @@ -57,11 +57,11 @@ INSTALLING: can then install. If not, you'll need to run three separate install steps, one for each of the - three subpackages (allmydata, allmydata.Crypto, and pyfec). You may wish to + three subpackages (allmydata, allmydata.Crypto, and zfec). You may wish to use a different version of 'python' for these steps, or provide a --prefix or --root argument for the install. - cd src/pyfec && python setup.py install && cd ../.. + cd src/zfec && python setup.py install && cd ../.. cd src/Crypto && python setup.py install && cd ../.. diff --git a/dapper/debian/rules b/dapper/debian/rules index 0dde9365..040f0d75 100644 --- a/dapper/debian/rules +++ b/dapper/debian/rules @@ -33,7 +33,7 @@ install: build dh_clean -k dh_installdirs - cd src/pyfec && python2.4 setup.py install --prefix=$(PREFIX) + cd src/zfec && python2.4 setup.py install --prefix=$(PREFIX) cd src/Crypto && python2.4 setup.py install --prefix=$(PREFIX) python2.4 setup.py install --prefix=$(PREFIX) diff --git a/feisty/debian/rules b/feisty/debian/rules index af77fd9e..b68df28f 100644 --- a/feisty/debian/rules +++ b/feisty/debian/rules @@ -11,7 +11,7 @@ STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe install/allmydata-tahoe:: mkdir -pm755 $(STAGING_DIR) - cd src/pyfec && python setup.py install --root=$(STAGING_DIR) + cd src/zfec && python setup.py install --root=$(STAGING_DIR) cd src/Crypto && python setup.py install --root=$(STAGING_DIR) python setup.py install --root=$(STAGING_DIR) diff --git a/sid/debian/rules b/sid/debian/rules index d58a99eb..b8d357c2 100644 --- a/sid/debian/rules +++ b/sid/debian/rules @@ -10,7 +10,7 @@ include /usr/share/cdbs/1/class/python-distutils.mk PREFIX=$(shell pwd)/debian/allmydata-tahoe/usr build/allmydata-tahoe:: - cd src/pyfec && python2.4 setup.py install --prefix=$(PREFIX) + cd src/zfec && python2.4 setup.py install --prefix=$(PREFIX) cd src/Crypto && python2.4 setup.py install --prefix=$(PREFIX) python2.4 setup.py install --prefix=$(PREFIX) -- 2.45.2