paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 02:19:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: keep PathDelim in .lpk files

Browse Source 
git-svn-id: trunk@18164 -
This commit is contained in:
mattias 2009-01-06 11:10:13 +00:00
parent 1f1aa8a31a
commit ce4f251804
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packager/packagedefs.pas
View File

@ -635,6 +635,7 @@ type
FRemovedFiles: TFPList; // TFPList of TPkgFile FRemovedFiles: TFPList; // TFPList of TPkgFile
FSourceDirectories: TFileReferenceList; FSourceDirectories: TFileReferenceList;
FStateFileDate: longint; FStateFileDate: longint;
FStorePathDelim: TPathDelimSwitch;
FTopologicalLevel: integer; FTopologicalLevel: integer;
FTranslated: string; FTranslated: string;
FUpdateLock: integer; FUpdateLock: integer;
@ -672,6 +673,7 @@ type
procedure SetModified(const AValue: boolean); procedure SetModified(const AValue: boolean);
procedure SetPackageEditor(const AValue: TBasePackageEditor); procedure SetPackageEditor(const AValue: TBasePackageEditor);
procedure SetPackageType(const AValue: TLazPackageType); procedure SetPackageType(const AValue: TLazPackageType);
procedure SetStorePathDelim(const AValue: TPathDelimSwitch);
procedure SetUserReadOnly(const AValue: boolean); procedure SetUserReadOnly(const AValue: boolean);
procedure OnMacroListSubstitution(TheMacro: TTransferMacro; procedure OnMacroListSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string; const MacroName: string; var s: string;
@ -839,6 +841,7 @@ type
property RemovedFiles[Index: integer]: TPkgFile read GetRemovedFiles; property RemovedFiles[Index: integer]: TPkgFile read GetRemovedFiles;
property SourceDirectories: TFileReferenceList read FSourceDirectories; property SourceDirectories: TFileReferenceList read FSourceDirectories;
property StateFileDate: longint read FStateFileDate write FStateFileDate; property StateFileDate: longint read FStateFileDate write FStateFileDate;
property StorePathDelim: TPathDelimSwitch read FStorePathDelim write SetStorePathDelim;
property TopologicalLevel: integer read FTopologicalLevel write FTopologicalLevel; property TopologicalLevel: integer read FTopologicalLevel write FTopologicalLevel;
property Translated: string read FTranslated write FTranslated; property Translated: string read FTranslated write FTranslated;
property UsageOptions: TPkgAdditionalCompilerOptions read FUsageOptions; property UsageOptions: TPkgAdditionalCompilerOptions read FUsageOptions;
@ -2448,6 +2451,12 @@ begin
Modified:=true; Modified:=true;
end; end;
procedure TLazPackage.SetStorePathDelim(const AValue: TPathDelimSwitch);
begin
if FStorePathDelim=AValue then exit;
FStorePathDelim:=AValue;
end;
constructor TLazPackage.Create; constructor TLazPackage.Create;
begin begin
inherited Create; inherited Create;
@ -2554,6 +2563,7 @@ begin
end else begin end else begin
FFlags:=[lpfDestroying]; FFlags:=[lpfDestroying];
end; end;
FStorePathDelim:=pdsNone;
end; end;
procedure TLazPackage.UpdateSourceDirectories; procedure TLazPackage.UpdateSourceDirectories;
@ -2651,7 +2661,7 @@ begin
Clear; Clear;
Filename:=OldFilename; Filename:=OldFilename;
LockModified; LockModified;
PathDelimChanged:=XMLConfig.GetValue(Path+'PathDelim/Value','/')<>PathDelim; StorePathDelim:=CheckPathDelim(XMLConfig.GetValue(Path+'PathDelim/Value','/'),PathDelimChanged);
Name:=XMLConfig.GetValue(Path+'Name/Value',''); Name:=XMLConfig.GetValue(Path+'Name/Value','');
FPackageType:=LazPackageTypeIdentToType(XMLConfig.GetValue(Path+'Type/Value', FPackageType:=LazPackageTypeIdentToType(XMLConfig.GetValue(Path+'Type/Value',
LazPackageTypeIdents[lptRunTime])); LazPackageTypeIdents[lptRunTime]));
@ -2705,6 +2715,11 @@ procedure TLazPackage.SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string
var var
UsePathDelim: TPathDelimSwitch; UsePathDelim: TPathDelimSwitch;
function f(const AFilename: string): string;
begin
Result:=SwitchPathDelims(AFilename,UsePathDelim);
end;
procedure SaveFiles(const ThePath: string; List: TFPList); procedure SaveFiles(const ThePath: string; List: TFPList);
var var
i: Integer; i: Integer;
@ -2724,7 +2739,7 @@ var
end; end;
begin begin
UsePathDelim:=pdsNone; UsePathDelim:=StorePathDelim;
XMLConfig.SetValue(Path+'Version',LazPkgXMLFileVersion); XMLConfig.SetValue(Path+'Version',LazPkgXMLFileVersion);
XMLConfig.SetDeleteValue(Path+'PathDelim/Value',PathDelimSwitchToDelim[UsePathDelim],'/'); XMLConfig.SetDeleteValue(Path+'PathDelim/Value',PathDelimSwitchToDelim[UsePathDelim],'/');
XMLConfig.SetDeleteValue(Path+'Name/Value',FName,''); XMLConfig.SetDeleteValue(Path+'Name/Value',FName,'');
@ -2739,13 +2754,13 @@ begin
FVersion.SaveToXMLConfig(XMLConfig,Path+'Version/'); FVersion.SaveToXMLConfig(XMLConfig,Path+'Version/');
SaveFiles(Path+'Files/',FFiles); SaveFiles(Path+'Files/',FFiles);
SaveFlags(Path); SaveFlags(Path);
XMLConfig.SetDeleteValue(Path+'IconFile/Value',FIconFile,''); XMLConfig.SetDeleteValue(Path+'IconFile/Value',f(FIconFile),'');
XMLConfig.SetDeleteValue(Path+'Name/Value',FName,''); XMLConfig.SetDeleteValue(Path+'Name/Value',FName,'');
XMLConfig.SetDeleteValue(Path+'OutputStateFile/Value',OutputStateFile,''); XMLConfig.SetDeleteValue(Path+'OutputStateFile/Value',f(OutputStateFile),'');
XMLConfig.SetDeleteValue(Path+'LazDoc/Paths',FLazDocPaths,''); XMLConfig.SetDeleteValue(Path+'LazDoc/Paths',f(FLazDocPaths),'');
XMLConfig.SetDeleteValue(Path+'i18n/EnableI18N/Value', EnableI18N, false); XMLConfig.SetDeleteValue(Path+'i18n/EnableI18N/Value', EnableI18N, false);
XMLConfig.SetDeleteValue(Path+'i18n/OutDir/Value',FPOOutputDirectory, ''); XMLConfig.SetDeleteValue(Path+'i18n/OutDir/Value',f(FPOOutputDirectory), '');
XMLConfig.SetDeleteValue(Path+'Type/Value',LazPackageTypeIdents[FPackageType], XMLConfig.SetDeleteValue(Path+'Type/Value',LazPackageTypeIdents[FPackageType],
LazPackageTypeIdents[lptRunTime]); LazPackageTypeIdents[lptRunTime]);