phase1: fix workdir of maketag.sh step

[buildbot.git] / phase1 / master.cfg

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 695973f8e0da85a1adbc182404a7ce53a6e3208b..a8d6737682c9a7839dddd0836b32fd7226fa8f05 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -194,7 +194,7 @@ def IsCleanRequested(pattern):
 
 def IsTaggingRequested(step):
        val = step.getProperty("tag")
-       if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", val):
+       if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", val):
                return True
        else:
                return False
@@ -213,7 +213,7 @@ def GetBaseVersion(props):
 
 def GetVersionPrefix(props):
        basever = GetBaseVersion(props)
-       if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", props["tag"]):
+       if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+(?:-rc[0-9]+)?$", props["tag"]):
                return "%s/" % props["tag"]
        elif basever != "master":
                return "%s-SNAPSHOT/" % basever
@@ -238,10 +238,19 @@ def GetCXX(props):
        else:
                return "g++"
 
+def GetCwd(props):
+       if props.hasProperty("builddir"):
+               return props["builddir"]
+       elif props.hasProperty("workdir"):
+               return props["workdir"]
+       else:
+               return "/"
+
 def MakeEnv(overrides=None):
        env = {
                'CC': WithProperties("%(cc)s", cc=GetCC),
-               'CXX': WithProperties("%(cxx)s", cxx=GetCXX)
+               'CXX': WithProperties("%(cxx)s", cxx=GetCXX),
+               'CCACHE_BASEDIR': WithProperties("%(cwd)s", cwd=GetCwd)
        }
        if overrides is not None:
                env.update(overrides)
@@ -374,7 +383,7 @@ for target in targets:
                description = "Tagging Git repository",
                command = [home_dir+'/maketag.sh', '-i', '-k', str(gpg_keyid or ''),
                           '-p', str(gpg_passfile or ''), '-v', WithProperties("%(tag:-)s")],
-               path = home_dir+'/source.git',
+               workdir = home_dir+'/source.git',
                env = {'GNUPGHOME': gpg_home},
                haltOnFailure = True,
                doStepIf = IsTaggingRequested,
@@ -454,13 +463,6 @@ for target in targets:
                command=["./scripts/feeds", "install", "-a"],
                env = MakeEnv()))
 
-       # ccache prepare
-       factory.addStep(ShellCommand(
-                name = "prepccache",
-                description = "Preparing ccache",
-                command = ["./ccache.sh"]
-       ))
-
        # seed config
        factory.addStep(FileDownload(
                mastersrc = "config.seed",
@@ -513,6 +515,13 @@ for target in targets:
                mode = 0755
        ))
 
+       # ccache prepare
+       factory.addStep(ShellCommand(
+                name = "prepccache",
+                description = "Preparing ccache",
+                command = ["./ccache.sh"]
+       ))
+
        # install build key
        factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
        factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600))
@@ -530,7 +539,7 @@ for target in targets:
        factory.addStep(ShellCommand(
                name = "dltar",
                description = "Building GNU tar",
-               command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/install", "V=s"],
+               command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/compile", "V=s"],
                env = MakeEnv(),
                haltOnFailure = True
        ))