Cleaned up dependencies.

Adjusted doc Makefiles to correctly rebuild the NFPA diamond when
necessary.  Added LaTeX section to DEPENDENCIES.  Added some missing
files to .gitignore.  Updated webserver name due to changes in
webpy/httpserver.py patch.

diff --git a/.gitignore b/.gitignore
index 77c2ce7e4711f3a58b9fc929e3b4cb63d3a1a6db..0175ada7fa1af543b295eefdc5bd3a2d87346fa3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ daemon.pyc
 docs/door_data.tex
 docs/door_warning.pdf
 docs/inventory_data.tex
+docs/inventory.pdf
 docs/main.aux
 docs/main.log
 docs/main.pdf

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 7a21a56678c81cedf76169c73beac72a94ab9ed3..c71e2c50e97be07303ec72cb6481b1a5cdbb1936 100644 (file)
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,3 +1,4 @@
+------------------------------Python dependencies------------------------------
 
 STANDARD MODULES
 
@@ -32,3 +33,12 @@ web  http://webpy.org/
 markdown Implements a version of markdown syntax.  webpy bundles a
        version of this in their `tools' subdirectory.
 
+------------------------------System dependencies------------------------------
+
+You need latex and metapost to compile the documents.  The
+texlive-base, texlive-metapost, and context Debian packages should
+cover you.  You can avoid the context dependency with some legwork,
+see
+  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=465107
+
+

diff --git a/chem_db.py b/chem_db.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/chem_web.py b/chem_web.py
index 203d2002b5fde0393d801e685c3a571dbd361092..e41449cd7586b82d4dfb52dfd8434097a98524a2 100755 (executable)
--- a/chem_web.py
+++ b/chem_web.py
@@ -499,7 +499,7 @@ class chem_web_daemon (daemon.Daemon) :
             ## How we have to start it now
             webpy_func = web.webpyfunc(urls, globals(), False)
             wsgi_func = web.wsgifunc(webpy_func)
-            web.httpserver.runsecure(wsgi_func,
+            web.httpserver.runsimple(wsgi_func,
                                      web.validip(self.options.ip),
                                      ssl_private_key_filename=self.pkey_file,
                                      ssl_certificate_filename=self.cert_file)

diff --git a/docs/Makefile b/docs/Makefile
index 1b02257944dce33d65decbe1f73690b288425635..5ae6fcde660454fd82e03810c4f86fb13b9c901a 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -62,7 +62,7 @@ PDF_VIEWER = xpdf # you can also try evince, acroread, 'xpdf -view H', etc.
 
 ## image generation rules, to handle the images in $(IMAGES)
 
-mp/NFPA.1 : 
+mp/NFPA.1 : mp/NFPA.mp
        $(MAKE) -C mp images
 
 
@@ -74,7 +74,7 @@ images : $(IMAGES)
 
 
 ## Big targets
-all : pdf html dvi view
+all : pdf view # html dvi view
 
 view : pdf
        $(PDF_VIEWER) main.pdf &

diff --git a/docs/mp/Makefile b/docs/mp/Makefile
index 511e5cae0586c91d34607e312d2667ceff68381d..4e3d67e1334ba8cc2b5125b2018537f2a6feb443 100644 (file)
--- a/docs/mp/Makefile
+++ b/docs/mp/Makefile
@@ -1,6 +1,6 @@
 MPS = NFPA
 
-TEMP_FILES = $(MPS:%=%.mp[a-z]) $(MPS:%=%.log) mp* texnum.mpx
+TEMP_FILES = $(MPS:%=%.mp[a-z]) $(MPS:%=%.log) mp* texnum.mpx NFPA.mp
 GENERATED_FILES = $(MPS:%=%.[0-9]*) sample.log sample.aux sample.pdf
 
 #PDFVIEWER = gv
@@ -20,6 +20,11 @@ clean : semi-clean
 semi-clean :
        rm -f $(TEMP_FILES)
 
+# Dummy NFPA.mp in case the pdf doesn't need it,
+# since ./doc/Makefile always thinks the pdf needs NFPA.1
+NFPA.mp : gen_NFPA.sh
+       $< 9 9 9 y y > $@
+
 # generate a pdf containing all mp images for previewing-troubleshooting
 # depend on the first image from each mp file
 sample.pdf : sample.tex images