diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-04-06 20:17:29 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-04-06 20:17:29 +0000 |
commit | 2c297760df2d512841d6ad1cb38d09b574530cef (patch) | |
tree | 2a46e11ca294ce06b3c695489ceccfee4b0bd0a1 | |
parent | 3184cbe10add23e0e4e53523a06e311db0ba15cd (diff) |
deploy.py: insert version number into sources.
After downloading the sources insert the number of the revision checked out
into the code. Results in the Rockbox Utility about dialog showing the actual
revision instead of the one of the last change to version.h. Only applied when
building from trunk for now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29684 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | utils/common/deploy-rbutil.py | 4 | ||||
-rwxr-xr-x | utils/common/deploy-themeeditor.py | 1 | ||||
-rwxr-xr-x | utils/common/deploy.py | 16 |
3 files changed, 20 insertions, 1 deletions
diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py index dea9f328ee..a94dfdae20 100755 --- a/utils/common/deploy-rbutil.py +++ b/utils/common/deploy-rbutil.py @@ -52,6 +52,9 @@ deploy.progexe = { "darwin" : "RockboxUtility.app", "linux2" : "RockboxUtility" } +deploy.regreplace = { + "rbutil/rbutilqt/version.h" : ["SVN \$.*\$", "SVN $Revision: %REVISION% $"] +} # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are # compatible with 10.4 requires using gcc-4.0. deploy.qmakespec = { @@ -72,4 +75,3 @@ deploy.programfiles = [ ] deploy.nsisscript = "" deploy.deploy() - diff --git a/utils/common/deploy-themeeditor.py b/utils/common/deploy-themeeditor.py index 4569052e97..8b66e5aef4 100755 --- a/utils/common/deploy-themeeditor.py +++ b/utils/common/deploy-themeeditor.py @@ -35,6 +35,7 @@ deploy.progexe = { "darwin" : "rbthemeeditor.app", "linux2" : "rbthemeeditor" } +deploy.regreplace = {} # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are # compatible with 10.4 requires using gcc-4.0. deploy.qmakespec = { diff --git a/utils/common/deploy.py b/utils/common/deploy.py index 44635c851d..1e48f8a56f 100755 --- a/utils/common/deploy.py +++ b/utils/common/deploy.py @@ -563,6 +563,22 @@ def deploy(): tempclean(workfolder, cleanup and not keeptemp) sys.exit(1) + # replace version strings. Only done when building from trunk + if tag == "": + print "Updating version information in sources" + for f in regreplace: + infile = open(sourcefolder + "/" + f, "r") + incontents = infile.readlines() + infile.close() + + outfile = open(sourcefolder + "/" + f, "w") + for line in incontents: + # replacements made on the replacement string: + # %REVISION% is replaced with the revision number + replacement = re.sub("%REVISION%", str(trunk), regreplace[f][1]) + outfile.write(re.sub(regreplace[f][0], replacement, line)) + outfile.close() + if source == True: tf = tarfile.open(archivename, mode='w:bz2') tf.add(sourcefolder, os.path.basename(re.subn('/$', '', sourcefolder)[0])) |