Skip to content

Commit fd9b131

Browse files
committed
chore(developer): remove Package Installer UI from TIKE
1 parent 5a6758d commit fd9b131

12 files changed

+15
-1231
lines changed

developer/src/common/delphi/compiler/CompilePackage.pas

Lines changed: 0 additions & 540 deletions
This file was deleted.

developer/src/common/delphi/compiler/CompilePackageInstaller.pas

Lines changed: 0 additions & 446 deletions
This file was deleted.

developer/src/tike/child/UfrmPackageEditor.dfm

Lines changed: 5 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,6 @@ inherited frmPackageEditor: TfrmPackageEditor
11341134
Anchors = [akLeft, akTop, akRight]
11351135
TabOrder = 2
11361136
OnClick = cbLicenseClick
1137-
ExplicitWidth = 482
11381137
end
11391138
end
11401139
end
@@ -1351,7 +1350,7 @@ inherited frmPackageEditor: TfrmPackageEditor
13511350
BevelOuter = bvNone
13521351
Color = 15921906
13531352
ParentBackground = False
1354-
TabOrder = 4
1353+
TabOrder = 3
13551354
object lblDebugHostCaption: TLabel
13561355
Left = 12
13571356
Top = 70
@@ -1438,7 +1437,7 @@ inherited frmPackageEditor: TfrmPackageEditor
14381437
Left = 15
14391438
Top = 274
14401439
Width = 295
1441-
Height = 124
1440+
Height = 276
14421441
BevelOuter = bvNone
14431442
Color = 15921906
14441443
ParentBackground = False
@@ -1484,74 +1483,6 @@ inherited frmPackageEditor: TfrmPackageEditor
14841483
OnClick = cmdUninstallClick
14851484
end
14861485
end
1487-
object panBuildWindowsInstaller: TPanel
1488-
Left = 15
1489-
Top = 418
1490-
Width = 295
1491-
Height = 132
1492-
BevelOuter = bvNone
1493-
Color = 15921906
1494-
ParentBackground = False
1495-
TabOrder = 3
1496-
object Label9: TLabel
1497-
Left = 9
1498-
Top = 6
1499-
Width = 124
1500-
Height = 17
1501-
Caption = 'Windows Installer'
1502-
Font.Charset = DEFAULT_CHARSET
1503-
Font.Color = clWindowText
1504-
Font.Height = -14
1505-
Font.Name = 'Tahoma'
1506-
Font.Style = [fsBold]
1507-
ParentFont = False
1508-
end
1509-
object lblBootstrapMSI: TLabel
1510-
Left = 9
1511-
Top = 69
1512-
Width = 64
1513-
Height = 13
1514-
Caption = 'Keyman MSI:'
1515-
FocusControl = editBootstrapMSI
1516-
end
1517-
object lblInstallerOutputFilename: TLabel
1518-
Left = 9
1519-
Top = 37
1520-
Width = 82
1521-
Height = 13
1522-
Caption = 'Target filename:'
1523-
FocusControl = editInstallerOutputFilename
1524-
end
1525-
object editBootstrapMSI: TEdit
1526-
Left = 125
1527-
Top = 66
1528-
Width = 156
1529-
Height = 21
1530-
TabStop = False
1531-
ParentColor = True
1532-
ReadOnly = True
1533-
TabOrder = 1
1534-
end
1535-
object editInstallerOutputFilename: TEdit
1536-
Left = 125
1537-
Top = 34
1538-
Width = 156
1539-
Height = 21
1540-
TabStop = False
1541-
ParentColor = True
1542-
ReadOnly = True
1543-
TabOrder = 0
1544-
end
1545-
object cmdInstallWith: TButton
1546-
Left = 125
1547-
Top = 96
1548-
Width = 156
1549-
Height = 25
1550-
Caption = 'Find Keyman MSI...'
1551-
TabOrder = 2
1552-
OnClick = cmdInstallWithClick
1553-
end
1554-
end
15551486
object panOpenInExplorer: TPanel
15561487
Left = 15
15571488
Top = 187
@@ -1641,30 +1572,21 @@ inherited frmPackageEditor: TfrmPackageEditor
16411572
ReadOnly = True
16421573
TabOrder = 0
16431574
end
1644-
object cmdCompileInstaller: TButton
1645-
Left = 148
1646-
Top = 32
1647-
Width = 133
1648-
Height = 25
1649-
Caption = 'Compile I&nstaller'
1650-
TabOrder = 1
1651-
OnClick = cmdCompileInstallerClick
1652-
end
16531575
object cmdAddToProject: TButton
1654-
Left = 287
1576+
Left = 148
16551577
Top = 32
16561578
Width = 133
16571579
Height = 25
16581580
Action = modActionsMain.actProjectAddCurrentEditorFile
1659-
TabOrder = 2
1581+
TabOrder = 1
16601582
end
16611583
object cmdBuildPackage: TButton
16621584
Left = 9
16631585
Top = 32
16641586
Width = 133
16651587
Height = 25
16661588
Caption = 'Compile &Package'
1667-
TabOrder = 3
1589+
TabOrder = 2
16681590
OnClick = cmdBuildPackageClick
16691591
end
16701592
end
@@ -1685,12 +1607,4 @@ inherited frmPackageEditor: TfrmPackageEditor
16851607
Left = 32
16861608
Top = 532
16871609
end
1688-
object dlgOpenProductInstaller: TOpenDialog
1689-
DefaultExt = 'msi'
1690-
Filter = 'Product Installer Files (*.msi)|*.msi|All Files (*.*)|*.*'
1691-
Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
1692-
Title = 'Select Product Installer'
1693-
Left = 32
1694-
Top = 456
1695-
end
16961610
end

