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

calibre now builds fully on windows

Browse Source 
The duktape tests are crashing have to figure out why at some point
This commit is contained in:
Kovid Goyal 2019-06-19 17:48:41 +05:30
parent aed78ba857
commit 2635e23ed5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bypy/init_env.py
View File

@ -94,6 +94,9 @@ PYQT_MODULES = (
) )
del dlls del dlls
if iswindows:
PYQT_MODULES += ('QtWinExtras',)
def read_cal_file(name): def read_cal_file(name):
with open(os.path.join(CALIBRE_DIR, 'src', 'calibre', name), 'rb') as f: with open(os.path.join(CALIBRE_DIR, 'src', 'calibre', name), 'rb') as f:

12
src/calibre/test_build.py
View File

@ -142,7 +142,9 @@ class BuildTest(unittest.TestCase):
winutil = plugins['winutil'][0] winutil = plugins['winutil'][0]
def au(x, name): def au(x, name):
self.assertTrue(isinstance(x, unicode_type), name + '() did not return a unicode string') self.assertTrue(
isinstance(x, unicode_type),
'%s() did not return a unicode string, instead returning: %r' % (name, x))
for x in winutil.argv(): for x in winutil.argv():
au(x, 'argv') au(x, 'argv')
for x in 'username temp_path locale_name'.split(): for x in 'username temp_path locale_name'.split():
@ -152,12 +154,14 @@ class BuildTest(unittest.TestCase):
au(d['decimal_point'], 'localeconv') au(d['decimal_point'], 'localeconv')
for k, v in iteritems(d): for k, v in iteritems(d):
au(v, k) au(v, k)
for k in os.environ:
au(getenv(k), 'getenv-' + k)
os.environ['XXXTEST'] = 'YYY' os.environ['XXXTEST'] = 'YYY'
self.assertEqual(getenv('XXXTEST'), 'YYY') self.assertEqual(getenv('XXXTEST'), 'YYY')
del os.environ['XXXTEST'] del os.environ['XXXTEST']
self.assertIsNone(getenv('XXXTEST')) self.assertIsNone(getenv('XXXTEST'))
for k in os.environ:
v = getenv(k)
if v is not None:
au(v, 'getenv-' + k)
t = time.localtime() t = time.localtime()
fmt = '%Y%a%b%e%H%M' fmt = '%Y%a%b%e%H%M'
for fmt in (fmt, fmt.encode('ascii')): for fmt in (fmt, fmt.encode('ascii')):
@ -311,8 +315,8 @@ class BuildTest(unittest.TestCase):
def find_tests(): def find_tests():
ans = unittest.defaultTestLoader.loadTestsFromTestCase(BuildTest) ans = unittest.defaultTestLoader.loadTestsFromTestCase(BuildTest)
from calibre.utils.icu_test import find_tests from calibre.utils.icu_test import find_tests
import duktape.tests as dtests
ans.addTests(find_tests()) ans.addTests(find_tests())
import duktape.tests as dtests
ans.addTests(unittest.defaultTestLoader.loadTestsFromModule(dtests)) ans.addTests(unittest.defaultTestLoader.loadTestsFromModule(dtests))
from tinycss.tests.main import find_tests from tinycss.tests.main import find_tests
ans.addTests(find_tests()) ans.addTests(find_tests())