michaelh/zephyr
1
0
Fork 0
Code Releases Activity

doc: fixed version parsing for docs

Browse source 
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-11-07 20:02:24 -05:00 • committed by Anas Nashif
commit a037c363bb
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/Makefile
View file

@ -73,7 +73,7 @@ content: scripts/extract_content.py
$(Q)$< $(Q)$<
kconfig: scripts/genrest/genrest.py kconfig: scripts/genrest/genrest.py
$(Q)srctree=../ SRCARCH=x86 python $< ../Kconfig reference/kconfig/ $(Q)srctree=../ KERNELVERSION=1.9.99 SRCARCH=x86 python $< ../Kconfig reference/kconfig/
prep: doxy content kconfig prep: doxy content kconfig

4
doc/conf.py
View file

@ -60,7 +60,7 @@ try:
makefile_version_major = None makefile_version_major = None
makefile_version_minor = None makefile_version_minor = None
makefile_patchlevel = None makefile_patchlevel = None
for line in open('../Makefile'): for line in open('../VERSION'):
key, val = [x.strip() for x in line.split('=', 2)] key, val = [x.strip() for x in line.split('=', 2)]
if key == 'VERSION_MAJOR': if key == 'VERSION_MAJOR':
makefile_version_major = val makefile_version_major = val
@ -78,7 +78,7 @@ finally:
else: else:
sys.stderr.write('Warning: Could not extract kernel version\n') sys.stderr.write('Warning: Could not extract kernel version\n')
version = release = "unknown version" version = release = "unknown version"
version = release = os.getenv('KERNELVERSION','0.1.0') version = release = os.getenv('KERNELVERSION','1.9.0')
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.