Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(developer): link welcome.htm in package for new projects; use v17 project format for new models #13161

Merged
merged 1 commit into from
Feb 10, 2025
Merged

fix(developer): link welcome.htm in package for new projects; use v17 project format for new models #13161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions developer/src/kmconvert/Keyman.Developer.System.KeyboardProjectTemplate.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ procedure TKeyboardProjectTemplate.WriteKPS;
f := TPackageContentFile.Create(kps);
f.FileName := BasePath + ID + '\' + SFolder_Source + '\' + SFile_WelcomeHTM;
kps.Files.Add(f);
kps.Options.WelcomeFile := f;

// Add readme
f := TPackageContentFile.Create(kps);
Expand Down
1 change: 1 addition & 0 deletions developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ procedure TLDMLKeyboardProjectTemplate.WriteKPS;
f := TPackageContentFile.Create(kps);
f.FileName := BasePath + ID + '\' + SFolder_Source + '\' + SFile_WelcomeHTM;
kps.Files.Add(f);
kps.Options.WelcomeFile := f;

// Add readme
f := TPackageContentFile.Create(kps);
Expand Down
18 changes: 4 additions & 14 deletions developer/src/kmconvert/Keyman.Developer.System.ModelProjectTemplate.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ TModelProjectTemplate = class(TProjectTemplate)
procedure WriteWordlist;
procedure WriteKPS;
procedure WriteKPJ;
procedure WriteModelInfo;
function GetModelFilename: string;
function GetWordlistFilename: string;

protected
const
SFileTemplate_ModelInfo = '%s.model_info'; // in root
SFileTemplate_Package = '%s.model.kps';
SFilename_Model = 'model.ts'; // Only for source
SFilename_Wordlist = 'wordlist.tsv';
Expand Down Expand Up @@ -82,8 +80,6 @@ procedure TModelProjectTemplate.Generate;
WriteKPJ;

WriteRepositoryMetadata;

WriteModelInfo;
end;

function TModelProjectTemplate.GetModelFilename: string;
Expand All @@ -107,15 +103,6 @@ procedure TModelProjectTemplate.WriteModel;
Format(SFolder_Source + '\' + SFileTemplate_Model, [ID]));
end;

procedure TModelProjectTemplate.WriteModelInfo;
begin
// Write modelid.model_info
Transform(
Format(SFileTemplate_ModelInfo, ['model']),
Format(SFileTemplate_ModelInfo, [ID])
);
end;

procedure TModelProjectTemplate.WriteWordlist;
begin
Transform(SFolder_Source + '\' + SFilename_Wordlist);
Expand All @@ -127,10 +114,13 @@ procedure TModelProjectTemplate.WriteKPJ;
begin
kpj := TProject.Create(ptLexicalModel, GetProjectFilename, False);
try
kpj.Options.Version := pv20;
kpj.Options.BuildPath := '$PROJECTPATH\' + SFolder_Build;
kpj.Options.SourcePath := '$PROJECTPATH\' + SFolder_Source;
kpj.Options.WarnDeprecatedCode := True;
kpj.Options.CompilerWarningsAsErrors := True;
kpj.Options.CheckFilenameConventions := True;
kpj.Options.SkipMetadataFiles := False;

// Add model and package to project
kpj.Files.Add(TmodelTsProjectFile.Create(kpj, GetModelFilename, nil));
Expand All @@ -140,7 +130,6 @@ procedure TModelProjectTemplate.WriteKPJ;
kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + SFile_HistoryMD, nil));
kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + SFile_LicenseMD, nil));
kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + SFile_ReadmeMD, nil));
kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + Format(SFileTemplate_ModelInfo, [ID]), nil));

kpj.Save;
finally
Expand Down Expand Up @@ -173,6 +162,7 @@ procedure TModelProjectTemplate.WriteKPS;
f := TPackageContentFile.Create(kps);
f.FileName := BasePath + ID + '\' + SFolder_Source + '\' + SFile_WelcomeHTM;
kps.Files.Add(f);
kps.Options.WelcomeFile := f;

// Add readme
f := TPackageContentFile.Create(kps);
Expand Down
2 changes: 1 addition & 1 deletion ...per/src/tike/project/Keyman.Developer.UI.Project.UfrmNewLDMLKeyboardProjectParameters.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ inherited frmNewLDMLKeyboardProjectParameters: TfrmNewLDMLKeyboardProjectParamet
Top = 260
Width = 102
Height = 13
Caption = 'Supported &languages'
Caption = '&Supported languages'
FocusControl = memoLanguages
end
object Label4: TLabel
Expand Down