Remove lexer data extraction and regeneration since lexers are now in Lexilla.

3 files changed, 0 insertions, 78 deletions

diff --git a/scripts/HFacer.py b/scripts/HFacer.py
index d32054ec9..f365762b6 100755
--- a/scripts/HFacer.py
+++ b/scripts/HFacer.py
@@ -9,15 +9,6 @@ import Face
 
 from FileGenerator import UpdateFile, Generate, Regenerate, UpdateLineInFile, lineEnd
 
-def printLexHFile(f):
-	out = []
-	for name in f.order:
-		v = f.features[name]
-		if v["FeatureType"] in ["val"]:
-			if "SCE_" in name or "SCLEX_" in name:
-				out.append("#define " + name + " " + v["Value"])
-	return out
-
 def printHFile(f):
 	out = []
 	previousCategory = ""
@@ -46,7 +37,6 @@ def RegenerateAll(root, showMaxID):
 	f = Face.Face()
 	f.ReadFromFile(root / "include/Scintilla.iface")
 	Regenerate(root / "include/Scintilla.h", "/* ", printHFile(f))
-	Regenerate(root / "include/SciLexer.h", "/* ", printLexHFile(f))
 	if showMaxID:
 		valueSet = set(int(x) for x in f.values if int(x) < 3000)
 		maximumID = max(valueSet)
diff --git a/scripts/LexGen.py b/scripts/LexGen.py
index 7927de624..c638e9878 100644
--- a/scripts/LexGen.py
+++ b/scripts/LexGen.py
@@ -54,11 +54,6 @@ def UpdateVersionNumbers(sci, root):
 
     cocoa = root / "cocoa"
 
