X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=release;h=e9a29ff002fd14bd06440a25ac5f958c2f6b32bc;hb=ad8df4e3c3e8a1ecf62e4c7bc6872b4c5839e667;hp=184be763ac51e81e6c6faccd5d788087c677c4a4;hpb=372dcbe1ef6b04708d7e2d89d503bd181e49958d;p=dcpomatic.git

diff --git a/release b/release
index 184be763a..e9a29ff00 100755
--- a/release
+++ b/release
@@ -30,29 +30,27 @@ def check_diff_with_user():
         print 'Aborted'
         sys.exit(1)
 
-command("git checkout master")
-    
-new_version = version.rewrite_wscript(version.Version.to_release)
+if not args.debug and os.popen('git status -s').read() != '':
+    print '%s: uncommitted changes exist.' % sys.argv[0]
+    sys.exit(1)
+
+m = version.Version.to_release
+if args.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))
 
-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")
+if args.full:
+    version.rewrite_wscript(version.Version.bump_and_to_pre)
+    check_diff_with_user()
+    command("git commit -a -m \"Bump version\"")