Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that python setup.py resources works even if calibre has not been installed

Browse Source
This commit is contained in:
Kovid Goyal 2012-01-11 09:18:58 +05:30
parent 8e7a9eceb1
commit 2d6291e5fc
3 changed files with 160 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
setup/resources.py
View File

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, cPickle, re, shutil, marshal, zipfile, glob, time import os, cPickle, re, shutil, marshal, zipfile, glob, time, subprocess, sys
from zlib import compress from zlib import compress
from setup import Command, basenames, __appname__ from setup import Command, basenames, __appname__
@ -35,8 +35,8 @@ class Coffee(Command): # {{{
help='Display the generated javascript') help='Display the generated javascript')
def run(self, opts): def run(self, opts):
from calibre.utils.serve_coffee import compile_coffeescript cc = self.j(self.SRC, 'calibre', 'utils', 'serve_coffee.py')
self.compiler = compile_coffeescript self.compiler = [sys.executable, cc, 'compile']
self.do_coffee_compile(opts) self.do_coffee_compile(opts)
if opts.watch: if opts.watch:
try: try:
@ -63,24 +63,24 @@ class Coffee(Command): # {{{
if self.newer(js, x): if self.newer(js, x):
print ('\t%sCompiling %s'%(time.strftime('[%H:%M:%S] ') if print ('\t%sCompiling %s'%(time.strftime('[%H:%M:%S] ') if
timestamp else '', os.path.basename(x))) timestamp else '', os.path.basename(x)))
with open(x, 'rb') as f: try:
cs, errs = self.compiler(f.read()) cs = subprocess.check_output(self.compiler +
for line in errs: [x]).decode('utf-8')
print (line) except Exception as e:
if cs and not errs: print ('\n\tCompilation of %s failed'%os.path.basename(x))
print (e)
if ignore_errors:
with open(js, 'wb') as f:
f.write('# Compilation from coffeescript failed')
else:
raise SystemExit(1)
else:
with open(js, 'wb') as f: with open(js, 'wb') as f:
f.write(cs.encode('utf-8')) f.write(cs.encode('utf-8'))
if opts.show_js: if opts.show_js:
self.show_js(js) self.show_js(js)
print ('#'*80) print ('#'*80)
print ('#'*80) print ('#'*80)
else:
print ('\n\tCompilation of %s failed'%os.path.basename(x))
if ignore_errors:
with open(js, 'wb') as f:
f.write('# Compilation from coffeescript failed')
else:
raise SystemExit(1)
def clean(self): def clean(self):
for toplevel, dest in self.COFFEE_DIRS.iteritems(): for toplevel, dest in self.COFFEE_DIRS.iteritems():

132
src/TestHTTPServer.py
View File

File diff suppressed because one or more lines are too long

148
src/calibre/utils/serve_coffee.py
View File

File diff suppressed because one or more lines are too long