developer/src/tike/child/UfrmPackageEditor.pas

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ interface
6969
TfrmPackageEditor = class(TfrmTikeEditor) // I4689
7070
dlgFiles: TOpenDialog;
7171
dlgNewCustomisation: TSaveDialog;
72-
dlgOpenProductInstaller: TOpenDialog;
7372
pages: TLeftTabbedPageControl;
7473
pageFiles: TTabSheet;
7574
pageDetails: TTabSheet;
@@ -169,13 +168,6 @@ TfrmPackageEditor = class(TfrmTikeEditor) // I4689
169168
lblCompileTargetHeader: TLabel;
170169
cmdInstall: TButton;
171170
cmdUninstall: TButton;
172-
panBuildWindowsInstaller: TPanel;
173-
Label9: TLabel;
174-
lblBootstrapMSI: TLabel;
175-
lblInstallerOutputFilename: TLabel;
176-
editBootstrapMSI: TEdit;
177-
editInstallerOutputFilename: TEdit;
178-
cmdInstallWith: TButton;
179171
pageLexicalModels: TTabSheet;
180172
panLexicalModels: TPanel;
181173
lblLexlicalModels: TLabel;
@@ -200,7 +192,6 @@ TfrmPackageEditor = class(TfrmTikeEditor) // I4689
200192
panFileActions: TPanel;
201193
lblFileActions: TLabel;
202194
editOutPath: TEdit;
203-
cmdCompileInstaller: TButton;
204195
cmdAddToProject: TButton;
205196
cmdBuildPackage: TButton;
206197
Label5: TLabel;
@@ -256,8 +247,6 @@ TfrmPackageEditor = class(TfrmTikeEditor) // I4689
256247
procedure cmdUninstallClick(Sender: TObject);
257248
procedure cmdOpenContainingFolderClick(Sender: TObject);
258249
procedure cmdOpenFileClick(Sender: TObject);
259-
procedure cmdCompileInstallerClick(Sender: TObject);
260-
procedure cmdInstallWithClick(Sender: TObject);
261250
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
262251
procedure pagesChanging(Sender: TObject;
263252
var AllowChange: Boolean);
@@ -395,7 +384,6 @@ implementation
395384

