ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-21 05:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setup: if the build fails, make returns a failure exit code

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2008-01-11 14:43:31 -07:00
parent 964edadf44
commit 6a6d198e1d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -47,11 +47,11 @@ TRIAL=PYTHONUNBUFFERED=1 $(TRIALCMD) --rterrors $(REACTOROPT)
build-auto-deps: check-deps build-auto-deps: check-deps
mkdir -p "$(SUPPORTLIB)" mkdir -p "$(SUPPORTLIB)"
@echo PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" $(PYTHON) misc/dependencies/setup.py easy_install --prefix="$(SUPPORT)" --always-unzip misc/dependencies @echo PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
@-PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \ $(PYTHON) misc/dependencies/build-deps-setup.py easy_install --prefix="$(SUPPORT)" --always-unzip misc/dependencies
$(PYTHON) misc/dependencies/setup.py easy_install \ @PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
--prefix="$(SUPPORT)" --always-unzip misc/dependencies || \ $(PYTHON) misc/dependencies/build-deps-setup.py easy_install --prefix="$(SUPPORT)" --always-unzip misc/dependencies || \
echo "Build of Tahoe's bundled, automatically built dependent libraries failed -- please see docs/install.html for instructions." ( echo "Build of Tahoe's bundled, automatically built dependent libraries failed -- please see docs/install.html for instructions." && false )
# The following target is here because I don't know how to tell the buildmaster # The following target is here because I don't know how to tell the buildmaster
# to start instructing his slaves to "build-auto-deps" instead of instructing # to start instructing his slaves to "build-auto-deps" instead of instructing
@ -108,10 +108,9 @@ src/allmydata/_version.py:
$(MAKE) make-version $(MAKE) make-version
build: src/allmydata/_version.py build: src/allmydata/_version.py
@echo $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG) @echo $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG) && chmod +x bin/tahoe
@$(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG) || \ @( $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG) && chmod +x bin/tahoe ) || \
echo "Build of Allmydata-Tahoe failed -- please see docs/install.html for instructions." ( echo "Build of Allmydata-Tahoe failed -- please see docs/install.html for instructions." && false )
chmod +x bin/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)
@ -236,7 +235,7 @@ upload-figleaf:
else else
upload-figleaf: upload-figleaf:
echo "this target is meant to be run with UPLOAD_TARGET=host:/path/" echo "this target is meant to be run with UPLOAD_TARGET=host:/path/"
/bin/false false
endif endif
.figleaf.el: .figleaf .figleaf.el: .figleaf