Changeset 6 for trunk/UInstance.pas

Timestamp:

Feb 4, 2011, 9:45:01 AM (13 years ago)

Author:

chronos

Message:

• Modified: Source selection separated to single form.
• Added: Starting compiler and IDE with updated paths in configuration files.

File:

• trunk/UInstance.pas (modified) (6 diffs)

trunk/UInstance.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, USource, Contnrs, Process, Forms, Controls,
-  FileUtil;
+  FileUtil, Dialogs;
 
 type
@@ -14 +14 @@
   TInstance = class
   private
+    function GetCompiled: Boolean;
     function GetDownloaded: Boolean;
   public
     Id: Integer;
     Name: string;
-    Compiled: Boolean;
     IDESource: TSource;
     IDERevision: string;
@@ -27 +27 @@
     procedure Build;
     procedure Start;
+    procedure UpdateLazarusConfig;
+    procedure UpdateFPCConfig;
     function GetPath: string;
     property Downloaded: Boolean read GetDownloaded;
+    property Compiled: Boolean read GetCompiled;
   end;
 
@@ -56 +59 @@
 { TInstance }
 
+function TInstance.GetCompiled: Boolean;
+begin
+  Result := FileExistsUTF8(GetPath + DirectorySeparator + FPCSource.ProjectShortName +
+    DirectorySeparator + 'bin' + DirectorySeparator +
+    MainForm.Platform + DirectorySeparator + FPCSource.GetExecutableFile);
+  if Assigned(IDESource) then Result := Result and
+    FileExistsUTF8(GetPath + DirectorySeparator + IDESource.ProjectShortName +
+    DirectorySeparator + IDESource.GetExecutableFile);
+end;
+
 function TInstance.GetDownloaded: Boolean;
 begin
@@ -65 +78 @@
 procedure TInstance.Build;
 begin
-  OperationProgressForm.Environment := 'path=' + //GetEnvironmentVariable('PATH') + ';' +
-    MainForm.GetBinUtilsDir;
+  (*OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir;
   OperationProgressForm.Path := GetPath + DirectorySeparator + FPCSource.ProjectShortName;
-  OperationProgressForm.CommandLine :=
-    '"' + MainForm.GetBinUtilsDir + DirectorySeparator + 'make.exe" clean all PP="' +
-    MainForm.GetBinUtilsDir + '"';
+  OperationProgressForm.CommandLine := 'make all PP="' +
+    MainForm.GetBinUtilsDir + DirectorySeparator + 'fpc"';
   OperationProgressForm.ShowModal;
 
+  OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir;
   OperationProgressForm.Path := GetPath + DirectorySeparator + FPCSource.ProjectShortName;
-  OperationProgressForm.CommandLine :=
-    '"' + MainForm.GetBinUtilsDir + DirectorySeparator + 'make.exe" install PREFIX="' +
+  OperationProgressForm.CommandLine := 'make install PREFIX="' +
     GetPath + DirectorySeparator + FPCSource.ProjectShortName + '"' +
-    ' PP="' + MainForm.GetBinUtilsDir + '"';
+    ' PP="' + MainForm.GetBinUtilsDir + DirectorySeparator + 'fpc"';
   OperationProgressForm.ShowModal;
+  *)
 
   if Assigned(IDESource) then begin
+    OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir;
     OperationProgressForm.Path := GetPath + DirectorySeparator + IDESource.ProjectShortName;
     OperationProgressForm.CommandLine :=
-      '"' + MainForm.GetBinUtilsDir + DirectorySeparator + 'make.exe" bigideclean bigide OPT="-Xg"';
+      'make bigideclean bigide OPT="-Xg"';
     OperationProgressForm.ShowModal;
   end;
@@ -94 +107 @@
   if Assigned(IDESource) then
   try
+    UpdateFPCConfig;
+    UpdateLazarusConfig;
     Process := TProcess.Create(nil);
     Process.CurrentDirectory := GetPath + DirectorySeparator + IDESource.ProjectShortName;
-    Process.CommandLine := IDESource.GetExecutableFile;
+    Process.CommandLine := GetPath + DirectorySeparator + IDESource.ProjectShortName +
+      DirectorySeparator + IDESource.GetExecutableFile + ' --primary-config-path=' +
+      GetPath + DirectorySeparator + IDESource.ProjectShortName +
+      DirectorySeparator + 'config';
     Process.Execute;
   finally
     Process.Free;
+  end;
+end;
+
+procedure TInstance.UpdateLazarusConfig;
+var
+  Config: TStringList;
+begin
+  try
+    Config := TStringList.Create;
+    Config.LoadFromFile(MainForm.GetBaseDir + DirectorySeparator +
+      MainForm.TemplateDir + DirectorySeparator + 'environmentoptions.xml');
+    Config.Text := StringReplace(Config.Text, '%FPCDir%', GetPath + DirectorySeparator + FPCSource.ProjectShortName, [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%BaseDir%', MainForm.GetBaseDir, [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%LazarusDir%', GetPath + DirectorySeparator + IDESource.ProjectShortName, [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%FPCPlatform%', MainForm.Platform, [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%Temp%', GetEnvironmentVariableUTF8('Temp'), [rfReplaceAll]);
+    Config.SaveToFile(GetPath + DirectorySeparator + IDESource.ProjectShortName +
+      DirectorySeparator + 'config' + DirectorySeparator + 'environmentoptions.xml');
+  finally
+    Config.Free;
+  end;
+end;
+
+procedure TInstance.UpdateFPCConfig;
+var
+  Config: TStringList;
+begin
+  try
+    Config := TStringList.Create;
+    Config.LoadFromFile(MainForm.GetBaseDir + DirectorySeparator +
+      MainForm.TemplateDir + DirectorySeparator + 'fpc.cfg');
+    Config.Text := StringReplace(Config.Text, '$(FPCDir)', GetPath +
+      DirectorySeparator + FPCSource.ProjectShortName, [rfReplaceAll]);
+    Config.SaveToFile(GetPath + DirectorySeparator + FPCSource.ProjectShortName +
+      DirectorySeparator + 'bin' + DirectorySeparator +
+      MainForm.Platform + DirectorySeparator + 'fpc.cfg');
+  finally
+    Config.Free;
   end;
 end;