IDEIntf: project build modes

git-svn-id: trunk@50431 -

components/ideintf/projectintf.pas

@@ -17,7 +17,8 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LazFileUtils, Controls, Forms, AvgLvlTree,
-  NewItemIntf, ProjPackIntf, CompOptsIntf, ObjInspStrConsts, LazFileCache;
+  NewItemIntf, ProjPackIntf, CompOptsIntf, ObjInspStrConsts, LazFileCache,
+  LazMethodList;
 
 const
   FileDescGroupName = 'File';
@@ -349,6 +350,50 @@ type
       Read fIncludeSystemVariables Write fIncludeSystemVariables;
   end;
 
+  { TLazProjectBuildMode }
+
+  TLazProjectBuildMode = class(TComponent)
+  private
+    FChangeStamp: int64;
+    fSavedChangeStamp: int64;
+    fOnChanged: TMethodList;
+    function GetModified: boolean;
+    procedure SetIdentifier(AValue: string);
+    procedure SetInSession(AValue: boolean);
+    procedure SetModified(AValue: boolean);
+  protected
+    FIdentifier: string;
+    FInSession: boolean;
+    procedure OnItemChanged(Sender: TObject);
+    function GetLazCompilerOptions: TLazCompilerOptions; virtual; abstract;
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    property ChangeStamp: int64 read FChangeStamp;
+    procedure IncreaseChangeStamp;
+    procedure AddOnChangedHandler(const Handler: TNotifyEvent);
+    procedure RemoveOnChangedHandler(const Handler: TNotifyEvent);
+    function GetCaption: string; virtual; abstract;
+    function GetIndex: integer; virtual; abstract;
+    property Name; // See Identifier for the name of the buildmode
+    property InSession: boolean read FInSession write SetInSession;
+    property Identifier: string read FIdentifier write SetIdentifier;// arbitrary string
+    property Modified: boolean read GetModified write SetModified;
+    property LazCompilerOptions: TLazCompilerOptions read GetLazCompilerOptions;
+  end;
+
+  { TProjectBuildModes }
+
+  TLazProjectBuildModes = class(TComponent)
+  protected
+    FChangeStamp: integer;
+    function GetLazBuildModes(Index: integer): TLazProjectBuildMode; virtual; abstract;
+  public
+    function Count: integer; virtual; abstract;
+    property ChangeStamp: integer read FChangeStamp;
+    property BuildModes[Index: integer]: TLazProjectBuildMode read GetLazBuildModes;
+  end;
+
   { TLazProject - interface class to a Lazarus project }
 
   TProjectFileSearchFlag = (
@@ -396,6 +441,7 @@ type
     function GetMainFile: TLazProjectFile; virtual; abstract;
     function GetMainFileID: Integer; virtual; abstract;
     function GetModified: boolean; virtual; abstract;
+    function GetLazBuildModes: TLazProjectBuildModes; virtual; abstract;
     function GetProjectInfoFile: string; virtual; abstract;
     function GetUseManifest: boolean; virtual; abstract;
     procedure SetExecutableType(const AValue: TProjectExecutableType); virtual;
@@ -434,9 +480,9 @@ type
     function GetTitleOrName: string; // GetTitle, if this is '' then GetDefaultTitle
   public
     property ChangeStamp: integer read FChangeStamp;
-    property MainFileID: Integer read GetMainFileID write SetMainFileID;
     property Files[Index: integer]: TLazProjectFile read GetFiles;
     property FileCount: integer read GetFileCount;
+    property MainFileID: Integer read GetMainFileID write SetMainFileID;
     property MainFile: TLazProjectFile read GetMainFile;
     property Title: String read FTitle write SetTitle;
     property Flags: TProjectFlags read FFlags write SetFlags;
@@ -444,6 +490,7 @@ type
                  write SetExecutableType;// read from MainFile, not saved to lpi
     property ProjectInfoFile: string read GetProjectInfoFile write SetProjectInfoFile;
     property ProjectSessionFile: string read FProjectSessionFile write SetProjectSessionFile;
+    property LazBuildModes: TLazProjectBuildModes read GetLazBuildModes;
     property SessionStorage: TProjectSessionStorage read FSessionStorage write SetSessionStorage;
     // project data (not units, session), units have their own Modified
     property Modified: boolean read GetModified write SetModified;
@@ -1003,6 +1050,87 @@ begin
   Result:=mrOk;
 end;
 
+{ TLazProjectBuildMode }
+
+function TLazProjectBuildMode.GetModified: boolean;
+begin
+  Result:=fSavedChangeStamp<>FChangeStamp;
+end;
+
+procedure TLazProjectBuildMode.SetIdentifier(AValue: string);
+begin
+  if FIdentifier=AValue then exit;
+  FIdentifier:=AValue;
+  {$IFDEF VerboseIDEModified}
+  debugln(['TLazProjectBuildMode.SetIdentifier ',AValue]);
+  {$ENDIF}
+  IncreaseChangeStamp;
+end;
+
+procedure TLazProjectBuildMode.SetInSession(AValue: boolean);
+begin
+  if FInSession=AValue then exit;
+  FInSession:=AValue;
+  {$IFDEF VerboseIDEModified}
+  debugln(['TLazProjectBuildMode.SetInSession ',AValue]);
+  {$ENDIF}
+  IncreaseChangeStamp;
+end;
+
+procedure TLazProjectBuildMode.OnItemChanged(Sender: TObject);
+begin
+  {$IFDEF VerboseIDEModified}
+  debugln(['TLazProjectBuildMode.OnItemChanged ',DbgSName(Sender)]);
+  {$ENDIF}
+  IncreaseChangeStamp;
+end;
+
+procedure TLazProjectBuildMode.SetModified(AValue: boolean);
+begin
+  if AValue then
+    IncreaseChangeStamp
+  else begin
+    fSavedChangeStamp:=FChangeStamp;
+    LazCompilerOptions.Modified:=false;
+  end;
+end;
+
+constructor TLazProjectBuildMode.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  fOnChanged:=TMethodList.Create;
+  FChangeStamp:=LUInvalidChangeStamp64;
+  fSavedChangeStamp:=FChangeStamp;
+end;
+
+destructor TLazProjectBuildMode.Destroy;
+begin
+  FreeAndNil(fOnChanged);
+  inherited Destroy;
+end;
+
+procedure TLazProjectBuildMode.IncreaseChangeStamp;
+begin
+  {$IFDEF VerboseIDEModified}
+  if not Modified then begin
+    debugln(['TLazProjectBuildMode.IncreaseChangeStamp ']);
+  end;
+  {$ENDIF}
+  LUIncreaseChangeStamp64(FChangeStamp);
+  if fOnChanged<>nil then fOnChanged.CallNotifyEvents(Self);
+end;
+
+procedure TLazProjectBuildMode.AddOnChangedHandler(const Handler: TNotifyEvent);
+begin
+  fOnChanged.Add(TMethod(Handler));
+end;
+
+procedure TLazProjectBuildMode.RemoveOnChangedHandler(
+  const Handler: TNotifyEvent);
+begin
+  fOnChanged.Remove(TMethod(Handler));
+end;
+
 { TLazProject }
 
 procedure TLazProject.SetFlags(const AValue: TProjectFlags);

ide/project.pp

@@ -573,19 +573,11 @@ type
 
   { TProjectBuildMode }
 
-  TProjectBuildMode = class(TComponent)
+  TProjectBuildMode = class(TLazProjectBuildMode)
   private
-    FChangeStamp: int64;
-    fSavedChangeStamp: int64;
     FCompilerOptions: TProjectCompilerOptions;
-    FIdentifier: string;
+  protected
-    FInSession: boolean;
+    function GetLazCompilerOptions: TLazCompilerOptions; override;
-    fOnChanged: TMethodList;
-    function GetModified: boolean;
-    procedure SetIdentifier(const AValue: string);
-    procedure SetInSession(const AValue: boolean);
-    procedure OnItemChanged(Sender: TObject);
-    procedure SetModified(const AValue: boolean);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -599,28 +591,18 @@ type
     procedure SaveMacroValuesAtOldPlace(XMLConfig: TXMLConfig; const Path: string);
     procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string;
                               IsDefault: Boolean; var Cnt: integer);
