From: William Trevor King <wking@thor.yang.physics.drexel.edu>
Date: Sat, 13 Sep 2008 13:29:10 +0000 (-0400)
Subject: Cleaned up dependencies.
X-Git-Tag: 0.3~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b4bfbdfdea9a0465b0123c00179348021395424;p=chemdb.git

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 77c2ce7..0175ada 100644
--- 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 7a21a56..c71e2c5 100644
--- 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
new mode 100755
diff --git a/chem_web.py b/chem_web.py
index 203d200..e41449c 100755
--- 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 1b02257..5ae6fcd 100644
--- 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 511e5ca..4e3d67e 100644
--- 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