changeset 272:b062718d313d

use XStatic-svgweb package, require it via setup.py, remove it from quickinstall scripts
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 03 Jul 2011 15:34:34 +0200
parents 8a21b92d8985
children 57a8a41014a4
files quickinstall quickinstall.bat setup.py wikiconfig.py
diffstat 4 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/quickinstall	Sun Jul 03 01:20:04 2011 +0200
+++ b/quickinstall	Sun Jul 03 15:34:34 2011 +0200
@@ -38,9 +38,6 @@
 download $DIR/mathjax.tgz http://static.moinmo.in/files/packages/mathjax.tar.gz
 tar xz -C $DIR/ -f $DIR/mathjax.tgz
 
-download $DIR/svgweb.zip http://svgweb.googlecode.com/files/svgweb-2010-08-10-Owlephant-1.zip
-unzip -q -o -d $DIR/ $DIR/svgweb.zip
-
 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
--- a/quickinstall.bat	Sun Jul 03 01:20:04 2011 +0200
+++ b/quickinstall.bat	Sun Jul 03 15:34:34 2011 +0200
@@ -28,9 +28,6 @@
 7za x env/svg-edit.tar.gz -y -oenv\
 7za x env/svg-edit.tar -y -oenv\
 
-wget -nc http://svgweb.googlecode.com/files/svgweb-2010-08-10-Owlephant-1.zip -Penv/
-7za x env/svgweb-2010-08-10-Owlephant-1.zip -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
--- a/setup.py	Sun Jul 03 01:20:04 2011 +0200
+++ b/setup.py	Sun Jul 03 15:34:34 2011 +0200
@@ -92,6 +92,7 @@
         'sphinx', # needed to build the docs
         'XStatic-jQuery',
         'XStatic-jQuery-File-Upload',
+        'XStatic-svgweb',
     ],
     # optional features and their list of requirements
     extras_require = {
--- a/wikiconfig.py	Sun Jul 03 01:20:04 2011 +0200
+++ b/wikiconfig.py	Sun Jul 03 15:34:34 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
         ckeditor = os.path.join(wikiconfig_dir, env_dir, 'ckeditor'),
-        svgweb = os.path.join(wikiconfig_dir, env_dir, 'svgweb', 'src'),
         anywikidraw = os.path.join(wikiconfig_dir, env_dir, 'AnyWikiDraw', 'anywikidraw', 'moinmoin'),
         twikidraw = os.path.join(wikiconfig_dir, env_dir, 'TWikiDrawPlugin'),
         svgedit = os.path.join(wikiconfig_dir, env_dir, 'svg-edit'),
@@ -74,6 +73,10 @@
     jfu = JQueryFileUpload(root_url='/static', provider='local', protocol='http')
     serve_files.update([(jfu.name, jfu.get_mapping()[1])])
 
+    from xstatic.pkg.svgweb import SVGWeb
+    sw = SVGWeb(root_url='/static', provider='local', protocol='http')
+    serve_files.update([(sw.name, sw.get_mapping()[1])])
+
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
 
     #item_root = u'Home' # change to some better value