2
0
Эх сурвалжийг харах

pas2js: cleaned up pcu

git-svn-id: trunk@40554 -
Mattias Gaertner 6 жил өмнө
parent
commit
38a511a2f0

+ 2 - 2
packages/pastojs/src/pas2jscompiler.pp

@@ -3844,7 +3844,7 @@ end;
 
 procedure TPas2jsCompiler.WritePrecompiledFormats;
 begin
-  WriteHelpLine('No support for PCU files in this class');
+  WriteHelpLine('   -JU: This pas2js does not support PCU files');
 end;
 
 procedure TPas2jsCompiler.AddNamespaces(const Paths: string;
@@ -4204,7 +4204,7 @@ begin
   w('     -JoCheckVersion=main: insert rtl version check into main.');
   w('     -JoCheckVersion=system: insert rtl version check into system unit init.');
   w('     -JoCheckVersion=unit: insert rtl version check into every unit init.');
-  w('     -JoRTL-<x>=<y>: set RTL identifier x to value y.');
+  w('     -JoRTL-<y>=<z>: set RTL identifier y to value z.');
   w('   -Jpcmd<command>: Run postprocessor. For each generated js execute command passing the js as stdin and read the new js from stdout. This option can be added multiple times to call several postprocessors in succession.');
   w('   -Ju<x>: Add <x> to foreign unit paths. Foreign units are not compiled.');
   WritePrecompiledFormats;

+ 3 - 0
utils/pas2js/pas2js.lpi

@@ -34,6 +34,7 @@
       <Unit1>
         <Filename Value="../../packages/pastojs/src/pas2jspcucompiler.pp"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Pas2JSPCUCompiler"/>
       </Unit1>
       <Unit2>
         <Filename Value="../../packages/pastojs/src/pas2jscompilercfg.pp"/>
@@ -42,6 +43,7 @@
       <Unit3>
         <Filename Value="../../packages/pastojs/src/pas2jsfs.pp"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Pas2JSFS"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../packages/pastojs/src/pas2jscompilerpp.pp"/>
@@ -50,6 +52,7 @@
       <Unit5>
         <Filename Value="../../packages/pastojs/src/pas2jsfscompiler.pp"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="Pas2JSFSCompiler"/>
       </Unit5>
     </Units>
   </ProjectOptions>

+ 4 - 4
utils/pas2js/pas2js.pp

@@ -13,7 +13,7 @@ uses
   {$ENDIF}
   Classes, SysUtils, CustApp,
   Pas2jsFileUtils, Pas2jsLogger, Pas2jsCompiler,
-  Pas2JSPCUCompiler, Pas2JSCompilerPP, Pas2JSCompilerCfg;
+  Pas2JSFSCompiler, Pas2JSCompilerPP, Pas2JSCompilerCfg;
 
 Type
 
@@ -21,14 +21,14 @@ Type
 
   TPas2jsCLI = class(TCustomApplication)
   private
-    FCompiler: TPas2jsPCUCompiler;
+    FCompiler: TPas2JSFSCompiler;
     FWriteOutputToStdErr: Boolean;
   protected
     procedure DoRun; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
-    property Compiler: TPas2jsPCUCompiler read FCompiler;
+    property Compiler: TPas2JSFSCompiler read FCompiler;
     property WriteOutputToStdErr: Boolean read FWriteOutputToStdErr write FWriteOutputToStdErr;
   end;
 
@@ -67,7 +67,7 @@ constructor TPas2jsCLI.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
   StopOnException:=True;
-  FCompiler:=TPas2jsPCUCompiler.Create;
+  FCompiler:=TPas2JSFSCompiler.Create;
   FCompiler.ConfigSupport:=TPas2JSFileConfigSupport.Create(FCompiler);
   FCompiler.PostProcessorSupport:=TPas2JSFSPostProcessorSupport.Create(FCompiler);
 end;