From 3a270f77c53238e6adfaf272a1ed53e90d9d23b4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 27 May 2017 22:37:56 +0530 Subject: [PATCH] Ensure correct base directory is used when compiling with CALIBRE_DEVELOP_FROM --- src/calibre/utils/rapydscript.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py index 799e1126e6..8c7bfc5f1c 100644 --- a/src/calibre/utils/rapydscript.py +++ b/src/calibre/utils/rapydscript.py @@ -194,9 +194,13 @@ def create_manifest(html): h.hexdigest(), manifest).encode('utf-8') -def compile_srv(): +def base_dir(): d = os.path.dirname - base = d(d(d(d(os.path.abspath(__file__))))) + return d(d(d(d(os.path.abspath(__file__))))) + + +def compile_srv(): + base = base_dir() iconf = os.path.join(base, 'imgsrc', 'srv', 'generate.py') g = {'__file__': iconf} execfile(iconf, g) @@ -213,7 +217,7 @@ def compile_srv(): if e.errno != errno.ENOENT: raise mathjax_version = '0' - base = P('content-server', allow_user_override=False) + base = os.path.join(base, 'resources', 'content-server') fname = os.path.join(rapydscript_dir, 'srv.pyj') with lopen(fname, 'rb') as f: js = compile_fast(f.read(), fname).replace(