-    property ChangeStamp: int64 read FChangeStamp;
+    function GetCaption: string; override;
-    procedure IncreaseChangeStamp;
+    function GetIndex: integer; override;
-    procedure AddOnChangedHandler(const Handler: TNotifyEvent);
-    procedure RemoveOnChangedHandler(const Handler: TNotifyEvent);
-    function GetCaption: string;
-    function GetIndex: integer;
   public
-    property Name; // See Identifier for the name of the buildmode
-    property InSession: boolean read FInSession write SetInSession;
-    property Identifier: string read FIdentifier write SetIdentifier;// arbitrary string
-    property Modified: boolean read GetModified write SetModified;
-
     // copied by Assign, compared by Equals, cleared by Clear
     property CompilerOptions: TProjectCompilerOptions read FCompilerOptions;
   end;
 
   { TProjectBuildModes }
 
-  TProjectBuildModes = class(TComponent)
+  TProjectBuildModes = class(TLazProjectBuildModes)
   private
     FAssigning: Boolean;
-    FChangeStamp: integer;
     FSessionMatrixOptions: TBuildMatrixOptions;
     FSharedMatrixOptions: TBuildMatrixOptions;
     fSavedChangeStamp: int64;
@@ -645,6 +627,8 @@ type
     // Used by SaveToXMLConfig
     procedure SaveSessionData(const Path: string);
     procedure SaveSharedMatrixOptions(const Path: string);
