diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-08-15 10:33:48 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-08-26 23:51:43 +0100 |
| commit | e79a9a87c311fd0499c96cecbe560839a17d244e (patch) | |
| tree | f98d1fe635112df75ff68177bf9b8b3451185de4 /perf | |
| parent | 6bfb77a33c3614cafdcd6206de5c71321c5fc1e5 (diff) | |
[perf] Support objdir!=srcdir in cairo-perf-diff
Crude support to detect when we have cairo-perf-diff-files in the local
directory which is not srcdir.
Diffstat (limited to 'perf')
| -rwxr-xr-x | perf/cairo-perf-diff | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff index 469da891..52c6d80a 100755 --- a/perf/cairo-perf-diff +++ b/perf/cairo-perf-diff @@ -223,14 +223,20 @@ run_cairo_perf_if_not_cached() { git_setup -# Build cairo-perf-diff-files if not available -if [ ! -e $CAIRO_DIR/perf/cairo-perf-diff-files ]; then - echo "Building cairo-perf-diff-files" - if [ "x$OS" = "xWindows_NT" ]; then - make -f Makefile.win32 -C $CAIRO_DIR/perf/ cairo-perf-diff-files CFG=debug - else - make -C $CAIRO_DIR/perf/ cairo-perf-diff-files - fi +if [ -e ./cairo-perf-diff-files ]; then + bindir="." +else + bindir=$CAIRO_DIR/perf + + # Build cairo-perf-diff-files if not available + if [ ! -e $bindir/cairo-perf-diff-files ]; then + echo "Building cairo-perf-diff-files" + if [ "x$OS" = "xWindows_NT" ]; then + make -f Makefile.win32 -C $bindir cairo-perf-diff-files CFG=debug + else + make -C $bindir cairo-perf-diff-files + fi + fi fi if [ ! -e $old ]; then @@ -244,8 +250,8 @@ if [ ! -e $new ]; then fi if [ -z "$html_output" ]; then - $CAIRO_DIR/perf/cairo-perf-diff-files $old $new + $bindir/cairo-perf-diff-files $old $new else - $CAIRO_DIR/perf/cairo-perf-diff-files $old $new | + $bindir/cairo-perf-diff-files $old $new | $CAIRO_DIR/perf/make-html.py > $html_output fi |