print 'Aborted'
sys.exit(1)
-if os.popen('git status -s').read() != '':
+if not args.debug and os.popen('git status -s').read() != '':
print '%s: uncommitted changes exist.' % sys.argv[0]
sys.exit(1)
-m = Version.to_release
+m = version.Version.to_release
if args.beta:
- m = Version.to_beta
+ m = version.Version.bump_beta
new_version = version.rewrite_wscript(m)
version.append_to_changelog(new_version)
+command("dch -b -v %s-1 \"New upstream release.\"" % new_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' % new_version), '.')
-command("./builds/windows-64")
-shutil.copy(os.path.join('build', 'windows', 'DVD-o-matic %s 64-bit Installer.exe' % new_version), '.')
check_diff_with_user()
command("git commit -a -m \"Bump version\"")
command("git tag -m \"v%s\" v%s" % (new_version, new_version))
-m = Version.bump_and_to_pre
-if args.beta:
- m = Version.to_pre
-version.rewrite_wscript(m)
-
-check_diff_with_user()
-
-command("git commit -a -m \"Bump version\"")
-
-command("cp DVD-o-matic*.exe dvdomatic-*.tar.bz2 /home/carl/public_html/carlh.net/software/dvdomatic")
+if args.full:
+ version.rewrite_wscript(version.Version.bump_and_to_pre)
+ check_diff_with_user()
+ command("git commit -a -m \"Bump version\"")