+  protected
+    function GetLazBuildModes(Index: integer): TLazProjectBuildMode; override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -657,7 +641,7 @@ type
     function Find(Identifier: string): TProjectBuildMode;
     function Add(Identifier: string): TProjectBuildMode;
     procedure Move(FromIndex, ToIndex: integer);
-    function Count: integer;
+    function Count: integer; override;
     procedure IncreaseChangeStamp;
     procedure AddOnChangedHandler(const Handler: TNotifyEvent);
     procedure RemoveOnChangedHandler(const Handler: TNotifyEvent);
@@ -856,6 +840,7 @@ type
     function GetMainFile: TLazProjectFile; override;
     function GetMainFileID: Integer; override;
     procedure SetMainFileID(const AValue: Integer); override;
+    function GetLazBuildModes: TLazProjectBuildModes; override;
     function GetFiles(Index: integer): TLazProjectFile; override;
     procedure SetFlags(const AValue: TProjectFlags); override;
     function GetModified: boolean; override;
@@ -5766,6 +5751,11 @@ begin
   MainUnitID:=AValue;
 end;
 
+function TProject.GetLazBuildModes: TLazProjectBuildModes;
+begin
+  Result:=FBuildModes;
+end;
+
 procedure TProject.AddToList(AnUnitInfo: TUnitInfo; ListType: TUnitInfoList);
 begin
   // add to list if AnUnitInfo is not in list
@@ -6588,55 +6578,14 @@ end;
 
 { TProjectBuildMode }
 
-procedure TProjectBuildMode.SetInSession(const AValue: boolean);
+function TProjectBuildMode.GetLazCompilerOptions: TLazCompilerOptions;
 begin
