paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-21 01:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fpc binary supported options made localizable and not shown separately from those handled by ppc* any longer

Browse Source 
git-svn-id: trunk@20694 -
This commit is contained in:
Tomas Hajny 2012-04-02 22:11:21 +00:00
parent e7e486c38a
commit b12c38984b
5 changed files with 115 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/msg/errore.msg
View File

@ -3156,6 +3156,7 @@ or
# 6 = 680x0 targets
# A = ARM
# e = in extended debug mode only
# F = help for the 'fpc' binary (independent of the target compiler)
# P = PowerPC targets
# S = Sparc targets
# V = Virtual machine targets
@ -3306,6 +3307,10 @@ S*2Aas_Assemble using GNU AS
**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possible values
**2Os_Optimize for size rather than speed
**1pg_Generate profile code for gprof (defines FPC_PROFILE)
F*1P<x>_Target CPU / compiler related options:
F*2PB_Show default compiler binary
F*2PP_Show default target cpu
F*2P<x>_Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sparc,x86_64
**1R<x>_Assembler reading style:
**2Rdefault_Use default assembler for target
3*2Ratt_Read AT&T style assembler
@ -3391,6 +3396,7 @@ S*2Tlinux_Linux
**2*_ with full path v : Write fpcdebug.txt with
**2*_ lots of debugging info
**2*_m<x>,<y> : Don't show messages numbered <x> and <y>
F*1V<x>_Append '-<x>' to the used compiler binary name (e.g. for version)
**1W<x>_Target-specific options (targets)
3*2WA_Specify native type application (Windows)
4*2WA_Specify native type application (Windows)
@ -3456,6 +3462,7 @@ P*2WT_Specify MPW tool type application (Classic Mac OS)
**2Xi_Use internal linker
**2Xm_Generate link map
**2XM<x>_Set the name of the 'main' program routine (default is 'main')
F*2Xp<x>_First search for the compiler binary in the directory <x>
**2XP<x>_Prepend the binutils names with the prefix <x>
**2Xr<x>_Set the linker's rlink-path to <x> (needed for cross compile, see the ld manual for more information) (BeOS, Linux)
**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD, Linux, Mac OS, Solaris)

2
compiler/msgidx.inc
View File

