From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 9 Aug 2006 21:38:06 +0000 (+0000)
Subject: distinguish between the tag used to import sources, and the tag used to build, so... 
X-Git-Tag: planetlab-4_0-rc1~118
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=13deafa8992af49ddd78fdf994f0e16ed766bd52;p=myplc.git

distinguish between the tag used to import sources, and the tag used to build, so that the date gets appended to rpm release versions correctly in nightly myplc builds
---

diff --git a/build.functions b/build.functions
index e762341..faf4b84 100644
--- a/build.functions
+++ b/build.functions
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: build.functions,v 1.1 2006/07/17 21:31:31 mlhuang Exp $
+# $Id: build.functions,v 1.2 2006/07/24 19:32:23 mlhuang Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -35,7 +35,10 @@ PLC_DEVEL_FEDORA_URL=file:///usr/share/mirrors/fedora
 PLC_DEVEL_BOOTSTRAP=true
 
 # Source tag to use for initial import of sources into local CVS
-TAG=planetlab-$(date +%Y-%m-%d)
+IMPORT_TAG=planetlab-$(date +%Y-%m-%d)
+
+# Source tag to use for building from local CVS
+BUILD_TAG=HEAD
 
 # We may be running inside a myplc-devel environment, which can
 # override these defaults. Specifically, whether to build myplc inside
@@ -68,7 +71,8 @@ while getopts "l:r:a:t:h" opt ; do
 	    PLC_DEVEL_FEDORA_ARCH=$OPTARG
 	    ;;
 	t)
-	    TAG=$OPTARG
+	    IMPORT_TAG=$OPTARG
+	    BUILD_TAG=$OPTARG
 	    ;;
 	h|*)
 	    usage
diff --git a/build.sh b/build.sh
index d9d6abe..b76f2a3 100755
--- a/build.sh
+++ b/build.sh
@@ -51,8 +51,8 @@ service plc start
 plc-config --category=plc_devel --variable=bootstrap --value="false" --save
 service plc reload
 cd /
-cvs -d /cvs checkout -r $TAG build
-make TAG=$TAG -C /build myplc
+cvs -d /cvs checkout -r $BUILD_TAG build
+make TAG=$BUILD_TAG -C /build myplc
 EOF
 
     # Yoink the image that was just built
diff --git a/build_devel.sh b/build_devel.sh
index 687aaf8..edce0bc 100755
--- a/build_devel.sh
+++ b/build_devel.sh
@@ -14,7 +14,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: build_devel.sh,v 1.1 2006/07/17 21:31:31 mlhuang Exp $
+# $Id: build_devel.sh,v 1.2 2006/07/24 19:32:23 mlhuang Exp $
 #
 
 . build.functions
@@ -40,7 +40,7 @@ for dir in * ; do
 	else
 	    ignore="-I !"
 	fi
-	cvs -d $cvsroot import -m "Initial import" -ko $ignore $dir planetlab $TAG
+	cvs -d $cvsroot import -m "Initial import" -ko $ignore $dir planetlab $IMPORT_TAG
 	popd
     fi
 done