changeset 275:ff38aed82112

use XStatic-AnyWikiDraw package, require it via setup.py, remove it from quickinstall scripts
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sun, 03 Jul 2011 23:00:33 +0200
parents a09f9b06a48f
children 0513cfd0aaeb 748054b11929 add7c6c78f34
files quickinstall quickinstall.bat setup.py wikiconfig.py
diffstat 4 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/quickinstall	Sun Jul 03 20:45:56 2011 +0200
+++ b/quickinstall	Sun Jul 03 23:00:33 2011 +0200
@@ -32,13 +32,6 @@
 download $DIR/mathjax.tgz http://static.moinmo.in/files/packages/mathjax.tar.gz
 tar xz -C $DIR/ -f $DIR/mathjax.tgz
 
-AWDDIR='AnyWikiDraw 0.14'
-download $DIR/awd.zip 'http://downloads.sourceforge.net/project/anywikidraw/anywikidraw/anywikidraw-0.14/anywikidraw-0.14.zip?use_mirror=ignum'
-unzip -q -o -d $DIR/ $DIR/awd.zip
-cd $DIR/
-ln -s "$AWDDIR" AnyWikiDraw
-cd ..
-
 # 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/quickinstall.bat	Sun Jul 03 20:45:56 2011 +0200
+++ b/quickinstall.bat	Sun Jul 03 23:00:33 2011 +0200
@@ -20,9 +20,6 @@
 7za x env/svg-edit.tar.gz -y -oenv\
 7za x env/svg-edit.tar -y -oenv\
 
-wget -nc http://downloads.sourceforge.net/project/anywikidraw/anywikidraw/anywikidraw-0.14/anywikidraw-0.14.zip?use_mirror=ignum -Penv/
-7za x env/anywikidraw-0.14.zip -y -oenv\
-xcopy "env\AnyWikiDraw 0.14" env\AnyWikiDraw\ /Y /E /H
 
 del /q env\*.tar
 
--- a/setup.py	Sun Jul 03 20:45:56 2011 +0200
+++ b/setup.py	Sun Jul 03 23:00:33 2011 +0200
@@ -95,6 +95,7 @@
         'XStatic-jQuery-File-Upload',
         'XStatic-svgweb',
         'XStatic-TWikiDraw-moin',
+        'XStatic-AnyWikiDraw',
     ],
     # optional features and their list of requirements
     extras_require = {
--- a/wikiconfig.py	Sun Jul 03 20:45:56 2011 +0200
+++ b/wikiconfig.py	Sun Jul 03 23:00:33 2011 +0200
@@ -56,7 +56,6 @@
     serve_files = dict(
         docs = os.path.join(wikiconfig_dir, 'docs', '_build', 'html'),
         # see "quickinstall" script about how to get those files there
-        anywikidraw = os.path.join(wikiconfig_dir, env_dir, 'AnyWikiDraw', 'anywikidraw', 'moinmoin'),
         svgedit = os.path.join(wikiconfig_dir, env_dir, 'svg-edit'),
         mathjax = os.path.join(wikiconfig_dir, env_dir, 'MathJax'),
     )
@@ -83,6 +82,10 @@
     twd = TWikiDraw(root_url='/static', provider='local', protocol='http')
     serve_files.update([(twd.name, twd.get_mapping()[1])])
 
+    from xstatic.pkg.anywikidraw import AnyWikiDraw
+    awd = AnyWikiDraw(root_url='/static', provider='local', protocol='http')
+    serve_files.update([(awd.name, awd.get_mapping()[1])])
+
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
 
     #item_root = u'Home' # change to some better value