@ -925,7 +925,7 @@ const
option_info=11024;
option_help_pages=11025;
MsgTxtSize = 63163;
MsgTxtSize = 63497;
MsgIdxMax : array[1..20] of longint=(
26,90,315,112,85,55,116,26,202,63,

133
compiler/msgtxt.inc
View File

@ -1,7 +1,7 @@
{$ifdef Delphi}
const msgtxt : array[0..000263] of string[240]=(
const msgtxt : array[0..000264] of string[240]=(
{$else Delphi}
const msgtxt : array[0..000263,1..240] of char=(
const msgtxt : array[0..000264,1..240] of char=(
{$endif Delphi}
'01000_T_Compiler: $1'#000+
'01001_D_Compiler OS: $1'#000+
@ -1290,65 +1290,70 @@ const msgtxt : array[0..000263,1..240] of char=(
'ible values'#010+
'**2Os_Optimize for size rather than speed'#010+
'**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
'F*1P<x>_Target CPU / compiler related options:'#010+
'F*2PB_Show default compiler binary'#010+
'F*2PP_Show default target cpu'#010+
'F*2P<x>_Se','t target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,'+
'sparc,x86_64'#010+
'**1R<x>_Assembler reading style:'#010+
'**2Rdefault_Use default assembler for target'#010+
'3*2Ratt_Read AT&T style assembler'#010+
'3*2Rintel_','Read Intel style assembler'#010+
'6*2RMOT_Read motorola style assembler'#010+
'3*2Rintel_Read Intel style assembler'#010+
'6*2RMOT_Read motorol','a style assembler'#010+
'**1S<x>_Syntax options:'#010+
'**2S2_Same as -Mobjfpc'#010+
'**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
'**2Sa_Turn on assertions'#010+
'**2Sd_Same as -Mdelphi'#010+
'**2Se<x>_Error options. <x> is ','a combination of the following:'#010+
'**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
'**2Se<x>_Error options. <x> is a combination of the following:'#010+
'**3*_<n> : Comp','iler halts after the <n> errors (default is 1)'#010+
'**3*_w : Compiler also halts after warnings'#010+
'**3*_n : Compiler also halts after notes'#010+
'**3*_h : Compiler also halts after hints'#010+
'**2Sg_Enable LABEL a','nd GOTO (default in -Mtp and -Mdelphi)'#010+
'**2Sh_Use ansistrings by default instead of shortstrings'#010+
'**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
'**2Sh_Us','e ansistrings by default instead of shortstrings'#010+
'**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
'**2Sk_Load fpcylix unit'#010+
'**2SI<x>_Set interface style to <x>'#010+
'**3SIcom_COM com','patible interface (default)'#010+
'**3SIcorba_CORBA compatible interface'#010+
'**3SIcom_COM compatible interface (default)'#010+
'**3SIcorba_CORBA co','mpatible interface'#010+
'**2Sm_Support macros like C (global)'#010+
'**2So_Same as -Mtp'#010+
'**2Ss_Constructor name must be init (destructor must be done)'#010+
'**2Sx_Enable exception keywords (default in Delphi/ObjFP','C modes)'#010+
'**2Sy_@<pointer> returns a typed pointer, same as $T+'#010+
'**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
'**2Sy_@<pointer> returns a typed point','er, same as $T+'#010+
'**1s_Do not call assembler and linker'#010+
'**2sh_Generate script to link on host'#010+
'**2st_Generate script to link on target'#010+
'**2sr_Skip register allocation phase (use with -alr)'#010+
'**1T<x>_','Target operating system:'#010+
'3*2Tdarwin_Darwin/Mac OS X'#010+
'**1T<x>_Target operating system:'#010+
'3*2Tdarwin_Darwin/Mac ','OS X'#010+
'3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
'3*2Tfreebsd_FreeBSD'#010+
'3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
'3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda',
'3*2Tiphonesim_ iPhoneSimulator from iOS SDK 3.2+ (older versions: -Tda'+
'rwin)'#010+
'3*2Tlinux_Linux'#010+
'3*2Tnetbsd_NetBSD'#010+
'3*2Tnetware_Novell Netware Module (clib)'#010+
'3*2Tnet','ware_Novell Netware Module (clib)'#010+
'3*2Tnetwlibc_Novell Netware Module (libc)'#010+
'3*2Topenbsd_OpenBSD'#010+
'3*2Tos2_OS/2 / eComStation'#010+
'3*2Tsunos_SunOS/Solaris'#010+
'3*2Tsymbian_Symbian OS'#010+
'3*2Tsolaris_Solaris'#010+
'3*2','Twatcom_Watcom compatible DOS extender'#010+
'3*2Twdosx_WDOSX DOS extender'#010+
'3*2Twatcom_Watcom compatible DOS extender'#010+
'3*2Twdos','x_WDOSX DOS extender'#010+
'3*2Twin32_Windows 32 Bit'#010+
'3*2Twince_Windows CE'#010+
'4*2Tdarwin_Darwin/Mac OS X'#010+
'4*2Tlinux_Linux'#010+
'4*2Twin64_Win64 (64 bit Windows systems)'#010+
'6*2Tamiga_Commodore Amiga'#010+
'6*2Tatari_Atari ','ST/STe/TT'#010+
'6*2Tatari_Atari ST/STe/TT'#010+
'6*2Tlinux_Linux'#010+
'6*2Tpalmos_PalmOS'#010+
'A*2Tdarwin_Darwin/iPhoneOS/iOS'#010+
'A*2','Tdarwin_Darwin/iPhoneOS/iOS'#010+
'A*2Tlinux_Linux'#010+
'A*2Twince_Windows CE'#010+
'P*2Tamiga_AmigaOS'#010+
@ -1356,112 +1361,116 @@ const msgtxt : array[0..000263,1..240] of char=(
'P*2Tlinux_Linux'#010+
'P*2Tmacos_Mac OS (classic)'#010+
'P*2Tmorphos_MorphOS'#010+
'S*2Tsolaris_Solaris'#010,
'S*2Tsolaris_Solaris'#010+
'S*2Tlinux_Linux'#010+
'**1u<x>_Undefines the symbol <x>'#010+
'**1u<x>_Undefines the symbol <x','>'#010+
'**1U_Unit options:'#010+
'**2Un_Do not check where the unit name matches the file name'#010+
'**2Ur_Generate release unit files (never automatically recompiled)'#010+
'**2Us_Compile a system unit'#010+
'**1v<x>_Be verbo','se. <x> is a combination of the following letters:'#010+
'**1v<x>_Be verbose. <x> is a combination of the following lette','rs:'#010+
'**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+
'**2*_w : Show warnings u : Show unit info'#010+
'**2*_n : Show notes t : Show tried/used files'#010,
'**2*_h : Show hints c : Show conditionals'#010+
'**2*_n : Show notes t : Show tried/used files'#010+
'**2*_h : Show hints c : Show c','onditionals'#010+
'**2*_i : Show general info d : Show debug info'#010+
'**2*_l : Show linenumbers r : Rhide/GCC compatibility mode'#010+
'**2*_s : Show time stamps q : Show message ','numbers'#010+
'**2*_a : Show everything x : Executable info (Win32 only)'#010+
'**2*_s : Show time stamps q : Show message numbers'#010+
'**2*_a : Show everything x ',': Executable info (Win32 only'+
')'#010+
'**2*_b : Write file names messages p : Write tree.log with parse tre'+
'e'#010+
'**2*_ with full path v : Write fpcdebug.txt with'#010+
'**2*_ ',' lots of debugging info'#010+
'**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
'**2*_ lots of debugging info'#010+
'**2*_m<x','>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
'F*1V<x>_Append '#039'-<x>'#039' to the used compiler binary name (e.g. f'+
'or version)'#010+
'**1W<x>_Target-specific options (targets)'#010+
'3*2WA_Specify native type application (Windows)'#010+
'4*2WA_Specify native type application (Windows)'#010+
'A*2WA_','Specify native type application (Windows)'#010+
'4*2WA_Specify native type a','pplication (Windows)'#010+
'A*2WA_Specify native type application (Windows)'#010+
'3*2Wb_Create a bundle instead of a library (Darwin)'#010+
'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
'A*2Wb_Create a bundle instead of a library',' (Darwin)'#010+
'A*2Wb_Create a ','bundle instead of a library (Darwin)'#010+
'4*2Wb_Create a bundle instead of a library (Darwin)'#010+
'3*2WB_Create a relocatable image (Windows, Symbian)'#010+
'3*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
'4*2WB_Create a relocatable image (Windows)'#010+
'4*2WBxxxx_Set image base to xxx','x (Windows)'#010+
'4*2W','Bxxxx_Set image base to xxxx (Windows)'#010+
'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
'A*2WBxxxx_Set image base to xxxx (Windows, Symbian)'#010+
'3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
'4*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
'A*2W','C_Specify console type application (Windows)'#010+
'4*2WC_Specify console type applicatio','n (EMX, OS/2, Windows)'#010+
'A*2WC_Specify console type application (Windows)'#010+
'P*2WC_Specify console type application (Classic Mac OS)'#010+
'3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'4*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'A*2WD_Use DEFFI','LE to export functions of DLL or EXE (Windows)'#010+
'4*2WD_Use DEFFILE to export functions of DLL or EX','E (Windows)'#010+
'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
'3*2We_Use external resources (Darwin)'#010+
'4*2We_Use external resources (Darwin)'#010+
'A*2We_Use external resources (Darwin)'#010+
'P*2We_Use external resources (Darwin)'#010+
'p*2We_Use external resources (Darwin)'#010+
'3*2','WF_Specify full-screen type application (EMX, OS/2)'#010+
'p*2We_Use exte','rnal resources (Darwin)'#010+
'3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
'3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
'4*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
'A*2WG_Specify graphic type application (Windows)'#010+
'P*2WG_Specify graph','ic type application (Classic Mac OS)'#010+
'A*2WG_Specify graphic type application (W','indows)'#010+
'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
'3*2Wi_Use internal resources (Darwin)'#010+
'4*2Wi_Use internal resources (Darwin)'#010+
'A*2Wi_Use internal resources (Darwin)'#010+
'P*2Wi_Use internal resources (Darwin)'#010+
'p*2Wi_Use internal resources (Darwin)'#010+
'3*2WI_Turn on','/off the usage of import sections (Windows)'#010+
'p*2Wi_Use internal resou','rces (Darwin)'#010+
'3*2WI_Turn on/off the usage of import sections (Windows)'#010+
'4*2WI_Turn on/off the usage of import sections (Windows)'#010+
'A*2WI_Turn on/off the usage of import sections (Windows)'#010+
'3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
'4*2WM<x>_','Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Dar'+
'3*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.','5.1, ... (Dar'+
'win)'#010+
'4*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
'p*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
'P*2WM<x>_Minimum Mac OS X deployment version: 10.4, 10.5.1, ... (Darwi'+
'n)'#010+
'3*2WN_Do not generate relocati','on code, needed for debugging (Windows'+
'3*2','WN_Do not generate relocation code, needed for debugging (Windows'+
')'#010+
'4*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
'A*2Wpxxxx_Specify the controller type, see fpc -i for possib','le value'+
'A*2Wpxxxx_Specify the controller ','type, see fpc -i for possible value'+
's'#010+
'V*2Wpxxxx_Specify the controller type, see fpc -i for possible values'#010+
'3*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (iphonesim)'#010+
'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)'#010+
'3*2WR_Generate relocation',' code (Windows)'#010+
'A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin',')'#010+
'3*2WR_Generate relocation code (Windows)'#010+
'4*2WR_Generate relocation code (Windows)'#010+
'A*2WR_Generate relocation code (Windows)'#010+
'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
'**2WX_Enable executable stack (Linux)'#010+
'**1X_Executable options:'#010+
'**2Xc_Pass --shared/-d','ynamic to the linker (BeOS, Darwin, FreeBSD, L'+
'inux)'#010+
'**1X_Executable opti','ons:'#010+
'**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
'ux)'#010+
'**2Xd_Do not use standard library search path (needed for cross compil'+
'e)'#010+
'**2Xe_Use external linker'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink section '+
'to executable'#010+
'**2XD','_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
'**2Xg_Create debuginfo in a separate file and add a debuglink ','sectio'+
'n to executable'#010+
'**2XD_Try to link units dynamically (defines FPC_LINK_DYNAMIC)'#010+
'**2Xi_Use internal linker'#010+
'**2Xm_Generate link map'#010+
'**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
's '#039'main'#039')'#010+
'**2XP<x>_Prepend the binutils names with the prefix <x>',#010+
'F*2Xp<x>_First search for th','e compiler binary in the directory <x>'#010+
'**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
'**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
'ile, see the ld manual for more information) (BeOS, Linux)'#010+
'**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
', Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all sy','mbols from executable'#010+
'**2XR<x>_Prepend <x>',' to all linker search paths (BeOS, Darwin, FreeB'+
'SD, Linux, Mac OS, Solaris)'#010+
'**2Xs_Strip all symbols from executable'#010+
'**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
'**2Xt_Link with static libraries (-static is passed to linker)'#010+
'**2Xt_Link with static libraries (-static is passed to',' linker)'#010+
'**2XX_Try to smartlink units (defines FPC_LINK_SMART)'#010+
'**1*_'#010+
'**1?_Show thi','s help'#010+
'**1?_Show this help'#010+
'**1h_Shows this help without waiting'
);

25
compiler/options.pas
View File

@ -34,12 +34,14 @@ Type
FirstPass,
ParaLogo,
NoPressEnter,
FPCHelpLines,
LogoWritten,
FPUSetExplicitly,
CPUSetExplicitly,
OptCPUSetExplicitly: boolean;
FileLevel : longint;
QuickInfo : string;
FPCBinaryPath: string;
ParaIncludePath,
ParaUnitPath,
ParaObjectPath,
@ -330,7 +332,10 @@ var
begin
WriteLogo;
Lines:=4;
Message1(option_usage,FixFileName(system.paramstr(0)));
if FPCHelpLines then
Message1(option_usage,FixFileName(FPCBinaryPath))
else
Message1(option_usage,FixFileName(system.paramstr(0)));
lastident:=0;
p:=MessagePChar(option_help_pages);
while assigned(p) do
@ -341,6 +346,8 @@ begin
show:=false;
{ parse options }
case s[1] of
'F': if FPCHelpLines then
Show := true;
{$ifdef UNITALIASES}
'a',
{$endif}
@ -685,7 +692,15 @@ begin
Message1(option_interpreting_option,opt);
case opt[2] of
'?' :
WriteHelpPages;
begin
if More [1] = 'F' then
begin
FPCHelpLines := true;
Delete (More, 1, 1);
FPCBinaryPath := More;
end;
WriteHelpPages;
end;
'a' :
begin
@ -1233,6 +1248,12 @@ begin
'h' :
begin
NoPressEnter:=true;
if More [1] = 'F' then
begin
FPCHelpLines := true;
Delete (More, 1, 1);
FPCBinaryPath := More;
end;
WriteHelpPages;
end;

38
compiler/utils/fpc.pp
View File

@ -121,9 +121,7 @@ program fpc;
ppccommandlinelen : longint;
i : longint;
errorvalue : Longint;
dohelp : Boolean;
begin
dohelp := false;
setlength(ppccommandline,paramcount);
ppccommandlinelen:=0;
cpusuffix :=''; // if not empty, signals attempt at cross
@ -158,7 +156,14 @@ program fpc;
processorname:='x86_64';
{$endif x86_64}
versionstr:=''; { Default is just the name }
for i:=1 to paramcount do
if ParamCount = 0 then
begin
SetLength (PPCCommandLine, 1);
PPCCommandLine [PPCCommandLineLen] := '-?F' + ParamStr (0);
Inc (PPCCommandLineLen);
end
else
for i:=1 to paramcount do
begin
s:=paramstr(i);
if pos('-V',s)=1 then
@ -169,7 +174,7 @@ program fpc;
begin
processorstr:=copy(s,3,length(s)-2);
{ -PB is a special code that will show the
default compiler and exit immediatly. It's
default compiler and exit immediately. It's
main usage is for Makefile }
if processorstr='B' then
begin
@ -179,7 +184,7 @@ program fpc;
halt(0);
end
{ -PP is a special code that will show the
processor and exit immediatly. It's
processor and exit immediately. It's
main usage is for Makefile }
else if processorstr='P' then
begin
@ -228,8 +233,9 @@ program fpc;
else
begin
if pos('-h',s)=1 then
dohelp:=true;
ppccommandline[ppccommandlinelen]:=s;
ppccommandline[ppccommandlinelen] := '-hF' + ParamStr (0)
else
ppccommandline[ppccommandlinelen]:=s;
inc(ppccommandlinelen);
end;
end;
@ -260,23 +266,5 @@ program fpc;
if (errorvalue<>0) and
(paramcount<>0) then
error(ppcbin+' returned an error exitcode');
if dohelp or
(paramcount=0) then
begin
if not dohelp then
begin
writeln('*** press enter ***');
readln;
end
else
writeln;
writeln(paramstr(0),' [options] <inputfile> [options]');
writeln(' -X<x> Target CPU options');
writeln(' -PB Show default compiler binary');
writeln(' -PP Show default target cpu');
writeln(' -P<x> Set target CPU (arm,i386,m68k,mips,mipsel,powerpc,powerpc64,sparc,x86_64)');
Writeln(' -V<x> Append ''-<x>'' to the used compiler binary name');
Writeln(' -Xp<x> First search for the compiler binary in the directory <x>');
end;
halt(errorvalue);
end.