Commit Graph

213 Commits

Author SHA1 Message Date
Brian Warner
dc6fe89629 Makefile: minor, add .PHONY declarations 2009-02-13 01:23:41 -07:00
Brian Warner
666652ed84 Makefile: add figleaf-delta-output, to render figleaf coverage differences with a previous run 2009-02-12 15:18:29 -07:00
Brian Warner
020715c8e7 Makefile: include the figleaf pickle in the uploaded coverage data, for later differential analysis 2009-02-11 18:09:13 -07:00
Brian Warner
8fd9cbe351 Makefile: fix test-clean, by ignoring _appname.py and removing src/allmydata_tahoe.egg-info 2009-02-11 18:04:34 -07:00
Brian Warner
f0572421fe Makefile: fix 'clean' target to remove bin/tahoe and bin/tahoe-script.py, since both are now generated 2009-02-02 17:03:07 -07:00
Brian Warner
a6eb434b57 Makefile: use 'setup.py test' for test/quicktest targets (instead of
'setup.py trial'). 'setup.py trial' clobbers the tahoe .egg's PKG-INFO
"Version:" field (resetting it to 0.0.0), possibly because it isn't invoking
the darcsver subcommand that 'setup.py test' does before it runs the 'trial'
subcommand.

This slows down quicktest by another couple of seconds (see #591) and adds
more noise to its output, but without this change, 'make test' and 'make
quicktest' fail on test_runner (which spawns bin/tahoe as a subprocess, and
with a mangled Version:, the setuptools-based entry point script refuses to
recognize our source tree as a usable version of Tahoe).
2009-01-30 04:25:36 -07:00
Brian Warner
20ebfcc0c6 Makefile: remove the obsolete stats-gatherer-run target 2009-01-29 19:01:31 -07:00
Zooko O'Whielacronx
4e6c09d306 setup: remove the "build three times in a row" kludge now that #229 is fixed, and spell build "build" instead of "build_tahoe" 2009-01-29 13:59:52 -07:00
Brian Warner
66b8190fb1 rollback the #591 fix, since it breaks quicktest entirely 2009-01-23 17:28:12 -07:00
Zooko O'Whielacronx
2cf9505d5f setup: use "trial" executable instead of the setuptools_trial plugin for "make quicktest"
This is to fix #591 ("make quicktest" could be quicker and less noisy).  This means that "make quicktest" won't work unless the user has manually installed Twisted already such that the "trial" executable is on their PATH and the Twisted package is on their PYTHONPATH.  This bypasses the behavior of setuptools_trial which builds and checks package dependencies before executing the tests.
2009-01-23 16:58:30 -07:00
cgalvan
5cd6ed17fb use_setuptools_trial.patch 2008-11-21 14:57:59 -07:00
robk-tahoe
e1f7008e47 makefile: added 'fuse-test' target to makefile, to run 'runtests' 2008-10-19 06:25:18 -07:00
robk-tahoe
00aa75d1e8 fuse/impl_c: move mac tahoefuse impl out into contrib/fuse
For a variety of reasons, high amongst them the fact that many people 
interested in fuse support for tahoe seem to have missed its existence,
the existing fuse implementation for tahoe, previously 'mac/tahoefuse.py'
has been renamed and moved.

It was suggested that, even though the mac build depends upon it, that
the mac/tahoefuse implementation be moved into contrib/fuse along with
the other fuse implementations.  The fact that it's not as extensively
covered by unit tests as mainline tahoe was given as corroboration.

