release: 1.3.0

[lilypond.git] / stepmake / bin / release.py

diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py
index 18be2822b20bb73609f48afed53400302e79e0bd..cc6d6ec5ed440c172e9e06a07b792199d2451e2a 100755 (executable)
--- a/stepmake/bin/release.py
+++ b/stepmake/bin/release.py
@@ -1,74 +1,77 @@
 #!@PYTHON@
 # release.py
 
-name = 'release'
-version = '0.1'
-
 import os
 import sys
 import getopt
 
-(options, files) = getopt.getopt(sys.argv[1:], 'hp:', ['help', 'package=']) 
+topdir = ''
+outdir = '.'
+
+(options, files) = getopt.getopt(sys.argv[1:], 'ho:p:', ['help', 'outdir=', 'package=']) 
 
 def help ():
-    sys.stdout.write ("Usage: release [OPTION]...\n"
-                "Make a tarball and patch and combined ../test/updeet\n\n"
-                + "Options:\n"
-                + "  -h, --help             print this help\n"
-                + "  -p, --package=DIR      specify package\n"
-                     )
-    sys.exit (0)
+       sys.stdout.write (r"""Usage: release [OPTION]...
+Make a tarball and patch
+
+Options:
+  -o, --outdir=DIR       where to leave patches.
+  -h, --help             print this help
+  -p, --package=DIR      specify package"""
+)
+       sys.exit (0)
 
 for opt in options:
-    o = opt[0]
-    a = opt[1]
-    if o == '-h' or o == '--help':
-       help ()
-    elif o == '-p' or o == '--package':
-       topdir = a
+        o = opt[0]
+        a = opt[1]
+       if o == '-h' or o == '--help':
+               help ()
+       elif o == '-p' or o == '--package':
+               topdir = a
+       elif o == '--outdir' or o == '-o':
+               outdir = a
+           
 
 sys.path.append (topdir + '/stepmake/bin')
 from packagepython import *
 package = Package (topdir)
-packager = Packager ()
-from flower import *
-
 os.chdir(package.topdir)
-status =os.system('make dist')
+
+try:
+       os.system ('set -x; rm ' + os.path.join (outdir, package.name + '*gz'))
+except:
+       pass
+
+
+
+status = os.system('make dist')
 if status:
-    raise 'make dist failed'
+       raise 'make dist failed'
 
 cur_ver = package.version
-# urg?
-# print tarball(cur_ver)
-barbaal=package.name + '-' + version_tuple_to_str (cur_ver) + '.tar.gz'
-print barbaal
-# os.rename('out/' + tarball(cur_ver), released_tarball(cur_ver))
-# hmmm
-os.remove(package.release_dir + barbaal)
-os.link('out/' + barbaal, package.release_dir + barbaal)
-os.chdir(package.test_dir)
-os.system('set -x; rm ' + package.test_dir + package.name + '*gz')
-# os.link(released_tarball(cur_ver), tarball(cur_ver))
-os.link(package.release_dir + barbaal, barbaal)
-
-# not a module, but a script (JCN)
-# makepatch.main()
-
-# Module wherefore aren't thou Script
-# A Rose by any other name would be as blonde. --HWN
-
-# urg
-# os.system('@PYTHON@ ' + package.topdir + '/stepmake/bin/package-diff.py --package=' + topdir)
+
+
+pn = '%s-%s' %(package.name, version_tuple_to_str(cur_ver))
+tarball = pn + '.tar.gz'
+orig  = os.path.join (outdir, tarball)
+try:
+       os.remove(os.path.join (package.release_dir, tarball))
+except:
+       pass
+os.link(orig,  os.path.join (package.release_dir, tarball))
+
+# urg: howto check exit code?
 os.system(sys.executable + ' ' + package.topdir + '/stepmake/bin/package-diff.py --package=' + topdir)
 
-pn = package.name + '-%s' % version_tuple_to_str(cur_ver)
-pn = pn + '.diff'
-pn = pn + '.gz'
-rel_pn = package.patch_dir + pn
+diffname = pn + '.diff.gz'
+rel_pn = package.patch_dir + diffname
 
-os.rename(pn, rel_pn)
-os.link(rel_pn, pn)
+diffname = os.path.join (outdir, diffname)
 
-os.system('tar cf ' + package.nickname + ' *gz')
+try:
+       os.rename(diffname, rel_pn)
+except:
+       sys.stderr.write ("Can't find diff: %s\n" % diffname)
+       sys.exit (1)
+os.link(rel_pn, diffname)