From 05fe88bb3ada8437cc2e30d2bcb515c24fbadc93 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 30 May 2023 10:57:57 +0700
Subject: [PATCH] chore(developer): remove usekmcmplib flag from kmcomp

---
 developer/src/kmcomp/main.pas | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/developer/src/kmcomp/main.pas b/developer/src/kmcomp/main.pas
index 5a29927a80..4aa29cf6c1 100644
--- a/developer/src/kmcomp/main.pas
+++ b/developer/src/kmcomp/main.pas
@@ -65,7 +65,7 @@ uses
   UKeymanTargets;
 
 function CompileKeyboard(FInFile, FOutFile: string; FDebug, FWarnAsError: Boolean): Boolean; forward;   // I4706
-function KCSetCompilerOptions(const FInFile: string; FShouldAddCompilerVersion, FUseKmcmpLib: Boolean): Boolean; forward;
+function KCSetCompilerOptions(const FInFile: string; FShouldAddCompilerVersion: Boolean): Boolean; forward;
 //function CompilerMessage(line: Integer; msgcode: LongWord; text: PAnsiChar): Integer; stdcall; forward;
 procedure FixupPathSlashes(var path: string); forward;
 
@@ -90,7 +90,6 @@ var
   FParamDistribution: Boolean;
   FMergingValidateIds: Boolean;
   FShouldAddCompilerVersion: Boolean;
-  FUseKmcmpLib: Boolean;
   FJsonSchemaPath: string;
   FParamSourcePath: string;
   FParamHelpLink: string;
@@ -117,7 +116,6 @@ begin
   FColorMode := cmDefault;
 
   FShouldAddCompilerVersion := True;
-  FUseKmcmpLib := True;
 
   FParamInfile := '';
   FParamOutfile := '';
@@ -193,8 +191,6 @@ begin
       FColorMode := cmForceNoColor
     else if s = '-no-compiler-version' then
       FShouldAddCompilerVersion := False
-    else if s = '-use-legacy-compiler' then
-      FUseKmcmpLib := False
     else if (s = '-help') or (s = '-h') then
     begin
       // Force help
@@ -223,8 +219,6 @@ begin
     writeln(SKeymanDeveloperName + ' Compiler (32-bit)');
 {$ENDIF}
     writeln('Version ' + CKeymanVersionInfo.VersionWithTag + ', ' + GetVersionCopyright);
-    if not FUseKmcmpLib then
-      writeln('Note: using legacy compiler');
   end;
 
   if FError or (FParamInfile = '') then
@@ -234,7 +228,7 @@ begin
     writeln('');
     writeln('Usage: '+cmd+' [-s[s]] [-nologo] [-c] [-d] [-w] [-cfc] [-v[s|d]] [-source-path path] [-schema-path path] ');
     writeln('       '+spc+' [-m] infile [-m infile] [-t target] [outfile.kmx|outfile.js [error.log]]');   // I4699
-    writeln('       '+spc+' [-add-help-link path] [-color|-no-color] [-no-compiler-version] [-use-legacy-compiler]');
+    writeln('       '+spc+' [-add-help-link path] [-color|-no-color] [-no-compiler-version]');
     writeln('       '+spc+' [-extract-keyboard-info field[,field...]]');
     writeln('          infile        can be a .kmn file (Keyboard Source, .kps file (Package Source), or .kpj (project)');   // I4699   // I4825
     writeln('                        if -v specified, can also be a .keyboard_info file');
@@ -258,7 +252,6 @@ begin
     writeln('                         uses console mode to determine whether color should be used.');
     writeln;
     writeln('          -no-compiler-version   Don''t embed the compiler version stores, useful for regression tests.');
-    writeln('          -use-legacy-compiler   Use legacy compiler (will be removed in 18.0)');
     writeln;
     writeln(' JSON .keyboard_info compile targets:');
     writeln('          -v[s]    validate infile against source schema');
@@ -298,7 +291,7 @@ begin
 
     TProjectLogConsole.Create(FSilent, FFullySilent, hOutfile, FColorMode);
 
-    KCSetCompilerOptions(FParamInfile, FShouldAddCompilerVersion, FUseKmcmpLib);
+    KCSetCompilerOptions(FParamInfile, FShouldAddCompilerVersion);
 
     if FValidateRepoChanges then
       FError := not TValidateRepoChanges.Execute(FParamInfile, FParamOutfile)
@@ -324,7 +317,7 @@ begin
     ExitCode := 1;
 end;
 
-function KCSetCompilerOptions(const FInFile: string; FShouldAddCompilerVersion, FUseKmcmpLib: Boolean): Boolean;
+function KCSetCompilerOptions(const FInFile: string; FShouldAddCompilerVersion: Boolean): Boolean;
 var
   opt: TCompilerOptions;
 begin
@@ -332,7 +325,6 @@ begin
 
   opt.dwSize := sizeof(TCompilerOptions);
   opt.ShouldAddCompilerVersion := FShouldAddCompilerVersion;
-  opt.UseKmcmpLib := FUseKmcmpLib;
 
   Result := SetCompilerOptions(@opt, @CompilerMessageW);