In a bid to try and stem the confusion inherent in having tahoe_fuse,
tfuse and tahoefuse jumbled together (not necessarily helped by 
referring to them as impl_a, b and c respectively) I'm hereby renaming
tahoefuse as 'blackmatch'  (black match is, per wikipedia "a type of 
crude fuse" hey, I'm a punny guy)  Maybe one day it'll be promoted to
be 'quickmatch' instead...

Anyway, this patch moves mac/tahoefuse.py out to contrib/fuse/impl_c/
as blackmatch.py, and makes appropriate changes to the mac build process
to transclude blackmatch therein.  this leaves the extant fuse.py and
fuseparts business in mac/ as-is and doesn't attempt to address such
issues in contrib/fuse/impl_c.

it is left as an exercise to the reader (or the reader of a message
to follow) as to how to deal with the 'fuse' python module on the mac.

as of this time, blackmatch should work on both mac and linux, and
passes the four extant tests in runtests.  (fwiw neither impl_a nor
impl_b have I managed to get working on the mac yet)

since blackmatch supports a read-write and caching fuse interface to
tahoe, some write tests obviously need to be added to runtests.
2008-09-24 18:42:14 -07:00
Brian Warner
050bee8fdc setup.py,Makefile: move the 'chmod +x bin/tahoe' into setup.py 2008-09-17 16:07:56 -07:00
Brian Warner
09603212ca Makefile,docs: tahoe-deps.tar.gz now lives in separate source/deps/ directory on http://allmydata.org 2008-09-17 13:44:52 -07:00
Brian Warner
749c5a95e0 setup.py,Makefile: teat sdist --sumo about tahoe-deps/, use -SUMO suffix on tarballs, add sumo to 'make tarballs' target 2008-09-17 13:01:19 -07:00
Brian Warner
880df93c8b Makefile: pyutil from a dependent lib causes a #455-ish problem, the workaround is to run build-once *three* times 2008-09-16 22:36:43 -07:00
Brian Warner
00debea3a9 Makefile: desert-island: don't re-fetch tahoe-deps.tar.gz if it's already there, remove the tahoe-deps/ before untarring directory to avoid unpacking weirdness 2008-09-16 22:22:04 -07:00
Brian Warner
1853020a5f #249: add 'test-desert-island', to assert that a tahoe-deps.tar.gz -enabled build does not download anything 2008-09-16 18:37:02 -07:00
Brian Warner
0afe7afac0 Makefile: fix windows issues 2008-09-11 22:09:19 -07:00
Brian Warner
3035c6bcf1 Makefile: use run_with_pythonpath, move windows targets into a separate Makefile 2008-09-11 21:45:08 -07:00
Brian Warner
5ca999fb72 Makefile: convert check-auto-deps target into 'setup.py check_auto_deps' 2008-09-11 20:59:04 -07:00
Brian Warner
39552404d7 rewrite parts of the Makefile in setup.py. Add 'build_tahoe' and 'trial' subcommands.
The 'make build' target now runs 'setup.py build_tahoe', which figures out
where the target 'supportlib' directory should go, and invokes 'setup.py
develop' with the appropriate arguments.

The 'make test' target now runs 'setup.py trial', which manages sys.path and
runs trial as a subroutine instead of spawning an external process. This
simplifies the case where Twisted was built as a dependent library (and thus
the 'trial' executable is not on PATH).

setup.py now manages sys.path and PYTHONPATH for its internal subcommands, so
the $(PP) prefix was removed from all Makefile targets that invoke setup.py .
For the remaining ones, the 'setup.py -q show_pythonpath' subcommand was
added to compute this prefix with python rather than with fragile
shell/Makefile syntax.
2008-09-11 18:03:21 -07:00
Brian Warner
ae6cc14a2d Makefile: give setup.py develop a '--site-dirs' arg to work around the #249 setuptools bug which causes us to unnecessarily rebuild pyopenssl and other support libs installed via debian's python-support. Should be harmless on other platforms. 2008-09-10 16:34:32 -07:00
Zooko O'Whielacronx
3fab96493e setup: don't assert that trial is present when the Makefile is evaluated
This should fix #506, but it means that if (for some weird reason) Twisted can't be auto-installed and the find_trial.py script doesn't work, the user will get a weird failure message instead of a clean failure message explaining that trial couldn't be found.  Oh well.

Chris Galvan is working on a much nicer fix to all these issues -- see #505.
2008-09-03 10:18:37 -07:00
Zooko O'Whielacronx
5786ddd36a setup: remove accidentally duplicated lines from Makefile 2008-08-07 12:30:29 -07:00
Brian Warner
c4405b529f Makefile: avoid bare quotes, since the emacs syntax-highlighter gets confused by them 2008-08-07 11:30:01 -07:00
Zooko O'Whielacronx
d44fc9fb88 setup: don't attempt to escape quote marks, just delete them. Ugly, but it works okay. 2008-08-06 16:27:42 -07:00
Zooko O'Whielacronx
960a648d5b setup: escape any double-quote chars in the PATH before using the PATH to find and invoke trial 2008-08-06 16:11:43 -07:00
Zooko O'Whielacronx
2ed1d03a49 setup: if the user passes a TRIALOPT env var then pass that on to trial
This is useful for --reporter=bwverbose, for example.
2008-07-30 13:58:06 -07:00
Zooko O'Whielacronx
8aab91115a setup: turn back on reactor=poll for cygwin trial (else it runs out of fds) 2008-07-30 11:12:17 -07:00
Zooko O'Whielacronx
5a0e98d693 setup: fix bug in Makefile -- ifeq, not ifneq -- so that now it sets poll reactor only if the user hasn't specified a REACTOR variable, instead of setting poll reactor only if the user has specified a REACTOR variable 2008-07-30 09:04:29 -07:00
Zooko O'Whielacronx
bd0fe3588b setup: whoops, really remove the default reactor=poll this time 2008-07-29 20:23:58 -07:00
Zooko O'Whielacronx
677f26f0f4 setup: instead of setting --reactor=poll for trial in all cases (which fails on platforms that don't have poll reactor, such as Windows and some Mac OS X), just set --reactor=poll for linux2. 2008-07-29 20:16:56 -07:00
Zooko O'Whielacronx
3eb5f221d7 setup: pass --reactor=poll to trial unless REACTOR variable is set, in which case pass --reactor=$(REACTOR)
This hopefully works around the problem that Twisted v8.1.0 has a bug when used
with pyOpenSSL v0.7 which bug causes some unit tests to spuriously fail -- see
known_issues.txt r2788:

http://allmydata.org/trac/tahoe/browser/docs/known_issues.txt?rev=2788#L122

Also it matches with the fact that --reactor=poll is required on cygwin.
2008-07-29 19:39:06 -07:00
Zooko O'Whielacronx
1a62904289 setup: don't use "python" in Makefile, use $(PYTHON) everywhere 2008-07-21 09:28:49 -07:00
Brian Warner
9ed9eb2048 check_grid.py: make it work, move node start/stop responsibility from Makefile to script 2008-06-19 12:39:52 -07:00
Brian Warner
2fffdbd439 Makefile: minor comment 2008-06-18 15:49:30 -07:00
Brian Warner
164c3f83a1 Makefile: edit check-grid comment a bit 2008-06-18 13:15:55 -07:00
Brian Warner
50d945ea8f start work on 'check-grid' target, for use in an automated prodnet tester. Just a docstring so far. 2008-06-18 12:57:47 -07:00
Brian Warner
0cba951ca0 Makefile: add ubuntu/hardy deb targets 2008-06-17 15:26:18 -07:00
Zooko O'Whielacronx
4b8632b7e5 setup: quote another place where spaces in paths cause shell command misparsing 2008-06-09 16:21:50 -07:00
Brian Warner
08d07f0cc5 Makefile: build twice, since sometimes the Nevow build fails the first time. See #455. This ought to be undone once that ticket is fixed by a new release of setuptools 2008-06-09 16:06:29 -07:00
Zooko O'Whielacronx
78791ab36d setup: don't quote REACTOROPT -- when it is empty then we want no argument at all to be passed to trial, rather than the empty-string-argument 2008-06-09 11:53:24 -07:00
Zooko O'Whielacronx
74908b9334 setup: don't quote TRIALCMD in Makefile -- it can be a pair of (python executable, path to command) paths 2008-06-05 16:39:12 -07:00
Zooko O'Whielacronx
065625738a setup: quote variables which are going to be passed through a shell and which might contain spaces 2008-06-05 15:19:51 -07:00
Zooko O'Whielacronx
36182fb1ac setup: indentation 2008-06-05 14:02:49 -07:00
Zooko O'Whielacronx
970edc5c65 setup and docs: various improvements to setup and docs
Remove docs/install-details.html and README.win32 for now (see #282).
Remove checks for pywin32 and pyopenssl in Makefile -- that is (or will be) automated by setuptools.
Remove twisted from setup_requires.  This causes the problem in which Nevow doesn't declare its dependency on Twisted (#440) to yield a clear ImportError mentioning Twisted and to fail repeatedly, rather than yielding a weird ImportError and working on the second identical attempt.
Fix Makefile to set PATH so that trial and twistd can be found by "make test" after Twisted was installed into support/ during "make"
2008-06-05 13:55:05 -07:00
Zooko O'Whielacronx
59cdfb8f35 setup: tiny fix to syntax in makefile 2008-05-07 05:37:11 -07:00
Zooko O'Whielacronx
a097f45243 setup: remove specific checks for twisted dependency in makefile
Now that the twisted dependency is handled by the automatic dependency mechanism.
2008-05-06 12:09:00 -07:00