-  if FInSession=AValue then exit;
+  Result:=FCompilerOptions;
-  FInSession:=AValue;
-  {$IFDEF VerboseIDEModified}
-  debugln(['TProjectBuildMode.SetInSession ',AValue]);
-  {$ENDIF}
-  IncreaseChangeStamp;
-end;
-
-procedure TProjectBuildMode.OnItemChanged(Sender: TObject);
-begin
-  {$IFDEF VerboseIDEModified}
-  debugln(['TProjectBuildMode.OnItemChanged ',DbgSName(Sender)]);
-  {$ENDIF}
-  IncreaseChangeStamp;
-end;
-
-procedure TProjectBuildMode.SetModified(const AValue: boolean);
-begin
-  if AValue then
-    IncreaseChangeStamp
-  else begin
-    fSavedChangeStamp:=FChangeStamp;
-    FCompilerOptions.Modified:=false;
-  end;
-end;
-
-procedure TProjectBuildMode.SetIdentifier(const AValue: string);
-begin
-  if FIdentifier=AValue then exit;
-  FIdentifier:=AValue;
-  {$IFDEF VerboseIDEModified}
-  debugln(['TProjectBuildMode.SetIdentifier ',AValue]);
-  {$ENDIF}
-  IncreaseChangeStamp;
-end;
-
-function TProjectBuildMode.GetModified: boolean;
-begin
-  Result:=fSavedChangeStamp<>FChangeStamp;
 end;
 
 constructor TProjectBuildMode.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
-  fOnChanged:=TMethodList.Create;
-  FChangeStamp:=CTInvalidChangeStamp64;
-  fSavedChangeStamp:=FChangeStamp;
   FCompilerOptions:=TProjectCompilerOptions.Create(LazProject);
   FCompilerOptions.AddOnChangedHandler(@OnItemChanged);
   FCompilerOptions.FBuildMode:=Self;
@@ -6644,7 +6593,6 @@ end;
 
 destructor TProjectBuildMode.Destroy;
 begin
-  FreeAndNil(fOnChanged);
   FreeAndNil(FCompilerOptions);
   inherited Destroy;
 end;
@@ -6719,28 +6667,6 @@ begin
   end;
 end;
 
-procedure TProjectBuildMode.IncreaseChangeStamp;
-begin
-  {$IFDEF VerboseIDEModified}
-  if not Modified then begin
-    debugln(['TProjectBuildMode.IncreaseChangeStamp ']);
-    CTDumpStack;
-  end;
-  {$ENDIF}
-  CTIncreaseChangeStamp64(FChangeStamp);
-  if fOnChanged<>nil then fOnChanged.CallNotifyEvents(Self);
-end;
-
-procedure TProjectBuildMode.AddOnChangedHandler(const Handler: TNotifyEvent);
-begin
-  fOnChanged.Add(TMethod(Handler));
-end;
-
-procedure TProjectBuildMode.RemoveOnChangedHandler(const Handler: TNotifyEvent);
-begin
-  fOnChanged.Remove(TMethod(Handler));
-end;
-
 function TProjectBuildMode.GetCaption: string;
 var
   i: Integer;
@@ -7223,6 +7149,12 @@ begin
   SharedMatrixOptions.SaveToXMLConfig(FXMLConfig, Path+'BuildModes/SharedMatrixOptions/',@IsSharedMode);
 end;
 
+function TProjectBuildModes.GetLazBuildModes(Index: integer
+  ): TLazProjectBuildMode;
+begin
+  Result:=TLazProjectBuildMode(fItems[Index]);
+end;
+
 // SaveToXMLConfig itself
 procedure TProjectBuildModes.SaveProjOptsToXMLConfig(XMLConfig: TXMLConfig;
   const Path: string; SaveSession: boolean);
@@ -7258,6 +7190,7 @@ begin
   FXMLConfig.SetDeleteValue(Path+'BuildModes/Count',Cnt,0);
 end;
 
+
 initialization
   RegisterIDEOptionsGroup(GroupProject, TProjectIDEOptions);
   RegisterIDEOptionsGroup(GroupCompiler, TProjectCompilerOptions);