[26852] in Source-Commits
/svn/athena r25794 - trunk/debathena/scripts/build-server/build-all
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Oct 31 16:06:55 2012
Date: Wed, 31 Oct 2012 16:06:45 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201210312006.q9VK6jqJ002926@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-10-31 16:06:45 -0400 (Wed, 31 Oct 2012)
New Revision: 25794
Modified:
trunk/debathena/scripts/build-server/build-all/Makefile
Log:
- Pick a (slightly) less silly stamps directory (Trac: #727)
- Ensure that we don't accidentally end up with parallel builds because of
stray .started or .error stamps (Trac: #1230)
Modified: trunk/debathena/scripts/build-server/build-all/Makefile
===================================================================
--- trunk/debathena/scripts/build-server/build-all/Makefile 2012-10-31 16:10:09 UTC (rev 25793)
+++ trunk/debathena/scripts/build-server/build-all/Makefile 2012-10-31 20:06:45 UTC (rev 25794)
@@ -1,6 +1,6 @@
suite := quantal
psuite := quantal
-STAMPS := /afs/sipb.mit.edu/project/debathena/machines/awesome-build-server/stamps.$(suite)
+STAMPS := /afs/sipb.mit.edu/project/debathena/arch/amd64_deb40/bin/build-server/build-all/stamps/stamps.$(suite)
package = $(STAMPS)/$(1).done
@@ -14,17 +14,22 @@
:
$(call package,%):
- file=$$(mktemp -t 'stupid.XXXXXX') && \
+ @echo "Starting build of $*"
+ @if [ -e $(STAMPS)/$*.started ]; then echo "Error, remove 'started' stamp and try again."; false; fi
+ @rm -f $(STAMPS)/$*.error
+ @file=$$(mktemp -t 'stupid.XXXXXX') && \
echo "screen sh -c '$(CURDIR)/do-build $* $(STAMPS)/$* $(suite) $(psuite)'" > "$$file" && \
echo "other" >> "$$file" && \
screen -X source "$$file" && \
sleep 2 && \
rm -f "$$file"
- [ -e $(STAMPS)/$*.started ]
- while ! [ -e $(STAMPS)/$*.done ] && ! [ -e $(STAMPS)/$*.error ]; do sleep 1; done
- rm -f $(STAMPS)/$*.started
- rm -f $(STAMPS)/$*.error
- [ -e $(STAMPS)/$*.done ]
+ @[ -e $(STAMPS)/$*.started ]
+ @echo -n "Building $*..."
+ @while ! [ -e $(STAMPS)/$*.done ] && ! [ -e $(STAMPS)/$*.error ]; do sleep 1; done
+ @if [ -e $(STAMPS)/$*.done ]; then echo "OK"; else echo "FAILED"; fi
+ @rm -f $(STAMPS)/$*.started
+ @rm -f $(STAMPS)/$*.error
+ @[ -e $(STAMPS)/$*.done ]
clean:
rm -f deps.mk $(STAMPS)/*.started $(STAMPS)/*.error
