anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* configure.py : Fix the detection of tex2lyx when running in-place (#6986).

Browse Source 
Remove the hack with os.environ and instead directly search for
../src/tex2lyx/tex2lyx relative to where configure.py is found.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39643 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-09-07 23:59:23 +00:00
parent deb9736929
commit 5891c139da
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/configure.py
View File

@ -617,24 +617,21 @@ def checkConverterEntries(java='', perl=''):
checkLuatex() checkLuatex()
''' If we're running LyX in-place then tex2lyx will be found in # Look for tex2lyx in this order (see bugs #3308 and #6986):
../src/tex2lyx. Add this directory to the PATH temporarily and # 1) If we're running LyX in-place then tex2lyx will be found
search for tex2lyx. # in ../src/tex2lyx with respect to the srcdir.
Use PATH to avoid any problems with paths-with-spaces. # 2) If LyX was configured with a version suffix then tex2lyx
''' # will also have this version suffix.
path_orig = os.environ["PATH"] # 3) Otherwise always use tex2lyx.
os.environ["PATH"] = os.path.join('..', 'src', 'tex2lyx') + \ in_place = os.path.join('srcdir', '..', 'src', 'tex2lyx', 'tex2lyx')
os.pathsep + path_orig in_place = os.path.abspath(in_place)
# First search for tex2lyx with version suffix (bug 6986) path, t2l = checkProg('a LaTeX/Noweb -> LyX converter', [in_place, 'tex2lyx' + version_suffix, 'tex2lyx'],
path, t2l = checkProg('a LaTeX/Noweb -> LyX converter', ['tex2lyx' + version_suffix, 'tex2lyx'],
rc_entry = [r'''\converter latex lyx "%% -f $$i $$o" "" rc_entry = [r'''\converter latex lyx "%% -f $$i $$o" ""
\converter literate lyx "%% -n -f $$i $$o" ""'''], not_found = 'tex2lyx') \converter literate lyx "%% -n -f $$i $$o" ""'''], not_found = 'tex2lyx')
if path == '': if path == '':
logger.warning("Failed to find tex2lyx on your system.") logger.warning("Failed to find tex2lyx on your system.")
os.environ["PATH"] = path_orig
# #
checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'], checkProg('a Noweb -> LaTeX converter', ['noweave -delay -index $$i > $$o'],
rc_entry = [r'''\converter literate latex "%%" "" rc_entry = [r'''\converter literate latex "%%" ""