From e5320303cca1d2dc0ea41f45c0321e1c039e7c7f Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 30 May 2015 18:40:40 +0200 Subject: Make revision handling work when building from local folder. Change-Id: I8e6cc0eb8a5bff722bf5278ffa7685436c3d846a --- utils/common/deploy.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'utils') diff --git a/utils/common/deploy.py b/utils/common/deploy.py index f57447a158..02323888d5 100755 --- a/utils/common/deploy.py +++ b/utils/common/deploy.py @@ -43,7 +43,6 @@ import getopt import time import hashlib import tempfile -import string import gitscraper # modules that are not part of python itself. @@ -537,12 +536,12 @@ def deploy(): archivename = program + "-" + str(revision) + versionextra + "-src.tar.bz2" ver = str(revision) os.mkdir(sourcefolder) + print "Version: %s" % revision else: workfolder = "." sourcefolder = "." archivename = "" # check if project file explicitly given. If yes, don't get sources from svn - print "Version: %s" % revision if proj == "": proj = sourcefolder + project # get sources and pack source tarball @@ -585,7 +584,7 @@ def deploy(): else: # figure version from sources. Need to take path to project file into account. versionfile = re.subn('[\w\.]+$', "version.h", proj)[0] - ver = findversion(versionfile) + ver = findversion(versionfile) + "-dev" # append buildid if any. if buildid != None: ver += "-" + buildid -- cgit v1.2.3