Drop building of SciLexer.dll which included lexers.

2 files changed, 4 insertions, 171 deletions

diff --git a/win32/makefile b/win32/makefile
index a722fbd84..5e005fe24 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -12,7 +12,6 @@
 DIR_BIN=../bin
 
 COMPONENT = $(DIR_BIN)/Scintilla.dll
-LEXCOMPONENT = $(DIR_BIN)/SciLexer.dll
 LIBSCI = $(DIR_BIN)/libscintilla.a
 
 WARNINGS = -Wpedantic -Wall
@@ -66,7 +65,7 @@ endif
 CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
 CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS)
 
-all:	$(COMPONENT) $(LEXCOMPONENT) $(LIBSCI)
+all:	$(COMPONENT) $(LIBSCI)
 
 clean:
 	$(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI))
@@ -75,13 +74,11 @@ clean:
 	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
 
 analyze:
-	$(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx
+	$(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx
 
 depend deps.mak:
 	$(PYTHON) DepGen.py
 
-LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard ../lexers/Lex*.cxx)))))
-
 # Required for base Scintilla
 SRC_OBJS = \
 	AutoComplete.o \
@@ -105,7 +102,6 @@ SRC_OBJS = \
 	MarginView.o \
 	PerLine.o \
 	PositionCache.o \
-	PropSetSimple.o \
 	RESearch.o \
 	RunStyles.o \
 	Selection.o \
@@ -115,23 +111,9 @@ SRC_OBJS = \
 	ViewStyle.o \
 	XPM.o
 
-# Required by lexers
-LEXLIB_OBJS = \
-	Accessor.o \
-	CatalogueL.o \
-	DefaultLexer.o \
-	ExternalLexer.o \
-	LexerBase.o \
-	LexerModule.o \
-	LexerSimple.o \
-	StyleContext.o \
-	WordList.o
-
 # Required by libraries and DLLs that include lexing
 SCILEX_OBJS=\
 	$(SRC_OBJS) \
-	$(LEXLIB_OBJS) \
-	$(LEX_OBJS) \
 	HanjaDic.o \
 	PlatWin.o \
 	ScintillaBaseL.o \
@@ -139,30 +121,16 @@ SCILEX_OBJS=\
 
 COMPONENT_OBJS = \
 	$(SRC_OBJS) \
-	Accessor.o \
-	Catalogue.o \
 	HanjaDic.o \
-	LexerBase.o \
-	LexerModule.o \
-	LexerSimple.o \
 	PlatWin.o \
 	ScintillaBase.o \
 	ScintillaDLL.o \
 	ScintillaWin.o \
