* Documentation/bibliography/SConscript (bibs): failed try to get

bib2html find html-long.bst.

* buildscripts/bib2html.py (stat): fail if bibtex fails.

diff --git a/ChangeLog b/ChangeLog
index 6ccb989ebe0961c715de9cb21e909b720f02326d..193f0e0fe17afe847c0a462e72201a935927ec02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-16  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * Documentation/bibliography/SConscript (bibs): failed try to get
+       bib2html find html-long.bst.
+
+       * buildscripts/bib2html.py (stat): fail if bibtex fails.
+
+       * make/stepmake.make: use usescons for using scons. 
+
 2004-07-16  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scripts/lilypond-book.py (Lilypond_snippet.is_outdated): Check

diff --git a/Documentation/bibliography/SConscript b/Documentation/bibliography/SConscript
index c115efc0266cc549639171fd4739c2dc33160828..fb06d5ba4e085f7111a173377a4bfefb6a800b1b 100644 (file)
--- a/Documentation/bibliography/SConscript
+++ b/Documentation/bibliography/SConscript
@@ -1,9 +1,13 @@
 # -*-python-*-
+import os
 
 Import ('env')
 bibs = env['src_glob'] (env, '*.bib')
 env.AT_COPY ('index.html.in')
 
+# todo: must make html-long.bst as source too.
+env['ENV']['BSTINPUTS'] = ":"+os.getcwd()
+print env.BIB2HTML
 map (env.BIB2HTML, bibs)
 env.Alias ('doc', bibs)
 

diff --git a/buildscripts/bib2html.py b/buildscripts/bib2html.py
index 37bc4694fd35455014b39cfdbe9f17db8bc19241..b2312517a98dba98c31775d4eb0053b0a117073e 100644 (file)
--- a/buildscripts/bib2html.py
+++ b/buildscripts/bib2html.py
@@ -9,7 +9,7 @@ import string
 def usage ():
     print 'usage: %s [-s style] [-o <outfile>] BIBFILES...';
 
-
+print os.environ['BSTINPUTS']
 
 (options, files) = getopt.getopt(sys.argv[1:], 's:o:', [])
 
@@ -58,12 +58,14 @@ open(tempfile + '.aux', 'w').write (r'''
 cmd = "bibtex %s" % tempfile;
 
 sys.stdout.write ("Invoking `%s'\n" % cmd)
-os.system (cmd) 
+stat = os.system (cmd)
+if stat <> 0:
+    sys.exit(1)
 
 
 #TODO: do tex -> html on output 
 
-bbl =open (tempfile + '.bbl').read ()
+bbl = open (tempfile + '.bbl').read ()
 
 open (output, 'w').write  (bbl)