Bibliography.lyx: remove preamble and master doc

[lyx.git] / lib / configure.py

diff --git a/lib/configure.py b/lib/configure.py
index 3db23f66b1249a8f8959587f31b75f78fe409147..bd5eb44a5521eb5a7397ad56bbc418daf27b8b5a 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -186,22 +186,6 @@ 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',
@@ -572,10 +556,10 @@ def checkLatex(dtl_tools):
         PPLATEX = LATEX
     if dtl_tools:
         # Windows only: DraftDVI
-        addToRC(r'''\converter latex      dvi2       "%s"      "latex"
+        addToRC(r'''\converter latex      dvi2       "%s"      "latex,hyperref-driver=dvips"
 \converter dvi2       dvi        "python -tt $$s/scripts/clean_dvi.py $$i $$o" ""''' % PPLATEX)
     else:
-        addToRC(r'\converter latex      dvi        "%s"        "latex"' % PPLATEX)
+        addToRC(r'\converter latex      dvi        "%s"        "latex,hyperref-driver=dvips"' % PPLATEX)
     # no latex
     if LATEX != '':
         # Check if latex is usable
@@ -1814,7 +1798,7 @@ if __name__ == '__main__':
     lyx_check_config = True
     lyx_kpsewhich = True
     outfile = 'lyxrc.defaults'
-    lyxrc_fileformat = 27
+    lyxrc_fileformat = 29
     rc_entries = ''
     lyx_keep_temps = False
     version_suffix = ''
@@ -1856,8 +1840,6 @@ 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