Merged revisions 4165 via svnmerge from

http://[email protected]/svn/fpc/trunk

........
r4165 | hajny | 2006-07-13 23:06:46 +0000 (Thu, 13 Jul 2006) | 1 line

  + allow output of full version in QuickInfo
........

git-svn-id: branches/fixes_2_0@4172 -

compiler/msg/errore.msg

@@ -2296,6 +2296,7 @@ S*2Aas_assemble using GNU AS
 **1i_information
 **2iD_return compiler date
 **2iV_return compiler version
+**2iW_return full compiler version
 **2iSO_return compiler OS
 **2iSP_return compiler processor
 **2iTO_return target OS

compiler/msgidx.inc

@@ -671,7 +671,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 39896;
+  MsgTxtSize = 39931;
 
   MsgIdxMax : array[1..20] of longint=(
     19,74,219,61,62,47,100,20,135,60,

compiler/msgtxt.inc

@@ -826,78 +826,79 @@ const msgtxt : array[0..000166,1..240] of char=(
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
+  '**2iW_return full compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
-  '**2iTP_return target processor'#010+
-  '**1I<x>_adds <x> to include p','ath'#010+
+  '**2iTP_return target proc','essor'#010+
+  '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1M<x>_set language mode to <x>'#010+
   '**2Mfpc_free pascal dialect (default)'#010+
   '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
-  '**2Mdelphi_tries to be Delphi compatible'#010+
-  '**2Mtp_tries to be TP/BP 7.0 co','mpatible'#010+
+  '**2Mdelphi_tries to be Delphi compati','ble'#010+
+  '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
   '**2Mgpc_tries to be gpc compatible'#010+
   '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
   '**1n_don'#039't read the default config file'#010+
-  '**1o<x>_change the name of the executable produced to <x>'#010+
+  '**1o<x>_change the name of the executable produced to ','<x>'#010+
   '**1O<x>_optimizations:'#010+
-  '3*2Oa_<t','ype>=<values> set alignment'#010+
+  '3*2Oa_<type>=<values> set alignment'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
   '**2Or_keep certain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
-  '3*2O1_level 1 optimizations (quick optimizations)'#010+
-  '3*2O2_l','evel 2 optimizations (-O1 + slower optimizations)'#010+
+  '3*2O1_level 1 optimiza','tions (quick optimizations)'#010+
+  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
-  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
-  '3*3Op3_set ','target processor to PPro/PII/c6x86/K6 (tm)'#010+
+  '3*3Op2_set target processor to ','Pentium/PentiumMMX (tm)'#010+
+  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*3Op4_set target processor to Pentium 4 (tm)'#010+
   '3*3Op5_set target processor to Pentium M (tm)'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
-  '6*2Ox_optimize maximum (still BUGGY!!!)'#010,
+  '6*2Ox','_optimize maximum (still BUGGY!!!)'#010+
   '6*2O0_set target processor to a MC68000'#010+
   '6*2O2_set target processor to a MC68020+ (default)'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_assembler reading style:'#010+
-  '**2Rdefault_use default assembler'#010+
-  '3*2Ratt_read AT&T styl','e assembler'#010+
+  '**2Rdefault_use defau','lt assembler'#010+
+  '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_include assertion code.'#010+
+  '**2Sa_include asserti','on code.'#010+
   '**2Sd_same as -Mdelphi'#010+
-  '**2','Se<x>_error options. <x> is a combination of the following:'#010+
+  '**2Se<x>_error options. <x> is a combination of the following:'#010+
   '**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
   '**3*_w : compiler stops also after warnings'#010+
-  '**3*_n : compiler stops also after notes'#010+
-  '**3*_h : compiler stops also afte','r hints'#010+
+  '**3*_n : compiler stops also after note','s'#010+
+  '**3*_h : compiler stops also after hints'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sk_load fpcylix unit'#010+
   '**2SI<x>_set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
-  '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sm_sup','port macros like C (global)'#010+
+  '**3SIcorba_C','ORBA compatible interface'#010+
+  '**2Sm_support macros like C (global)'#010+
   '**2So_same as -Mtp'#010+
   '**2Sp_same as -Mgpc'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker'#010+
-  '**2sh_Generate script to link on hos','t'#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*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2 of DJ Delorie DOS ext','ender'#010+
+  '3*2Tgo3','2v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
   '3*2Tnetware_Novell Netware Module (clib)'#010+
@@ -905,8 +906,8 @@ const msgtxt : array[0..000166,1..240] of char=(
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
-  '3*2Twatcom_Watcom compatible DOS extender'#010+
-  '3*2T','wdosx_WDOSX DOS extender'#010+
+  '3*2Twatcom_','Watcom compatible DOS extender'#010+
+  '3*2Twdosx_WDOSX DOS extender'#010+
   '3*2Twin32_Windows 32 Bit'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
@@ -914,8 +915,8 @@ const msgtxt : array[0..000166,1..240] of char=(
   '6*2Tlinux_Linux/m68k'#010+
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
-  'A*2Tlinux_Linux'#010+
-  'P*2Tdarwin_Darwin and MacO','S X on PowerPC'#010+
+  'A*2Tlin','ux_Linux'#010+
+  'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
@@ -923,48 +924,48 @@ const msgtxt : array[0..000166,1..240] of char=(
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
-  '**2Ur_generate release unit files'#010+
-  '**2Us_c','ompile a system unit'#010+
+  '**2Ur_','generate release unit files'#010+
+  '**2Us_compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#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*_w : Show warnings               u : Show u','nit info'#010+
+  '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  c : Show conditionals'#010+
   '**2*_i : Show general info           d : Show debug info'#010+
-  '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
-  '**2*_a : Show eve','rything             x : Executable info (Win32 only'+
-  ')'#010+
+  '**2*_l : Show linenumbers            r : Rhide/GCC c','ompatibility mod'+
+  'e'#010+
+  '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
   '**2*_b : Write file names messages with full path'#010+
   '**2*_v : write fpcdebug.txt with     p : Write tree.log with parse tre'+
   'e'#010+
-  '**2*_    lots of debugging info'#010+
-  '3*1W<x>_Win32-like target options',#010+
+  '**2*_    lots of debugging inf','o'#010+
+  '3*1W<x>_Win32-like target options'#010+
   '3*2WB_Create a relocatable image'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Speci','fy graphic type application'#010+
+  '3*2WF_Specify full-screen type ','application (OS/2 only)'#010+
+  '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify graphic type application (MacOS only)'#010+
-  'P*2WT_Specify',' tool type application (MPW tool, MacOS only)'#010+
+  'P*2WG_Specify graphic type app','lication (MacOS only)'#010+
+  'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1X_executable options:'#010+
   '**2Xc_pass --shared to the linker (Unix only)'#010+
   '**2Xd_don'#039't use standard library search path (needed for cross com'+
   'pile)'#010+
-  '**2XD_try to link units dynamic          (defines F','PC_LINK_DYNAMIC)'#010+
+  '**2XD_try to lin','k units dynamic          (defines FPC_LINK_DYNAMIC)'#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+
-  '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
-  '**2X','s_strip all symbols from executable'#010+
+  '**2Xr<x>_set library search path to ','<x> (needed for cross compile)'#010+
+  '**2Xs_strip all symbols from executable'#010+
   '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
   '**2Xt_link with static libraries (-static is passed to linker)'#010+
-  '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
+  '**2XX_try to link units smart          ','  (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**','1?_shows this help'#010+
+  '**1?_shows this help'#010+
   '**1h_shows this help without waiting'#000
 );

compiler/options.pas

@@ -1631,6 +1631,8 @@ begin
         end;
       'V' :
         AddInfo(version_string);
+      'W' :
+        AddInfo(full_version_string);
       'D' :
         AddInfo(date_string);
       '_' :