Mercurial > hg > vamp-build-and-test
comparison SCRIPTS/process.sh @ 77:2e60b888e526
Try distclean before clean (otherwise we can end up trying to add to archives of the wrong arch for example)
| author | Chris Cannam |
|---|---|
| date | Thu, 30 Oct 2014 16:06:26 +0000 |
| parents | a76b96026c2d |
| children | ab0dbbb58119 |
comparison
equal
deleted
inserted
replaced
| 75:a76b96026c2d | 77:2e60b888e526 |
|---|---|
| 250 dir="$1" | 250 dir="$1" |
| 251 log=$(logfile_for build "$dir") | 251 log=$(logfile_for build "$dir") |
| 252 if configure_maybe "$dir"; then | 252 if configure_maybe "$dir"; then |
| 253 mfile=$(find_makefile "$dir") | 253 mfile=$(find_makefile "$dir") |
| 254 if [ -n "$mfile" ]; then | 254 if [ -n "$mfile" ]; then |
| 255 if make -C "$dir" -f "$mfile" clean; then | 255 if make -C "$dir" -f "$mfile" distclean; then |
| 256 build "$dir" | |
| 257 elif make -C "$dir" -f "$mfile" clean; then | |
| 256 build "$dir" | 258 build "$dir" |
| 257 else | 259 else |
| 258 echo "Failed to 'make clean' in $dir!" | tee "$log" | 260 echo "Failed to 'make clean' in $dir!" | tee "$log" |
| 259 return 1 | 261 return 1 |
| 260 fi | 262 fi |