Changeset 12 for trunk/UInstance.pas

Timestamp:

Apr 4, 2011, 2:13:06 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Instance environment configuration for Windows.

File:

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

trunk/UInstance.pas

@@ -117 +117 @@
     Process := TProcess.Create(nil);
 
+    {$IFDEF Linux}
     for I := 0 to GetEnvironmentVariableCount - 1 do
       Process.Environment.Add(GetEnvironmentString(I));
@@ -123 +124 @@
       '/lib/fpc/' + FPCSource.VersionNumber + ':' + Process.Environment.Values['PATH'];
     Process.Environment.Values['PPC_CONFIG_PATH'] := GetBinPath;
-    ShowMessage(Process.Environment.Text);
-
+    //ShowMessage(Process.Environment.Text);
+    {$ENDIF}
+    {$IFDEF Windows}
+    OperationProgressForm.Environment := 'PATH=' + MainForm.GetBinUtilsDir;
+    {$ENDIF}
     Process.CurrentDirectory := GetPath + DirectorySeparator + IDESource.ProjectShortName;
     Process.CommandLine := GetPath + DirectorySeparator + IDESource.ProjectShortName +
@@ -154 +158 @@
     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, '%FPCCompiler%', GetBinPath + DirectorySeparator + FPCSource.ExecutableFile, [rfReplaceAll]);
-    Config.Text := StringReplace(Config.Text, '%Make%', MainForm.GetBinUtilsDir + DirectorySeparator + 'make', [rfReplaceAll]);
-    {$IFDEF Windows}
+    {$IFDEF Windows}
+    Config.Text := StringReplace(Config.Text, '%Make%', MainForm.GetBinUtilsDir + DirectorySeparator + 'make.exe', [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%FPCCompiler%', GetBinPath + DirectorySeparator + FPCSource.ExecutableFile + '.exe', [rfReplaceAll]);
     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, '%Make%', MainForm.GetBinUtilsDir + DirectorySeparator + 'make', [rfReplaceAll]);
+    Config.Text := StringReplace(Config.Text, '%FPCCompiler%', GetBinPath + DirectorySeparator + FPCSource.ExecutableFile, [rfReplaceAll]);
     Config.Text := StringReplace(Config.Text, '%Temp%', '/tmp', [rfReplaceAll]);
     Config.Text := StringReplace(Config.Text, '%GDB%', '/usr/bin/gdb', [rfReplaceAll]);