changeset 276:0513cfd0aaeb

use XStatic-MathJax package, require it via setup.py, remove it from quickinstall scripts
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Tue, 05 Jul 2011 22:45:37 +0200
parents ff38aed82112
children 88d8b4663efc d70f30322e68
files quickinstall wikiconfig.py
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/quickinstall	Sun Jul 03 23:00:33 2011 +0200
+++ b/quickinstall	Tue Jul 05 22:45:37 2011 +0200
@@ -29,9 +29,6 @@
 download $DIR/svgedit.tgz http://static.moinmo.in/files/packages/svg-edit.tar.gz
 tar xz -C $DIR/ -f $DIR/svgedit.tgz
 
-download $DIR/mathjax.tgz http://static.moinmo.in/files/packages/mathjax.tar.gz
-tar xz -C $DIR/ -f $DIR/mathjax.tgz
-
 # first install babel, moin's setup.py will emit a warning if it is not there
 pip install babel
 # first install XStatic, XStatic-jQuery's setup.py will fail if it is not there
--- a/wikiconfig.py	Sun Jul 03 23:00:33 2011 +0200
+++ b/wikiconfig.py	Tue Jul 05 22:45:37 2011 +0200
@@ -57,7 +57,6 @@
         docs = os.path.join(wikiconfig_dir, 'docs', '_build', 'html'),
         # see "quickinstall" script about how to get those files there
         svgedit = os.path.join(wikiconfig_dir, env_dir, 'svg-edit'),
-        mathjax = os.path.join(wikiconfig_dir, env_dir, 'MathJax'),
     )
 
     # we slowly migrate all stuff from above (old) method, to xstatic (new) method,
@@ -86,6 +85,10 @@
     awd = AnyWikiDraw(root_url='/static', provider='local', protocol='http')
     serve_files.update([(awd.name, awd.get_mapping()[1])])
 
+    from xstatic.pkg.mathjax import MathJax
+    mj = MathJax(root_url='/static', provider='local', protocol='http')
+    serve_files.update([(mj.name, mj.get_mapping()[1])])
+
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
 
     #item_root = u'Home' # change to some better value