paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 10:37:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move unitt ParsedCompilerOpts and CompilerOptions to package IdeConfig.

Browse Source
This commit is contained in:
Juha 2024-04-06 15:38:38 +03:00
parent 201af675d3
commit 817427e89e
28 changed files with 88 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
converter/convertdelphi.pas
View File

@ -46,10 +46,9 @@ uses
// IDEIntf
IDEDialogs, LazIDEIntf, IDEOptEditorIntf, EditorSyntaxHighlighterDef,
// IdeConfig
IDEProcs,
IDEProcs, ParsedCompilerOpts, CompilerOptions,
// IDE
DialogProcs, ParsedCompilerOpts, CompilerOptions, ProjPackCommon, Project,
PackageDefs, PackageSystem, PackageEditor,
DialogProcs, ProjPackCommon, Project, PackageDefs, PackageSystem, PackageEditor,
BasePkgManager, LazarusIDEStrConsts, SearchPathProcs, SourceFileManager,
// Converter
ConverterTypes, ConvertSettings, ConvCodeTool, MissingUnits, MissingPropertiesDlg,

1
ide/allcompileroptions.pas
View File

@ -35,6 +35,7 @@ uses
LazUTF8, LazLoggerBase,
// IdeIntf
IDEImagesIntf,
// IDE
Compiler, LazarusIDEStrConsts;
type

5
ide/buildlazdialog.pas
View File

@ -60,11 +60,10 @@ uses
IdeIntfStrConsts, LazIDEIntf, IDEMsgIntf, IDEHelpIntf, IDEImagesIntf, IDEWindowIntf,
PackageIntf, IDEExternToolIntf, IDEDialogs, IDEUtils,
// IdeConfig
EnvironmentOpts, LazConf, TransferMacros,
EnvironmentOpts, LazConf, TransferMacros, ParsedCompilerOpts, CompilerOptions,
// IDE
LazarusIDEStrConsts, DialogProcs, MainBar, ApplicationBundle, ModeMatrixOpts,
ParsedCompilerOpts, CompilerOptions, BuildProfileManager, GenericListEditor,
GenericCheckList, PackageSystem, PackageDefs;
BuildProfileManager, GenericListEditor, GenericCheckList, PackageSystem, PackageDefs;
type

5
ide/buildmanager.pas
View File

@ -52,11 +52,10 @@ uses
IDEDialogs, LazIDEIntf, IDEMsgIntf, SrcEditorIntf, InputHistory,
// IdeConfig
LazConf, EnvironmentOpts, ModeMatrixOpts, TransferMacros, IdeConfStrConsts,
IDEProcs, etMakeMsgParser,
IDEProcs, etMakeMsgParser, etFPCMsgFilePool, ParsedCompilerOpts, CompilerOptions,
// IDE
LazarusIDEStrConsts, DialogProcs, EditDefineTree, ProjectResources,
MiscOptions, ParsedCompilerOpts, CompilerOptions,
ExtTools, etFPCMsgFilePool, etFPCMsgParser, etPas2jsMsgParser, Compiler,
MiscOptions, ExtTools, etFPCMsgParser, etPas2jsMsgParser, Compiler,
FPCSrcScan, PackageDefs, PackageSystem, Project, ProjectIcon, BaseBuildManager,
ApplicationBundle, RunParamsOpts, IdeTransferMacros, SearchPathProcs;

4
ide/buildmodesmanager.pas
View File

@ -40,9 +40,9 @@ uses
IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf,
IDEWindowIntf,
// IdeConfig
EnvironmentOpts, TransferMacros, SearchPathProcs,
EnvironmentOpts, TransferMacros, SearchPathProcs, ParsedCompilerOpts, CompilerOptions,
// IDE
MainBase, MainBar, BasePkgManager, PackageDefs, Project, ParsedCompilerOpts, CompilerOptions,
MainBase, MainBar, BasePkgManager, PackageDefs, Project,
BaseBuildManager, Compiler_ModeMatrix, BuildModeDiffDlg, GenericCheckList,
LazarusIDEStrConsts;

