Changeset 11 for trunk/UInstance.pas

Timestamp:

Mar 19, 2011, 12:17:53 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Right setting of FPC instance location on Linux for Lazarus.

File:

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

trunk/UInstance.pas

@@ -108 +108 @@
 var
   Process: TProcess;
+  I: Integer;
 begin
   if Assigned(IDESource) then
@@ -113 +114 @@
     UpdateFPCConfig;
     UpdateLazarusConfig;
+
     Process := TProcess.Create(nil);
+
+    for I := 0 to GetEnvironmentVariableCount - 1 do
+      Process.Environment.Add(GetEnvironmentString(I));
+
+    Process.Environment.Values['PATH'] := GetPath + DirectorySeparator + FPCSource.ProjectShortName +
+      '/lib/fpc/' + FPCSource.VersionNumber + ':' + Process.Environment.Values['PATH'];
+    Process.Environment.Values['PPC_CONFIG_PATH'] := GetBinPath;
+    ShowMessage(Process.Environment.Text);
+
     Process.CurrentDirectory := GetPath + DirectorySeparator + IDESource.ProjectShortName;
     Process.CommandLine := GetPath + DirectorySeparator + IDESource.ProjectShortName +
@@ -167 +178 @@
     Config.LoadFromFile(MainForm.GetBaseDir + DirectorySeparator +
       MainForm.TemplateDir + DirectorySeparator + 'fpc.cfg');
+    {$IFDEF Windows}
     Config.Text := StringReplace(Config.Text, '$(FPCDir)', GetPath +
       DirectorySeparator + FPCSource.ProjectShortName, [rfReplaceAll]);
+    {$ENDIF}
+    {$IFDEF Linux}
+    Config.Text := StringReplace(Config.Text, '$(FPCDir)', GetPath +
+      DirectorySeparator + FPCSource.ProjectShortName +
+      '/lib/fpc/' + FPCSource.VersionNumber, [rfReplaceAll]);
+    {$ENDIF}
     Config.SaveToFile(GetBinPath + DirectorySeparator + 'fpc.cfg');
   finally