summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-05 00:14:39 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-05 00:14:39 +0000
commit0bab18777f9e3ff54d5c1960c665bf8dbc7530e3 (patch)
treec08790b3d0c30207c15ad377f7da77ad7276b5bd
parent40c36996cf628aa0a0b6c32f24e83a269932b0ac (diff)
Tidy up slightly.
-rwxr-xr-xrelease10
1 files changed, 5 insertions, 5 deletions
diff --git a/release b/release
index c1f84ce7a..10fac732b 100755
--- a/release
+++ b/release
@@ -12,8 +12,8 @@ def command(c):
command("git checkout master")
-release_version_string = version.rewrite_wscript(version.Version.to_release)
-version.append_to_changelog(release_version_string)
+release_version = version.rewrite_wscript(version.Version.to_release)
+version.append_to_changelog(release_version)
command("git diff")
if (raw_input() != "y"):
@@ -22,15 +22,15 @@ if (raw_input() != "y"):
sys.exit(1)
command("git commit -a -m \"Bump version\"")
-command("git tag -m \"v%s\" v%s" % (release_version_string, release_version_string))
+command("git tag -m \"v%s\" v%s" % (release_version, release_version))
command("./waf clean")
command("./waf")
command("./waf configure")
command("./waf dist")
command("./builds/windows-32")
-shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 32-bit Installer.exe' % release_version_string), '.')
+shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 32-bit Installer.exe' % release_version), '.')
command("./builds/windows-64")
-shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 64-bit Installer.exe' % release_version_string), '.')
+shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 64-bit Installer.exe' % release_version), '.')
version.rewrite_wscript(version.Version.bump_and_to_pre)