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

Allow lyxpak to work when LyX is run in place.

Browse Source 
Note that this should also make lyx2lyx detection a lot easier than 
it was before.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37498 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-02-04 20:33:52 +00:00
parent 497a131804
commit 9865f85122
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
development/tools/lyxpak.py
View File

@ -205,29 +205,38 @@ def main(argv):
# Try to find the location of the lyx2lyx script # Try to find the location of the lyx2lyx script
global lyx2lyx global lyx2lyx
if lyx2lyx == None: if lyx2lyx == None:
lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path) # first we will see if the script is roughly where we are
if lyx_exe == None: # i.e., we will assume we are in $SOMEDIR/scripts and look
error('Cannot find the LyX executable in the path.') # for $SOMEDIR/lyx2lyx/lyx2lyx.
cmd_status, cmd_stdout = run_cmd("%s -version 2>&1" % lyx_exe) ourpath = os.path.dirname(abspath(argv[0]))
if cmd_status != None: (upone, discard) = os.path.split(ourpath)
error('Cannot query LyX about the lyx2lyx script.') tryit = os.path.join(upone, "lyx2lyx", "lyx2lyx")
re_msvc = re.compile(r'^(\s*)(Host type:)(\s+)(win32)$') if os.path.exists(tryit):
re_sysdir = re.compile(r'^(\s*)(LyX files dir:)(\s+)(\S+)$') lyx2lyx = tryit
lines = cmd_stdout.splitlines() else:
for line in lines: lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path)
match = re_msvc.match(line) if lyx_exe == None:
if match: error('Cannot find the LyX executable in the path.')
# The LyX executable was built with MSVC, so the cmd_status, cmd_stdout = run_cmd("%s -version 2>&1" % lyx_exe)
# "LyX files dir:" line is unusable if cmd_status != None:
basedir = os.path.dirname(os.path.dirname(full_path)) error('Cannot query LyX about the lyx2lyx script.')
lyx2lyx = os.path.join(basedir, 'Resources', 'lyx2lyx', 'lyx2lyx') re_msvc = re.compile(r'^(\s*)(Host type:)(\s+)(win32)$')
break re_sysdir = re.compile(r'^(\s*)(LyX files dir:)(\s+)(\S+)$')
match = re_sysdir.match(line) lines = cmd_stdout.splitlines()
if match: for line in lines:
lyx2lyx = os.path.join(match.group(4), 'lyx2lyx', 'lyx2lyx') match = re_msvc.match(line)
break if match:
if not os.access(lyx2lyx, os.X_OK): # The LyX executable was built with MSVC, so the
error('Unable to find the lyx2lyx script.') # "LyX files dir:" line is unusable
basedir = os.path.dirname(os.path.dirname(full_path))
lyx2lyx = os.path.join(basedir, 'Resources', 'lyx2lyx', 'lyx2lyx')
break
match = re_sysdir.match(line)
if match:
lyx2lyx = os.path.join(match.group(4), 'lyx2lyx', 'lyx2lyx')
break
if not os.access(lyx2lyx, os.X_OK):
error('Unable to find the lyx2lyx script.')
# Initialize the list with the specified LyX file and recursively # Initialize the list with the specified LyX file and recursively
# gather all required files (also from child documents). # gather all required files (also from child documents).