-	ScintRes.o \
-	WordList.o
-
-LEXCOMPONENT_OBJS = \
-	$(SCILEX_OBJS) \
-	ScintillaDLL.o \
 	ScintRes.o
 
 $(COMPONENT): $(COMPONENT_OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
 
-$(LEXCOMPONENT): $(LEXCOMPONENT_OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $^ $(CXXFLAGS) $(LIBS)
-
 $(LIBSCI): $(COMPONENT_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index bb850e295..7a7fb89da 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -14,7 +14,6 @@ DIR_O=.
 DIR_BIN=..\bin
 
 COMPONENT=$(DIR_BIN)\Scintilla.dll
-LEXCOMPONENT=$(DIR_BIN)\SciLexer.dll
 LIBSCI=$(DIR_BIN)\libscintilla.lib
 
 LD=link
@@ -63,10 +62,10 @@ CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
 INCLUDES=-I../include -I../src -I../lexlib
 CXXFLAGS=$(CXXFLAGS) $(INCLUDES)
 
-all:	$(COMPONENT) $(LEXCOMPONENT) $(LIBSCI)
+all:	$(COMPONENT) $(LIBSCI)
 
 clean:
-	-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) $(LEXCOMPONENT) \
+	-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) \
 	$(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb \
 	$(DIR_BIN)\Scintilla.lib $(DIR_BIN)\SciLexer.lib $(LIBSCI)
 
@@ -96,7 +95,6 @@ SRC_OBJS=\
 	$(DIR_O)\MarginView.obj \
 	$(DIR_O)\PerLine.obj \
 	$(DIR_O)\PositionCache.obj \
-	$(DIR_O)\PropSetSimple.obj \
 	$(DIR_O)\RESearch.obj \
 	$(DIR_O)\RunStyles.obj \
 	$(DIR_O)\Selection.obj \
@@ -106,126 +104,6 @@ SRC_OBJS=\
 	$(DIR_O)\ViewStyle.obj \
 	$(DIR_O)\XPM.obj
 
-#++Autogenerated -- run scripts/LexGen.py to regenerate
-#**LEX_OBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\)
-LEX_OBJS=\
-	$(DIR_O)\LexA68k.obj \
-	$(DIR_O)\LexAbaqus.obj \
-	$(DIR_O)\LexAda.obj \
-	$(DIR_O)\LexAPDL.obj \
-	$(DIR_O)\LexAsm.obj \
-	$(DIR_O)\LexAsn1.obj \
-	$(DIR_O)\LexASY.obj \
-	$(DIR_O)\LexAU3.obj \
-	$(DIR_O)\LexAVE.obj \
-	$(DIR_O)\LexAVS.obj \
-	$(DIR_O)\LexBaan.obj \
-	$(DIR_O)\LexBash.obj \
-	$(DIR_O)\LexBasic.obj \
-	$(DIR_O)\LexBatch.obj \
-	$(DIR_O)\LexBibTeX.obj \
-	$(DIR_O)\LexBullant.obj \
-	$(DIR_O)\LexCaml.obj \
-	$(DIR_O)\LexCIL.obj \
-	$(DIR_O)\LexCLW.obj \
-	$(DIR_O)\LexCmake.obj \
-	$(DIR_O)\LexCOBOL.obj \
-	$(DIR_O)\LexCoffeeScript.obj \
-	$(DIR_O)\LexConf.obj \
-	$(DIR_O)\LexCPP.obj \
-	$(DIR_O)\LexCrontab.obj \
-	$(DIR_O)\LexCsound.obj \
-	$(DIR_O)\LexCSS.obj \
-	$(DIR_O)\LexD.obj \
-	$(DIR_O)\LexDataflex.obj \
-	$(DIR_O)\LexDiff.obj \
-	$(DIR_O)\LexDMAP.obj \
-	$(DIR_O)\LexDMIS.obj \
-	$(DIR_O)\LexECL.obj \
-	$(DIR_O)\LexEDIFACT.obj \
-	$(DIR_O)\LexEiffel.obj \
-	$(DIR_O)\LexErlang.obj \
-	$(DIR_O)\LexErrorList.obj \
-	$(DIR_O)\LexEScript.obj \
-	$(DIR_O)\LexFlagship.obj \
-	$(DIR_O)\LexForth.obj \
-	$(DIR_O)\LexFortran.obj \
-	$(DIR_O)\LexGAP.obj \
-	$(DIR_O)\LexGui4Cli.obj \
-	$(DIR_O)\LexHaskell.obj \
-	$(DIR_O)\LexHex.obj \
-	$(DIR_O)\LexHollywood.obj \
-	$(DIR_O)\LexHTML.obj \
-	$(DIR_O)\LexIndent.obj \
-	$(DIR_O)\LexInno.obj \
-	$(DIR_O)\LexJSON.obj \
-	$(DIR_O)\LexKix.obj \
-	$(DIR_O)\LexKVIrc.obj \
-	$(DIR_O)\LexLaTeX.obj \
-	$(DIR_O)\LexLisp.obj \
-	$(DIR_O)\LexLout.obj \
-	$(DIR_O)\LexLua.obj \
-	$(DIR_O)\LexMagik.obj \
-	$(DIR_O)\LexMake.obj \
-	$(DIR_O)\LexMarkdown.obj \
-	$(DIR_O)\LexMatlab.obj \
-	$(DIR_O)\LexMaxima.obj \
-	$(DIR_O)\LexMetapost.obj \
-	$(DIR_O)\LexMMIXAL.obj \
-	$(DIR_O)\LexModula.obj \
-	$(DIR_O)\LexMPT.obj \
-	$(DIR_O)\LexMSSQL.obj \
-	$(DIR_O)\LexMySQL.obj \
-	$(DIR_O)\LexNim.obj \
-	$(DIR_O)\LexNimrod.obj \
-	$(DIR_O)\LexNsis.obj \
-	$(DIR_O)\LexNull.obj \
-	$(DIR_O)\LexOpal.obj \
-	$(DIR_O)\LexOScript.obj \
-	$(DIR_O)\LexPascal.obj \
-	$(DIR_O)\LexPB.obj \
-	$(DIR_O)\LexPerl.obj \
-	$(DIR_O)\LexPLM.obj \
-	$(DIR_O)\LexPO.obj \
-	$(DIR_O)\LexPOV.obj \
-	$(DIR_O)\LexPowerPro.obj \
-	$(DIR_O)\LexPowerShell.obj \
-	$(DIR_O)\LexProgress.obj \
-	$(DIR_O)\LexProps.obj \
-	$(DIR_O)\LexPS.obj \
-	$(DIR_O)\LexPython.obj \
-	$(DIR_O)\LexR.obj \
-	$(DIR_O)\LexRaku.obj \
-	$(DIR_O)\LexRebol.obj \
-	$(DIR_O)\LexRegistry.obj \
-	$(DIR_O)\LexRuby.obj \
-	$(DIR_O)\LexRust.obj \
-	$(DIR_O)\LexSAS.obj \
-	$(DIR_O)\LexScriptol.obj \
-	$(DIR_O)\LexSmalltalk.obj \
-	$(DIR_O)\LexSML.obj \
-	$(DIR_O)\LexSorcus.obj \
-	$(DIR_O)\LexSpecman.obj \
-	$(DIR_O)\LexSpice.obj \
-	$(DIR_O)\LexSQL.obj \
-	$(DIR_O)\LexStata.obj \
-	$(DIR_O)\LexSTTXT.obj \
-	$(DIR_O)\LexTACL.obj \
-	$(DIR_O)\LexTADS3.obj \
-	$(DIR_O)\LexTAL.obj \
-	$(DIR_O)\LexTCL.obj \
-	$(DIR_O)\LexTCMD.obj \
-	$(DIR_O)\LexTeX.obj \
-	$(DIR_O)\LexTxt2tags.obj \
-	$(DIR_O)\LexVB.obj \
-	$(DIR_O)\LexVerilog.obj \
-	$(DIR_O)\LexVHDL.obj \
-	$(DIR_O)\LexVisualProlog.obj \
-	$(DIR_O)\LexX12.obj \
-	$(DIR_O)\LexYAML.obj \
-
-#--Autogenerated -- end of automatically generated section
-
 # Required by lexers
 LEXLIB_OBJS = \
 	$(DIR_O)\Accessor.obj \
@@ -249,32 +127,19 @@ SCILEX_OBJS = \
 	$(DIR_O)\ScintillaWin.obj
 
 COMPONENT_OBJS = \
-	$(DIR_O)\Accessor.obj \
-	$(DIR_O)\Catalogue.obj \
 	$(DIR_O)\HanjaDic.obj \
-	$(DIR_O)\LexerBase.obj \
-	$(DIR_O)\LexerModule.obj \
-	$(DIR_O)\LexerSimple.obj \
 	$(DIR_O)\PlatWin.obj \
 	$(DIR_O)\ScintillaBase.obj \
 	$(DIR_O)\ScintillaDLL.obj \
 	$(DIR_O)\ScintillaWin.obj \
-	$(DIR_O)\WordList.obj \
 	$(SRC_OBJS)
 
-LEXCOMPONENT_OBJS = \
-	$(DIR_O)\ScintillaDLL.obj \
-	$(SCILEX_OBJS)
-
 $(DIR_O)\ScintRes.res : ScintRes.rc
 	$(RC) -fo$@ $**
 
 $(COMPONENT): $(COMPONENT_OBJS) $(DIR_O)\ScintRes.res
 	$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
 
-$(LEXCOMPONENT): $(LEXCOMPONENT_OBJS) $(DIR_O)\ScintRes.res
-	$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
-
 $(LIBSCI): $(COMPONENT_OBJS)
 	LIB /OUT:$@ $**