From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 6 Jul 2006 14:58:14 +0000 (+0000)
Subject: - merge revision 1.35
X-Git-Tag: myplc-0_4-rc1~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a3a2102811bfba009acb79bafc4c47bf8effb7f5;p=build.git

- merge revision 1.35
- checkout instead of export so that we don't have to modify the
  Makefiles on branches of the build repository
---

diff --git a/build.sh b/build.sh
index d8d04c4a..5040aced 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.33 2006/03/16 16:38:43 mlhuang Exp $
+# $Id: build.sh,v 1.35 2006/07/06 14:57:50 mlhuang Exp $
 #
 
 # Set defaults
@@ -86,7 +86,7 @@ exec 2>&1
 exec &>${BASE}/log
 
 # Build
-cvs -d ${CVSROOT} export -r ${TAG} -d ${BASE} ${MODULE}
+cvs -d ${CVSROOT} checkout -r ${TAG} -d ${BASE} ${MODULE}
 make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} && \
 make TAG=${TAG} PLDISTRO=${PLDISTRO} -C ${BASE} install BASE=$BASE BUILDS=$BUILDS
 rc=$?