summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaul Cuza <raulcuza@gmail.com>2011-07-06 16:22:37 -0400
committerRaul Cuza <raulcuza@gmail.com>2011-07-06 16:22:37 -0400
commit254fbd906be0d927f1a456e80a8add41d7aa9068 (patch)
tree6fb6423f9991659a27d52789338e1c4ac798577e
parent1021d458baa61a581e29d99eadb4bf17cd057cb9 (diff)
downloadbcfg2-254fbd906be0d927f1a456e80a8add41d7aa9068.tar.gz
bcfg2-254fbd906be0d927f1a456e80a8add41d7aa9068.tar.bz2
bcfg2-254fbd906be0d927f1a456e80a8add41d7aa9068.zip
Add code to modify osx/Makefile directly so version is no longer discovered.
osx/Makefile will now have the version variables set when the repo is tagged like other package directories.
-rwxr-xr-xtools/export2.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/export2.py b/tools/export2.py
index 780462523..dd5816cab 100755
--- a/tools/export2.py
+++ b/tools/export2.py
@@ -191,7 +191,15 @@ E.G. 1.2.0pre1 is a valid version.
dryrun=options.dryrun)
# update osx Makefile
find_and_replace('osx/Makefile', 'BCFGVER =',
- 'BCFGVER = \'%s\'\n' % (version),
+ 'BCFGVER = %s\n' % (version),
+ startswith=True,
+ dryrun=options.dryrun)
+ find_and_replace('osx/Makefile', 'MAJOR =',
+ 'MAJOR = %s\n' % (version_info['major']),
+ startswith=True,
+ dryrun=options.dryrun)
+ find_and_replace('osx/Makefile', 'MINOR =',
+ 'MINOR = %s.%s\n' % (version_info['minor'], version_info['micro']),
startswith=True,
dryrun=options.dryrun)