From 0a9b1e5b63f983dc65cb2c328c1a384bb00932a6 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 6 Mar 2005 13:48:59 +0000
Subject: [PATCH]   + Units & Exe dir may now contain $fpc... valus   * version
 to 1.0.4 increased

---
 ide/fpcompil.pas | 14 ++++++++++----
 ide/fpconst.pas  |  8 ++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ide/fpcompil.pas b/ide/fpcompil.pas
index e1f020c3f7..698c0985e5 100644
--- a/ide/fpcompil.pas
+++ b/ide/fpcompil.pas
@@ -133,6 +133,7 @@ uses
 {$ifdef fpc}
   Video,
 {$endif fpc}
+  globals,
   StdDlg,App,tokens,
   FVConsts,
   CompHook, Compiler, systems, browcol,
@@ -966,6 +967,7 @@ begin
     EXEFile:=FixFileName(GetEXEPath+NameOf(MainFile)+GetTargetExeExt)
   else
     EXEFile:=DirOf(MainFile)+NameOf(MainFile)+GetTargetExeExt;
+  DefaultReplacements(ExeFile);
   { tokens are created and distroyed by compiler.compile !! PM }
   InitTokens;
   if LinkAfter and
@@ -1147,9 +1149,9 @@ begin
         for I:=0 to SourceFiles^.Count-1 do
           begin
             SF:=SourceFiles^.At(I);
-            SourceTime:=GetFileTime(SF^.GetSourceFileName);
-            PPUTime:=GetFileTime(SF^.GetPPUFileName);
-            ObjTime:=GetFileTime(SF^.GetObjFileName);
+            SourceTime:=wutils.GetFileTime(SF^.GetSourceFileName);
+            PPUTime:=wutils.GetFileTime(SF^.GetPPUFileName);
+            ObjTime:=wutils.GetFileTime(SF^.GetObjFileName);
 {            writeln('S: ',SF^.GetSourceFileName,' - ',SourceTime);
             writeln('P: ',SF^.GetPPUFileName,' - ',PPUTime);
             writeln('O: ',SF^.GetObjFileName,' - ',ObjTime);
@@ -1277,7 +1279,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.37  2005-02-28 15:38:38  marco
+  Revision 1.38  2005-03-06 13:48:59  florian
+    + Units & Exe dir may now contain $fpc... valus
+    * version to 1.0.4 increased
+
+  Revision 1.37  2005/02/28 15:38:38  marco
    * getFPCheapstatus  (no, FPC HEAP, not FP CHEAP!)
 
   Revision 1.36  2005/02/14 17:13:18  peter
diff --git a/ide/fpconst.pas b/ide/fpconst.pas
index 13e34d76ef..c75cc0f9f2 100644
--- a/ide/fpconst.pas
+++ b/ide/fpconst.pas
@@ -22,7 +22,7 @@ uses Views,App,
      WViews,WEditor,WHTMLHlp;
 
 const
-     VersionStr           = '1.0.2';
+     VersionStr           = '1.0.4';
 
      MaxRecentFileCount   = 9;
      MaxToolCount         = 16;
@@ -474,7 +474,11 @@ implementation
 END.
 {
   $Log$
-  Revision 1.21  2005-02-14 17:13:18  peter
+  Revision 1.22  2005-03-06 13:48:59  florian
+    + Units & Exe dir may now contain $fpc... valus
+    * version to 1.0.4 increased
+
+  Revision 1.21  2005/02/14 17:13:18  peter
     * truncate log
 
   Revision 1.20  2005/01/08 13:43:44  florian