-    UpdateLineInPlistFile(cocoa / "ScintillaFramework/Info.plist",
-        "CFBundleVersion", sci.versionDotted)
-    UpdateLineInPlistFile(cocoa / "ScintillaFramework/Info.plist",
-        "CFBundleShortVersionString", sci.versionDotted)
-
     UpdateLineInPlistFile(cocoa / "Scintilla" / "Info.plist",
         "CFBundleShortVersionString", sci.versionDotted)
     ReplaceREInFile(cocoa / "Scintilla"/ "Scintilla.xcodeproj" / "project.pbxproj",
@@ -72,61 +67,6 @@ def uid24():
 def ciLexerKey(a):
     return a.split()[2].lower()
 
-"""
-		11F35FDB12AEFAF100F0236D /* LexA68k.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 11F35FDA12AEFAF100F0236D /* LexA68k.cxx */; };
-		11F35FDA12AEFAF100F0236D /* LexA68k.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../lexers/LexA68k.cxx; sourceTree = SOURCE_ROOT; };
-				11F35FDA12AEFAF100F0236D /* LexA68k.cxx */,
-				11F35FDB12AEFAF100F0236D /* LexA68k.cxx in Sources */,
-"""
-def RegenerateXcodeProject(path, lexers, lexerReferences):
-    # Build 4 blocks for insertion:
-    # Each markers contains a unique section start, an optional wait string, and a section end
-
-    markersPBXBuildFile = ["Begin PBXBuildFile section", "", "End PBXBuildFile section"]
-    sectionPBXBuildFile = []
-
-    markersPBXFileReference = ["Begin PBXFileReference section", "", "End PBXFileReference section"]
-    sectionPBXFileReference = []
-
-    markersLexers = ["/* Lexers */ =", "children", ");"]
-    sectionLexers = []
-
-    markersPBXSourcesBuildPhase = ["Begin PBXSourcesBuildPhase section", "files", ");"]
-    sectionPBXSourcesBuildPhase = []
-
-    for lexer in lexers:
-        if lexer not in lexerReferences:
-            uid1 = uid24()
-            uid2 = uid24()
-            print("Lexer", lexer, "is not in Xcode project. Use IDs", uid1, uid2)
-            lexerReferences[lexer] = [uid1, uid2]
-            linePBXBuildFile = "\t\t{} /* {}.cxx in Sources */ = {{isa = PBXBuildFile; fileRef = {} /* {}.cxx */; }};".format(uid1, lexer, uid2, lexer)
-            linePBXFileReference = "\t\t{} /* {}.cxx */ = {{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = {}.cxx; path = ../../lexers/{}.cxx; sourceTree = SOURCE_ROOT; }};".format(uid2, lexer, lexer, lexer)
-            lineLexers = "\t\t\t\t{} /* {}.cxx */,".format(uid2, lexer)
-            linePBXSourcesBuildPhase = "\t\t\t\t{} /* {}.cxx in Sources */,".format(uid1, lexer)
-            sectionPBXBuildFile.append(linePBXBuildFile)
-            sectionPBXFileReference.append(linePBXFileReference)
-            sectionLexers.append(lineLexers)
-            sectionPBXSourcesBuildPhase.append(linePBXSourcesBuildPhase)
-
-    lines = ReadFileAsList(path)
-
-    sli = FindSectionInList(lines, markersPBXBuildFile)
-    lines[sli.stop:sli.stop] = sectionPBXBuildFile
-
-    sli = FindSectionInList(lines, markersPBXFileReference)
-    lines[sli.stop:sli.stop] = sectionPBXFileReference
-
-    sli = FindSectionInList(lines, markersLexers)
-    # This section is shown in the project outline so sort it to make it easier to navigate.
-    allLexers = sorted(lines[sli.start:sli.stop] + sectionLexers, key=ciLexerKey)
-    lines[sli] = allLexers
-
-    sli = FindSectionInList(lines, markersPBXSourcesBuildPhase)
-    lines[sli.stop:sli.stop] = sectionPBXSourcesBuildPhase
-
-    UpdateFileFromLines(path, lines, "\n")
-
 def RegenerateAll(rootDirectory):
     
     root = pathlib.Path(rootDirectory)
@@ -135,7 +75,6 @@ def RegenerateAll(rootDirectory):
 
     sci = ScintillaData.ScintillaData(scintillaBase)
 
-    Regenerate(scintillaBase / "src/Catalogue.cxx", "//", sci.lexerModules)
     Regenerate(scintillaBase / "win32/scintilla.mak", "#", sci.lexFiles)
 
     startDir = os.getcwd()
@@ -145,9 +84,6 @@ def RegenerateAll(rootDirectory):
     gtk.DepGen.Generate()
     os.chdir(startDir)
 
-    RegenerateXcodeProject(root / "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj",
-        sci.lexFiles, sci.lexersXcode)
-
     UpdateVersionNumbers(sci, root)
 
     HFacer.RegenerateAll(root, False)
diff --git a/scripts/ScintillaData.py b/scripts/ScintillaData.py
index 1d9537d03..7937c321e 100644
--- a/scripts/ScintillaData.py
+++ b/scripts/ScintillaData.py
@@ -233,8 +233,6 @@ class ScintillaData:
         self.lexerProperties = list(lexerProperties)
         SortListInsensitive(self.lexerProperties)
 
-        self.lexersXcode = FindLexersInXcode(scintillaRoot /
-            "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj")
         self.credits = FindCredits(scintillaRoot / "doc" / "ScintillaHistory.html")
 
 def printWrapped(text):
@@ -247,8 +245,6 @@ if __name__=="__main__":
         sci.dateModified, sci.yearModified, sci.mdyModified, sci.dmyModified, sci.myModified))
     printWrapped(str(len(sci.lexFiles)) + " lexer files: " + ", ".join(sci.lexFiles))
     printWrapped(str(len(sci.lexerModules)) + " lexer modules: " + ", ".join(sci.lexerModules))
-    #~ printWrapped(str(len(sci.lexersXcode)) + " Xcode lexer references: " + ", ".join(
-        #~ [lex+":"+uids[0]+","+uids[1] for lex, uids in sci.lexersXcode.items()]))
     print("Lexer name to ID:")
     lexNames = sorted(sci.sclexFromName.keys())
     for lexName in lexNames: