Преглед на файлове

* Added -m option to show values of all macros
* Removed unused resourcestrings

git-svn-id: trunk@15216 -

joost преди 15 години
родител
ревизия
633aa31ea3
променени са 1 файла, в които са добавени 17 реда и са изтрити 3 реда
  1. 17 3
      utils/fpcmkcfg/fpcmkcfg.pp

+ 17 - 3
utils/fpcmkcfg/fpcmkcfg.pp

@@ -49,6 +49,7 @@ Resourcestring
   SUsage50  = '  -h            show this help and exit.';
   SUsage60  = '  -u name       remove name from list of name/value pairs.';
 //  SUsage70  = '  -l filename   read name/value pairs from filename';
+  SUsage70  = '  -m            show builtin macros and exit.';
   SUsage80  = '  -b            show builtin template and exit.';
   SUsage90  = '  -v            be verbose.';
   Susage100 = '  -0            use built in fpc.cfg template (default)';
@@ -64,8 +65,6 @@ Resourcestring
   SErrDelBackupFailed = 'Error: Delete of old backup file "%s" failed.';
   SWarnIgnoringFile   = 'Warning: Ignoring non-existent file: ';
   SWarnIgnoringPair   = 'Warning: ignoring wrong name/value pair: ';
-  SStats              = 'Replaced %d placeholders in %d lines.';
-  SSubstInLine        = 'Replaced %s placeholders in line %d.';
 
 
 Var
@@ -126,7 +125,7 @@ begin
   Writeln(SUsage40);
   Writeln(SUsage50);
   Writeln(SUsage60);
-//  Writeln(SUsage70);
+  Writeln(SUsage70);
   Writeln(SUsage80);
   Writeln(SUsage90);
   Writeln(SUsage100);
@@ -156,6 +155,17 @@ begin
 end;
 
 
+Procedure ShowBuiltInMacros;
+
+Var
+  I : Integer;
+
+begin
+  For I:=0 to TemplateParser.ValueCount-1 do
+    Writeln(TemplateParser.NamesByIndex[I]+'='+TemplateParser.ValuesByIndex[I]);
+end;
+
+
 Procedure ProcessCommandline;
 
 Var
@@ -205,6 +215,10 @@ begin
               ShowBuiltin;
               halt(0);
               end;
+        'm' : begin
+              ShowBuiltinMacros;
+              halt(0);
+              end;
         't' : TemplateFileName:=GetOptArg;
         'd' : AddPair(GetOptArg);
         'u' : TemplateParser.Values[GetOptArg]:='';