396385
CharMapDropTool,
397386
CharMapInsertMode,
398-
CompilePackageInstaller,
399387
Keyman.Developer.System.Project.kpsProjectFile,
400388
Keyman.Developer.System.Project.kpsProjectFileAction,
401389
Keyman.Developer.System.ServerAPI,
@@ -492,17 +480,6 @@ procedure TfrmPackageEditor.SourceChanged(Sender: TObject);
492480
Modified := True;
493481
end;
494482

495-
procedure TfrmPackageEditor.cmdCompileInstallerClick(Sender: TObject);
496-
begin
497-
if Untitled or Modified then // I2178
498-
ShowMessage('You must save the package before you can build it.')
499-
else
500-
begin
501-
frmMessages.Clear;
502-
DoAction(pfaCompileInstaller);
503-
end;
504-
end;
505-
506483
procedure TfrmPackageEditor.cmdCopyDebuggerLinkClick(Sender: TObject);
507484
begin
508485
try
@@ -1267,17 +1244,6 @@ procedure TfrmPackageEditor.cmdInstallClick(Sender: TObject);
12671244
DoAction(pfaInstall);
12681245
end;
12691246

1270-
procedure TfrmPackageEditor.cmdInstallWithClick(Sender: TObject);
1271-
begin
1272-
dlgOpenProductInstaller.FileName := pack.KPSOptions.MSIFileName;
1273-
if dlgOpenProductInstaller.Execute then
1274-
begin
1275-
pack.KPSOptions.MSIFileName := dlgOpenProductInstaller.FileName;
1276-
Modified := True;
1277-
UpdateData;
1278-
end;
1279-
end;
1280-
12811247
{-------------------------------------------------------------------------------
12821248
- Display refresh routines -
12831249
-------------------------------------------------------------------------------}
@@ -1350,10 +1316,6 @@ procedure TfrmPackageEditor.UpdateData;
13501316
editStartMenuPath.Text := pack.StartMenu.Path;
13511317

13521318
editOutPath.Text := (ProjectFile as TkpsProjectFile).TargetFilename; // I4688
1353-
editBootstrapMSI.Text := pack.KPSOptions.MSIFileName;
1354-
if pack.KPSOptions.MSIFileName = ''
1355-
then editInstallerOutputFilename.Text := ''
1356-
else editInstallerOutputFilename.Text := (ProjectFile as TkpsProjectFile).TargetInstallerFileName; // I4688
13571319

13581320
if lbFiles.Items.Count > 0 then lbFiles.ItemIndex := 0;
13591321
lbFilesClick(lbFiles);
@@ -1983,7 +1945,6 @@ procedure TfrmPackageEditor.RefreshTargetPanels;
19831945
end;
19841946

19851947
panBuildDesktop.Visible := FHasDesktopTarget;
1986-
panBuildWindowsInstaller.Visible := FHasDesktopTarget;
19871948
panBuildMobile.Visible := FHasMobileTarget;
19881949
end;
19891950

developer/src/tike/project/Keyman.Developer.System.Project.kpsProjectFileAction.pas

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,13 @@ interface
1515

1616
type
1717
TkpsProjectFileAction = class(TkpsProjectFile)
18-
private
19-
procedure SelfMessage(Sender: TObject; msg: string; State: TProjectLogState); // I4706
20-
2118
public
22-
function CompilePackageInstaller(APack: TKPSFile; FSilent: Boolean): Boolean;
2319
function CompilePackage: Boolean;
2420
function Clean: Boolean;
2521
end;
2622

2723
implementation
2824

29-
uses
30-
compile,
31-
CompilePackageInstaller,
32-
Keyman.Developer.System.ValidateKpsFile,
33-
PackageInfo,
34-
utilexecute;
35-
3625
function TkpsProjectFileAction.CompilePackage: Boolean;
3726
var
3827
w: TKmcWrapper;
@@ -46,59 +35,13 @@ function TkpsProjectFileAction.CompilePackage: Boolean;
4635
end;
4736
end;
4837

