changeset 273:57a8a41014a4

use XStatic-CKEditor 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 16:03:53 +0200
parents b062718d313d
children a09f9b06a48f
files quickinstall quickinstall.bat setup.py wikiconfig.py
diffstat 4 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/quickinstall	Sun Jul 03 15:34:34 2011 +0200
+++ b/quickinstall	Sun Jul 03 16:03:53 2011 +0200
@@ -26,9 +26,6 @@
 # wikiconfig.py expects them. should be replaced by packaging.
 # we do this FIRST, so that breakage with pip install is better visible.
 
-download $DIR/ckeditor.tgz http://download.cksource.com/CKEditor/CKEditor/CKEditor%203.5/ckeditor_3.5.tar.gz
-tar xz -C $DIR/ -f $DIR/ckeditor.tgz
-
 download $DIR/twd.tgz http://static.moinmo.in/files/packages/TWikiDrawPlugin-moin.tar.gz
 tar xz -C $DIR/ -f $DIR/twd.tgz
 
--- a/quickinstall.bat	Sun Jul 03 15:34:34 2011 +0200
+++ b/quickinstall.bat	Sun Jul 03 16:03:53 2011 +0200
@@ -16,10 +16,6 @@
 echo Getting some 3rd party stuff and unpack them into env/, where the default
 echo wikiconfig.py expects them (should be replaced by packaging) ...
 
-wget -nc "http://download.cksource.com/CKEditor/CKEditor/CKEditor 3.5/ckeditor_3.5.tar.gz" -Penv/
-7za x env/ckeditor_3.5.tar.gz -y -oenv\
-7za x env/ckeditor_3.5.tar -y -oenv\
-
 wget -nc http://static.moinmo.in/files/packages/TWikiDrawPlugin-moin.tar.gz -Penv/
 7za x env/TWikiDrawPlugin-moin.tar.gz -y -oenv\
 7za x env/TWikiDrawPlugin-moin.tar -y -oenv\
--- a/setup.py	Sun Jul 03 15:34:34 2011 +0200
+++ b/setup.py	Sun Jul 03 16:03:53 2011 +0200
@@ -90,6 +90,7 @@
         'Werkzeug==0.6.2', # use this if 0.7dev fails
         'py==1.3.4', # py.test 1.3.4 is needed by unit tests
         'sphinx', # needed to build the docs
+        'XStatic-CKEditor',
         'XStatic-jQuery',
         'XStatic-jQuery-File-Upload',
         'XStatic-svgweb',
--- a/wikiconfig.py	Sun Jul 03 15:34:34 2011 +0200
+++ b/wikiconfig.py	Sun Jul 03 16:03:53 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
-        ckeditor = os.path.join(wikiconfig_dir, env_dir, 'ckeditor'),
         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'),
@@ -77,6 +76,10 @@
     sw = SVGWeb(root_url='/static', provider='local', protocol='http')
     serve_files.update([(sw.name, sw.get_mapping()[1])])
 
+    from xstatic.pkg.ckeditor import CKEditor
+    cke = CKEditor(root_url='/static', provider='local', protocol='http')
+    serve_files.update([(cke.name, cke.get_mapping()[1])])
+
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
 
     #item_root = u'Home' # change to some better value