anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make configure.py compatible with python 2.2

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@15097 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2006-09-21 10:12:08 +00:00
parent a989be6e85
commit 5eac90cdd3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2009-09-21 José Matos <jamatos@lyx.org>
* configure.py: make it compatible with python 2.2
2006-09-16 Michael Gerz <michael.gerz@teststep.org> 2006-09-16 Michael Gerz <michael.gerz@teststep.org>
* stdmenus.ui: add entry for phonetic symbols; * stdmenus.ui: add entry for phonetic symbols;

9
lib/configure.py
View File

@ -106,7 +106,7 @@ def checkTeXPaths():
os.close(fd) os.close(fd)
inpname = cmdOutput('cygpath -m ' + tmpfname) inpname = cmdOutput('cygpath -m ' + tmpfname)
latex_out = cmdOutput(r'latex "\nonstopmode\input{%s}"' % inpname) latex_out = cmdOutput(r'latex "\nonstopmode\input{%s}"' % inpname)
if 'Error' in latex_out: if latex_out.find('Error') != -1:
print "configure: TeX engine needs posix-style paths in latex files" print "configure: TeX engine needs posix-style paths in latex files"
windows_style_tex_paths = 'false' windows_style_tex_paths = 'false'
else: else:
@ -579,7 +579,10 @@ def checkLatexConfig(check_config, bool_docbook, bool_linuxdoc):
for line in open('chkconfig.vars').readlines(): for line in open('chkconfig.vars').readlines():
key, val = re.sub('-', '_', line).split('=') key, val = re.sub('-', '_', line).split('=')
val = val.strip() val = val.strip()
values[key] = val.strip("'") tmp = val.split("'")
while tmp and not tmp[0]: tmp = tmp[1:]
while tmp and not tmp[-1]: tmp = tmp[:-1]
values[key] = "'".join(tmp)
# chk_fontenc may not exist # chk_fontenc may not exist
try: try:
addToRC(r'\font_encoding "%s"' % values["chk_fontenc"]) addToRC(r'\font_encoding "%s"' % values["chk_fontenc"])
@ -652,7 +655,7 @@ def checkTeXAllowSpaces():
latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """) latex_out = cmdOutput(LATEX + r""" "\nonstopmode\input{\"a b\"}" """)
else: else:
latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """) latex_out = cmdOutput(LATEX + r""" '\nonstopmode\input{"a b"}' """)
if 'working' in latex_out: if latex_out.find('working') != -1:
print 'yes' print 'yes'
tex_allows_spaces = 'true' tex_allows_spaces = 'true'
else: else: