X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fbuild%2Fbib2texi.py;h=b76a171a09263bd64c9ba1970a1b0439845aa3ac;hb=HEAD;hp=51b7d7b6f470d6dbeb836d82ea3cbf221ed821c1;hpb=9158bc17904d4dd930a1f776cfe3226f1ad84092;p=lilypond.git

diff --git a/scripts/build/bib2texi.py b/scripts/build/bib2texi.py
index 51b7d7b6f4..b76a171a09 100644
--- a/scripts/build/bib2texi.py
+++ b/scripts/build/bib2texi.py
@@ -6,12 +6,14 @@ import tempfile
 
 # usage:
 def usage ():
-    print 'usage: %s [-s style] [-o <outfile>] BIBFILES...'
+    print 'usage: bib2texi.py [-s style] [-o <outfile>] [-q] BIBFILES...'
+    print '-q suppresses most output'
 
-(options, files) = getopt.getopt (sys.argv[1:], 's:o:', [])
+(options, files) = getopt.getopt (sys.argv[1:], 's:o:hq', [])
 
 output = 'bib.itexi'
 style = 'long'
+show_output = True
 
 for (o,a) in options:
     if o == '-h' or o == '--help':
@@ -21,17 +23,20 @@ for (o,a) in options:
         style = a
     elif o == '-o' or o == '--output':
         output = a
+    elif o == '-q':
+        show_output = False
     else:
         raise Exception ('unknown option: %s' % o)
 
-
-if style not in ['alpha','index','long','longp','long-pario','short','short-pario','split']:
-    sys.stderr.write ("Unknown style \`%s'\n" % style)
-
 if not files:
    usage ()
    sys.exit (2)
 
+marker = """@c This file was autogenerated
+@c     from: %s
+@c     by:   %s
+
+""" % (", ".join(files), sys.argv[0])
 
 def strip_extension (f, ext):
     (p, e) = os.path.splitext (f)
@@ -47,32 +52,54 @@ files = ','.join (nf)
 
 tmpfile = tempfile.mkstemp ('bib2texi')[1]
 
+#This writes a .aux file to the temporary directory.
+#The .aux file contains the commands for bibtex
+#PEH changed the bibstyle to allow a single template file in the parent directory
+#The template filename is texi-*.bst, where * defaults to 'long' but can be a parameter
 open (tmpfile + '.aux', 'w').write (r'''
 \relax
 \citation{*}
-\bibstyle{texi-%(style)s}
+\bibstyle{%(style)s}
 \bibdata{%(files)s}''' % vars ())
 
 tmpdir = tempfile.gettempdir ()
 
-cmd = "TEXMFOUTPUT=%s bibtex %s" % (tmpdir, tmpfile)
+if (show_output):
+    quiet_flag = ''
+else:
+    quiet_flag = ' -terse '
+
+#The command line to invoke bibtex
+cmd = "TEXMFOUTPUT=%s bibtex %s %s" % (tmpdir, quiet_flag, tmpfile)
 
-sys.stdout.write ("Invoking `%s'\n" % cmd)
+if (show_output):
+    sys.stdout.write ("Running bibtex on %s\n" % files)
+    sys.stdout.write (cmd)
+#And invoke it
 stat = os.system (cmd)
 if stat <> 0:
-    sys.exit(1)
-
+    sys.stderr.write ("Bibtex exited with nonzero exit status!")
+    sys.exit (1)
 
 #TODO: do tex -> itexi on output
-
+# Following lines copy tmpfile.bbl to the desired output file
 bbl = open (tmpfile + '.bbl').read ()
 
-open (output, 'w').write  (bbl)
+if bbl.strip () == '':
+    sys.stderr.write ("Bibtex generated an empty file!")
+    sys.exit (1)
 
+fout = open (output, 'w')
+fout.write (marker)
+fout.write (bbl)
+fout.close ()
 
 def cleanup (tmpfile):
     for a in ['aux','bbl', 'blg']:
         os.unlink (tmpfile + '.' + a)
 
+
 cleanup (tmpfile)
+#Following line added by PEH - script was leaving a dangling temporary file with no extension
+os.unlink (tmpfile)