Selaa lähdekoodia

* generate .rst from ppufilename instead of modulename

peter 24 vuotta sitten
vanhempi
commit
8f2aaed119
2 muutettua tiedostoa jossa 13 lisäystä ja 8 poistoa
  1. 7 5
      compiler/cresstr.pas
  2. 6 3
      compiler/pmodules.pas

+ 7 - 5
compiler/cresstr.pas

@@ -50,7 +50,7 @@ Type
     destructor  Destroy;override;
     function  Register(Const name : string;p : pchar;len : longint) : longint;
     procedure CreateResourceStringList;
-    Procedure WriteResourceFile(FileName : String);
+    Procedure WriteResourceFile(const FileName : String);
   end;
 
 var
@@ -212,7 +212,7 @@ begin
 end;
 
 
-Procedure TResourceStrings.WriteResourceFile(Filename : String);
+Procedure TResourceStrings.WriteResourceFile(const FileName : String);
 Type
   TMode = (quoted,unquoted);
 Var
@@ -231,8 +231,7 @@ Var
 begin
   If List.Empty then
     exit;
-  FileName:=current_module.outputpath^+FixFileName(ForceExtension(FileName,'.rst'));
-  message1 (general_i_writingresourcefile,filename);
+  message1 (general_i_writingresourcefile,SplitFileName(filename));
   Assign(F,Filename);
   {$i-}
   Rewrite(f);
@@ -293,7 +292,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.8  2000-12-25 00:07:25  peter
+  Revision 1.9  2001-02-24 10:44:55  peter
+    * generate .rst from ppufilename instead of modulename
+
+  Revision 1.8  2000/12/25 00:07:25  peter
     + new tlinkedlist class (merge of old tstringqueue,tcontainer and
       tlinkedlist objects)
 

+ 6 - 3
compiler/pmodules.pas

@@ -1248,7 +1248,7 @@ implementation
             current_module.flags:=current_module.flags or uf_has_resources;
             { only write if no errors found }
             if (Errorcount=0) then
-             ResourceStrings.WriteResourceFile(current_module.ModuleName^);
+             ResourceStrings.WriteResourceFile(ForceExtension(current_module.ppufilename^,'.rst'));
           end;
 
          { avoid self recursive destructor call !! PM }
@@ -1524,7 +1524,7 @@ implementation
             ResourceStrings.CreateResourceStringList;
             { only write if no errors found }
             if (Errorcount=0) then
-             ResourceStrings.WriteResourceFile(current_module.ModuleName^);
+             ResourceStrings.WriteResourceFile(ForceExtension(current_module.ppufilename^,'.rst'));
           end;
 
          codegen_doneprocedure;
@@ -1627,7 +1627,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.22  2001-02-21 19:37:19  peter
+  Revision 1.23  2001-02-24 10:44:56  peter
+    * generate .rst from ppufilename instead of modulename
+
+  Revision 1.22  2001/02/21 19:37:19  peter
     * moved deref to be done after loading of implementation units. prederef
       is still done directly after loading of symbols and definitions.