Changeset 29 for trunk

Timestamp:

Feb 13, 2012, 7:21:04 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Distinguish between windows and linux long file name commandline handling.

Location:

trunk/Compiler

Files:

• UCompiler.pas (modified) (5 diffs)
• UCompilerC.pas (modified) (2 diffs)

trunk/Compiler/UCompiler.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, StrUtils, Registry, URegistry, SpecializedList,
+  Classes, SysUtils, StrUtils, Registry, URegistry, SpecializedList, Dialogs,
   FileUtil, Process;
 
@@ -18 +18 @@
     Indent: Integer;
     procedure AddLine(Text: string);
+    function LongFileName(FileName: string): string;
   public
     Name: string;
@@ -93 +94 @@
 end;
 
+function TBrainFuckCompiler.LongFileName(FileName: string): string;
+begin
+  Result := FileName;
+  {$IFDEF Windows}
+  Result := '"' + FileName + '"';
+  {$ENDIF}
+  {$IFDEF Linux}
+  Result := StringReplace(FileName, ' ', '\ ', [rfReplaceAll]);
+  {$ENDIF}
+end;
+
 constructor TBrainFuckCompiler.Create;
 begin
@@ -129 +141 @@
     Process := TProcess.Create(nil);
     Process.CurrentDirectory := ExtractFilePath(CompilerPath);
-    Process.CommandLine := '"' + CompilerPath + '" "' + CompiledFile + '"';
+    Process.CommandLine := LongFileName(CompilerPath) + ' ' + LongFileName(CompiledFile);
     Process.Options := [poWaitOnExit];
     Process.Execute;
@@ -148 +160 @@
   try
     Process := TProcess.Create(nil);
-    Process.CommandLine := '"' + CompiledFile + '"';
+    Process.CommandLine := LongFileName(CompiledFile);
     Process.Options := [poWaitOnExit];
     Process.Execute;

trunk/Compiler/UCompilerC.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, UCompiler, Process;
+  Classes, SysUtils, FileUtil, UCompiler, Process, Dialogs;
 
 type
@@ -124 +124 @@
     Process := TProcess.Create(nil);
     Process.CurrentDirectory := ExtractFilePath(CompilerPath);
-    Process.CommandLine := '"' + CompilerPath + '" "' + CompiledFile + '" -o ' +
-      ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension;
+    Process.CommandLine := LongFileName(CompilerPath) + ' ' + LongFileName(CompiledFile) + ' -o ' +
+      LongFileName(ExtractFilePath(CompiledFile) + ExtractFileNameOnly(CompiledFile) + CompiledExtension);
     Process.Options := [poWaitOnExit];
     Process.Execute;