nightly passes build-SVNPATH to make, to avoid having to tune the tags file when...

diff --git a/Makefile b/Makefile
index 23b07e3..4ddedc8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,19 @@ include $(PLDISTROCONTENTS)
 PLDISTROTAGS := $(PLDISTRO)-tags.mk
 include $(PLDISTROTAGS)
 
+# this used to be set in the -tags.mk files, but that turned out to require
+# error-prone duplicate changes 
+# so now the nightly build script sets this to what it is currently using
+# we set a default in case we run the build manually:
+# if the local directory was svn checked out, then use the corresponding URL
+default-build-SVNPATH := $(shell svn info 2> /dev/null | grep URL: | awk '{print $2;}')
+# otherwise, use this hard-coded default
+ifeq "$(default-build-SVNPATH)" ""
+default-build-SVNPATH := http://svn.planet-lab.org/svn/build/trunk
+endif
+# use default if necessary
+build-SVNPATH ?= $(default-build-SVNPATH)
+
 ########## stage1 and stage1iter
 # extract specs and compute .mk files by running 
 # make stage1=true

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 9e15961..5841495 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
+# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 558bfb3..1e19da8 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
+# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication
 linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index ef3582e..32c99d7 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -146,6 +146,7 @@ function build () {
     MAKEVARS=("PLDISTROTAGS=${PLDISTROTAGS}" "${MAKEVARS[@]}")
     MAKEVARS=("NIGHTLY_BASE=${BASE}" "${MAKEVARS[@]}")
     MAKEVARS=("NIGHTLY_PERSONALITY=${PERSONALITY}" "${MAKEVARS[@]}")
+    MAKEVARS=("build-SVNPATH=${SVNPATH}" "${MAKEVARS[@]}")
 
     # stage1
     make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true