4
ide/checkcompileropts.pas
View File

@ -43,9 +43,9 @@ uses
ProjectIntf, MacroIntf, IDEExternToolIntf, LazIDEIntf, IDEDialogs,
PackageIntf, IDEMsgIntf,
// IdeConfig
TransferMacros, SearchPathProcs, IDEProcs,
TransferMacros, SearchPathProcs, IDEProcs, ParsedCompilerOpts, CompilerOptions,
// IDE
Project, PackageSystem, LazarusIDEStrConsts, PackageDefs, ParsedCompilerOpts, CompilerOptions;
Project, PackageSystem, PackageDefs, LazarusIDEStrConsts;
type
TCompilerOptionsTest = (

5
ide/etfpcmsgparser.pas
View File

@ -45,9 +45,10 @@ uses
// IDEIntf
LazIDEIntf, IDEUtils,
// IdeConfig
EnvironmentOpts, LazConf, IDECmdLine, SearchPathProcs, etMakeMsgParser,
EnvironmentOpts, LazConf, IDECmdLine, SearchPathProcs,
etMakeMsgParser, etFPCMsgFilePool,
// IDE
etFPCMsgFilePool, LazarusIDEStrConsts;
LazarusIDEStrConsts;
const
FPCMsgIDCompiling = 3104;

5
ide/frames/compiler_buildmacro_options.pas
View File

@ -33,9 +33,10 @@ uses
// CodeTools
KeywordFuncLists, CodeToolsCfgScript,
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, MacroIntf, IDEImagesIntf, IDEDialogs,
IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, MacroIntf, IDEImagesIntf,
IDEDialogs, ParsedCompilerOpts, CompilerOptions,
// IDE
ParsedCompilerOpts, CompilerOptions, LazarusIDEStrConsts, PackageDefs;
LazarusIDEStrConsts, PackageDefs;
type
TCBMNodeType = (

4
ide/frames/compiler_messages_options.pas
View File

@ -18,8 +18,10 @@ uses
IDEOptionsIntf, IDEExternToolIntf, CompOptsIntf,
// IdeIntf
IDEOptEditorIntf, IDEDialogs,
// IdeConfig
etFPCMsgFilePool,
// IDE
CompilerOptions, etFPCMsgFilePool, LazarusIDEStrConsts;
CompilerOptions, LazarusIDEStrConsts;
type

4
ide/frames/compiler_other_options.pas
View File

@ -39,8 +39,10 @@ uses
IDEOptionsIntf, IDEOptEditorIntf, CompOptsIntf, IDECommands,
// SynEdit
SynEdit, SynEditKeyCmds, SynCompletion,
// IdeConfig
ParsedCompilerOpts, CompilerOptions,
// IDE
LazarusIDEStrConsts, ParsedCompilerOpts, CompilerOptions, Compiler,
LazarusIDEStrConsts, Compiler,
AllCompilerOptions, DefinesGui, EditorOptions, PackageDefs, SourceSynEditor;
type

4
ide/frames/compiler_path_options.pas
View File

@ -13,9 +13,9 @@ uses
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, CompOptsIntf, IDEImagesIntf, IDEDialogs,
// IdeConfig
SearchPathProcs,
SearchPathProcs, ParsedCompilerOpts, CompilerOptions,
// IDE
Project, ParsedCompilerOpts, CompilerOptions, LazarusIDEStrConsts, PathEditorDlg,
Project, LazarusIDEStrConsts, PathEditorDlg,
CheckCompilerOpts, ShowCompilerOpts, ImExportCompilerOpts;
type

16
ide/lazarus.lpi
View File

@ -691,11 +691,6 @@
<IsPartOfProject Value="True"/>
<UnitName Value="etFPCMsgParser"/>
</Unit>
<Unit>
<Filename Value="etmakemsgparser.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="etMakeMsgParser"/>
</Unit>
<Unit>
<Filename Value="etmessageframe.pas"/>
<IsPartOfProject Value="True"/>
@ -735,11 +730,6 @@
<ResourceBaseClass Value="Frame"/>
<UnitName Value="MsgWnd_Options"/>
</Unit>
<Unit>
<Filename Value="compileroptions.pp"/>
<IsPartOfProject Value="True"/>
<UnitName Value="CompilerOptions"/>
</Unit>
<Unit>
<Filename Value="exttools.pas"/>
<IsPartOfProject Value="True"/>
@ -1278,6 +1268,7 @@
<Filename Value="showcompileropts.pas"/>
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
<UnitName Value="ShowCompilerOpts"/>
</Unit>
<Unit>
<Filename Value="cleandirdlg.pas"/>
@ -1507,11 +1498,6 @@
<ResourceBaseClass Value="Frame"/>
<UnitName Value="Project_DisplayFormat_Options"/>
</Unit>
<Unit>
<Filename Value="etfpcmsgfilepool.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="etFPCMsgFilePool"/>
</Unit>
</Units>
</ProjectOptions>
<CompilerOptions>

1
ide/lazarusidestrconsts.pas
View File

@ -5977,7 +5977,6 @@ resourcestring
lisPENoFilesMissingAllFilesExist = 'No files missing. All files exist.';
lisCurrentLCLWidgetSet = 'Current LCL widgetset: "%s"';
lisSelectAnotherLCLWidgetSet = 'Select another LCL widgetset (macro LCLWidgetType)';
lisEndlessLoopInMacros = 'Endless loop in macros';
// Uses Unit dialog
dlgUseUnitCaption = 'Add unit to Uses section';

4
ide/lazbuild.lpr
View File

@ -40,9 +40,9 @@ uses
BaseIDEIntf, MacroIntf, PackageIntf, LazMsgWorker, ProjectIntf, IDEExternToolIntf,
CompOptsIntf, IDEOptionsIntf, PackageDependencyIntf,
// IdeConfig
LazConf, IDECmdLine, TransferMacros, EnvironmentOpts,
LazConf, IDECmdLine, TransferMacros, EnvironmentOpts, ParsedCompilerOpts, CompilerOptions,
// IDE
InitialSetupProc, ExtToolsConsole, ParsedCompilerOpts, CompilerOptions, ApplicationBundle,
InitialSetupProc, ExtToolsConsole, ApplicationBundle,
IDETranslations, LazarusIDEStrConsts, MiscOptions, Project, PackageDefs,
PackageLinks, PackageSystem, InterPkgConflictFiles, BuildLazDialog,
BuildProfileManager, BuildManager, BaseBuildManager, ModeMatrixOpts;

6
ide/compileroptions.pp → ide/packages/ideconfig/compileroptions.pp
View File

@ -4,10 +4,8 @@
Compiler options sets the switches for the project
file for the FPC compiler.
Initial Revision : Sat May 10 23:15:32 CST 1999
***************************************************************************/
***************************************************************************
@ -53,9 +51,7 @@ uses
ProjectIntf, MacroIntf, IDEExternToolIntf, CompOptsIntf, IDEOptionsIntf,
// IdeConfig
LazConf, EnvironmentOpts, SearchPathProcs, IdeXmlConfigProcs, TransferMacros,
IDEProcs, ModeMatrixOpts, CompOptsModes,
// IDE
etFPCMsgFilePool, ParsedCompilerOpts;
IDEProcs, ModeMatrixOpts, CompOptsModes, etFPCMsgFilePool, ParsedCompilerOpts;
const
DefaultCompilerPath = '$(CompPath)';

6
ide/packages/ideconfig/fpmake.pp
View File

@ -50,6 +50,7 @@ begin
P.IncludePath.Add('include/$(OS)');
P.UnitPath.Add('.');
T:=P.Targets.AddUnit('ideconfig.pas');
t.Dependencies.AddUnit('compileroptions');
t.Dependencies.AddUnit('compoptsmodes');
t.Dependencies.AddUnit('coolbaroptions');
t.Dependencies.AddUnit('diffpatch');
@ -65,17 +66,19 @@ begin
t.Dependencies.AddUnit('idexmlconfigprocs');
t.Dependencies.AddUnit('lazconf');
t.Dependencies.AddUnit('modematrixopts');
t.Dependencies.AddUnit('parsedcompileropts');
t.Dependencies.AddUnit('recentlistprocs');
t.Dependencies.AddUnit('searchpathprocs');
t.Dependencies.AddUnit('toolbaroptionsbase');
t.Dependencies.AddUnit('transfermacros');
T:=P.Targets.AddUnit('compileroptions.pp');
T:=P.Targets.AddUnit('compoptsmodes.pas');
T:=P.Targets.AddUnit('coolbaroptions.pas');
T:=P.Targets.AddUnit('diffpatch.pas');
T:=P.Targets.AddUnit('editortoolbaroptions.pas');
T:=P.Targets.AddUnit('environmentopts.pp');
P.Targets.AddImplicitUnit('etfpcmsgfilepool.pas');
T:=P.Targets.AddUnit('etfpcmsgfilepool.pas');
T:=P.Targets.AddUnit('etmakemsgparser.pas');
T:=P.Targets.AddUnit('idecmdline.pas');
T:=P.Targets.AddUnit('ideconfstrconsts.pas');
@ -85,6 +88,7 @@ begin
T:=P.Targets.AddUnit('idexmlconfigprocs.pas');
T:=P.Targets.AddUnit('lazconf.pp');
T:=P.Targets.AddUnit('modematrixopts.pas');
T:=P.Targets.AddUnit('parsedcompileropts.pas');
T:=P.Targets.AddUnit('recentlistprocs.pas');
T:=P.Targets.AddUnit('searchpathprocs.pas');
T:=P.Targets.AddUnit('toolbaroptionsbase.pas');

8
ide/packages/ideconfig/ideconfig.lpk
View File

@ -23,6 +23,10 @@ Files in this package are for the main configuration of the IDE."/>
<License Value="GPLv2"/>
<Version Major="1"/>
<Files>
<Item>
<Filename Value="compileroptions.pp"/>
<UnitName Value="CompilerOptions"/>
</Item>
<Item>
<Filename Value="compoptsmodes.pas"/>
<UnitName Value="CompOptsModes"/>
@ -83,6 +87,10 @@ Files in this package are for the main configuration of the IDE."/>
<Filename Value="modematrixopts.pas"/>
<UnitName Value="ModeMatrixOpts"/>
</Item>
<Item>
<Filename Value="parsedcompileropts.pas"/>
<UnitName Value="ParsedCompilerOpts"/>
</Item>
<Item>
<Filename Value="recentlistprocs.pas"/>
<UnitName Value="RecentListProcs"/>

11
ide/packages/ideconfig/ideconfig.pas
View File

@ -8,11 +8,12 @@ unit IdeConfig;
interface
uses
CompOptsModes, CoolBarOptions, DiffPatch, EditorToolBarOptions,
EnvironmentOpts, etFPCMsgFilePool, etMakeMsgParser, IDECmdLine,
IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, IDEProcs, IdeXmlConfigProcs,
LazConf, ModeMatrixOpts, RecentListProcs, SearchPathProcs,
ToolBarOptionsBase, TransferMacros, LazarusPackageIntf;
CompilerOptions, CompOptsModes, CoolBarOptions, DiffPatch,
EditorToolBarOptions, EnvironmentOpts, etFPCMsgFilePool, etMakeMsgParser,
IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs, IDEProcs,
IdeXmlConfigProcs, LazConf, ModeMatrixOpts, ParsedCompilerOpts,
RecentListProcs, SearchPathProcs, ToolBarOptionsBase, TransferMacros,
LazarusPackageIntf;
implementation

1
ide/packages/ideconfig/ideconfstrconsts.pas
View File

@ -24,6 +24,7 @@ resourcestring
lisTMunknownMacro = '(unknown macro: %s)';
lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier';
lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.';
lisEndlessLoopInMacros = 'Endless loop in macros';
implementation

24
ide/parsedcompileropts.pas → ide/packages/ideconfig/parsedcompileropts.pas
View File

@ -1,3 +1,23 @@
{
***************************************************************************
* *
* This source is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This code is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* General Public License for more details. *
* *
* A copy of the GNU General Public License is available on the World *
* Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also *
* obtain it by writing to the Free Software Foundation, *
* Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1335, USA. *
* *
***************************************************************************
}
unit ParsedCompilerOpts;
{$mode ObjFPC}{$H+}
@ -15,9 +35,7 @@ uses
// BuildIntf
CompOptsIntf, MacroIntf,
// IdeConfig
EnvironmentOpts, TransferMacros, SearchPathProcs, ModeMatrixOpts,
// IDE
LazarusIDEStrConsts;
EnvironmentOpts, TransferMacros, SearchPathProcs, ModeMatrixOpts, IdeConfStrConsts;
type

3
ide/project.pp
View File

@ -65,8 +65,9 @@ uses
// IdeConfig
EnvironmentOpts, LazConf, TransferMacros, SearchPathProcs, IdeXmlConfigProcs,
IDECmdLine, IDEProcs, CompOptsModes, ModeMatrixOpts,
ParsedCompilerOpts, CompilerOptions,
// IDE
ProjectResources, ProjectIcon, ParsedCompilerOpts, CompilerOptions, RunParamsOpts,
ProjectResources, ProjectIcon, RunParamsOpts,
ProjectDefs, EditDefineTree, LazarusIDEStrConsts,
ProjPackCommon, PackageDefs, PackageSystem;

5
ide/showcompileropts.pas
View File

@ -44,10 +44,9 @@ uses
CodeToolsCfgScript,
// IdeIntf
BaseIDEIntf, LazIDEIntf, IDEImagesIntf, CompOptsIntf, ProjectIntf,
PackageIntf, MacroIntf,
PackageIntf, MacroIntf, ParsedCompilerOpts, CompilerOptions,
// IDE
LazarusIDEStrConsts, Project, PackageDefs,
ParsedCompilerOpts, CompilerOptions, ModeMatrixOpts, MiscOptions;
LazarusIDEStrConsts, Project, PackageDefs, ModeMatrixOpts, MiscOptions;
type
TShowCompToolOpts = class

3
ide/sourcefilemanager.pas
View File

@ -54,10 +54,11 @@ uses
UnitResources, InputHistory,
// IdeConfig
EnvironmentOpts, SearchPathProcs, TransferMacros, RecentListProcs, IDEProcs,
ParsedCompilerOpts, CompilerOptions,
// IDE
DialogProcs, IDEProtocol, LazarusIDEStrConsts, NewDialog,
NewProjectDlg, MainBase, MainBar, MainIntf, Project, ProjectDefs,
ProjectInspector, ParsedCompilerOpts, CompilerOptions, SourceSynEditor, SourceEditor,
ProjectInspector, SourceSynEditor, SourceEditor,
EditorOptions, CustomFormEditor, ControlSelection,
FormEditor, EmptyMethodsDlg, BaseDebugManager, BuildManager,
EditorMacroListViewer, FindRenameIdentifier, BuildModesManager, ViewUnit_Dlg,

3
packager/interpkgconflictfiles.pas
View File

@ -65,8 +65,9 @@ uses
ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf,
// IdeConfig
EnvironmentOpts, TransferMacros, IDEProcs, SearchPathProcs,
ParsedCompilerOpts, CompilerOptions,
// IDE
ParsedCompilerOpts, CompilerOptions, DialogProcs, LazarusIDEStrConsts, PackageDefs, PackageSystem;
DialogProcs, LazarusIDEStrConsts, PackageDefs, PackageSystem;
type
TPGInterPkgOwnerInfo = class

6
packager/packagedefs.pas
View File

@ -51,10 +51,10 @@ uses
MacroIntf, MacroDefIntf, CompOptsIntf, IDEOptionsIntf, PublishModuleIntf, ComponentReg,
PackageDependencyIntf, PackageIntf, FppkgIntf, LazMsgWorker, BaseIDEIntf,
// IdeConfig
TransferMacros, IDEProcs, IDEOptionDefs, CompOptsModes, SearchPathProcs, IdeXmlConfigProcs,
TransferMacros, IDEProcs, IDEOptionDefs, CompOptsModes, SearchPathProcs,
IdeXmlConfigProcs, ParsedCompilerOpts, CompilerOptions,
// IDE
EditDefineTree, ParsedCompilerOpts, CompilerOptions, ProjPackCommon,
LazarusIDEStrConsts, FppkgHelper;
EditDefineTree, ProjPackCommon, LazarusIDEStrConsts, FppkgHelper;
type
TLazPackage = class;

4
packager/packageeditor.pas
View File

@ -50,9 +50,9 @@ uses
IDEImagesIntf, MenuIntf, LazIDEIntf, FormEditingIntf, IDEHelpIntf, InputHistory,
IdeIntfStrConsts, IDEWindowIntf, IDEDialogs, IDEOptEditorIntf,
// IdeConfig
EnvironmentOpts, SearchPathProcs,
EnvironmentOpts, SearchPathProcs, ParsedCompilerOpts, CompilerOptions,
// IDE
MainBase, DialogProcs, LazarusIDEStrConsts, IDEDefs, ParsedCompilerOpts, CompilerOptions,
MainBase, DialogProcs, LazarusIDEStrConsts, IDEDefs,
PackageSystem, PackageDefs, AddToPackageDlg, AddPkgDependencyDlg, ComponentPalette,
AddFPMakeDependencyDlg, ProjPackChecks, PkgVirtualUnitEditor, CleanPkgDeps,
MissingPkgFilesDlg, ProjPackFilePropGui, ProjPackEditing, BasePkgManager;

3
packager/packagesystem.pas
View File

@ -62,8 +62,9 @@ uses
LazarusPackageIntf,
// IdeConfig
EnvironmentOpts, LazConf, TransferMacros, IDEProcs, SearchPathProcs,
ParsedCompilerOpts, CompilerOptions,
// IDE
LazarusIDEStrConsts, DialogProcs, IDETranslations, ParsedCompilerOpts, CompilerOptions,
LazarusIDEStrConsts, DialogProcs, IDETranslations,
PackageLinks, PackageDefs, FppkgHelper, PkgSysBasePkgs;
const

6
packager/pkgmanager.pas
View File

@ -64,14 +64,14 @@ uses
IdeIntfStrConsts, ComponentEditors, PropEdits, IDEDialogs,
UnitResources, InputHistory,
// IdeConfig
EnvironmentOpts, IDEOptionDefs, ModeMatrixOpts, RecentListProcs,
SearchPathProcs, TransferMacros, IDECmdLine, IDEProcs,
EnvironmentOpts, IDEOptionDefs, ModeMatrixOpts, RecentListProcs, SearchPathProcs,
TransferMacros, IDECmdLine, IDEProcs, ParsedCompilerOpts, CompilerOptions,
// FCL registration
LazarusPackageIntf,
// IDE
LazarusIDEStrConsts, DialogProcs, MiscOptions,
Project, ProjPackEditing, AddToPackageDlg, PackageDefs, PackageLinks, PackageSystem,
OpenInstalledPkgDlg, PkgGraphExplorer, BrokenDependenciesDlg, ParsedCompilerOpts, CompilerOptions,
OpenInstalledPkgDlg, PkgGraphExplorer, BrokenDependenciesDlg,
IDETranslations, BuildLazDialog, NewDialog, FindInFilesDlg,
ProjectInspector, PackageEditor, SourceEditor, ProjPackChecks, AddFileToAPackageDlg,
PublishModuleDlg, PkgLinksDlg, InterPkgConflictFiles, InstallPkgSetDlg,