From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 16 Jan 2008 08:54:04 +0000 (+0000)
Subject: cosmetic improvements to GetPlcRelease info
X-Git-Tag: 4.2-rc2~257
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=def99ca2a47cbb5a411f4b0ba16a52e2fbf3a2d9;p=build.git

cosmetic improvements to GetPlcRelease info
---

diff --git a/Makefile b/Makefile
index 94d2e191..d8fc25af 100644
--- a/Makefile
+++ b/Makefile
@@ -581,14 +581,17 @@ myplc-release:
 	@echo $(NIGHTLY_BASE) > .base
 
 version-build:
-	@echo -n 'Build bdate: ' ; date '+%Y.%m.%d'
-	@echo -n 'Build btime: ' ; date '+%H:%M'
-	@echo -n 'Build bhostname: ' ; hostname
-	@echo    "Build base: $(NIGHTLY_BASE)"
-	@echo -n 'Build btags: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
-	@echo    "Build tarch: $(HOSTARCH)"
-	@echo    "Build tdistro: $(DISTRO)"
-	@echo    "Build trelease: $(RELEASE)"	
+	@echo -n 'Build build-date: ' ; date '+%Y.%m.%d'
+	@echo -n 'Build build-time: ' ; date '+%H:%M'
+	@echo -n 'Build build-hostname: ' ; hostname
+	@echo    "Build build-base: $(NIGHTLY_BASE)"
+	@echo    "Build planetab-distro: $(PLDISTRO)"
+	@echo -n "Build planetlab-tags: $(PLDISTROTAGS)"
+	@echo -n 'Build planetlab-tagsid: ' ; fgrep '$$''Id' $(PLDISTROTAGS)
+	@echo    "Build target-arch: $(HOSTARCH)"
+	@echo    "Build target-distro: $(DISTRO)"
+	@echo    "Build target-release: $(RELEASE)"	
+	@echo    "Build target-personality: $(NIGHTLY_PERSONALITY)"	
 
 #################### 
 # for a given module
diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 1466d354..0bd86795 100755
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -132,12 +132,19 @@ function build () {
     show_env
     
     echo "Running make IN $(pwd)"
+    
+    # stuff our own variable settings
+    MAKEVARS=("PLDISTRO=${PLDISTRO}" "${MAKEVARS[@]}")
+    MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}")
+    MAKEVARS=("NIGHTLY_BASE=${BASE}" "${MAKEVARS[@]}")
+    MAKEVARS=("NIGHTLY_PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+
     # stage1
-    make -C /build "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" stage1=true 
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true 
     # versions
-    make -C /build "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" NIGHTLY_BASE=${BASE} versions
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" versions
     # actual stuff
-    make -C /build "${MAKEOPTS[@]}" PLDISTROTAGS=${PLDISTROTAGS} PLDISTRO=${PLDISTRO} "${MAKEVARS[@]}" $MAKETARGETS
+    make -C /build $DRY_RUN "${MAKEVARS[@]}" $MAKETARGETS
 
 }
 
@@ -183,7 +190,7 @@ function show_env () {
     echo BASE=$BASE
     echo SVNPATH=$SVNPATH
     echo MAKEVARS="${MAKEVARS[@]}"
-    echo MAKEOPTS="${MAKEOPTS[@]}"
+    echo DRY_RUN="$DRY_RUN"
     echo PLDISTROTAGS="$PLDISTROTAGS"
     echo TAGSRELEASE="$TAGSRELEASE"
     echo -n "(might be unexpanded)"
@@ -232,12 +239,12 @@ function main () {
     
     # parse arguments
     MAKEVARS=()
-    MAKEOPTS=()
+    DRY_RUN=
     DO_BUILD=true
     DO_TEST=true
     while getopts "nf:d:b:p:t:r:s:om:a:w:BTvh7" opt ; do
 	case $opt in
-	    n) DRY_RUN="true" ; MAKEOPTS=(${MAKEOPTS[@]} -n) ;;
+	    n) DRY_RUN="-n" ;;
 	    f) FCDISTRO=$OPTARG ;;
 	    d) PLDISTRO=$OPTARG ;;
 	    p) PERSONALITY=$OPTARG ;;