From e155b2ac633cb51910809822d6d48509c9a0a732 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 17 Oct 2014 10:09:18 +0530 Subject: [PATCH] Proper exclusion for generated language based user manual files --- manual/conf.py | 6 +++++- setup/publish.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/manual/conf.py b/manual/conf.py index 0b7763f358..c023457496 100644 --- a/manual/conf.py +++ b/manual/conf.py @@ -43,7 +43,11 @@ exclude_patterns = ['simple_index.rst'] if master_doc == 'index' else ['index.rs # The language language = os.environ.get('CALIBRE_OVERRIDE_LANG', 'en') # ignore generated files in languages other than the language we are building for -exclude_patterns += ['generated/' + x for x in os.listdir('generated') if x != language] +ge = {'generated/' + x for x in os.listdir('generated')} | { + 'generated/' + x for x in os.environ.get('ALL_USER_MANUAL_LANGUAGES', '').split()} +ge.discard('generated/' + language) +exclude_patterns += list(ge) +del ge # General substitutions. project = __appname__ diff --git a/setup/publish.py b/setup/publish.py index fd14378dc9..5c4b25a2e3 100644 --- a/setup/publish.py +++ b/setup/publish.py @@ -100,8 +100,9 @@ class Manual(Command): jobs = [] languages = opts.language or list(json.load(open(self.j(base, 'locale', 'completed.json'), 'rb'))) languages = ['en'] + list(set(languages) - {'en'}) + os.environ['ALL_USER_MANUAL_LANGUAGES'] = ' '.join(languages) for language in languages: - jobs.append((['calibre-debug', self.j(self.d(self.SRC), 'manual', 'build.py'), + jobs.append((['calibre-debug', self.j(self.d(self.SRC), 'manual', 'build.py'), '--', language, self.j(tdir, language)], '\n\n**************** Building translations for: %s'%language)) self.info('Building manual for %d languages' % len(jobs))