projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
589ccca
)
Try to fix up beta generation.
author
Carl Hetherington
<cth@carlh.net>
Wed, 5 Dec 2012 20:16:00 +0000
(20:16 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 5 Dec 2012 20:16:00 +0000
(20:16 +0000)
release
patch
|
blob
|
history
version.py
patch
|
blob
|
history
diff --git
a/release
b/release
index 30c2f495d45d72ce175ef3db20c79653339df5af..92ca9322d397ddd3abe4b8d39ed29caf582ec75b 100755
(executable)
--- a/
release
+++ b/
release
@@
-34,7
+34,11
@@
if os.popen('git status -s').read() != '':
print '%s: uncommitted changes exist.' % sys.argv[0]
sys.exit(1)
print '%s: uncommitted changes exist.' % sys.argv[0]
sys.exit(1)
-new_version = version.rewrite_wscript(version.Version.to_release)
+m = Version.to_release
+if args.beta:
+ m = Version.to_beta
+
+new_version = version.rewrite_wscript(m)
version.append_to_changelog(new_version)
command("./waf clean")
version.append_to_changelog(new_version)
command("./waf clean")
@@
-51,7
+55,10
@@
check_diff_with_user()
command("git commit -a -m \"Bump version\"")
command("git tag -m \"v%s\" v%s" % (new_version, new_version))
command("git commit -a -m \"Bump version\"")
command("git tag -m \"v%s\" v%s" % (new_version, new_version))
-version.rewrite_wscript(version.Version.bump_and_to_pre)
+m = Version.bump_and_to_pre
+if args.beta:
+ m = Version.to_pre
+version.rewrite_wscript(m)
check_diff_with_user()
check_diff_with_user()
diff --git
a/version.py
b/version.py
index c11a623d217f50da66bef1531c3e410109299faf..89be9239856551af86022164d588952515542980 100644
(file)
--- a/
version.py
+++ b/
version.py
@@
-33,6
+33,10
@@
class Version:
self.pre = False
self.beta = None
self.pre = False
self.beta = None
+ def to_pre(self):
+ self.pre = True
+ self.beta = None
+
def bump_and_to_pre(self):
self.bump()
self.pre = True
def bump_and_to_pre(self):
self.bump()
self.pre = True