summaryrefslogtreecommitdiff
path: root/utils/common/deploy.py
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2015-05-30 18:40:40 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2015-05-30 18:40:40 +0200
commite5320303cca1d2dc0ea41f45c0321e1c039e7c7f (patch)
tree6d2b1cd232a8f97a962397fa065c61c4631e2932 /utils/common/deploy.py
parent5f5d7f608a01a682b3416dc576ac897b2714e55f (diff)
downloadrockbox-e5320303cca1d2dc0ea41f45c0321e1c039e7c7f.tar.gz
rockbox-e5320303cca1d2dc0ea41f45c0321e1c039e7c7f.zip
Make revision handling work when building from local folder.
Change-Id: I8e6cc0eb8a5bff722bf5278ffa7685436c3d846a
Diffstat (limited to 'utils/common/deploy.py')
-rwxr-xr-xutils/common/deploy.py5
1 files changed, 2 insertions, 3 deletions
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
43import time 43import time
44import hashlib 44import hashlib
45import tempfile 45import tempfile
46import string
47import gitscraper 46import gitscraper
48 47
49# modules that are not part of python itself. 48# modules that are not part of python itself.
@@ -537,12 +536,12 @@ def deploy():
537 archivename = program + "-" + str(revision) + versionextra + "-src.tar.bz2" 536 archivename = program + "-" + str(revision) + versionextra + "-src.tar.bz2"
538 ver = str(revision) 537 ver = str(revision)
539 os.mkdir(sourcefolder) 538 os.mkdir(sourcefolder)
539 print "Version: %s" % revision
540 else: 540 else:
541 workfolder = "." 541 workfolder = "."
542 sourcefolder = "." 542 sourcefolder = "."
543 archivename = "" 543 archivename = ""
544 # check if project file explicitly given. If yes, don't get sources from svn 544 # check if project file explicitly given. If yes, don't get sources from svn
545 print "Version: %s" % revision
546 if proj == "": 545 if proj == "":
547 proj = sourcefolder + project 546 proj = sourcefolder + project
548 # get sources and pack source tarball 547 # get sources and pack source tarball
@@ -585,7 +584,7 @@ def deploy():
585 else: 584 else:
586 # figure version from sources. Need to take path to project file into account. 585 # figure version from sources. Need to take path to project file into account.
587 versionfile = re.subn('[\w\.]+$', "version.h", proj)[0] 586 versionfile = re.subn('[\w\.]+$', "version.h", proj)[0]
588 ver = findversion(versionfile) 587 ver = findversion(versionfile) + "-dev"
589 # append buildid if any. 588 # append buildid if any.
590 if buildid != None: 589 if buildid != None:
591 ver += "-" + buildid 590 ver += "-" + buildid