소스 검색

Merged revisions 4073 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

........
r4073 | karoly | 2006-07-02 12:40:10 +0200 (Sun, 02 Jul 2006) | 2 lines

+ fixed scripts to have proper deletedir commands
........

git-svn-id: branches/fixes_2_0@4077 -

Károly Balogh 19 년 전
부모
커밋
ad01f1d113
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      compiler/link.pas
  2. 2 2
      compiler/script.pas

+ 1 - 1
compiler/link.pas

@@ -671,7 +671,7 @@ begin
    else
    else
     begin
     begin
       AsmRes.AddDeleteCommand(FixFileName(smartpath+current_module.asmprefix^+'*'+target_info.objext));
       AsmRes.AddDeleteCommand(FixFileName(smartpath+current_module.asmprefix^+'*'+target_info.objext));
-      AsmRes.Add('rmdir '+smartpath);
+      AsmRes.AddDeleteDirCommand(smartpath);
     end;
     end;
   MakeStaticLibrary:=success;
   MakeStaticLibrary:=success;
 end;
 end;

+ 2 - 2
compiler/script.pas

@@ -329,13 +329,13 @@ end;
 
 
 Procedure TAsmScriptAmiga.AddDeleteCommand (Const FileName : String);
 Procedure TAsmScriptAmiga.AddDeleteCommand (Const FileName : String);
 begin
 begin
- Add('Delete ' + PathConv(MaybeQuoted(ScriptFixFileName(FileName))) + ' All Quiet');
+ Add('Delete ' + PathConv(MaybeQuoted(ScriptFixFileName(FileName))) + ' Quiet');
 end;
 end;
 
 
 
 
 Procedure TAsmScriptAmiga.AddDeleteDirCommand (Const FileName : String);
 Procedure TAsmScriptAmiga.AddDeleteDirCommand (Const FileName : String);
 begin
 begin
- Add('Delete ' + PathConv(MaybeQuoted(ScriptFixFileName(FileName))));
+ Add('Delete ' + PathConv(MaybeQuoted(ScriptFixFileName(FileName))) + ' All Quiet');
 end;
 end;