Browse Source

do not search for sources of released ppu files

git-svn-id: trunk@4818 -
micha 19 years ago
parent
commit
a3c1250cd3
4 changed files with 11 additions and 16 deletions
  1. 7 10
      compiler/fppu.pas
  2. 2 4
      compiler/msg/errore.msg
  3. 1 1
      compiler/msgidx.inc
  4. 1 1
      compiler/msgtxt.inc

+ 7 - 10
compiler/fppu.pas

@@ -684,7 +684,9 @@ uses
         source_time   : longint;
         hp            : tinputfile;
       begin
-        sources_avail:=true;
+        sources_avail:=(flags and uf_release) = 0;
+        if not sources_avail then
+          exit;
         is_main:=true;
         main_dir:='';
         while not ppufile.endofentry do
@@ -744,13 +746,9 @@ uses
                   if (orgfiletime<>-1) and
                      (source_time<>orgfiletime) then
                     begin
-                      if ((flags and uf_release)=0) then
-                        begin
-                          do_compile:=true;
-                          recompile_reason:=rr_sourcenewer;
-                        end
-                      else
-                        Message2(unit_h_source_modified,hs,ppufilename^);
+                      do_compile:=true;
+                      recompile_reason:=rr_sourcenewer;
+                      Message2(unit_u_source_modified,hs,ppufilename^);
                       temp:=temp+' *';
                     end;
                 end
@@ -773,8 +771,7 @@ uses
          end;
       { check if we want to rebuild every unit, only if the sources are
         available }
-        if do_build and sources_avail and
-           ((flags and uf_release)=0) then
+        if do_build and sources_avail then
           begin
              do_compile:=true;
              recompile_reason:=rr_build;

+ 2 - 4
compiler/msg/errore.msg

@@ -2136,10 +2136,8 @@ unit_u_check_time=10037_U_PPU Check file $1 time $2
 unit_w_cant_compile_unit_with_changed_incfile=10040_W_Can't recompile unit $1, but found modifed include files
 % A unit was found to have modified include files, but
 % some source files were not found, so recompilation is impossible.
-unit_h_source_modified=10041_H_File $1 is newer than Release PPU file $2
-% A modified source file for a unit was found that was compiled with the
-% release flag (-Ur). The unit will not implicitly be recompiled because
-% this release flag is set.
+unit_u_source_modified=10041_U_File $1 is newer than PPU file $2
+% A modified source file for a compiler unit was found.
 unit_u_ppu_invalid_fpumode=10042_U_Using a unit which was not compiled with correct FPU mode
 % Trying to compile code while using units which were not compiled with
 % the same floating point format mode. Either all code should be compiled

+ 1 - 1
compiler/msgidx.inc

@@ -638,7 +638,7 @@ const
   unit_u_second_load_unit=10036;
   unit_u_check_time=10037;
   unit_w_cant_compile_unit_with_changed_incfile=10040;
-  unit_h_source_modified=10041;
+  unit_u_source_modified=10041;
   unit_u_ppu_invalid_fpumode=10042;
   unit_u_loading_interface_units=10043;
   unit_u_loading_implementation_units=10044;

+ 1 - 1
compiler/msgtxt.inc

@@ -696,7 +696,7 @@ const msgtxt : array[0..000171,1..240] of char=(
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
-  '10041_H_Fi','le $1 is newer than Release PPU file $2'#000+
+  '10041_U_Fi','le $1 is newer than Release PPU file $2'#000+
   '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+