lyx2lyx refactoring

[features.git] / lib / configure.py

diff --git a/lib/configure.py b/lib/configure.py
index f1550fc03179ca85ee8a46f6845a75de07a4d8f6..0b3c2a761c885d5466ef1f3fe5c52a93e2209bbb 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1472,7 +1472,7 @@ def checkModulesConfig():
 ## It has been automatically generated by configure
 ## Use "Options/Reconfigure" if you need to update it after a
 ## configuration change.
-## "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category"
+## "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category" "Local"
 ''')
 
   # build the list of available modules
@@ -1517,7 +1517,7 @@ def processModuleFile(file, filename, bool_docbook):
     remods = re.compile(b'\s*#\s*\\\\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}')
     rereqs = re.compile(b'\s*#+\s*Requires: (.*)')
     reexcs = re.compile(b'\s*#+\s*Excludes: (.*)')
-    recaty = re.compile(b'\s*#+\s*Category: (.*)')
+    recaty = re.compile(b'\\s*#\\s*\\\\DeclareCategory{(.*)}\\s*$')
     redbeg = re.compile(b'\s*#+\s*DescriptionBegin\s*$')
     redend = re.compile(b'\s*#+\s*DescriptionEnd\s*$')
 
@@ -1587,8 +1587,11 @@ def processModuleFile(file, filename, bool_docbook):
             cm.write(line + '\n')
         cm.close()
 
-    return (b'"%s" "%s" "%s" "%s" "%s" "%s" "%s"\n'
-            % (modname, filename, desc, pkgs, req, excl, catgy))
+    local = b"true"
+    if (file.startswith(srcdir)):
+        local = b"false"
+    return (b'"%s" "%s" "%s" "%s" "%s" "%s" "%s" "%s"\n'
+            % (modname, filename, desc, pkgs, req, excl, catgy, local))
 
 
 def checkCiteEnginesConfig():
@@ -1859,8 +1862,6 @@ Format %i
     inkscape_cl = inkscape_gui
     if os.name == 'nt':
         inkscape_cl = inkscape_gui.replace('.exe', '.com')
-    # On MacOSX, Inkscape requires full path file arguments. This
-    # is not needed on Linux and Win and even breaks the latter.
     checkFormatEntries(dtl_tools)
     checkConverterEntries()
     (chk_docbook, bool_docbook, docbook_cmd) = checkDocBook()