Merge master.

[dcpomatic.git] / release

diff --git a/release b/release
index 19b244037ae022df3e51ea0e3ab5b067a454340b..e9a29ff002fd14bd06440a25ac5f958c2f6b32bc 100755 (executable)
--- a/release
+++ b/release
@@ -40,24 +40,17 @@ if args.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 configure")
-command("./waf")
 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))
 
-if args.release:
+if args.full:
     version.rewrite_wscript(version.Version.bump_and_to_pre)
     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")