commit 38e439d3001a10eff0779d12d586ab41c0dd6a29
Author: Richard Kimberly Heck <[email protected]>
Date: Sun Sep 30 13:51:30 2018 -0400
Revert "Revert "Check for old "LyX 2.3" user directory when configuring.""
This reverts commit b66cf5aecd04518243d90058c6243b9cd90eebce.
---
lib/configure.py | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index c317e79..c16064a 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -181,6 +181,22 @@ def checkUpgrade():
return
+def checkUpgradeWin():
+ ''' Check for upgrade from previous version '''
+ cwd = os.getcwd()
+ basename = os.path.basename(cwd)
+ if basename != "LyX":
+ return
+ lyxrc = os.path.join(cwd, outfile)
+ if os.path.isfile(lyxrc):
+ return
+ olddir = os.path.join(os.path.dirname(cwd), "LyX2.3")
+ if not os.path.isdir(oldir):
+ return
+ logger.info('Copying ' + olddir + ' into ' + cwd)
+ copy_tree(olddir, cwd, True)
+
+
def createDirectories():
''' Create the build directories if necessary '''
for dir in ['bind', 'clipart', 'doc', 'examples', 'images', 'kbd',
@@ -1840,6 +1856,8 @@ Options:
setEnviron()
if sys.platform == 'darwin' and len(version_suffix) > 0:
checkUpgrade()
+ if os.name == 'nt':
+ checkUpgradeWin()
createDirectories()
dtl_tools = checkDTLtools()
## Write the first part of outfile