Changeset 9 for trunk/UInstance.pas

Timestamp:

Feb 12, 2011, 12:33:04 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Instance compilation on Linux.

Location:

trunk

Files:

• . (modified) (1 prop)
• UInstance.pas (modified) (7 diffs)

trunk

@@ -4 +4 @@
 Source
 Instance
+FreePascalManager

@@ -4 +4 @@
 Source
 Instance
+FreePascalManager

trunk/UInstance.pas

@@ -30 +30 @@
     procedure UpdateFPCConfig;
     function GetPath: string;
+    function GetBinPath: string;
     property Downloaded: Boolean read GetDownloaded;
     property Compiled: Boolean read GetCompiled;
@@ -61 +62 @@
 function TInstance.GetCompiled: Boolean;
 begin
-  Result := FileExistsUTF8(GetPath + DirectorySeparator + FPCSource.ProjectShortName +
-    DirectorySeparator + 'bin' + DirectorySeparator +
-    MainForm.Platform + DirectorySeparator + FPCSource.GetExecutableFile);
+  Result := FileExistsUTF8(GetBinPath + DirectorySeparator + FPCSource.GetExecutableFile);
   if Assigned(IDESource) then Result := Result and
     FileExistsUTF8(GetPath + DirectorySeparator + IDESource.ProjectShortName +
@@ -78 +77 @@
 procedure TInstance.Build;
 begin
-  OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir;
+  {$IFDEF Windows}
+  OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir;
+  {$ENDIF}
   OperationProgressForm.Path := GetPath + DirectorySeparator + FPCSource.ProjectShortName;
   OperationProgressForm.CommandLine := 'make clean all PP="' +
-    MainForm.GetBinUtilsDir + DirectorySeparator + 'fpc"';
+    MainForm.GetCompilerPath + '"';
   OperationProgressForm.ShowModal;
 
-  OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir;
+  {$IFDEF Windows}
+  OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir;
+  {$ENDIF}
   OperationProgressForm.Path := GetPath + DirectorySeparator + FPCSource.ProjectShortName;
-  OperationProgressForm.CommandLine := 'make install PREFIX="' +
-    GetPath + DirectorySeparator + FPCSource.ProjectShortName + '"' +
-    ' PP="' + MainForm.GetBinUtilsDir + DirectorySeparator + 'fpc"';
+  OperationProgressForm.CommandLine := 'make install PREFIX=' +
+    GetPath + DirectorySeparator + FPCSource.ProjectShortName + '' +
+    ' PP=' + MainForm.GetCompilerPath + '';
   OperationProgressForm.ShowModal;
 
   if Assigned(IDESource) then begin
-    OperationProgressForm.Environment := 'path=' + MainForm.GetBinUtilsDir;
+    {$IFDEF Windows}
+    OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir;
+    {$ENDIF}
     OperationProgressForm.Path := GetPath + DirectorySeparator + IDESource.ProjectShortName;
     OperationProgressForm.CommandLine :=
@@ -124 +129 @@
   Config: TStringList;
   ConfigFileName: string;
+  ConfigPath: string;
 begin
-  ConfigFileName := GetPath + DirectorySeparator + IDESource.ProjectShortName +
-    DirectorySeparator + 'config' + DirectorySeparator + 'environmentoptions.xml';
+  ConfigPath := GetPath + DirectorySeparator + IDESource.ProjectShortName +
+    DirectorySeparator + 'config';
+  ForceDirectoriesUTF8(ConfigPath);
+  ConfigFileName := ConfigPath + DirectorySeparator + 'environmentoptions.xml';
   if not FileExistsUTF8(ConfigFileName) then
   try
@@ -135 +143 @@
     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.Text := StringReplace(Config.Text, '%FPCCompiler%', GetBinPath + DirectorySeparator + FPCSource.ExecutableFile, [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%Make%', MainForm.GetBinUtilsDir + DirectorySeparator + 'make', [rfReplaceAll]);
+    {$IFDEF Windows}
+    Config.Text := StringReplace(Config.Text, '%Temp%', GetEnvironmentVariableUTF8('TEMP'), [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%GDB%', MainForm.GetBinUtilsDir + DirectorySeparator + 'mingw\gdb.exe', [rfReplaceAll]);
+    {$ENDIF}
+    {$IFDEF Linux}
+    Config.Text := StringReplace(Config.Text, '%Temp%', '/tmp', [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%GDB%', '/usr/bin/gdb', [rfReplaceAll]);
+    {$ENDIF}
     Config.SaveToFile(ConfigFileName);
   finally
@@ -153 +169 @@
     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');
+    Config.SaveToFile(GetBinPath + DirectorySeparator + 'fpc.cfg');
   finally
     Config.Free;
@@ -167 +181 @@
 end;
 
+function TInstance.GetBinPath: string;
+begin
+  Result := GetPath + DirectorySeparator + FPCSource.ProjectShortName +
+    DirectorySeparator + 'bin';
+  {$IFDEF Windows}
+  Result := Result + DirectorySeparator +  MainForm.Platform;
+  {$ENDIF}
+end;
+
 end.
 

@@ -4 +4 @@
 Source
 Instance
+FreePascalManager