Changeset 13 for trunk/UInstance.pas

Timestamp:

Dec 18, 2017, 10:13:15 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 1.8.0.

File:

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

trunk/UInstance.pas

@@ -62 +62 @@
 function TInstance.GetCompiled: Boolean;
 begin
-  Result := FileExistsUTF8(GetBinPath + DirectorySeparator + FPCSource.GetExecutableFile);
+  Result := FileExists(GetBinPath + DirectorySeparator + FPCSource.GetExecutableFile);
   if Assigned(IDESource) then Result := Result and
-    FileExistsUTF8(GetPath + DirectorySeparator + IDESource.ProjectShortName +
+    FileExists(GetPath + DirectorySeparator + IDESource.ProjectShortName +
     DirectorySeparator + IDESource.GetExecutableFile);
 end;
@@ -70 +70 @@
 function TInstance.GetDownloaded: Boolean;
 begin
-  Result := DirectoryExistsUTF8(GetPath + DirectorySeparator + FPCSource.ProjectShortName);
+  Result := DirectoryExists(GetPath + DirectorySeparator + FPCSource.ProjectShortName);
   if Assigned(IDESource) then Result := Result and
-    DirectoryExistsUTF8(GetPath + DirectorySeparator + IDESource.ProjectShortName);
+    DirectoryExists(GetPath + DirectorySeparator + IDESource.ProjectShortName);
 end;
 
@@ -100 +100 @@
     OperationProgressForm.Path := GetPath + DirectorySeparator + IDESource.ProjectShortName;
     OperationProgressForm.CommandLine :=
-      'make bigideclean bigide OPT="-Xg"';
+      'make OPT="-Xg"';
     OperationProgressForm.ShowModal;
   end;
@@ -148 +148 @@
   ConfigPath := GetPath + DirectorySeparator + IDESource.ProjectShortName +
     DirectorySeparator + 'config';
-  ForceDirectoriesUTF8(ConfigPath);
+  ForceDirectories(ConfigPath);
   ConfigFileName := ConfigPath + DirectorySeparator + 'environmentoptions.xml';
-  if not FileExistsUTF8(ConfigFileName) then
+  if not FileExists(ConfigFileName) then
   try
     Config := TStringList.Create;
@@ -161 +161 @@
     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, '%Temp%', GetEnvironmentVariable('TEMP'), [rfReplaceAll]);
     Config.Text := StringReplace(Config.Text, '%GDB%', MainForm.GetBinUtilsDir + DirectorySeparator + 'mingw\gdb.exe', [rfReplaceAll]);
     {$ENDIF}