49-
function TkpsProjectFileAction.CompilePackageInstaller(APack: TKPSFile; FSilent: Boolean): Boolean;
50-
var
51-
pack: TKPSFile;
52-
begin
53-
HasCompileWarning := False; // I4706
54-
55-
if APack = nil then
56-
begin
57-
pack := TKPSFile.Create;
58-
pack.FileName := FileName;
59-
pack.LoadXML;
60-
end
61-
else
62-
pack := APack;
63-
64-
try
65-
try
66-
Result := DoCompilePackageInstaller(pack, SelfMessage, FSilent, '', TargetInstallerFilename, '', False, True, '', '', '', False, False);
67-
if HasCompileWarning and (WarnAsError or OwnerProject.Options.CompilerWarningsAsErrors) then // I4706
68-
Result := False;
69-
70-
if Result
71-
then Log(plsSuccess, '''' + FileName + ''' compiled successfully.', 0, 0)
72-
else Log(plsFailure, '''' + FileName + ''' was not compiled successfully.', 0, 0);
73-
except
74-
on E:Exception do
75-
begin
76-
Log(plsError, E.Message, CERR_ERROR, 0);
77-
Log(plsFailure, '''' + FileName + ''' was not compiled successfully.', 0, 0);
78-
Result := False;
79-
end;
80-
end;
81-
82-
finally
83-
if APack = nil then
84-
pack.Free;
85-
end;
86-
end;
87-
8838
function TkpsProjectFileAction.Clean: Boolean;
8939
begin
9040
CleanFile(OutputFileName);
9141
CleanFile(TargetInstallerFilename); // I4737
9242
Result := True;
9343
end;
9444

95-
procedure TkpsProjectFileAction.SelfMessage(Sender: TObject; msg: string; State: TProjectLogState); // I4706
96-
begin
97-
if State = plsWarning then
98-
HasCompileWarning := True;
99-
Log(State, msg, 0, 0);
100-
end;
101-
10245
initialization
10346
RegisterProjectFileType('.kps', TkpsProjectFileAction);
10447
end.

developer/src/tike/project/Keyman.Developer.UI.Project.ProjectFileUI.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface
3434

3535
type
3636
TProjectFileAction = (pfaCompile, pfaInstall, pfaUninstall, pfaDebug,
37-
pfaTestKeymanWeb, pfaCompileInstaller, pfaFontHelper, pfaFontDialog, pfaClean); // I4057
37+
pfaTestKeymanWeb, pfaFontHelper, pfaFontDialog, pfaClean); // I4057
3838

3939
TProjectUI = class(TProject)
4040
private

developer/src/tike/project/Keyman.Developer.UI.Project.UfrmProject.pas

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -549,21 +549,6 @@ procedure TfrmProject.WebCommandProject(Command: WideString; Params: TStringList
549549
(FGlobalProject.Files[i].UI as TProjectFileUI).DoAction(pfaCompile, False);
550550
end;
551551
end
552-
else if Command = 'package_compileallinstallers' then // I4734
553-
begin
554-
ClearMessages;
555-
for i := 0 to FGlobalProject.Files.Count - 1 do
556-
begin
557-
if FGlobalProject.Files[i] is TkpsProjectFile then
558-
(FGlobalProject.Files[i].UI as TProjectFileUI).DoAction(pfaCompileInstaller, False);
559-
end;
560-
end
561-
else if Command = 'package_compileinstaller' then
562-
begin
563-
ClearMessages;
564-
pf := SelectedProjectFile;
565-
if Assigned(pf) then (pf.UI as TProjectFileUI).DoAction(pfaCompileInstaller, False);
566-
end
567552
else if Command = 'package_cleanall' then // I4692
568553
begin
569554
ClearMessages;

0 commit comments

Comments
 (0)