You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
(20) |
May
(48) |
Jun
(8) |
Jul
(23) |
Aug
(41) |
Sep
(42) |
Oct
(22) |
Nov
(17) |
Dec
(36) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(43) |
Feb
(42) |
Mar
(17) |
Apr
(39) |
May
(16) |
Jun
(35) |
Jul
(37) |
Aug
(47) |
Sep
(49) |
Oct
(9) |
Nov
(52) |
Dec
(37) |
2008 |
Jan
(48) |
Feb
(21) |
Mar
(7) |
Apr
(2) |
May
(5) |
Jun
(17) |
Jul
(17) |
Aug
(40) |
Sep
(58) |
Oct
(38) |
Nov
(19) |
Dec
(32) |
2009 |
Jan
(67) |
Feb
(46) |
Mar
(54) |
Apr
(34) |
May
(37) |
Jun
(52) |
Jul
(67) |
Aug
(72) |
Sep
(48) |
Oct
(35) |
Nov
(27) |
Dec
(12) |
2010 |
Jan
(56) |
Feb
(46) |
Mar
(19) |
Apr
(14) |
May
(21) |
Jun
(3) |
Jul
(13) |
Aug
(48) |
Sep
(34) |
Oct
(51) |
Nov
(16) |
Dec
(32) |
2011 |
Jan
(36) |
Feb
(14) |
Mar
(12) |
Apr
(3) |
May
(5) |
Jun
(24) |
Jul
(15) |
Aug
(30) |
Sep
(21) |
Oct
(4) |
Nov
(25) |
Dec
(23) |
2012 |
Jan
(45) |
Feb
(42) |
Mar
(19) |
Apr
(14) |
May
(13) |
Jun
(7) |
Jul
(3) |
Aug
(46) |
Sep
(21) |
Oct
(10) |
Nov
(2) |
Dec
|
2013 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ou...@us...> - 2010-02-18 21:16:44
|
Revision: 3192 http://jcl.svn.sourceforge.net/jcl/?rev=3192&view=rev Author: outchy Date: 2010-02-18 21:16:35 +0000 (Thu, 18 Feb 2010) Log Message: ----------- New classes to help event broadcasts. Modified Paths: -------------- trunk/jcl/source/common/JclNotify.pas Modified: trunk/jcl/source/common/JclNotify.pas =================================================================== --- trunk/jcl/source/common/JclNotify.pas 2010-02-18 11:15:10 UTC (rev 3191) +++ trunk/jcl/source/common/JclNotify.pas 2010-02-18 21:16:35 UTC (rev 3192) @@ -24,7 +24,7 @@ { } {**************************************************************************************************} { } -{ Last modified: $Date:: $ } +{ Last modified: $Date:: $ } { Revision: $Rev:: $ } { Author: $Author:: $ } { } @@ -101,6 +101,72 @@ procedure Remove(listener: IJclListener); stdcall; end; +type + TJclMethodArray = array of TMethod; + + // base class for all object methods broadcasts + TJclMethodBroadCast = class + protected + FHandlers: TJclMethodArray; + FHandlerCount: Integer; + function GetHandler(Index: Integer): TMethod; + public + function AddHandler(const AHandler: TMethod): Integer; + procedure RemoveHandler(const AHandler: TMethod); + procedure DeleteHandler(Index: Integer); + property HandlerCount: Integer read FHandlerCount; + end; + + // This class broadcasts a notification event to a list of handlers + TJclNotifyEventBroadcast = class(TJclMethodBroadCast) + protected + function GetHandler(Index: Integer): TNotifyEvent; + public + function AddHandler(const AHandler: TNotifyEvent): Integer; + procedure RemoveHandler(const AHandler: TNotifyEvent); + procedure Notify(Sender: TObject); + property Handlers[Index: Integer]: TNotifyEvent read GetHandler; + end; + + TJclProcedureEvent = procedure of object; + + // This class broadcasts an event to a list of handlers + TJclProcedureEventBroadcast = class(TJclMethodBroadCast) + protected + function GetHandler(Index: Integer): TJclProcedureEvent; + public + function AddHandler(const AHandler: TJclProcedureEvent): Integer; + procedure RemoveHandler(const AHandler: TJclProcedureEvent); + procedure CallAllProcedures; + property Handlers[Index: Integer]: TJclProcedureEvent read GetHandler; + end; + + TJclBooleanProcedureEvent = procedure(Value: Boolean) of object; + + // This class broadcasts an event to a list of handlers + TJclBooleanProcedureEventBroadcast = class(TJclMethodBroadCast) + protected + function GetHandler(Index: Integer): TJclBooleanProcedureEvent; + public + function AddHandler(const AHandler: TJclBooleanProcedureEvent): Integer; + procedure RemoveHandler(const AHandler: TJclBooleanProcedureEvent); + procedure CallAllProcedures(Value: Boolean); + property Handlers[Index: Integer]: TJclBooleanProcedureEvent read GetHandler; + end; + + TJclBooleanEvent = function: Boolean of object; + + // This class broadcasts a predicate to a list of handlers + TJclBooleanEventBroadcast = class(TJclMethodBroadCast) + protected + function GetHandler(Index: Integer): TJclBooleanEvent; + public + function AddHandler(const AHandler: TJclBooleanEvent): Integer; + procedure RemoveHandler(const AHandler: TJclBooleanEvent); + function LogicalAnd: Boolean; + property Handlers[Index: Integer]: TJclBooleanEvent read GetHandler; + end; + {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -202,6 +268,169 @@ // do nothing; descendants should override this method to process incoming notifications end; +//=== { TNotifyEventBroadcast } ============================================== + +function TJclMethodBroadcast.AddHandler( + const AHandler: TMethod): Integer; +var + HandlerLength: Integer; +begin + HandlerLength := Length(FHandlers); + if FHandlerCount >= HandlerLength then + begin + if HandlerLength > 0 then + HandlerLength := HandlerLength * 2 + else + HandlerLength := 4; + SetLength(FHandlers, HandlerLength); + end; + Result := FHandlerCount; + Inc(FHandlerCount); + FHandlers[Result] := AHandler; +end; + +procedure TJclMethodBroadcast.DeleteHandler(Index: Integer); +var + I: Integer; + HandlerLength: Integer; +begin + for I := Index to FHandlerCount - 2 do + FHandlers[I] := FHandlers[I + 1]; + + HandlerLength := Length(FHandlers); + Dec(FHandlerCount); + if (FHandlerCount > 0) and ((2 * FHandlerCount) < HandlerLength) then + begin + HandlerLength := HandlerLength div 2; + SetLength(FHandlers, HandlerLength); + end; +end; + +function TJclMethodBroadcast.GetHandler(Index: Integer): TMethod; +begin + Result := FHandlers[Index]; +end; + +procedure TJclMethodBroadcast.RemoveHandler(const AHandler: TMethod); +var + Index: Integer; +begin + for Index := FHandlerCount - 1 downto 0 do + if (TMethod(FHandlers[Index]).Code = TMethod(AHandler).Code) and + (TMethod(FHandlers[Index]).Data = TMethod(AHandler).Data) then + DeleteHandler(Index); +end; + +//=== { TJclNotifyEventBroadcast } =========================================== + +function TJclNotifyEventBroadcast.AddHandler( + const AHandler: TNotifyEvent): Integer; +begin + Result := inherited AddHandler(TMethod(AHandler)); +end; + +function TJclNotifyEventBroadcast.GetHandler(Index: Integer): TNotifyEvent; +begin + Result := TNotifyEvent(inherited GetHandler(Index)); +end; + +procedure TJclNotifyEventBroadcast.Notify(Sender: TObject); +var + Index: Integer; +begin + for Index := 0 to FHandlerCount - 1 do + TNotifyEvent(FHandlers[Index])(Sender); +end; + +procedure TJclNotifyEventBroadcast.RemoveHandler(const AHandler: TNotifyEvent); +begin + inherited RemoveHandler(TMethod(AHandler)); +end; + +//=== { TJclProcedureBroadcast } ============================================= + +function TJclProcedureEventBroadcast.AddHandler( + const AHandler: TJclProcedureEvent): Integer; +begin + Result := inherited AddHandler(TMethod(AHandler)); +end; + +function TJclProcedureEventBroadcast.GetHandler(Index: Integer): TJclProcedureEvent; +begin + Result := TJclProcedureEvent(inherited GetHandler(Index)); +end; + +procedure TJclProcedureEventBroadcast.CallAllProcedures; +var + Index: Integer; +begin + for Index := 0 to FHandlerCount - 1 do + TJclProcedureEvent(FHandlers[Index]); +end; + +procedure TJclProcedureEventBroadcast.RemoveHandler(const AHandler: TJclProcedureEvent); +begin + inherited RemoveHandler(TMethod(AHandler)); +end; + +//=== { TJclBooleanProcedureBroadcast } ============================================= + +function TJclBooleanProcedureEventBroadcast.AddHandler( + const AHandler: TJclBooleanProcedureEvent): Integer; +begin + Result := inherited AddHandler(TMethod(AHandler)); +end; + +function TJclBooleanProcedureEventBroadcast.GetHandler(Index: Integer): TJclBooleanProcedureEvent; +begin + Result := TJclBooleanProcedureEvent(inherited GetHandler(Index)); +end; + +procedure TJclBooleanProcedureEventBroadcast.CallAllProcedures(Value: Boolean); +var + Index: Integer; +begin + for Index := 0 to FHandlerCount - 1 do + TJclBooleanProcedureEvent(FHandlers[Index])(Value); +end; + +procedure TJclBooleanProcedureEventBroadcast.RemoveHandler(const AHandler: TJclBooleanProcedureEvent); +begin + inherited RemoveHandler(TMethod(AHandler)); +end; + +//=== { TJclBooleanEventBroadcast } ========================================== + +function TJclBooleanEventBroadcast.AddHandler( + const AHandler: TJclBooleanEvent): Integer; +begin + Result := inherited AddHandler(TMethod(AHandler)); +end; + +function TJclBooleanEventBroadcast.GetHandler(Index: Integer): TJclBooleanEvent; +begin + Result := TJclBooleanEvent(inherited GetHandler(Index)); +end; + +function TJclBooleanEventBroadcast.LogicalAnd: Boolean; +var + Index: Integer; +begin + Result := True; + for Index := 0 to FHandlerCount - 1 do + begin + Result := TJclBooleanEvent(FHandlers[Index]); + if not Result then + Break; + end; +end; + +procedure TJclBooleanEventBroadcast.RemoveHandler( + const AHandler: TJclBooleanEvent); +begin + inherited RemoveHandler(TMethod(AHandler)); +end; + {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-18 11:15:17
|
Revision: 3191 http://jcl.svn.sourceforge.net/jcl/?rev=3191&view=rev Author: outchy Date: 2010-02-18 11:15:10 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Mantis 5160: Bound check error in TJclBaseNotifier.Remove. minor style cleaning. Modified Paths: -------------- trunk/jcl/source/common/JclNotify.pas Modified: trunk/jcl/source/common/JclNotify.pas =================================================================== --- trunk/jcl/source/common/JclNotify.pas 2010-02-11 18:01:00 UTC (rev 3190) +++ trunk/jcl/source/common/JclNotify.pas 2010-02-18 11:15:10 UTC (rev 3191) @@ -93,7 +93,7 @@ FListeners: TInterfaceList; {$IFDEF THREADSAFE} FSynchronizer: TJclMultiReadExclusiveWrite; - {$ENDIF} + {$ENDIF THREADSAFE} public { IJclNotifier } procedure Add(listener: IJclListener); stdcall; @@ -186,7 +186,7 @@ try {$ENDIF THREADSAFE} idx := FListeners.IndexOf(listener); - if idx < 0 then + if idx >= 0 then FListeners.Delete(idx); {$IFDEF THREADSAFE} finally This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-11 18:01:13
|
Revision: 3190 http://jcl.svn.sourceforge.net/jcl/?rev=3190&view=rev Author: outchy Date: 2010-02-11 18:01:00 +0000 (Thu, 11 Feb 2010) Log Message: ----------- reverted revision 3189 since TSVN has some problems with file externals. to be investigated... Revision Links: -------------- http://jcl.svn.sourceforge.net/jcl/?rev=3189&view=rev Added Paths: ----------- trunk/jcl/source/include/jedi.inc Property Changed: ---------------- trunk/jcl/source/include/ Property changes on: trunk/jcl/source/include ___________________________________________________________________ Deleted: svn:externals - jedi.inc https://projectjedi.svn.sourceforge.net:443/svnroot/projectjedi/trunk/shared/include/jedi.inc Copied: trunk/jcl/source/include/jedi.inc (from rev 3188, trunk/jcl/source/include/jedi.inc) =================================================================== --- trunk/jcl/source/include/jedi.inc (rev 0) +++ trunk/jcl/source/include/jedi.inc 2010-02-11 18:01:00 UTC (rev 3190) @@ -0,0 +1,1265 @@ +{$IFNDEF JEDI_INC} +{$DEFINE JEDI_INC} + +{**************************************************************************************************} +{ } +{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");} +{ you may not use this file except in compliance with the License. You may obtain a copy of the } +{ License at http://www.mozilla.org/MPL/ } +{ } +{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF } +{ ANY KIND, either express or implied. See the License for the specific language governing rights } +{ and limitations under the License. } +{ } +{ The Original Code is: jedi.inc. } +{ The Initial Developer of the Original Code is Project JEDI http://www.delphi-jedi.org } +{ } +{ Alternatively, the contents of this file may be used under the terms of the GNU Lesser General } +{ Public License (the "LGPL License"), in which case the provisions of the LGPL License are } +{ applicable instead of those above. If you wish to allow use of your version of this file only } +{ under the terms of the LGPL License and not to allow others to use your version of this file } +{ under the MPL, indicate your decision by deleting the provisions above and replace them with } +{ the notice and other provisions required by the LGPL License. If you do not delete the } +{ provisions above, a recipient may use your version of this file under either the MPL or the } +{ LGPL License. } +{ } +{ For more information about the LGPL: http://www.gnu.org/copyleft/lesser.html } +{ } +{**************************************************************************************************} +{ } +{ This file defines various generic compiler directives used in different libraries, e.g. in the } +{ JEDI Code Library (JCL) and JEDI Visual Component Library Library (JVCL). The directives in } +{ this file are of generic nature and consist mostly of mappings from the VERXXX directives } +{ defined by Delphi, C++Builder and FPC to friendly names such as DELPHI5 and } +{ SUPPORTS_WIDESTRING. These friendly names are subsequently used in the libraries to test for } +{ compiler versions and/or whether the compiler supports certain features (such as widestrings or } +{ 64 bit integers. The libraries provide an additional, library specific, include file. For the } +{ JCL e.g. this is jcl.inc. These files should be included in source files instead of this file } +{ (which is pulled in automatically). } +{ } +{**************************************************************************************************} +{ } +{ Last modified: $Date:: $ } +{ Revision: $Rev:: $ } +{ Author: $Author:: $ } +{ } +{**************************************************************************************************} + +(* + +- Development environment directives + + This file defines two directives to indicate which development environment the + library is being compiled with. Currently this can either be Delphi, Kylix, + C++Builder or FPC. + + Directive Description + ------------------------------------------------------------------------------ + DELPHI Defined if compiled with Delphi + KYLIX Defined if compiled with Kylix + DELPHICOMPILER Defined if compiled with Delphi or Kylix/Delphi + BCB Defined if compiled with C++Builder + CPPBUILDER Defined if compiled with C++Builder (alias for BCB) + BCBCOMPILER Defined if compiled with C++Builder or Kylix/C++ + DELPHILANGUAGE Defined if compiled with Delphi, Kylix or C++Builder + BORLAND Defined if compiled with Delphi, Kylix or C++Builder + FPC Defined if compiled with FPC + +- Platform Directives + + Platform directives are not all explicitly defined in this file, some are + defined by the compiler itself. They are listed here only for completeness. + + Directive Description + ------------------------------------------------------------------------------ + WIN32 Defined when target platform is 32 bit Windows + WIN64 Defined when target platform is 64 bit Windows + MSWINDOWS Defined when target platform is 32 bit Windows + LINUX Defined when target platform is Linux + UNIX Defined when target platform is Unix-like (including Linux) + CLR Defined when target platform is .NET + +- Architecture directives. These are auto-defined by FPC + CPU32 and CPU64 are mostly for generic pointer size dependant differences rather + than for a specific architecture. + + CPU386 Defined when target platform is native x86 (win32) + CPUx86_64 Defined when target platform is native x86_64 (win64) + CPU32 Defined when target is 32-bit + CPU64 Defined when target is 64-bit + CPUASM Defined when target assembler is available + +- Visual library Directives + + The following directives indicate for a visual library. In a Delphi/BCB + (Win32) application you need to define the VisualCLX symbol in the project + options, if you want to use the VisualCLX library. Alternatively you can use + the IDE expert, which is distributed with the JCL to do this automatically. + + Directive Description + ------------------------------------------------------------------------------ + VCL Defined for Delphi/BCB (Win32) exactly if VisualCLX is not defined + VisualCLX Defined for Kylix; needs to be defined for Delphi/BCB to + use JCL with VisualCLX applications. + + +- Other cross-platform related defines + + These symbols are intended to help in writing portable code. + + Directive Description + ------------------------------------------------------------------------------ + PUREPASCAL Code is machine-independent (as opposed to assembler code) + Win32API Code is specific for the Win32 API; + use instead of "{$IFNDEF CLR} {$IFDEF MSWINDOWS}" constructs + + +- Delphi Versions + + The following directives are direct mappings from the VERXXX directives to a + friendly name of the associated compiler. These directives are only defined if + the compiler is Delphi (ie DELPHI is defined). + + Directive Description + ------------------------------------------------------------------------------ + DELPHI1 Defined when compiling with Delphi 1 (Codename WASABI/MANGO) + DELPHI2 Defined when compiling with Delphi 2 (Codename POLARIS) + DELPHI3 Defined when compiling with Delphi 3 (Codename IVORY) + DELPHI4 Defined when compiling with Delphi 4 (Codename ALLEGRO) + DELPHI5 Defined when compiling with Delphi 5 (Codename ARGUS) + DELPHI6 Defined when compiling with Delphi 6 (Codename ILLIAD) + DELPHI7 Defined when compiling with Delphi 7 (Codename AURORA) + DELPHI8 Defined when compiling with Delphi 8 (Codename OCTANE) + DELPHI2005 Defined when compiling with Delphi 2005 (Codename DIAMONDBACK) + DELPHI9 Alias for DELPHI2005 + DELPHI10 Defined when compiling with Delphi 2006 (Codename DEXTER) + DELPHI2006 Alias for DELPHI10 + DELPHI11 Defined when compiling with Delphi 2007 for Win32 (Codename SPACELY) + DELPHI2007 Alias for DELPHI11 + DELPHI12 Defined when compiling with Delphi 2009 for Win32 (Codename TIBURON) + DELPHI2009 Alias for DELPHI12 + DELPHI14 Defined when compiling with Delphi 2010 for Win32 (Codename WEAVER) + DELPHI2010 Alias for DELPHI14 + DELPHI1_UP Defined when compiling with Delphi 1 or higher + DELPHI2_UP Defined when compiling with Delphi 2 or higher + DELPHI3_UP Defined when compiling with Delphi 3 or higher + DELPHI4_UP Defined when compiling with Delphi 4 or higher + DELPHI5_UP Defined when compiling with Delphi 5 or higher + DELPHI6_UP Defined when compiling with Delphi 6 or higher + DELPHI7_UP Defined when compiling with Delphi 7 or higher + DELPHI8_UP Defined when compiling with Delphi 8 or higher + DELPHI2005_UP Defined when compiling with Delphi 2005 or higher + DELPHI9_UP Alias for DELPHI2005_UP + DELPHI10_UP Defined when compiling with Delphi 2006 or higher + DELPHI2006_UP Alias for DELPHI10_UP + DELPHI11_UP Defined when compiling with Delphi 2007 for Win32 or higher + DELPHI2007_UP Alias for DELPHI11_UP + DELPHI12_UP Defined when compiling with Delphi 2009 for Win32 or higher + DELPHI2009_UP Alias for DELPHI12_UP + DELPHI14_UP Defined when compiling with Delphi 2010 for Win32 or higher + DELPHI2010_UP Alias for DELPHI14_UP + + +- Kylix Versions + + The following directives are direct mappings from the VERXXX directives to a + friendly name of the associated compiler. These directives are only defined if + the compiler is Kylix (ie KYLIX is defined). + + Directive Description + ------------------------------------------------------------------------------ + KYLIX1 Defined when compiling with Kylix 1 + KYLIX2 Defined when compiling with Kylix 2 + KYLIX3 Defined when compiling with Kylix 3 (Codename CORTEZ) + KYLIX1_UP Defined when compiling with Kylix 1 or higher + KYLIX2_UP Defined when compiling with Kylix 2 or higher + KYLIX3_UP Defined when compiling with Kylix 3 or higher + + +- Delphi Compiler Versions (Delphi / Kylix, not in BCB mode) + + Directive Description + ------------------------------------------------------------------------------ + DELPHICOMPILER1 Defined when compiling with Delphi 1 + DELPHICOMPILER2 Defined when compiling with Delphi 2 + DELPHICOMPILER3 Defined when compiling with Delphi 3 + DELPHICOMPILER4 Defined when compiling with Delphi 4 + DELPHICOMPILER5 Defined when compiling with Delphi 5 + DELPHICOMPILER6 Defined when compiling with Delphi 6 or Kylix 1, 2 or 3 + DELPHICOMPILER7 Defined when compiling with Delphi 7 + DELPHICOMPILER8 Defined when compiling with Delphi 8 + DELPHICOMPILER9 Defined when compiling with Delphi 2005 + DELPHICOMPILER10 Defined when compiling with Delphi Personality of BDS 4.0 + DELPHICOMPILER11 Defined when compiling with Delphi 2007 for Win32 + DELPHICOMPILER12 Defined when compiling with Delphi Personality of BDS 6.0 + DELPHICOMPILER14 Defined when compiling with Delphi Personality of BDS 7.0 + DELPHICOMPILER1_UP Defined when compiling with Delphi 1 or higher + DELPHICOMPILER2_UP Defined when compiling with Delphi 2 or higher + DELPHICOMPILER3_UP Defined when compiling with Delphi 3 or higher + DELPHICOMPILER4_UP Defined when compiling with Delphi 4 or higher + DELPHICOMPILER5_UP Defined when compiling with Delphi 5 or higher + DELPHICOMPILER6_UP Defined when compiling with Delphi 6 or Kylix 1, 2 or 3 or higher + DELPHICOMPILER7_UP Defined when compiling with Delphi 7 or higher + DELPHICOMPILER8_UP Defined when compiling with Delphi 8 or higher + DELPHICOMPILER9_UP Defined when compiling with Delphi 2005 + DELPHICOMPILER10_UP Defined when compiling with Delphi 2006 or higher + DELPHICOMPILER11_UP Defined when compiling with Delphi 2007 for Win32 or higher + DELPHICOMPILER12_UP Defined when compiling with Delphi 2009 for Win32 or higher + DELPHICOMPILER14_UP Defined when compiling with Delphi 2010 for Win32 or higher + + +- C++Builder Versions + + The following directives are direct mappings from the VERXXX directives to a + friendly name of the associated compiler. These directives are only defined if + the compiler is C++Builder (ie BCB is defined). + + Directive Description + ------------------------------------------------------------------------------ + BCB1 Defined when compiling with C++Builder 1 + BCB3 Defined when compiling with C++Builder 3 + BCB4 Defined when compiling with C++Builder 4 + BCB5 Defined when compiling with C++Builder 5 (Codename RAMPAGE) + BCB6 Defined when compiling with C++Builder 6 (Codename RIPTIDE) + BCB10 Defined when compiling with C++Builder Personality of BDS 4.0 (also known as C++Builder 2006) (Codename DEXTER) + BCB11 Defined when compiling with C++Builder Personality of RAD Studio 2007 (also known as C++Builder 2007) (Codename COGSWELL) + BCB12 Defined when compiling with C++Builder Personality of RAD Studio 2009 (also known as C++Builder 2009) (Codename TIBURON) + BCB14 Defined when compiling with C++Builder Personality of RAD Studio 2010 (also known as C++Builder 2010) (Codename WEAVER) + BCB1_UP Defined when compiling with C++Builder 1 or higher + BCB3_UP Defined when compiling with C++Builder 3 or higher + BCB4_UP Defined when compiling with C++Builder 4 or higher + BCB5_UP Defined when compiling with C++Builder 5 or higher + BCB6_UP Defined when compiling with C++Builder 6 or higher + BCB10_UP Defined when compiling with C++Builder Personality of BDS 4.0 or higher + BCB11_UP Defined when compiling with C++Builder Personality of RAD Studio 2007 or higher + BCB12_UP Defined when compiling with C++Builder Personality of RAD Studio 2009 or higher + BCB14_UP Defined when compiling with C++Builder Personality of RAD Studio 2010 or higher + + +- RAD Studio / Borland Developer Studio Versions + + The following directives are direct mappings from the VERXXX directives to a + friendly name of the associated IDE. These directives are only defined if + the IDE is Borland Developer Studio Version 2 or above. + + Note: Borland Developer Studio 2006 is marketed as Delphi 2006 or C++Builder 2006, + but those provide only different labels for identical content. + + Directive Description + ------------------------------------------------------------------------------ + BDS Defined when compiling with BDS version of dcc32.exe (Codename SIDEWINDER) + BDS2 Defined when compiling with BDS 2.0 (Delphi 8) (Codename OCTANE) + BDS3 Defined when compiling with BDS 3.0 (Delphi 2005) (Codename DIAMONDBACK) + BDS4 Defined when compiling with BDS 4.0 (Borland Developer Studio 2006) (Codename DEXTER) + BDS5 Defined when compiling with BDS 5.0 (CodeGear RAD Studio 2007) (Codename HIGHLANDER) + BDS6 Defined when compiling with BDS 6.0 (CodeGear RAD Studio 2009) (Codename TIBURON) + BDS7 Defined when compiling with BDS 7.0 (Embarcadero RAD Studio 2010) (Codename WEAVER) + BDS2_UP Defined when compiling with BDS 2.0 or higher + BDS3_UP Defined when compiling with BDS 3.0 or higher + BDS4_UP Defined when compiling with BDS 4.0 or higher + BDS5_UP Defined when compiling with BDS 5.0 or higher + BDS6_UP Defined when compiling with BDS 6.0 or higher + BDS7_UP Defined when compiling with BDS 7.0 or higher + +- Compiler Versions + + The following directives are direct mappings from the VERXXX directives to a + friendly name of the associated compiler. Unlike the DELPHI_X and BCB_X + directives, these directives are indepedent of the development environment. + That is, they are defined regardless of whether compilation takes place using + Delphi or C++Builder. + + Directive Description + ------------------------------------------------------------------------------ + COMPILER1 Defined when compiling with Delphi 1 + COMPILER2 Defined when compiling with Delphi 2 or C++Builder 1 + COMPILER3 Defined when compiling with Delphi 3 + COMPILER35 Defined when compiling with C++Builder 3 + COMPILER4 Defined when compiling with Delphi 4 or C++Builder 4 + COMPILER5 Defined when compiling with Delphi 5 or C++Builder 5 + COMPILER6 Defined when compiling with Delphi 6 or C++Builder 6 + COMPILER7 Defined when compiling with Delphi 7 + COMPILER8 Defined when compiling with Delphi 8 + COMPILER9 Defined when compiling with Delphi 9 + COMPILER10 Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 + COMPILER11 Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 + COMPILER12 Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 + COMPILER14 Defined when compiling with Delphi or C++Builder Personalities of BDS 7.0 + COMPILER1_UP Defined when compiling with Delphi 1 or higher + COMPILER2_UP Defined when compiling with Delphi 2 or C++Builder 1 or higher + COMPILER3_UP Defined when compiling with Delphi 3 or higher + COMPILER35_UP Defined when compiling with C++Builder 3 or higher + COMPILER4_UP Defined when compiling with Delphi 4 or C++Builder 4 or higher + COMPILER5_UP Defined when compiling with Delphi 5 or C++Builder 5 or higher + COMPILER6_UP Defined when compiling with Delphi 6 or C++Builder 6 or higher + COMPILER7_UP Defined when compiling with Delphi 7 + COMPILER8_UP Defined when compiling with Delphi 8 + COMPILER9_UP Defined when compiling with Delphi Personalities of BDS 3.0 + COMPILER10_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 or higher + COMPILER11_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 or higher + COMPILER12_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 or higher + COMPILER14_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 7.0 or higher + + +- RTL Versions + + Use e.g. following to determine the exact RTL version since version 14.0: + {$IFDEF CONDITIONALEXPRESSIONS} + {$IF Declared(RTLVersion) and (RTLVersion >= 14.2)} + // code for Delphi 6.02 or higher, Kylix 2 or higher, C++Builder 6 or higher + ... + {$IFEND} + {$ENDIF} + + Directive Description + ------------------------------------------------------------------------------ + RTL80_UP Defined when compiling with Delphi 1 or higher + RTL90_UP Defined when compiling with Delphi 2 or higher + RTL93_UP Defined when compiling with C++Builder 1 or higher + RTL100_UP Defined when compiling with Delphi 3 or higher + RTL110_UP Defined when compiling with C++Builder 3 or higher + RTL120_UP Defined when compiling with Delphi 4 or higher + RTL125_UP Defined when compiling with C++Builder 4 or higher + RTL130_UP Defined when compiling with Delphi 5 or C++Builder 5 or higher + RTL140_UP Defined when compiling with Delphi 6, Kylix 1, 2 or 3 or C++Builder 6 or higher + RTL150_UP Defined when compiling with Delphi 7 or higher + RTL160_UP Defined when compiling with Delphi 8 or higher + RTL170_UP Defined when compiling with Delphi Personalities of BDS 3.0 or higher + RTL180_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 or higher + RTL185_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 or higher + RTL190_UP Defined when compiling with Delphi.NET of BDS 5.0 or higher + RTL200_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 or higher + RTL210_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 7.0 or higher + + +- CLR Versions + + Directive Description + ------------------------------------------------------------------------------ + CLR Defined when compiling for .NET + CLR10 Defined when compiling for .NET 1.0 (may be overriden by FORCE_CLR10) + CLR10_UP Defined when compiling for .NET 1.0 or higher + CLR11 Defined when compiling for .NET 1.1 (may be overriden by FORCE_CLR11) + CLR11_UP Defined when compiling for .NET 1.1 or higher + CLR20 Defined when compiling for .NET 2.0 (may be overriden by FORCE_CLR20) + CLR20_UP Defined when compiling for .NET 2.0 or higher + + +- Feature Directives + + The features directives are used to test if the compiler supports specific + features, such as method overloading, and adjust the sources accordingly. Use + of these directives is preferred over the use of the DELPHI and COMPILER + directives. + + Directive Description + ------------------------------------------------------------------------------ + SUPPORTS_CONSTPARAMS Compiler supports const parameters (D1+) + SUPPORTS_SINGLE Compiler supports the Single type (D1+) + SUPPORTS_DOUBLE Compiler supports the Double type (D1+) + SUPPORTS_EXTENDED Compiler supports the Extended type (D1+) + SUPPORTS_CURRENCY Compiler supports the Currency type (D2+) + SUPPORTS_THREADVAR Compiler supports threadvar declarations (D2+) + SUPPORTS_OUTPARAMS Compiler supports out parameters (D3+) + SUPPORTS_VARIANT Compiler supports variant (D2+) + SUPPORTS_WIDECHAR Compiler supports the WideChar type (D2+) + SUPPORTS_WIDESTRING Compiler supports the WideString type (D3+/BCB3+) + SUPPORTS_INTERFACE Compiler supports interfaces (D3+/BCB3+) + SUPPORTS_DISPINTERFACE Compiler supports dispatch interfaces (D3+/BCB3+) + SUPPORTS_DISPID Compiler supports dispatch ids (D3+/BCB3+/FPC) + SUPPORTS_EXTSYM Compiler supports the $EXTERNALSYM directive (D4+/BCB3+) + SUPPORTS_NODEFINE Compiler supports the $NODEFINE directive (D4+/BCB3+) + SUPPORTS_LONGWORD Compiler supports the LongWord type (unsigned 32 bit) (D4+/BCB4+) + SUPPORTS_INT64 Compiler supports the Int64 type (D4+/BCB4+) + SUPPORTS_DYNAMICARRAYS Compiler supports dynamic arrays (D4+/BCB4+) + SUPPORTS_DEFAULTPARAMS Compiler supports default parameters (D4+/BCB4+) + SUPPORTS_OVERLOAD Compiler supports overloading (D4+/BCB4+) + SUPPORTS_IMPLEMENTS Compiler supports implements (D4+/BCB4+) + SUPPORTS_DEPRECATED Compiler supports the deprecated directive (D6+/BCB6+) + SUPPORTS_PLATFORM Compiler supports the platform directive (D6+/BCB6+) + SUPPORTS_LIBRARY Compiler supports the library directive (D6+/BCB6+/FPC) + SUPPORTS_LOCAL Compiler supports the local directive (D6+/BCB6+) + SUPPORTS_SETPEFLAGS Compiler supports the SetPEFlags directive (D6+/BCB6+) + SUPPORTS_EXPERIMENTAL_WARNINGS Compiler supports the WARN SYMBOL_EXPERIMENTAL and WARN UNIT_EXPERIMENTAL directives (D6+/BCB6+) + SUPPORTS_INLINE Compiler supports the inline directive (D9+/FPC) + SUPPORTS_FOR_IN Compiler supports for in loops (D9+) + SUPPORTS_NESTED_CONSTANTS Compiler supports nested constants (D9+) + SUPPORTS_NESTED_TYPES Compiler supports nested types (D9+) + SUPPORTS_REGION Compiler supports the REGION and ENDREGION directives (D9+) + SUPPORTS_ENHANCED_RECORDS Compiler supports class [operator|function|procedure] for record types (D9.NET, D10+) + SUPPORTS_CLASS_FIELDS Compiler supports class fields (D9.NET, D10+) + SUPPORTS_CLASS_HELPERS Compiler supports class helpers (D9.NET, D10+) + SUPPORTS_CLASS_OPERATORS Compiler supports class operators (D9.NET, D10+) + SUPPORTS_CLASS_CTORDTORS Compiler supports class contructors/destructors (D14+) + SUPPORTS_STRICT Compiler supports strict keyword (D9.NET, D10+) + SUPPORTS_STATIC Compiler supports static keyword (D9.NET, D10+) + SUPPORTS_FINAL Compiler supports final keyword (D9.NET, D10+) + SUPPORTS_METHODINFO Compiler supports the METHODINFO directives (D10+) + SUPPORTS_GENERICS Compiler supports generic implementations (D11.NET, D12+) + SUPPORTS_DEPRECATED_DETAILS Compiler supports additional text for the deprecated directive (D11.NET, D12+) + ACCEPT_DEPRECATED Compiler supports or ignores the deprecated directive (D6+/BCB6+/FPC) + ACCEPT_PLATFORM Compiler supports or ignores the platform directive (D6+/BCB6+/FPC) + ACCEPT_LIBRARY Compiler supports or ignores the library directive (D6+/BCB6+) + SUPPORTS_CUSTOMVARIANTS Compiler supports custom variants (D6+/BCB6+) + SUPPORTS_VARARGS Compiler supports varargs (D6+/BCB6+) + SUPPORTS_ENUMVALUE Compiler supports assigning ordinalities to values of enums (D6+/BCB6+) + SUPPORTS_DEPRECATED_WARNINGS Compiler supports deprecated warnings (D6+/BCB6+) + SUPPORTS_LIBRARY_WARNINGS Compiler supports library warnings (D6+/BCB6+) + SUPPORTS_PLATFORM_WARNINGS Compiler supports platform warnings (D6+/BCB6+) + SUPPORTS_UNSAFE_WARNINGS Compiler supports unsafe warnings (D7) + SUPPORTS_WEAKPACKAGEUNIT Compiler supports the WEAKPACKAGEUNIT directive + SUPPORTS_COMPILETIME_MESSAGES Compiler supports the MESSAGE directive + SUPPORTS_PACKAGES Compiler supports Packages + HAS_UNIT_LIBC Unit Libc exists (Kylix, FPC on Linux/x86) + HAS_UNIT_RTLCONSTS Unit RTLConsts exists (D6+/BCB6+/FPC) + HAS_UNIT_TYPES Unit Types exists (D6+/BCB6+/FPC) + HAS_UNIT_VARIANTS Unit Variants exists (D6+/BCB6+/FPC) + HAS_UNIT_STRUTILS Unit StrUtils exists (D6+/BCB6+/FPC) + HAS_UNIT_DATEUTILS Unit DateUtils exists (D6+/BCB6+/FPC) + HAS_UNIT_CONTNRS Unit contnrs exists (D6+/BCB6+/FPC) + HAS_UNIT_HTTPPROD Unit HTTPProd exists (D9+) + HAS_UNIT_GIFIMG Unit GifImg exists (D11+) + HAS_UNIT_ANSISTRINGS Unit AnsiStrings exists (D12+) + HAS_UNIT_PNGIMAGE Unit PngImage exists (D12+) + XPLATFORM_RTL The RTL supports crossplatform function names (e.g. RaiseLastOSError) (D6+/BCB6+/FPC) + SUPPORTS_UNICODE string type is aliased to an unicode string (WideString or UnicodeString) (DX.NET, D12+) + SUPPORTS_UNICODE_STRING Compiler supports UnicodeString (D12+) + SUPPORTS_INT_ALIASES Types Int8, Int16, Int32, UInt8, UInt16 and UInt32 are defined in the unit System (D12+) + HAS_UNIT_RTTI Unit RTTI is available (D14+) + SUPPORTS_CAST_INTERFACE_TO_OBJ The compiler supports casts from interfaces to objects (D14+) + SUPPORTS_DELAYED_LOADING The compiler generates stubs for delaying imported function loads (D14+) + + +- Compiler Settings + + The compiler settings directives indicate whether a specific compiler setting + is in effect. This facilitates changing compiler settings locally in a more + compact and readible manner. + + Directive Description + ------------------------------------------------------------------------------ + ALIGN_ON Compiling in the A+ state (no alignment) + BOOLEVAL_ON Compiling in the B+ state (complete boolean evaluation) + ASSERTIONS_ON Compiling in the C+ state (assertions on) + DEBUGINFO_ON Compiling in the D+ state (debug info generation on) + IMPORTEDDATA_ON Compiling in the G+ state (creation of imported data references) + LONGSTRINGS_ON Compiling in the H+ state (string defined as AnsiString) + IOCHECKS_ON Compiling in the I+ state (I/O checking enabled) + WRITEABLECONST_ON Compiling in the J+ state (typed constants can be modified) + LOCALSYMBOLS Compiling in the L+ state (local symbol generation) + LOCALSYMBOLS_ON Alias of LOCALSYMBOLS + TYPEINFO_ON Compiling in the M+ state (RTTI generation on) + OPTIMIZATION_ON Compiling in the O+ state (code optimization on) + OPENSTRINGS_ON Compiling in the P+ state (variable string parameters are openstrings) + OVERFLOWCHECKS_ON Compiling in the Q+ state (overflow checing on) + RANGECHECKS_ON Compiling in the R+ state (range checking on) + TYPEDADDRESS_ON Compiling in the T+ state (pointers obtained using the @ operator are typed) + SAFEDIVIDE_ON Compiling in the U+ state (save FDIV instruction through RTL emulation) + VARSTRINGCHECKS_ON Compiling in the V+ state (type checking of shortstrings) + STACKFRAMES_ON Compiling in the W+ state (generation of stack frames) + EXTENDEDSYNTAX_ON Compiling in the X+ state (Delphi extended syntax enabled) +*) + +{$DEFINE BORLAND} + +{ Set FreePascal to Delphi mode } +{$IFDEF FPC} + {$MODE DELPHI} + {$ASMMODE Intel} + {$UNDEF BORLAND} + {$DEFINE CPUASM} + // FPC defines CPU32, CPU64 and Unix automatically +{$ENDIF} + +{$IFDEF BORLAND} + {$IFDEF LINUX} + {$DEFINE KYLIX} + {$ENDIF LINUX} + {$IFNDEF CLR} + {$DEFINE CPU386} // For Borland compilers select the x86 compat assembler by default + {$DEFINE CPU32} // Assume Borland compilers are 32-bit (rather than 64-bit) + {$DEFINE CPUASM} + {$ENDIF ~CLR} +{$ENDIF BORLAND} + +{------------------------------------------------------------------------------} +{ VERXXX to COMPILERX, DELPHIX and BCBX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF BORLAND} + {$IFDEF KYLIX} + {$I kylix.inc} // FPC incompatible stuff + {$ELSE ~KYLIX} + + {$DEFINE UNKNOWN_COMPILER_VERSION} + + {$IFDEF VER80} + {$DEFINE COMPILER1} + {$DEFINE DELPHI1} + {$DEFINE DELPHICOMPILER1} + {$DEFINE RTL80_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER90} + {$DEFINE COMPILER2} + {$DEFINE DELPHI2} + {$DEFINE DELPHICOMPILER2} + {$DEFINE RTL90_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER93} + {$DEFINE COMPILER2} + {$DEFINE BCB1} + {$DEFINE BCB} + {$DEFINE RTL93_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER100} + {$DEFINE COMPILER3} + {$DEFINE DELPHI3} + {$DEFINE DELPHICOMPILER3} + {$DEFINE RTL100_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER110} + {$DEFINE COMPILER35} + {$DEFINE BCB3} + {$DEFINE BCB} + {$DEFINE RTL110_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER120} + {$DEFINE COMPILER4} + {$DEFINE DELPHI4} + {$DEFINE DELPHICOMPILER4} + {$DEFINE RTL120_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER125} + {$DEFINE COMPILER4} + {$DEFINE BCB4} + {$DEFINE BCB} + {$DEFINE RTL125_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER130} + {$DEFINE COMPILER5} + {$IFDEF BCB} + {$DEFINE BCB5} + {$ELSE} + {$DEFINE DELPHI5} + {$DEFINE DELPHICOMPILER5} + {$ENDIF} + {$DEFINE RTL130_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER140} + {$DEFINE COMPILER6} + {$IFDEF BCB} + {$DEFINE BCB6} + {$ELSE} + {$DEFINE DELPHI6} + {$DEFINE DELPHICOMPILER6} + {$ENDIF} + {$DEFINE RTL140_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER150} + {$DEFINE COMPILER7} + {$DEFINE DELPHI7} + {$DEFINE DELPHICOMPILER7} + {$DEFINE RTL150_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER160} + {$DEFINE BDS2} + {$DEFINE BDS} + {$IFDEF CLR} + {$DEFINE CLR10} + {$ENDIF CLR} + {$DEFINE COMPILER8} + {$DEFINE DELPHI8} + {$DEFINE DELPHICOMPILER8} + {$DEFINE RTL160_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER170} + {$DEFINE BDS3} + {$DEFINE BDS} + {$IFDEF CLR} + {$DEFINE CLR11} + {$ENDIF CLR} + {$DEFINE COMPILER9} + {$DEFINE DELPHI9} + {$DEFINE DELPHI2005} // synonym to DELPHI9 + {$DEFINE DELPHICOMPILER9} + {$DEFINE RTL170_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER180} + {$DEFINE BDS} + {$IFDEF CLR} + {$DEFINE CLR11} + {$ENDIF CLR} + {$IFDEF VER185} + {$DEFINE BDS5} + {$DEFINE COMPILER11} + {$IFDEF BCB} + {$DEFINE BCB11} + {$ELSE} + {$DEFINE DELPHI11} + {$DEFINE DELPHI2007} // synonym to DELPHI11 + {$DEFINE DELPHICOMPILER11} + {$ENDIF} + {$DEFINE RTL185_UP} + {$ELSE ~~VER185} + {$DEFINE BDS4} + {$DEFINE COMPILER10} + {$IFDEF BCB} + {$DEFINE BCB10} + {$ELSE} + {$DEFINE DELPHI10} + {$DEFINE DELPHI2006} // synonym to DELPHI10 + {$DEFINE DELPHICOMPILER10} + {$ENDIF} + {$DEFINE RTL180_UP} + {$ENDIF ~VER185} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$IFDEF VER190} // Delphi 2007 for .NET + {$DEFINE BDS} + {$DEFINE BDS5} + {$IFDEF CLR} + {$DEFINE CLR20} + {$ENDIF CLR} + {$DEFINE COMPILER11} + {$DEFINE DELPHI11} + {$DEFINE DELPHI2007} // synonym to DELPHI11 + {$DEFINE DELPHICOMPILER11} + {$DEFINE RTL190_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF VER190} + + {$IFDEF VER200} // RAD Studio 2009 + {$DEFINE BDS} + {$DEFINE BDS6} + {$IFDEF CLR} + {$DEFINE CLR20} + {$ENDIF CLR} + {$DEFINE COMPILER12} + {$IFDEF BCB} + {$DEFINE BCB12} + {$ELSE} + {$DEFINE DELPHI12} + {$DEFINE DELPHI2009} // synonym to DELPHI12 + {$DEFINE DELPHICOMPILER12} + {$ENDIF BCB} + {$IFDEF CLR} + {$DEFINE RTL190_UP} + {$ELSE} + {$DEFINE RTL200_UP} + {$ENDIF} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF VER200} + + {$IFDEF VER210} // RAD Studio 2010 + {$DEFINE BDS} + {$DEFINE BDS7} + {$DEFINE COMPILER14} + {$IFDEF BCB} + {$DEFINE BCB14} + {$ELSE} + {$DEFINE DELPHI14} + {$DEFINE DELPHI2010} // synonym to DELPHI14 + {$DEFINE DELPHICOMPILER14} + {$ENDIF BCB} + {$DEFINE RTL210_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF VER210} + + {$IFDEF UNKNOWN_COMPILER_VERSION} // adjust for newer version (always use latest version) + {$DEFINE BDS} + {$DEFINE BDS7} + {$DEFINE COMPILER14} + {$IFDEF BCB} + {$DEFINE BCB14} + {$ELSE} + {$DEFINE DELPHI14} + {$DEFINE DELPHI2010} // synonym to DELPHI14 + {$DEFINE DELPHICOMPILER14} + {$ENDIF BCB} + {$DEFINE RTL210_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF} + + {$ENDIF ~KYLIX} + + {$IFDEF BCB} + {$DEFINE CPPBUILDER} + {$DEFINE BCBCOMPILER} + {$ELSE ~BCB} + {$DEFINE DELPHI} + {$DEFINE DELPHICOMPILER} + {$ENDIF ~BCB} + +{$ENDIF BORLAND} + +{------------------------------------------------------------------------------} +{ DELPHIX_UP from DELPHIX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF DELPHI14} {$DEFINE DELPHI14_UP} {$ENDIF} +{$IFDEF DELPHI12} {$DEFINE DELPHI12_UP} {$ENDIF} +{$IFDEF DELPHI11} {$DEFINE DELPHI11_UP} {$ENDIF} +{$IFDEF DELPHI10} {$DEFINE DELPHI10_UP} {$ENDIF} +{$IFDEF DELPHI9} {$DEFINE DELPHI9_UP} {$ENDIF} +{$IFDEF DELPHI8} {$DEFINE DELPHI8_UP} {$ENDIF} +{$IFDEF DELPHI7} {$DEFINE DELPHI7_UP} {$ENDIF} +{$IFDEF DELPHI6} {$DEFINE DELPHI6_UP} {$ENDIF} +{$IFDEF DELPHI5} {$DEFINE DELPHI5_UP} {$ENDIF} +{$IFDEF DELPHI4} {$DEFINE DELPHI4_UP} {$ENDIF} +{$IFDEF DELPHI3} {$DEFINE DELPHI3_UP} {$ENDIF} +{$IFDEF DELPHI2} {$DEFINE DELPHI2_UP} {$ENDIF} +{$IFDEF DELPHI1} {$DEFINE DELPHI1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ DELPHIX_UP from DELPHIX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF DELPHI14_UP} + {$DEFINE DELPHI2010_UP} // synonym to DELPHI14_UP + {$DEFINE DELPHI12_UP} +{$ENDIF} + +{$IFDEF DELPHI12_UP} + {$DEFINE DELPHI2009_UP} // synonym to DELPHI12_UP + {$DEFINE DELPHI11_UP} +{$ENDIF} + +{$IFDEF DELPHI11_UP} + {$DEFINE DELPHI2007_UP} // synonym to DELPHI11_UP + {$DEFINE DELPHI10_UP} +{$ENDIF} + +{$IFDEF DELPHI10_UP} + {$DEFINE DELPHI2006_UP} // synonym to DELPHI10_UP + {$DEFINE DELPHI9_UP} +{$ENDIF} + +{$IFDEF DELPHI9_UP} + {$DEFINE DELPHI2005_UP} // synonym to DELPHI9_UP + {$DEFINE DELPHI8_UP} +{$ENDIF} + +{$IFDEF DELPHI8_UP} {$DEFINE DELPHI7_UP} {$ENDIF} +{$IFDEF DELPHI7_UP} {$DEFINE DELPHI6_UP} {$ENDIF} +{$IFDEF DELPHI6_UP} {$DEFINE DELPHI5_UP} {$ENDIF} +{$IFDEF DELPHI5_UP} {$DEFINE DELPHI4_UP} {$ENDIF} +{$IFDEF DELPHI4_UP} {$DEFINE DELPHI3_UP} {$ENDIF} +{$IFDEF DELPHI3_UP} {$DEFINE DELPHI2_UP} {$ENDIF} +{$IFDEF DELPHI2_UP} {$DEFINE DELPHI1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ BCBX_UP from BCBX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF BCB14} {$DEFINE BCB14_UP} {$ENDIF} +{$IFDEF BCB12} {$DEFINE BCB12_UP} {$ENDIF} +{$IFDEF BCB11} {$DEFINE BCB11_UP} {$ENDIF} +{$IFDEF BCB10} {$DEFINE BCB10_UP} {$ENDIF} +{$IFDEF BCB6} {$DEFINE BCB6_UP} {$ENDIF} +{$IFDEF BCB5} {$DEFINE BCB5_UP} {$ENDIF} +{$IFDEF BCB4} {$DEFINE BCB4_UP} {$ENDIF} +{$IFDEF BCB3} {$DEFINE BCB3_UP} {$ENDIF} +{$IFDEF BCB1} {$DEFINE BCB1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ BCBX_UP from BCBX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF BCB14_UP} {$DEFINE BCB12_UP} {$ENDIF} +{$IFDEF BCB12_UP} {$DEFINE BCB11_UP} {$ENDIF} +{$IFDEF BCB11_UP} {$DEFINE BCB10_UP} {$ENDIF} +{$IFDEF BCB10_UP} {$DEFINE BCB6_UP} {$ENDIF} +{$IFDEF BCB6_UP} {$DEFINE BCB5_UP} {$ENDIF} +{$IFDEF BCB5_UP} {$DEFINE BCB4_UP} {$ENDIF} +{$IFDEF BCB4_UP} {$DEFINE BCB3_UP} {$ENDIF} +{$IFDEF BCB3_UP} {$DEFINE BCB1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ BDSX_UP from BDSX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF BDS7} {$DEFINE BDS7_UP} {$ENDIF} +{$IFDEF BDS6} {$DEFINE BDS6_UP} {$ENDIF} +{$IFDEF BDS5} {$DEFINE BDS5_UP} {$ENDIF} +{$IFDEF BDS4} {$DEFINE BDS4_UP} {$ENDIF} +{$IFDEF BDS3} {$DEFINE BDS3_UP} {$ENDIF} +{$IFDEF BDS2} {$DEFINE BDS2_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ BDSX_UP from BDSX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF BDS7_UP} {$DEFINE BDS6_UP} {$ENDIF} +{$IFDEF BDS6_UP} {$DEFINE BDS5_UP} {$ENDIF} +{$IFDEF BDS5_UP} {$DEFINE BDS4_UP} {$ENDIF} +{$IFDEF BDS4_UP} {$DEFINE BDS3_UP} {$ENDIF} +{$IFDEF BDS3_UP} {$DEFINE BDS2_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ DELPHICOMPILERX_UP from DELPHICOMPILERX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF DELPHICOMPILER14} {$DEFINE DELPHICOMPILER14_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER12} {$DEFINE DELPHICOMPILER12_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER11} {$DEFINE DELPHICOMPILER11_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER10} {$DEFINE DELPHICOMPILER10_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER9} {$DEFINE DELPHICOMPILER9_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER8} {$DEFINE DELPHICOMPILER8_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER7} {$DEFINE DELPHICOMPILER7_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER6} {$DEFINE DELPHICOMPILER6_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER5} {$DEFINE DELPHICOMPILER5_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER4} {$DEFINE DELPHICOMPILER4_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER3} {$DEFINE DELPHICOMPILER3_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER2} {$DEFINE DELPHICOMPILER2_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER1} {$DEFINE DELPHICOMPILER1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ DELPHICOMPILERX_UP from DELPHICOMPILERX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF DELPHICOMPILER14_UP} {$DEFINE DELPHICOMPILER12_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER12_UP} {$DEFINE DELPHICOMPILER11_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER11_UP} {$DEFINE DELPHICOMPILER10_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER10_UP} {$DEFINE DELPHICOMPILER9_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER9_UP} {$DEFINE DELPHICOMPILER8_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER8_UP} {$DEFINE DELPHICOMPILER7_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER8_UP} {$DEFINE DELPHICOMPILER7_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER7_UP} {$DEFINE DELPHICOMPILER6_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER6_UP} {$DEFINE DELPHICOMPILER5_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER5_UP} {$DEFINE DELPHICOMPILER4_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER4_UP} {$DEFINE DELPHICOMPILER3_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER3_UP} {$DEFINE DELPHICOMPILER2_UP} {$ENDIF} +{$IFDEF DELPHICOMPILER2_UP} {$DEFINE DELPHICOMPILER1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ COMPILERX_UP from COMPILERX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF COMPILER14} {$DEFINE COMPILER14_UP} {$ENDIF} +{$IFDEF COMPILER12} {$DEFINE COMPILER12_UP} {$ENDIF} +{$IFDEF COMPILER11} {$DEFINE COMPILER11_UP} {$ENDIF} +{$IFDEF COMPILER10} {$DEFINE COMPILER10_UP} {$ENDIF} +{$IFDEF COMPILER9} {$DEFINE COMPILER9_UP} {$ENDIF} +{$IFDEF COMPILER8} {$DEFINE COMPILER8_UP} {$ENDIF} +{$IFDEF COMPILER7} {$DEFINE COMPILER7_UP} {$ENDIF} +{$IFDEF COMPILER6} {$DEFINE COMPILER6_UP} {$ENDIF} +{$IFDEF COMPILER5} {$DEFINE COMPILER5_UP} {$ENDIF} +{$IFDEF COMPILER4} {$DEFINE COMPILER4_UP} {$ENDIF} +{$IFDEF COMPILER35} {$DEFINE COMPILER35_UP} {$ENDIF} +{$IFDEF COMPILER3} {$DEFINE COMPILER3_UP} {$ENDIF} +{$IFDEF COMPILER2} {$DEFINE COMPILER2_UP} {$ENDIF} +{$IFDEF COMPILER1} {$DEFINE COMPILER1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ COMPILERX_UP from COMPILERX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF COMPILER14_UP} {$DEFINE COMPILER12_UP} {$ENDIF} +{$IFDEF COMPILER12_UP} {$DEFINE COMPILER11_UP} {$ENDIF} +{$IFDEF COMPILER11_UP} {$DEFINE COMPILER10_UP} {$ENDIF} +{$IFDEF COMPILER10_UP} {$DEFINE COMPILER9_UP} {$ENDIF} +{$IFDEF COMPILER9_UP} {$DEFINE COMPILER8_UP} {$ENDIF} +{$IFDEF COMPILER8_UP} {$DEFINE COMPILER7_UP} {$ENDIF} +{$IFDEF COMPILER7_UP} {$DEFINE COMPILER6_UP} {$ENDIF} +{$IFDEF COMPILER6_UP} {$DEFINE COMPILER5_UP} {$ENDIF} +{$IFDEF COMPILER5_UP} {$DEFINE COMPILER4_UP} {$ENDIF} +{$IFDEF COMPILER4_UP} {$DEFINE COMPILER35_UP} {$ENDIF} +{$IFDEF COMPILER35_UP} {$DEFINE COMPILER3_UP} {$ENDIF} +{$IFDEF COMPILER3_UP} {$DEFINE COMPILER2_UP} {$ENDIF} +{$IFDEF COMPILER2_UP} {$DEFINE COMPILER1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ RTLX_UP from RTLX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF RTL210_UP} {$DEFINE RTL200_UP} {$ENDIF} +{$IFDEF RTL200_UP} {$DEFINE RTL190_UP} {$ENDIF} +{$IFDEF RTL190_UP} {$DEFINE RTL185_UP} {$ENDIF} +{$IFDEF RTL185_UP} {$DEFINE RTL180_UP} {$ENDIF} +{$IFDEF RTL180_UP} {$DEFINE RTL170_UP} {$ENDIF} +{$IFDEF RTL170_UP} {$DEFINE RTL160_UP} {$ENDIF} +{$IFDEF RTL160_UP} {$DEFINE RTL150_UP} {$ENDIF} +{$IFDEF RTL150_UP} {$DEFINE RTL145_UP} {$ENDIF} +{$IFDEF RTL145_UP} {$DEFINE RTL142_UP} {$ENDIF} +{$IFDEF RTL142_UP} {$DEFINE RTL140_UP} {$ENDIF} +{$IFDEF RTL140_UP} {$DEFINE RTL130_UP} {$ENDIF} +{$IFDEF RTL130_UP} {$DEFINE RTL125_UP} {$ENDIF} +{$IFDEF RTL125_UP} {$DEFINE RTL120_UP} {$ENDIF} +{$IFDEF RTL120_UP} {$DEFINE RTL110_UP} {$ENDIF} +{$IFDEF RTL110_UP} {$DEFINE RTL100_UP} {$ENDIF} +{$IFDEF RTL100_UP} {$DEFINE RTL93_UP} {$ENDIF} +{$IFDEF RTL93_UP} {$DEFINE RTL90_UP} {$ENDIF} +{$IFDEF RTL90_UP} {$DEFINE RTL80_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ Check for CLR overrides of default detection } +{------------------------------------------------------------------------------} + +{$IFDEF CLR} + {$IFDEF FORCE_CLR10} + {$DEFINE CLR10} + {$UNDEF CLR11} + {$UNDEF CLR20} + {$ENDIF FORCE_CLR10} + + {$IFDEF FORCE_CLR11} + {$UNDEF CLR10} + {$DEFINE CLR11} + {$UNDEF CLR20} + {$ENDIF FORCE_CLR11} + + {$IFDEF FORCE_CLR20} + {$UNDEF CLR10} + {$UNDEF CLR11} + {$DEFINE CLR20} + {$ENDIF FORCE_CLR20} +{$ENDIF CLR} + +{------------------------------------------------------------------------------} +{ CLRX from CLRX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF CLR10} {$DEFINE CLR10_UP} {$ENDIF} +{$IFDEF CLR11} {$DEFINE CLR11_UP} {$ENDIF} +{$IFDEF CLR20} {$DEFINE CLR20_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ CLRX_UP from CLRX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF CLR20_UP} {$DEFINE CLR11_UP} {$ENDIF} +{$IFDEF CLR11_UP} {$DEFINE CLR10_UP} {$ENDIF} + +{------------------------------------------------------------------------------} + +{$IFDEF DELPHICOMPILER} + {$DEFINE DELPHILANGUAGE} +{$ENDIF} + +{$IFDEF BCBCOMPILER} + {$DEFINE DELPHILANGUAGE} +{$ENDIF} + +{------------------------------------------------------------------------------} +{ KYLIXX_UP from KYLIXX mappings } +{------------------------------------------------------------------------------} + +{$IFDEF KYLIX3} {$DEFINE KYLIX3_UP} {$ENDIF} +{$IFDEF KYLIX2} {$DEFINE KYLIX2_UP} {$ENDIF} +{$IFDEF KYLIX1} {$DEFINE KYLIX1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ KYLIXX_UP from KYLIXX_UP mappings } +{------------------------------------------------------------------------------} + +{$IFDEF KYLIX3_UP} {$DEFINE KYLIX2_UP} {$ENDIF} +{$IFDEF KYLIX2_UP} {$DEFINE KYLIX1_UP} {$ENDIF} + +{------------------------------------------------------------------------------} +{ Map COMPILERX_UP to friendly feature names } +{------------------------------------------------------------------------------} + +{$IFDEF FPC} + {$IFDEF VER1_0} + Please use FPC 2.0 or higher to compile this. + {$ELSE} + {$DEFINE SUPPORTS_OUTPARAMS} + {$DEFINE SUPPORTS_WIDECHAR} + {$DEFINE SUPPORTS_WIDESTRING} + {$IFDEF HASINTF} + {$DEFINE SUPPORTS_INTERFACE} + {$ENDIF} + {$IFDEF HASVARIANT} + {$DEFINE SUPPORTS_VARIANT} + {$ENDIF} + {$IFDEF FPC_HAS_TYPE_SINGLE} + {$DEFINE SUPPORTS_SINGLE} + {$ENDIF} + {$IFDEF FPC_HAS_TYPE_DOUBLE} + {$DEFINE SUPPORTS_DOUBLE} + {$ENDIF} + {$IFDEF FPC_HAS_TYPE_EXTENDED} + {$DEFINE SUPPORTS_EXTENDED} + {$ENDIF} + {$IFDEF HASCURRENCY} + {$DEFINE SUPPORTS_CURRENCY} + {$ENDIF} + {$DEFINE SUPPORTS_THREADVAR} + {$DEFINE SUPPORTS_CONSTPARAMS} + {$DEFINE SUPPORTS_LONGWORD} + {$DEFINE SUPPORTS_INT64} + {$DEFINE SUPPORTS_DYNAMICARRAYS} + {$DEFINE SUPPORTS_DEFAULTPARAMS} + {$DEFINE SUPPORTS_OVERLOAD} + {$DEFINE ACCEPT_DEPRECATED} // 2.2 also gives warnings + {$DEFINE ACCEPT_PLATFORM} // 2.2 also gives warnings + {$DEFINE ACCEPT_LIBRARY} + {$DEFINE SUPPORTS_EXTSYM} + {$DEFINE SUPPORTS_NODEFINE} + + {$DEFINE SUPPORTS_CUSTOMVARIANTS} + {$DEFINE SUPPORTS_VARARGS} + {$DEFINE SUPPORTS_ENUMVALUE} + {$IFDEF LINUX} + {$DEFINE HAS_UNIT_LIBC} + {$ENDIF LINUX} + {$DEFINE HAS_UNIT_CONTNRS} + {$DEFINE HAS_UNIT_TYPES} + {$DEFINE HAS_UNIT_VARIANTS} + {$DEFINE HAS_UNIT_STRUTILS} + {$DEFINE HAS_UNIT_DATEUTILS} + {$DEFINE HAS_UNIT_RTLCONSTS} + + {$DEFINE XPLATFORM_RTL} + + {$IFDEF VER2_2} + {$DEFINE SUPPORTS_DISPINTERFACE} + {$DEFINE SUPPORTS_IMPLEMENTS} + {$DEFINE SUPPORTS_DISPID} + {$ELSE} + {$UNDEF SUPPORTS_DISPINTERFACE} + {$UNDEF SUPPORTS_IMPLEMENTS} + {$endif} + {$UNDEF SUPPORTS_UNSAFE_WARNINGS} + {$ENDIF} +{$ENDIF FPC} + +{$IFDEF CLR} + {$DEFINE SUPPORTS_UNICODE} +{$ENDIF CLR} + +{$IFDEF COMPILER1_UP} + {$DEFINE SUPPORTS_CONSTPARAMS} + {$DEFINE SUPPORTS_SINGLE} + {$DEFINE SUPPORTS_DOUBLE} + {$DEFINE SUPPORTS_EXTENDED} + {$DEFINE SUPPORTS_PACKAGES} +{$ENDIF COMPILER1_UP} + +{$IFDEF COMPILER2_UP} + {$DEFINE SUPPORTS_CURRENCY} + {$DEFINE SUPPORTS_THREADVAR} + {$DEFINE SUPPORTS_VARIANT} + {$DEFINE SUPPORTS_WIDECHAR} +{$ENDIF COMPILER2_UP} + +{$IFDEF COMPILER3_UP} + {$DEFINE SUPPORTS_OUTPARAMS} + {$DEFINE SUPPORTS_WIDESTRING} + {$DEFINE SUPPORTS_INTERFACE} + {$DEFINE SUPPORTS_DISPINTERFACE} + {$DEFINE SUPPORTS_DISPID} + {$DEFINE SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF COMPILER3_UP} + +{$IFDEF COMPILER35_UP} + {$DEFINE SUPPORTS_EXTSYM} + {$DEFINE SUPPORTS_NODEFINE} +{$ENDIF COMPILER35_UP} + +{$IFDEF COMPILER4_UP} + {$DEFINE SUPPORTS_LONGWORD} + {$DEFINE SUPPORTS_INT64} + {$DEFINE SUPPORTS_DYNAMICARRAYS} + {$DEFINE SUPPORTS_DEFAULTPARAMS} + {$DEFINE SUPPORTS_OVERLOAD} + {$DEFINE SUPPORTS_IMPLEMENTS} +{$ENDIF COMPILER4_UP} + +{$IFDEF COMPILER6_UP} + {$DEFINE SUPPORTS_DEPRECATED} + {$DEFINE SUPPORTS_LIBRARY} + {$DEFINE SUPPORTS_PLATFORM} + {$DEFINE SUPPORTS_LOCAL} + {$DEFINE SUPPORTS_SETPEFLAGS} + {$DEFINE SUPPORTS_EXPERIMENTAL_WARNINGS} + {$DEFINE ACCEPT_DEPRECATED} + {$DEFINE ACCEPT_PLATFORM} + {$DEFINE ACCEPT_LIBRARY} + {$DEFINE SUPPORTS_DEPRECATED_WARNINGS} + {$DEFINE SUPPORTS_LIBRARY_WARNINGS} + {$DEFINE SUPPORTS_PLATFORM_WARNINGS} + {$DEFINE SUPPORTS_CUSTOMVARIANTS} + {$DEFINE SUPPORTS_VARARGS} + {$DEFINE SUPPORTS_ENUMVALUE} + {$DEFINE SUPPORTS_COMPILETIME_MESSAGES} +{$ENDIF COMPILER6_UP} + +{$IFDEF COMPILER7_UP} + {$DEFINE SUPPORTS_UNSAFE_WARNINGS} +{$ENDIF COMPILER7_UP} + +{$IFDEF COMPILER9_UP} + {$DEFINE SUPPORTS_FOR_IN} + {$DEFINE SUPPORTS_INLINE} + {$DEFINE SUPPORTS_NESTED_CONSTANTS} + {$DEFINE SUPPORTS_NESTED_TYPES} + {$DEFINE SUPPORTS_REGION} + {$IFDEF CLR} + {$DEFINE SUPPORTS_ENHANCED_RECORDS} + {$DEFINE SUPPORTS_CLASS_FIELDS} + {$DEFINE SUPPORTS_CLASS_HELPERS} + {$DEFINE SUPPORTS_CLASS_OPERATORS} + {$DEFINE SUPPORTS_STRICT} + {$DEFINE SUPPORTS_STATIC} + {$DEFINE SUPPORTS_FINAL} + {$ENDIF CLR} +{$ENDIF COMPILER9_UP} + +{$IFDEF COMPILER10_UP} + {$DEFINE SUPPORTS_ENHANCED_RECORDS} + {$DEFINE SUPPORTS_CLASS_FIELDS} + {$DEFINE SUPPORTS_CLASS_HELPERS} + {$DEFINE SUPPORTS_CLASS_OPERATORS} + {$DEFINE SUPPORTS_STRICT} + {$DEFINE SUPPORTS_STATIC} + {$DEFINE SUPPORTS_FINAL} + {$DEFINE SUPPORTS_METHODINFO} +{$ENDIF COMPILER10_UP} + +{$IFDEF COMPILER11_UP} + {$IFDEF CLR} + {$DEFINE SUPPORTS_GENERICS} + {$DEFINE SUPPORTS_DEPRECATED_DETAILS} + {$ENDIF CLR} +{$ENDIF COMPILER11_UP} + +{$IFDEF COMPILER12_UP} + {$DEFINE SUPPORTS_GENERICS} + {$DEFINE SUPPORTS_DEPRECATED_DETAILS} + {$DEFINE SUPPORTS_INT_ALIASES} + {$IFNDEF CLR} + {$DEFINE SUPPORTS_UNICODE} + {$DEFINE SUPPORTS_UNICODE_STRING} + {$ENDIF CLR} +{$ENDIF COMPILER12_UP} + +{$IFDEF COMPILER14_UP} + {$DEFINE SUPPORTS_CLASS_CTORDTORS} + {$DEFINE HAS_UNIT_RTTI} + {$DEFINE SUPPORTS_CAST_INTERFACE_TO_OBJ} + {$DEFINE SUPPORTS_DELAYED_LOADING} +{$ENDIF COMPILER14_UP} + +{$IFDEF RTL130_UP} + {$DEFINE HAS_UNIT_CONTNRS} +{$ENDIF RTL130_UP} + +{$IFDEF RTL140_UP} + {$IFDEF LINUX} + {$DEFINE HAS_UNIT_LIBC} + {$ENDIF LINUX} + {$DEFINE HAS_UNIT_RTLCONSTS} + {$DEFINE HAS_UNIT_TYPES} + {$DEFINE HAS_UNIT_VARIANTS} + {$DEFINE HAS_UNIT_STRUTILS} + {$DEFINE HAS_UNIT_DATEUTILS} + {$DEFINE XPLATFORM_RTL} +{$ENDIF RTL140_UP} + +{$IFDEF RTL170_UP} + {$DEFINE HAS_UNIT_HTTPPROD} +{$ENDIF RTL170_UP} + +{$IFDEF RTL185_UP} + {$DEFINE HAS_UNIT_GIFIMG} +{$ENDIF RTL185_UP} + +{$IFDEF RTL200_UP} + {$DEFINE HAS_UNIT_ANSISTRINGS} + {$DEFINE HAS_UNIT_PNGIMAGE} +{$ENDIF RTL200_UP} + +{------------------------------------------------------------------------------} +{ Cross-platform related defines } +{------------------------------------------------------------------------------} + +{$IFNDEF CPUASM} + {$DEFINE PUREPASCAL} +{$ENDIF ~CPUASM} + +{$IFDEF WIN32} + {$DEFINE MSWINDOWS} // predefined for D6+/BCB6+ + {$DEFINE Win32API} +{$ENDIF} + +{$IFDEF DELPHILANGUAGE} + {$IFDEF LINUX} + {$DEFINE UNIX} + {$ENDIF} + + {$IFNDEF CONSOLE} + {$IFDEF LINUX} + {$DEFINE VisualCLX} + {$ENDIF} + {$IFNDEF VisualCLX} + {$DEFINE VCL} + {$ENDIF} + {$ENDIF ~CONSOLE} +{$ENDIF DELPHILANGUAGE} + +{------------------------------------------------------------------------------} +{ Compiler settings } +{------------------------------------------------------------------------------} + +{$IFOPT A+} {$DEFINE ALIGN_ON} {$ENDIF} +{$IFOPT B+} {$DEFINE BOOLEVAL_ON} {$ENDIF} +{$IFDEF COMPILER2_UP} + {$IFOPT C+} {$DEFINE ASSERTIONS_ON} {$ENDIF} +{$ENDIF} +{$IFOPT D+} {$DEFINE DEBUGINFO_ON} {$ENDIF} +{$IFOPT G+} {$DEFINE IMPORTEDDATA_ON} {$ENDIF} +{$IFDEF COMPILER2_UP} + {$IFOPT H+} {$DEFINE LONGSTRINGS_ON} {$ENDIF} +{$ENDIF} + +// Hints +{$IFOPT I+} {$DEFINE IOCHECKS_ON} {$ENDIF} +{$IFDEF COMPILER2_UP} + {$IFOPT J+} {$DEFINE WRITEABLECONST_ON} {$ENDIF} +{$ENDIF} +{$IFOPT L+} {$DEFINE LOCALSYMBOLS} {$DEFINE LOCALSYMBOLS_ON} {$ENDIF} +{$IFOPT M+} {$DEFINE TYPEINFO_ON} {$ENDIF} +{$IFOPT O+} {$DEFINE OPTIMIZATION_ON} {$ENDIF} +{$IFOPT P+} {$DEFINE OPENSTRINGS_ON} {$ENDIF} +{$IFOPT Q+} {$DEFINE OVERFLOWCHECKS_ON} {$ENDIF} +{$IFOPT R+} {$DEFINE RANGECHECKS_ON} {$ENDIF} + +// Real compatibility +{$IFOPT T+} {$DEFINE TYPEDADDRESS_ON} {$ENDIF} +{$IFOPT U+} {$DEFINE SAFEDIVIDE_ON} {$ENDIF} +{$IFOPT V+} {$DEFINE VARSTRINGCHECKS_ON} {$ENDIF} +{$IFOPT W+} {$DEFINE STACKFRAMES_ON} {$ENDIF} + +// Warnings +{$IFOPT X+} {$DEFINE EXTENDEDSYNTAX_ON} {$ENDIF} + +// for Delphi/BCB trial versions remove the point from the line below +{.$UNDEF SUPPORTS_WEAKPACKAGEUNIT} + +{$ENDIF ~JEDI_INC} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-11 17:53:21
|
Revision: 3189 http://jcl.svn.sourceforge.net/jcl/?rev=3189&view=rev Author: outchy Date: 2010-02-11 17:53:12 +0000 (Thu, 11 Feb 2010) Log Message: ----------- New external to jedi.inc from the projectjedi subversion repository. Removed Paths: ------------- trunk/jcl/source/include/jedi.inc Property Changed: ---------------- trunk/jcl/source/include/ Property changes on: trunk/jcl/source/include ___________________________________________________________________ Added: svn:externals + jedi.inc https://projectjedi.svn.sourceforge.net:443/svnroot/projectjedi/trunk/shared/include/jedi.inc Deleted: trunk/jcl/source/include/jedi.inc =================================================================== --- trunk/jcl/source/include/jedi.inc 2010-02-11 12:14:06 UTC (rev 3188) +++ trunk/jcl/source/include/jedi.inc 2010-02-11 17:53:12 UTC (rev 3189) @@ -1,1265 +0,0 @@ -{$IFNDEF JEDI_INC} -{$DEFINE JEDI_INC} - -{**************************************************************************************************} -{ } -{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");} -{ you may not use this file except in compliance with the License. You may obtain a copy of the } -{ License at http://www.mozilla.org/MPL/ } -{ } -{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF } -{ ANY KIND, either express or implied. See the License for the specific language governing rights } -{ and limitations under the License. } -{ } -{ The Original Code is: jedi.inc. } -{ The Initial Developer of the Original Code is Project JEDI http://www.delphi-jedi.org } -{ } -{ Alternatively, the contents of this file may be used under the terms of the GNU Lesser General } -{ Public License (the "LGPL License"), in which case the provisions of the LGPL License are } -{ applicable instead of those above. If you wish to allow use of your version of this file only } -{ under the terms of the LGPL License and not to allow others to use your version of this file } -{ under the MPL, indicate your decision by deleting the provisions above and replace them with } -{ the notice and other provisions required by the LGPL License. If you do not delete the } -{ provisions above, a recipient may use your version of this file under either the MPL or the } -{ LGPL License. } -{ } -{ For more information about the LGPL: http://www.gnu.org/copyleft/lesser.html } -{ } -{**************************************************************************************************} -{ } -{ This file defines various generic compiler directives used in different libraries, e.g. in the } -{ JEDI Code Library (JCL) and JEDI Visual Component Library Library (JVCL). The directives in } -{ this file are of generic nature and consist mostly of mappings from the VERXXX directives } -{ defined by Delphi, C++Builder and FPC to friendly names such as DELPHI5 and } -{ SUPPORTS_WIDESTRING. These friendly names are subsequently used in the libraries to test for } -{ compiler versions and/or whether the compiler supports certain features (such as widestrings or } -{ 64 bit integers. The libraries provide an additional, library specific, include file. For the } -{ JCL e.g. this is jcl.inc. These files should be included in source files instead of this file } -{ (which is pulled in automatically). } -{ } -{**************************************************************************************************} -{ } -{ Last modified: $Date:: $ } -{ Revision: $Rev:: $ } -{ Author: $Author:: $ } -{ } -{**************************************************************************************************} - -(* - -- Development environment directives - - This file defines two directives to indicate which development environment the - library is being compiled with. Currently this can either be Delphi, Kylix, - C++Builder or FPC. - - Directive Description - ------------------------------------------------------------------------------ - DELPHI Defined if compiled with Delphi - KYLIX Defined if compiled with Kylix - DELPHICOMPILER Defined if compiled with Delphi or Kylix/Delphi - BCB Defined if compiled with C++Builder - CPPBUILDER Defined if compiled with C++Builder (alias for BCB) - BCBCOMPILER Defined if compiled with C++Builder or Kylix/C++ - DELPHILANGUAGE Defined if compiled with Delphi, Kylix or C++Builder - BORLAND Defined if compiled with Delphi, Kylix or C++Builder - FPC Defined if compiled with FPC - -- Platform Directives - - Platform directives are not all explicitly defined in this file, some are - defined by the compiler itself. They are listed here only for completeness. - - Directive Description - ------------------------------------------------------------------------------ - WIN32 Defined when target platform is 32 bit Windows - WIN64 Defined when target platform is 64 bit Windows - MSWINDOWS Defined when target platform is 32 bit Windows - LINUX Defined when target platform is Linux - UNIX Defined when target platform is Unix-like (including Linux) - CLR Defined when target platform is .NET - -- Architecture directives. These are auto-defined by FPC - CPU32 and CPU64 are mostly for generic pointer size dependant differences rather - than for a specific architecture. - - CPU386 Defined when target platform is native x86 (win32) - CPUx86_64 Defined when target platform is native x86_64 (win64) - CPU32 Defined when target is 32-bit - CPU64 Defined when target is 64-bit - CPUASM Defined when target assembler is available - -- Visual library Directives - - The following directives indicate for a visual library. In a Delphi/BCB - (Win32) application you need to define the VisualCLX symbol in the project - options, if you want to use the VisualCLX library. Alternatively you can use - the IDE expert, which is distributed with the JCL to do this automatically. - - Directive Description - ------------------------------------------------------------------------------ - VCL Defined for Delphi/BCB (Win32) exactly if VisualCLX is not defined - VisualCLX Defined for Kylix; needs to be defined for Delphi/BCB to - use JCL with VisualCLX applications. - - -- Other cross-platform related defines - - These symbols are intended to help in writing portable code. - - Directive Description - ------------------------------------------------------------------------------ - PUREPASCAL Code is machine-independent (as opposed to assembler code) - Win32API Code is specific for the Win32 API; - use instead of "{$IFNDEF CLR} {$IFDEF MSWINDOWS}" constructs - - -- Delphi Versions - - The following directives are direct mappings from the VERXXX directives to a - friendly name of the associated compiler. These directives are only defined if - the compiler is Delphi (ie DELPHI is defined). - - Directive Description - ------------------------------------------------------------------------------ - DELPHI1 Defined when compiling with Delphi 1 (Codename WASABI/MANGO) - DELPHI2 Defined when compiling with Delphi 2 (Codename POLARIS) - DELPHI3 Defined when compiling with Delphi 3 (Codename IVORY) - DELPHI4 Defined when compiling with Delphi 4 (Codename ALLEGRO) - DELPHI5 Defined when compiling with Delphi 5 (Codename ARGUS) - DELPHI6 Defined when compiling with Delphi 6 (Codename ILLIAD) - DELPHI7 Defined when compiling with Delphi 7 (Codename AURORA) - DELPHI8 Defined when compiling with Delphi 8 (Codename OCTANE) - DELPHI2005 Defined when compiling with Delphi 2005 (Codename DIAMONDBACK) - DELPHI9 Alias for DELPHI2005 - DELPHI10 Defined when compiling with Delphi 2006 (Codename DEXTER) - DELPHI2006 Alias for DELPHI10 - DELPHI11 Defined when compiling with Delphi 2007 for Win32 (Codename SPACELY) - DELPHI2007 Alias for DELPHI11 - DELPHI12 Defined when compiling with Delphi 2009 for Win32 (Codename TIBURON) - DELPHI2009 Alias for DELPHI12 - DELPHI14 Defined when compiling with Delphi 2010 for Win32 (Codename WEAVER) - DELPHI2010 Alias for DELPHI14 - DELPHI1_UP Defined when compiling with Delphi 1 or higher - DELPHI2_UP Defined when compiling with Delphi 2 or higher - DELPHI3_UP Defined when compiling with Delphi 3 or higher - DELPHI4_UP Defined when compiling with Delphi 4 or higher - DELPHI5_UP Defined when compiling with Delphi 5 or higher - DELPHI6_UP Defined when compiling with Delphi 6 or higher - DELPHI7_UP Defined when compiling with Delphi 7 or higher - DELPHI8_UP Defined when compiling with Delphi 8 or higher - DELPHI2005_UP Defined when compiling with Delphi 2005 or higher - DELPHI9_UP Alias for DELPHI2005_UP - DELPHI10_UP Defined when compiling with Delphi 2006 or higher - DELPHI2006_UP Alias for DELPHI10_UP - DELPHI11_UP Defined when compiling with Delphi 2007 for Win32 or higher - DELPHI2007_UP Alias for DELPHI11_UP - DELPHI12_UP Defined when compiling with Delphi 2009 for Win32 or higher - DELPHI2009_UP Alias for DELPHI12_UP - DELPHI14_UP Defined when compiling with Delphi 2010 for Win32 or higher - DELPHI2010_UP Alias for DELPHI14_UP - - -- Kylix Versions - - The following directives are direct mappings from the VERXXX directives to a - friendly name of the associated compiler. These directives are only defined if - the compiler is Kylix (ie KYLIX is defined). - - Directive Description - ------------------------------------------------------------------------------ - KYLIX1 Defined when compiling with Kylix 1 - KYLIX2 Defined when compiling with Kylix 2 - KYLIX3 Defined when compiling with Kylix 3 (Codename CORTEZ) - KYLIX1_UP Defined when compiling with Kylix 1 or higher - KYLIX2_UP Defined when compiling with Kylix 2 or higher - KYLIX3_UP Defined when compiling with Kylix 3 or higher - - -- Delphi Compiler Versions (Delphi / Kylix, not in BCB mode) - - Directive Description - ------------------------------------------------------------------------------ - DELPHICOMPILER1 Defined when compiling with Delphi 1 - DELPHICOMPILER2 Defined when compiling with Delphi 2 - DELPHICOMPILER3 Defined when compiling with Delphi 3 - DELPHICOMPILER4 Defined when compiling with Delphi 4 - DELPHICOMPILER5 Defined when compiling with Delphi 5 - DELPHICOMPILER6 Defined when compiling with Delphi 6 or Kylix 1, 2 or 3 - DELPHICOMPILER7 Defined when compiling with Delphi 7 - DELPHICOMPILER8 Defined when compiling with Delphi 8 - DELPHICOMPILER9 Defined when compiling with Delphi 2005 - DELPHICOMPILER10 Defined when compiling with Delphi Personality of BDS 4.0 - DELPHICOMPILER11 Defined when compiling with Delphi 2007 for Win32 - DELPHICOMPILER12 Defined when compiling with Delphi Personality of BDS 6.0 - DELPHICOMPILER14 Defined when compiling with Delphi Personality of BDS 7.0 - DELPHICOMPILER1_UP Defined when compiling with Delphi 1 or higher - DELPHICOMPILER2_UP Defined when compiling with Delphi 2 or higher - DELPHICOMPILER3_UP Defined when compiling with Delphi 3 or higher - DELPHICOMPILER4_UP Defined when compiling with Delphi 4 or higher - DELPHICOMPILER5_UP Defined when compiling with Delphi 5 or higher - DELPHICOMPILER6_UP Defined when compiling with Delphi 6 or Kylix 1, 2 or 3 or higher - DELPHICOMPILER7_UP Defined when compiling with Delphi 7 or higher - DELPHICOMPILER8_UP Defined when compiling with Delphi 8 or higher - DELPHICOMPILER9_UP Defined when compiling with Delphi 2005 - DELPHICOMPILER10_UP Defined when compiling with Delphi 2006 or higher - DELPHICOMPILER11_UP Defined when compiling with Delphi 2007 for Win32 or higher - DELPHICOMPILER12_UP Defined when compiling with Delphi 2009 for Win32 or higher - DELPHICOMPILER14_UP Defined when compiling with Delphi 2010 for Win32 or higher - - -- C++Builder Versions - - The following directives are direct mappings from the VERXXX directives to a - friendly name of the associated compiler. These directives are only defined if - the compiler is C++Builder (ie BCB is defined). - - Directive Description - ------------------------------------------------------------------------------ - BCB1 Defined when compiling with C++Builder 1 - BCB3 Defined when compiling with C++Builder 3 - BCB4 Defined when compiling with C++Builder 4 - BCB5 Defined when compiling with C++Builder 5 (Codename RAMPAGE) - BCB6 Defined when compiling with C++Builder 6 (Codename RIPTIDE) - BCB10 Defined when compiling with C++Builder Personality of BDS 4.0 (also known as C++Builder 2006) (Codename DEXTER) - BCB11 Defined when compiling with C++Builder Personality of RAD Studio 2007 (also known as C++Builder 2007) (Codename COGSWELL) - BCB12 Defined when compiling with C++Builder Personality of RAD Studio 2009 (also known as C++Builder 2009) (Codename TIBURON) - BCB14 Defined when compiling with C++Builder Personality of RAD Studio 2010 (also known as C++Builder 2010) (Codename WEAVER) - BCB1_UP Defined when compiling with C++Builder 1 or higher - BCB3_UP Defined when compiling with C++Builder 3 or higher - BCB4_UP Defined when compiling with C++Builder 4 or higher - BCB5_UP Defined when compiling with C++Builder 5 or higher - BCB6_UP Defined when compiling with C++Builder 6 or higher - BCB10_UP Defined when compiling with C++Builder Personality of BDS 4.0 or higher - BCB11_UP Defined when compiling with C++Builder Personality of RAD Studio 2007 or higher - BCB12_UP Defined when compiling with C++Builder Personality of RAD Studio 2009 or higher - BCB14_UP Defined when compiling with C++Builder Personality of RAD Studio 2010 or higher - - -- RAD Studio / Borland Developer Studio Versions - - The following directives are direct mappings from the VERXXX directives to a - friendly name of the associated IDE. These directives are only defined if - the IDE is Borland Developer Studio Version 2 or above. - - Note: Borland Developer Studio 2006 is marketed as Delphi 2006 or C++Builder 2006, - but those provide only different labels for identical content. - - Directive Description - ------------------------------------------------------------------------------ - BDS Defined when compiling with BDS version of dcc32.exe (Codename SIDEWINDER) - BDS2 Defined when compiling with BDS 2.0 (Delphi 8) (Codename OCTANE) - BDS3 Defined when compiling with BDS 3.0 (Delphi 2005) (Codename DIAMONDBACK) - BDS4 Defined when compiling with BDS 4.0 (Borland Developer Studio 2006) (Codename DEXTER) - BDS5 Defined when compiling with BDS 5.0 (CodeGear RAD Studio 2007) (Codename HIGHLANDER) - BDS6 Defined when compiling with BDS 6.0 (CodeGear RAD Studio 2009) (Codename TIBURON) - BDS7 Defined when compiling with BDS 7.0 (Embarcadero RAD Studio 2010) (Codename WEAVER) - BDS2_UP Defined when compiling with BDS 2.0 or higher - BDS3_UP Defined when compiling with BDS 3.0 or higher - BDS4_UP Defined when compiling with BDS 4.0 or higher - BDS5_UP Defined when compiling with BDS 5.0 or higher - BDS6_UP Defined when compiling with BDS 6.0 or higher - BDS7_UP Defined when compiling with BDS 7.0 or higher - -- Compiler Versions - - The following directives are direct mappings from the VERXXX directives to a - friendly name of the associated compiler. Unlike the DELPHI_X and BCB_X - directives, these directives are indepedent of the development environment. - That is, they are defined regardless of whether compilation takes place using - Delphi or C++Builder. - - Directive Description - ------------------------------------------------------------------------------ - COMPILER1 Defined when compiling with Delphi 1 - COMPILER2 Defined when compiling with Delphi 2 or C++Builder 1 - COMPILER3 Defined when compiling with Delphi 3 - COMPILER35 Defined when compiling with C++Builder 3 - COMPILER4 Defined when compiling with Delphi 4 or C++Builder 4 - COMPILER5 Defined when compiling with Delphi 5 or C++Builder 5 - COMPILER6 Defined when compiling with Delphi 6 or C++Builder 6 - COMPILER7 Defined when compiling with Delphi 7 - COMPILER8 Defined when compiling with Delphi 8 - COMPILER9 Defined when compiling with Delphi 9 - COMPILER10 Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 - COMPILER11 Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 - COMPILER12 Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 - COMPILER14 Defined when compiling with Delphi or C++Builder Personalities of BDS 7.0 - COMPILER1_UP Defined when compiling with Delphi 1 or higher - COMPILER2_UP Defined when compiling with Delphi 2 or C++Builder 1 or higher - COMPILER3_UP Defined when compiling with Delphi 3 or higher - COMPILER35_UP Defined when compiling with C++Builder 3 or higher - COMPILER4_UP Defined when compiling with Delphi 4 or C++Builder 4 or higher - COMPILER5_UP Defined when compiling with Delphi 5 or C++Builder 5 or higher - COMPILER6_UP Defined when compiling with Delphi 6 or C++Builder 6 or higher - COMPILER7_UP Defined when compiling with Delphi 7 - COMPILER8_UP Defined when compiling with Delphi 8 - COMPILER9_UP Defined when compiling with Delphi Personalities of BDS 3.0 - COMPILER10_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 or higher - COMPILER11_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 or higher - COMPILER12_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 or higher - COMPILER14_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 7.0 or higher - - -- RTL Versions - - Use e.g. following to determine the exact RTL version since version 14.0: - {$IFDEF CONDITIONALEXPRESSIONS} - {$IF Declared(RTLVersion) and (RTLVersion >= 14.2)} - // code for Delphi 6.02 or higher, Kylix 2 or higher, C++Builder 6 or higher - ... - {$IFEND} - {$ENDIF} - - Directive Description - ------------------------------------------------------------------------------ - RTL80_UP Defined when compiling with Delphi 1 or higher - RTL90_UP Defined when compiling with Delphi 2 or higher - RTL93_UP Defined when compiling with C++Builder 1 or higher - RTL100_UP Defined when compiling with Delphi 3 or higher - RTL110_UP Defined when compiling with C++Builder 3 or higher - RTL120_UP Defined when compiling with Delphi 4 or higher - RTL125_UP Defined when compiling with C++Builder 4 or higher - RTL130_UP Defined when compiling with Delphi 5 or C++Builder 5 or higher - RTL140_UP Defined when compiling with Delphi 6, Kylix 1, 2 or 3 or C++Builder 6 or higher - RTL150_UP Defined when compiling with Delphi 7 or higher - RTL160_UP Defined when compiling with Delphi 8 or higher - RTL170_UP Defined when compiling with Delphi Personalities of BDS 3.0 or higher - RTL180_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 or higher - RTL185_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 or higher - RTL190_UP Defined when compiling with Delphi.NET of BDS 5.0 or higher - RTL200_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 or higher - RTL210_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 7.0 or higher - - -- CLR Versions - - Directive Description - ------------------------------------------------------------------------------ - CLR Defined when compiling for .NET - CLR10 Defined when compiling for .NET 1.0 (may be overriden by FORCE_CLR10) - CLR10_UP Defined when compiling for .NET 1.0 or higher - CLR11 Defined when compiling for .NET 1.1 (may be overriden by FORCE_CLR11) - CLR11_UP Defined when compiling for .NET 1.1 or higher - CLR20 Defined when compiling for .NET 2.0 (may be overriden by FORCE_CLR20) - CLR20_UP Defined when compiling for .NET 2.0 or higher - - -- Feature Directives - - The features directives are used to test if the compiler supports specific - features, such as method overloading, and adjust the sources accordingly. Use - of these directives is preferred over the use of the DELPHI and COMPILER - directives. - - Directive Description - ------------------------------------------------------------------------------ - SUPPORTS_CONSTPARAMS Compiler supports const parameters (D1+) - SUPPORTS_SINGLE Compiler supports the Single type (D1+) - SUPPORTS_DOUBLE Compiler supports the Double type (D1+) - SUPPORTS_EXTENDED Compiler supports the Extended type (D1+) - SUPPORTS_CURRENCY Compiler supports the Currency type (D2+) - SUPPORTS_THREADVAR Compiler supports threadvar declarations (D2+) - SUPPORTS_OUTPARAMS Compiler supports out parameters (D3+) - SUPPORTS_VARIANT Compiler supports variant (D2+) - SUPPORTS_WIDECHAR Compiler supports the WideChar type (D2+) - SUPPORTS_WIDESTRING Compiler supports the WideString type (D3+/BCB3+) - SUPPORTS_INTERFACE Compiler supports interfaces (D3+/BCB3+) - SUPPORTS_DISPINTERFACE Compiler supports dispatch interfaces (D3+/BCB3+) - SUPPORTS_DISPID Compiler supports dispatch ids (D3+/BCB3+/FPC) - SUPPORTS_EXTSYM Compiler supports the $EXTERNALSYM directive (D4+/BCB3+) - SUPPORTS_NODEFINE Compiler supports the $NODEFINE directive (D4+/BCB3+) - SUPPORTS_LONGWORD Compiler supports the LongWord type (unsigned 32 bit) (D4+/BCB4+) - SUPPORTS_INT64 Compiler supports the Int64 type (D4+/BCB4+) - SUPPORTS_DYNAMICARRAYS Compiler supports dynamic arrays (D4+/BCB4+) - SUPPORTS_DEFAULTPARAMS Compiler supports default parameters (D4+/BCB4+) - SUPPORTS_OVERLOAD Compiler supports overloading (D4+/BCB4+) - SUPPORTS_IMPLEMENTS Compiler supports implements (D4+/BCB4+) - SUPPORTS_DEPRECATED Compiler supports the deprecated directive (D6+/BCB6+) - SUPPORTS_PLATFORM Compiler supports the platform directive (D6+/BCB6+) - SUPPORTS_LIBRARY Compiler supports the library directive (D6+/BCB6+/FPC) - SUPPORTS_LOCAL Compiler supports the local directive (D6+/BCB6+) - SUPPORTS_SETPEFLAGS Compiler supports the SetPEFlags directive (D6+/BCB6+) - SUPPORTS_EXPERIMENTAL_WARNINGS Compiler supports the WARN SYMBOL_EXPERIMENTAL and WARN UNIT_EXPERIMENTAL directives (D6+/BCB6+) - SUPPORTS_INLINE Compiler supports the inline directive (D9+/FPC) - SUPPORTS_FOR_IN Compiler supports for in loops (D9+) - SUPPORTS_NESTED_CONSTANTS Compiler supports nested constants (D9+) - SUPPORTS_NESTED_TYPES Compiler supports nested types (D9+) - SUPPORTS_REGION Compiler supports the REGION and ENDREGION directives (D9+) - SUPPORTS_ENHANCED_RECORDS Compiler supports class [operator|function|procedure] for record types (D9.NET, D10+) - SUPPORTS_CLASS_FIELDS Compiler supports class fields (D9.NET, D10+) - SUPPORTS_CLASS_HELPERS Compiler supports class helpers (D9.NET, D10+) - SUPPORTS_CLASS_OPERATORS Compiler supports class operators (D9.NET, D10+) - SUPPORTS_CLASS_CTORDTORS Compiler supports class contructors/destructors (D14+) - SUPPORTS_STRICT Compiler supports strict keyword (D9.NET, D10+) - SUPPORTS_STATIC Compiler supports static keyword (D9.NET, D10+) - SUPPORTS_FINAL Compiler supports final keyword (D9.NET, D10+) - SUPPORTS_METHODINFO Compiler supports the METHODINFO directives (D10+) - SUPPORTS_GENERICS Compiler supports generic implementations (D11.NET, D12+) - SUPPORTS_DEPRECATED_DETAILS Compiler supports additional text for the deprecated directive (D11.NET, D12+) - ACCEPT_DEPRECATED Compiler supports or ignores the deprecated directive (D6+/BCB6+/FPC) - ACCEPT_PLATFORM Compiler supports or ignores the platform directive (D6+/BCB6+/FPC) - ACCEPT_LIBRARY Compiler supports or ignores the library directive (D6+/BCB6+) - SUPPORTS_CUSTOMVARIANTS Compiler supports custom variants (D6+/BCB6+) - SUPPORTS_VARARGS Compiler supports varargs (D6+/BCB6+) - SUPPORTS_ENUMVALUE Compiler supports assigning ordinalities to values of enums (D6+/BCB6+) - SUPPORTS_DEPRECATED_WARNINGS Compiler supports deprecated warnings (D6+/BCB6+) - SUPPORTS_LIBRARY_WARNINGS Compiler supports library warnings (D6+/BCB6+) - SUPPORTS_PLATFORM_WARNINGS Compiler supports platform warnings (D6+/BCB6+) - SUPPORTS_UNSAFE_WARNINGS Compiler supports unsafe warnings (D7) - SUPPORTS_WEAKPACKAGEUNIT Compiler supports the WEAKPACKAGEUNIT directive - SUPPORTS_COMPILETIME_MESSAGES Compiler supports the MESSAGE directive - SUPPORTS_PACKAGES Compiler supports Packages - HAS_UNIT_LIBC Unit Libc exists (Kylix, FPC on Linux/x86) - HAS_UNIT_RTLCONSTS Unit RTLConsts exists (D6+/BCB6+/FPC) - HAS_UNIT_TYPES Unit Types exists (D6+/BCB6+/FPC) - HAS_UNIT_VARIANTS Unit Variants exists (D6+/BCB6+/FPC) - HAS_UNIT_STRUTILS Unit StrUtils exists (D6+/BCB6+/FPC) - HAS_UNIT_DATEUTILS Unit DateUtils exists (D6+/BCB6+/FPC) - HAS_UNIT_CONTNRS Unit contnrs exists (D6+/BCB6+/FPC) - HAS_UNIT_HTTPPROD Unit HTTPProd exists (D9+) - HAS_UNIT_GIFIMG Unit GifImg exists (D11+) - HAS_UNIT_ANSISTRINGS Unit AnsiStrings exists (D12+) - HAS_UNIT_PNGIMAGE Unit PngImage exists (D12+) - XPLATFORM_RTL The RTL supports crossplatform function names (e.g. RaiseLastOSError) (D6+/BCB6+/FPC) - SUPPORTS_UNICODE string type is aliased to an unicode string (WideString or UnicodeString) (DX.NET, D12+) - SUPPORTS_UNICODE_STRING Compiler supports UnicodeString (D12+) - SUPPORTS_INT_ALIASES Types Int8, Int16, Int32, UInt8, UInt16 and UInt32 are defined in the unit System (D12+) - HAS_UNIT_RTTI Unit RTTI is available (D14+) - SUPPORTS_CAST_INTERFACE_TO_OBJ The compiler supports casts from interfaces to objects (D14+) - SUPPORTS_DELAYED_LOADING The compiler generates stubs for delaying imported function loads (D14+) - - -- Compiler Settings - - The compiler settings directives indicate whether a specific compiler setting - is in effect. This facilitates changing compiler settings locally in a more - compact and readible manner. - - Directive Description - ------------------------------------------------------------------------------ - ALIGN_ON Compiling in the A+ state (no alignment) - BOOLEVAL_ON Compiling in the B+ state (complete boolean evaluation) - ASSERTIONS_ON Compiling in the C+ state (assertions on) - DEBUGINFO_ON Compiling in the D+ state (debug info generation on) - IMPORTEDDATA_ON Compiling in the G+ state (creation of imported data references) - LONGSTRINGS_ON Compiling in the H+ state (string defined as AnsiString) - IOCHECKS_ON Compiling in the I+ state (I/O checking enabled) - WRITEABLECONST_ON Compiling in the J+ state (typed constants can be modified) - LOCALSYMBOLS Compiling in the L+ state (local symbol generation) - LOCALSYMBOLS_ON Alias of LOCALSYMBOLS - TYPEINFO_ON Compiling in the M+ state (RTTI generation on) - OPTIMIZATION_ON Compiling in the O+ state (code optimization on) - OPENSTRINGS_ON Compiling in the P+ state (variable string parameters are openstrings) - OVERFLOWCHECKS_ON Compiling in the Q+ state (overflow checing on) - RANGECHECKS_ON Compiling in the R+ state (range checking on) - TYPEDADDRESS_ON Compiling in the T+ state (pointers obtained using the @ operator are typed) - SAFEDIVIDE_ON Compiling in the U+ state (save FDIV instruction through RTL emulation) - VARSTRINGCHECKS_ON Compiling in the V+ state (type checking of shortstrings) - STACKFRAMES_ON Compiling in the W+ state (generation of stack frames) - EXTENDEDSYNTAX_ON Compiling in the X+ state (Delphi extended syntax enabled) -*) - -{$DEFINE BORLAND} - -{ Set FreePascal to Delphi mode } -{$IFDEF FPC} - {$MODE DELPHI} - {$ASMMODE Intel} - {$UNDEF BORLAND} - {$DEFINE CPUASM} - // FPC defines CPU32, CPU64 and Unix automatically -{$ENDIF} - -{$IFDEF BORLAND} - {$IFDEF LINUX} - {$DEFINE KYLIX} - {$ENDIF LINUX} - {$IFNDEF CLR} - {$DEFINE CPU386} // For Borland compilers select the x86 compat assembler by default - {$DEFINE CPU32} // Assume Borland compilers are 32-bit (rather than 64-bit) - {$DEFINE CPUASM} - {$ENDIF ~CLR} -{$ENDIF BORLAND} - -{------------------------------------------------------------------------------} -{ VERXXX to COMPILERX, DELPHIX and BCBX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF BORLAND} - {$IFDEF KYLIX} - {$I kylix.inc} // FPC incompatible stuff - {$ELSE ~KYLIX} - - {$DEFINE UNKNOWN_COMPILER_VERSION} - - {$IFDEF VER80} - {$DEFINE COMPILER1} - {$DEFINE DELPHI1} - {$DEFINE DELPHICOMPILER1} - {$DEFINE RTL80_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER90} - {$DEFINE COMPILER2} - {$DEFINE DELPHI2} - {$DEFINE DELPHICOMPILER2} - {$DEFINE RTL90_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER93} - {$DEFINE COMPILER2} - {$DEFINE BCB1} - {$DEFINE BCB} - {$DEFINE RTL93_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER100} - {$DEFINE COMPILER3} - {$DEFINE DELPHI3} - {$DEFINE DELPHICOMPILER3} - {$DEFINE RTL100_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER110} - {$DEFINE COMPILER35} - {$DEFINE BCB3} - {$DEFINE BCB} - {$DEFINE RTL110_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER120} - {$DEFINE COMPILER4} - {$DEFINE DELPHI4} - {$DEFINE DELPHICOMPILER4} - {$DEFINE RTL120_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER125} - {$DEFINE COMPILER4} - {$DEFINE BCB4} - {$DEFINE BCB} - {$DEFINE RTL125_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER130} - {$DEFINE COMPILER5} - {$IFDEF BCB} - {$DEFINE BCB5} - {$ELSE} - {$DEFINE DELPHI5} - {$DEFINE DELPHICOMPILER5} - {$ENDIF} - {$DEFINE RTL130_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER140} - {$DEFINE COMPILER6} - {$IFDEF BCB} - {$DEFINE BCB6} - {$ELSE} - {$DEFINE DELPHI6} - {$DEFINE DELPHICOMPILER6} - {$ENDIF} - {$DEFINE RTL140_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER150} - {$DEFINE COMPILER7} - {$DEFINE DELPHI7} - {$DEFINE DELPHICOMPILER7} - {$DEFINE RTL150_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER160} - {$DEFINE BDS2} - {$DEFINE BDS} - {$IFDEF CLR} - {$DEFINE CLR10} - {$ENDIF CLR} - {$DEFINE COMPILER8} - {$DEFINE DELPHI8} - {$DEFINE DELPHICOMPILER8} - {$DEFINE RTL160_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER170} - {$DEFINE BDS3} - {$DEFINE BDS} - {$IFDEF CLR} - {$DEFINE CLR11} - {$ENDIF CLR} - {$DEFINE COMPILER9} - {$DEFINE DELPHI9} - {$DEFINE DELPHI2005} // synonym to DELPHI9 - {$DEFINE DELPHICOMPILER9} - {$DEFINE RTL170_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER180} - {$DEFINE BDS} - {$IFDEF CLR} - {$DEFINE CLR11} - {$ENDIF CLR} - {$IFDEF VER185} - {$DEFINE BDS5} - {$DEFINE COMPILER11} - {$IFDEF BCB} - {$DEFINE BCB11} - {$ELSE} - {$DEFINE DELPHI11} - {$DEFINE DELPHI2007} // synonym to DELPHI11 - {$DEFINE DELPHICOMPILER11} - {$ENDIF} - {$DEFINE RTL185_UP} - {$ELSE ~~VER185} - {$DEFINE BDS4} - {$DEFINE COMPILER10} - {$IFDEF BCB} - {$DEFINE BCB10} - {$ELSE} - {$DEFINE DELPHI10} - {$DEFINE DELPHI2006} // synonym to DELPHI10 - {$DEFINE DELPHICOMPILER10} - {$ENDIF} - {$DEFINE RTL180_UP} - {$ENDIF ~VER185} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$IFDEF VER190} // Delphi 2007 for .NET - {$DEFINE BDS} - {$DEFINE BDS5} - {$IFDEF CLR} - {$DEFINE CLR20} - {$ENDIF CLR} - {$DEFINE COMPILER11} - {$DEFINE DELPHI11} - {$DEFINE DELPHI2007} // synonym to DELPHI11 - {$DEFINE DELPHICOMPILER11} - {$DEFINE RTL190_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF VER190} - - {$IFDEF VER200} // RAD Studio 2009 - {$DEFINE BDS} - {$DEFINE BDS6} - {$IFDEF CLR} - {$DEFINE CLR20} - {$ENDIF CLR} - {$DEFINE COMPILER12} - {$IFDEF BCB} - {$DEFINE BCB12} - {$ELSE} - {$DEFINE DELPHI12} - {$DEFINE DELPHI2009} // synonym to DELPHI12 - {$DEFINE DELPHICOMPILER12} - {$ENDIF BCB} - {$IFDEF CLR} - {$DEFINE RTL190_UP} - {$ELSE} - {$DEFINE RTL200_UP} - {$ENDIF} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF VER200} - - {$IFDEF VER210} // RAD Studio 2010 - {$DEFINE BDS} - {$DEFINE BDS7} - {$DEFINE COMPILER14} - {$IFDEF BCB} - {$DEFINE BCB14} - {$ELSE} - {$DEFINE DELPHI14} - {$DEFINE DELPHI2010} // synonym to DELPHI14 - {$DEFINE DELPHICOMPILER14} - {$ENDIF BCB} - {$DEFINE RTL210_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF VER210} - - {$IFDEF UNKNOWN_COMPILER_VERSION} // adjust for newer version (always use latest version) - {$DEFINE BDS} - {$DEFINE BDS7} - {$DEFINE COMPILER14} - {$IFDEF BCB} - {$DEFINE BCB14} - {$ELSE} - {$DEFINE DELPHI14} - {$DEFINE DELPHI2010} // synonym to DELPHI14 - {$DEFINE DELPHICOMPILER14} - {$ENDIF BCB} - {$DEFINE RTL210_UP} - {$UNDEF UNKNOWN_COMPILER_VERSION} - {$ENDIF} - - {$ENDIF ~KYLIX} - - {$IFDEF BCB} - {$DEFINE CPPBUILDER} - {$DEFINE BCBCOMPILER} - {$ELSE ~BCB} - {$DEFINE DELPHI} - {$DEFINE DELPHICOMPILER} - {$ENDIF ~BCB} - -{$ENDIF BORLAND} - -{------------------------------------------------------------------------------} -{ DELPHIX_UP from DELPHIX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF DELPHI14} {$DEFINE DELPHI14_UP} {$ENDIF} -{$IFDEF DELPHI12} {$DEFINE DELPHI12_UP} {$ENDIF} -{$IFDEF DELPHI11} {$DEFINE DELPHI11_UP} {$ENDIF} -{$IFDEF DELPHI10} {$DEFINE DELPHI10_UP} {$ENDIF} -{$IFDEF DELPHI9} {$DEFINE DELPHI9_UP} {$ENDIF} -{$IFDEF DELPHI8} {$DEFINE DELPHI8_UP} {$ENDIF} -{$IFDEF DELPHI7} {$DEFINE DELPHI7_UP} {$ENDIF} -{$IFDEF DELPHI6} {$DEFINE DELPHI6_UP} {$ENDIF} -{$IFDEF DELPHI5} {$DEFINE DELPHI5_UP} {$ENDIF} -{$IFDEF DELPHI4} {$DEFINE DELPHI4_UP} {$ENDIF} -{$IFDEF DELPHI3} {$DEFINE DELPHI3_UP} {$ENDIF} -{$IFDEF DELPHI2} {$DEFINE DELPHI2_UP} {$ENDIF} -{$IFDEF DELPHI1} {$DEFINE DELPHI1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ DELPHIX_UP from DELPHIX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF DELPHI14_UP} - {$DEFINE DELPHI2010_UP} // synonym to DELPHI14_UP - {$DEFINE DELPHI12_UP} -{$ENDIF} - -{$IFDEF DELPHI12_UP} - {$DEFINE DELPHI2009_UP} // synonym to DELPHI12_UP - {$DEFINE DELPHI11_UP} -{$ENDIF} - -{$IFDEF DELPHI11_UP} - {$DEFINE DELPHI2007_UP} // synonym to DELPHI11_UP - {$DEFINE DELPHI10_UP} -{$ENDIF} - -{$IFDEF DELPHI10_UP} - {$DEFINE DELPHI2006_UP} // synonym to DELPHI10_UP - {$DEFINE DELPHI9_UP} -{$ENDIF} - -{$IFDEF DELPHI9_UP} - {$DEFINE DELPHI2005_UP} // synonym to DELPHI9_UP - {$DEFINE DELPHI8_UP} -{$ENDIF} - -{$IFDEF DELPHI8_UP} {$DEFINE DELPHI7_UP} {$ENDIF} -{$IFDEF DELPHI7_UP} {$DEFINE DELPHI6_UP} {$ENDIF} -{$IFDEF DELPHI6_UP} {$DEFINE DELPHI5_UP} {$ENDIF} -{$IFDEF DELPHI5_UP} {$DEFINE DELPHI4_UP} {$ENDIF} -{$IFDEF DELPHI4_UP} {$DEFINE DELPHI3_UP} {$ENDIF} -{$IFDEF DELPHI3_UP} {$DEFINE DELPHI2_UP} {$ENDIF} -{$IFDEF DELPHI2_UP} {$DEFINE DELPHI1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ BCBX_UP from BCBX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF BCB14} {$DEFINE BCB14_UP} {$ENDIF} -{$IFDEF BCB12} {$DEFINE BCB12_UP} {$ENDIF} -{$IFDEF BCB11} {$DEFINE BCB11_UP} {$ENDIF} -{$IFDEF BCB10} {$DEFINE BCB10_UP} {$ENDIF} -{$IFDEF BCB6} {$DEFINE BCB6_UP} {$ENDIF} -{$IFDEF BCB5} {$DEFINE BCB5_UP} {$ENDIF} -{$IFDEF BCB4} {$DEFINE BCB4_UP} {$ENDIF} -{$IFDEF BCB3} {$DEFINE BCB3_UP} {$ENDIF} -{$IFDEF BCB1} {$DEFINE BCB1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ BCBX_UP from BCBX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF BCB14_UP} {$DEFINE BCB12_UP} {$ENDIF} -{$IFDEF BCB12_UP} {$DEFINE BCB11_UP} {$ENDIF} -{$IFDEF BCB11_UP} {$DEFINE BCB10_UP} {$ENDIF} -{$IFDEF BCB10_UP} {$DEFINE BCB6_UP} {$ENDIF} -{$IFDEF BCB6_UP} {$DEFINE BCB5_UP} {$ENDIF} -{$IFDEF BCB5_UP} {$DEFINE BCB4_UP} {$ENDIF} -{$IFDEF BCB4_UP} {$DEFINE BCB3_UP} {$ENDIF} -{$IFDEF BCB3_UP} {$DEFINE BCB1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ BDSX_UP from BDSX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF BDS7} {$DEFINE BDS7_UP} {$ENDIF} -{$IFDEF BDS6} {$DEFINE BDS6_UP} {$ENDIF} -{$IFDEF BDS5} {$DEFINE BDS5_UP} {$ENDIF} -{$IFDEF BDS4} {$DEFINE BDS4_UP} {$ENDIF} -{$IFDEF BDS3} {$DEFINE BDS3_UP} {$ENDIF} -{$IFDEF BDS2} {$DEFINE BDS2_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ BDSX_UP from BDSX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF BDS7_UP} {$DEFINE BDS6_UP} {$ENDIF} -{$IFDEF BDS6_UP} {$DEFINE BDS5_UP} {$ENDIF} -{$IFDEF BDS5_UP} {$DEFINE BDS4_UP} {$ENDIF} -{$IFDEF BDS4_UP} {$DEFINE BDS3_UP} {$ENDIF} -{$IFDEF BDS3_UP} {$DEFINE BDS2_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ DELPHICOMPILERX_UP from DELPHICOMPILERX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF DELPHICOMPILER14} {$DEFINE DELPHICOMPILER14_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER12} {$DEFINE DELPHICOMPILER12_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER11} {$DEFINE DELPHICOMPILER11_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER10} {$DEFINE DELPHICOMPILER10_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER9} {$DEFINE DELPHICOMPILER9_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER8} {$DEFINE DELPHICOMPILER8_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER7} {$DEFINE DELPHICOMPILER7_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER6} {$DEFINE DELPHICOMPILER6_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER5} {$DEFINE DELPHICOMPILER5_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER4} {$DEFINE DELPHICOMPILER4_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER3} {$DEFINE DELPHICOMPILER3_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER2} {$DEFINE DELPHICOMPILER2_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER1} {$DEFINE DELPHICOMPILER1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ DELPHICOMPILERX_UP from DELPHICOMPILERX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF DELPHICOMPILER14_UP} {$DEFINE DELPHICOMPILER12_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER12_UP} {$DEFINE DELPHICOMPILER11_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER11_UP} {$DEFINE DELPHICOMPILER10_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER10_UP} {$DEFINE DELPHICOMPILER9_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER9_UP} {$DEFINE DELPHICOMPILER8_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER8_UP} {$DEFINE DELPHICOMPILER7_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER8_UP} {$DEFINE DELPHICOMPILER7_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER7_UP} {$DEFINE DELPHICOMPILER6_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER6_UP} {$DEFINE DELPHICOMPILER5_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER5_UP} {$DEFINE DELPHICOMPILER4_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER4_UP} {$DEFINE DELPHICOMPILER3_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER3_UP} {$DEFINE DELPHICOMPILER2_UP} {$ENDIF} -{$IFDEF DELPHICOMPILER2_UP} {$DEFINE DELPHICOMPILER1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ COMPILERX_UP from COMPILERX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF COMPILER14} {$DEFINE COMPILER14_UP} {$ENDIF} -{$IFDEF COMPILER12} {$DEFINE COMPILER12_UP} {$ENDIF} -{$IFDEF COMPILER11} {$DEFINE COMPILER11_UP} {$ENDIF} -{$IFDEF COMPILER10} {$DEFINE COMPILER10_UP} {$ENDIF} -{$IFDEF COMPILER9} {$DEFINE COMPILER9_UP} {$ENDIF} -{$IFDEF COMPILER8} {$DEFINE COMPILER8_UP} {$ENDIF} -{$IFDEF COMPILER7} {$DEFINE COMPILER7_UP} {$ENDIF} -{$IFDEF COMPILER6} {$DEFINE COMPILER6_UP} {$ENDIF} -{$IFDEF COMPILER5} {$DEFINE COMPILER5_UP} {$ENDIF} -{$IFDEF COMPILER4} {$DEFINE COMPILER4_UP} {$ENDIF} -{$IFDEF COMPILER35} {$DEFINE COMPILER35_UP} {$ENDIF} -{$IFDEF COMPILER3} {$DEFINE COMPILER3_UP} {$ENDIF} -{$IFDEF COMPILER2} {$DEFINE COMPILER2_UP} {$ENDIF} -{$IFDEF COMPILER1} {$DEFINE COMPILER1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ COMPILERX_UP from COMPILERX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF COMPILER14_UP} {$DEFINE COMPILER12_UP} {$ENDIF} -{$IFDEF COMPILER12_UP} {$DEFINE COMPILER11_UP} {$ENDIF} -{$IFDEF COMPILER11_UP} {$DEFINE COMPILER10_UP} {$ENDIF} -{$IFDEF COMPILER10_UP} {$DEFINE COMPILER9_UP} {$ENDIF} -{$IFDEF COMPILER9_UP} {$DEFINE COMPILER8_UP} {$ENDIF} -{$IFDEF COMPILER8_UP} {$DEFINE COMPILER7_UP} {$ENDIF} -{$IFDEF COMPILER7_UP} {$DEFINE COMPILER6_UP} {$ENDIF} -{$IFDEF COMPILER6_UP} {$DEFINE COMPILER5_UP} {$ENDIF} -{$IFDEF COMPILER5_UP} {$DEFINE COMPILER4_UP} {$ENDIF} -{$IFDEF COMPILER4_UP} {$DEFINE COMPILER35_UP} {$ENDIF} -{$IFDEF COMPILER35_UP} {$DEFINE COMPILER3_UP} {$ENDIF} -{$IFDEF COMPILER3_UP} {$DEFINE COMPILER2_UP} {$ENDIF} -{$IFDEF COMPILER2_UP} {$DEFINE COMPILER1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ RTLX_UP from RTLX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF RTL210_UP} {$DEFINE RTL200_UP} {$ENDIF} -{$IFDEF RTL200_UP} {$DEFINE RTL190_UP} {$ENDIF} -{$IFDEF RTL190_UP} {$DEFINE RTL185_UP} {$ENDIF} -{$IFDEF RTL185_UP} {$DEFINE RTL180_UP} {$ENDIF} -{$IFDEF RTL180_UP} {$DEFINE RTL170_UP} {$ENDIF} -{$IFDEF RTL170_UP} {$DEFINE RTL160_UP} {$ENDIF} -{$IFDEF RTL160_UP} {$DEFINE RTL150_UP} {$ENDIF} -{$IFDEF RTL150_UP} {$DEFINE RTL145_UP} {$ENDIF} -{$IFDEF RTL145_UP} {$DEFINE RTL142_UP} {$ENDIF} -{$IFDEF RTL142_UP} {$DEFINE RTL140_UP} {$ENDIF} -{$IFDEF RTL140_UP} {$DEFINE RTL130_UP} {$ENDIF} -{$IFDEF RTL130_UP} {$DEFINE RTL125_UP} {$ENDIF} -{$IFDEF RTL125_UP} {$DEFINE RTL120_UP} {$ENDIF} -{$IFDEF RTL120_UP} {$DEFINE RTL110_UP} {$ENDIF} -{$IFDEF RTL110_UP} {$DEFINE RTL100_UP} {$ENDIF} -{$IFDEF RTL100_UP} {$DEFINE RTL93_UP} {$ENDIF} -{$IFDEF RTL93_UP} {$DEFINE RTL90_UP} {$ENDIF} -{$IFDEF RTL90_UP} {$DEFINE RTL80_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ Check for CLR overrides of default detection } -{------------------------------------------------------------------------------} - -{$IFDEF CLR} - {$IFDEF FORCE_CLR10} - {$DEFINE CLR10} - {$UNDEF CLR11} - {$UNDEF CLR20} - {$ENDIF FORCE_CLR10} - - {$IFDEF FORCE_CLR11} - {$UNDEF CLR10} - {$DEFINE CLR11} - {$UNDEF CLR20} - {$ENDIF FORCE_CLR11} - - {$IFDEF FORCE_CLR20} - {$UNDEF CLR10} - {$UNDEF CLR11} - {$DEFINE CLR20} - {$ENDIF FORCE_CLR20} -{$ENDIF CLR} - -{------------------------------------------------------------------------------} -{ CLRX from CLRX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF CLR10} {$DEFINE CLR10_UP} {$ENDIF} -{$IFDEF CLR11} {$DEFINE CLR11_UP} {$ENDIF} -{$IFDEF CLR20} {$DEFINE CLR20_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ CLRX_UP from CLRX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF CLR20_UP} {$DEFINE CLR11_UP} {$ENDIF} -{$IFDEF CLR11_UP} {$DEFINE CLR10_UP} {$ENDIF} - -{------------------------------------------------------------------------------} - -{$IFDEF DELPHICOMPILER} - {$DEFINE DELPHILANGUAGE} -{$ENDIF} - -{$IFDEF BCBCOMPILER} - {$DEFINE DELPHILANGUAGE} -{$ENDIF} - -{------------------------------------------------------------------------------} -{ KYLIXX_UP from KYLIXX mappings } -{------------------------------------------------------------------------------} - -{$IFDEF KYLIX3} {$DEFINE KYLIX3_UP} {$ENDIF} -{$IFDEF KYLIX2} {$DEFINE KYLIX2_UP} {$ENDIF} -{$IFDEF KYLIX1} {$DEFINE KYLIX1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ KYLIXX_UP from KYLIXX_UP mappings } -{------------------------------------------------------------------------------} - -{$IFDEF KYLIX3_UP} {$DEFINE KYLIX2_UP} {$ENDIF} -{$IFDEF KYLIX2_UP} {$DEFINE KYLIX1_UP} {$ENDIF} - -{------------------------------------------------------------------------------} -{ Map COMPILERX_UP to friendly feature names } -{------------------------------------------------------------------------------} - -{$IFDEF FPC} - {$IFDEF VER1_0} - Please use FPC 2.0 or higher to compile this. - {$ELSE} - {$DEFINE SUPPORTS_OUTPARAMS} - {$DEFINE SUPPORTS_WIDECHAR} - {$DEFINE SUPPORTS_WIDESTRING} - {$IFDEF HASINTF} - {$DEFINE SUPPORTS_INTERFACE} - {$ENDIF} - {$IFDEF HASVARIANT} - {$DEFINE SUPPORTS_VARIANT} - {$ENDIF} - {$IFDEF FPC_HAS_TYPE_SINGLE} - {$DEFINE SUPPORTS_SINGLE} - {$ENDIF} - {$IFDEF FPC_HAS_TYPE_DOUBLE} - {$DEFINE SUPPORTS_DOUBLE} - {$ENDIF} - {$IFDEF FPC_HAS_TYPE_EXTENDED} - {$DEFINE SUPPORTS_EXTENDED} - {$ENDIF} - {$IFDEF HASCURRENCY} - {$DEFINE SUPPORTS_CURRENCY} - {$ENDIF} - {$DEFINE SUPPORTS_THREADVAR} - {$DEFINE SUPPORTS_CONSTPARAMS} - {$DEFINE SUPPORTS_LONGWORD} - {$DEFINE SUPPORTS_INT64} - {$DEFINE SUPPORTS_DYNAMICARRAYS} - {$DEFINE SUPPORTS_DEFAULTPARAMS} - {$DEFINE SUPPORTS_OVERLOAD} - {$DEFINE ACCEPT_DEPRECATED} // 2.2 also gives warnings - {$DEFINE ACCEPT_PLATFORM} // 2.2 also gives warnings - {$DEFINE ACCEPT_LIBRARY} - {$DEFINE SUPPORTS_EXTSYM} - {$DEFINE SUPPORTS_NODEFINE} - - {$DEFINE SUPPORTS_CUSTOMVARIANTS} - {$DEFINE SUPPORTS_VARARGS} - {$DEFINE SUPPORTS_ENUMVALUE} - {$IFDEF LINUX} - {$DEFINE HAS_UNIT_LIBC} - {$ENDIF LINUX} - {$DEFINE HAS_UNIT_CONTNRS} - {$DEFINE HAS_UNIT_TYPES} - {$DEFINE HAS_UNIT_VARIANTS} - {$DEFINE HAS_UNIT_STRUTILS} - {$DEFINE HAS_UNIT_DATEUTILS} - {$DEFINE HAS_UNIT_RTLCONSTS} - - {$DEFINE XPLATFORM_RTL} - - {$IFDEF VER2_2} - {$DEFINE SUPPORTS_DISPINTERFACE} - {$DEFINE SUPPORTS_IMPLEMENTS} - {$DEFINE SUPPORTS_DISPID} - {$ELSE} - {$UNDEF SUPPORTS_DISPINTERFACE} - {$UNDEF SUPPORTS_IMPLEMENTS} - {$endif} - {$UNDEF SUPPORTS_UNSAFE_WARNINGS} - {$ENDIF} -{$ENDIF FPC} - -{$IFDEF CLR} - {$DEFINE SUPPORTS_UNICODE} -{$ENDIF CLR} - -{$IFDEF COMPILER1_UP} - {$DEFINE SUPPORTS_CONSTPARAMS} - {$DEFINE SUPPORTS_SINGLE} - {$DEFINE SUPPORTS_DOUBLE} - {$DEFINE SUPPORTS_EXTENDED} - {$DEFINE SUPPORTS_PACKAGES} -{$ENDIF COMPILER1_UP} - -{$IFDEF COMPILER2_UP} - {$DEFINE SUPPORTS_CURRENCY} - {$DEFINE SUPPORTS_THREADVAR} - {$DEFINE SUPPORTS_VARIANT} - {$DEFINE SUPPORTS_WIDECHAR} -{$ENDIF COMPILER2_UP} - -{$IFDEF COMPILER3_UP} - {$DEFINE SUPPORTS_OUTPARAMS} - {$DEFINE SUPPORTS_WIDESTRING} - {$DEFINE SUPPORTS_INTERFACE} - {$DEFINE SUPPORTS_DISPINTERFACE} - {$DEFINE SUPPORTS_DISPID} - {$DEFINE SUPPORTS_WEAKPACKAGEUNIT} -{$ENDIF COMPILER3_UP} - -{$IFDEF COMPILER35_UP} - {$DEFINE SUPPORTS_EXTSYM} - {$DEFINE SUPPORTS_NODEFINE} -{$ENDIF COMPILER35_UP} - -{$IFDEF COMPILER4_UP} - {$DEFINE SUPPORTS_LONGWORD} - {$DEFINE SUPPORTS_INT64} - {$DEFINE SUPPORTS_DYNAMICARRAYS} - {$DEFINE SUPPORTS_DEFAULTPARAMS} - {$DEFINE SUPPORTS_OVERLOAD} - {$DEFINE SUPPORTS_IMPLEMENTS} -{$ENDIF COMPILER4_UP} - -{$IFDEF COMPILER6_UP} - {$DEFINE SUPPORTS_DEPRECATED} - {$DEFINE SUPPORTS_LIBRARY} - {$DEFINE SUPPORTS_PLATFORM} - {$DEFINE SUPPORTS_LOCAL} - {$DEFINE SUPPORTS_SETPEFLAGS} - {$DEFINE SUPPORTS_EXPERIMENTAL_WARNINGS} - {$DEFINE ACCEPT_DEPRECATED} - {$DEFINE ACCEPT_PLATFORM} - {$DEFINE ACCEPT_LIBRARY} - {$DEFINE SUPPORTS_DEPRECATED_WARNINGS} - {$DEFINE SUPPORTS_LIBRARY_WARNINGS} - {$DEFINE SUPPORTS_PLATFORM_WARNINGS} - {$DEFINE SUPPORTS_CUSTOMVARIANTS} - {$DEFINE SUPPORTS_VARARGS} - {$DEFINE SUPPORTS_ENUMVALUE} - {$DEFINE SUPPORTS_COMPILETIME_MESSAGES} -{$ENDIF COMPILER6_UP} - -{$IFDEF COMPILER7_UP} - {$DEFINE SUPPORTS_UNSAFE_WARNINGS} -{$ENDIF COMPILER7_UP} - -{$IFDEF COMPILER9_UP} - {$DEFINE SUPPORTS_FOR_IN} - {$DEFINE SUPPORTS_INLINE} - {$DEFINE SUPPORTS_NESTED_CONSTANTS} - {$DEFINE SUPPORTS_NESTED_TYPES} - {$DEFINE SUPPORTS_REGION} - {$IFDEF CLR} - {$DEFINE SUPPORTS_ENHANCED_RECORDS} - {$DEFINE SUPPORTS_CLASS_FIELDS} - {$DEFINE SUPPORTS_CLASS_HELPERS} - {$DEFINE SUPPORTS_CLASS_OPERATORS} - {$DEFINE SUPPORTS_STRICT} - {$DEFINE SUPPORTS_STATIC} - {$DEFINE SUPPORTS_FINAL} - {$ENDIF CLR} -{$ENDIF COMPILER9_UP} - -{$IFDEF COMPILER10_UP} - {$DEFINE SUPPORTS_ENHANCED_RECORDS} - {$DEFINE SUPPORTS_CLASS_FIELDS} - {$DEFINE SUPPORTS_CLASS_HELPERS} - {$DEFINE SUPPORTS_CLASS_OPERATORS} - {$DEFINE SUPPORTS_STRICT} - {$DEFINE SUPPORTS_STATIC} - {$DEFINE SUPPORTS_FINAL} - {$DEFINE SUPPORTS_METHODINFO} -{$ENDIF COMPILER10_UP} - -{$IFDEF COMPILER11_UP} - {$IFDEF CLR} - {$DEFINE SUPPORTS_GENERICS} - {$DEFINE SUPPORTS_DEPRECATED_DETAILS} - {$ENDIF CLR} -{$ENDIF COMPILER11_UP} - -{$IFDEF COMPILER12_UP} - {$DEFINE SUPPORTS_GENERICS} - {$DEFINE SUPPORTS_DEPRECATED_DETAILS} - {$DEFINE SUPPORTS_INT_ALIASES} - {$IFNDEF CLR} - {$DEFINE SUPPORTS_UNICODE} - {$DEFINE SUPPORTS_UNICODE_STRING} - {$ENDIF CLR} -{$ENDIF COMPILER12_UP} - -{$IFDEF COMPILER14_UP} - {$DEFINE SUPPORTS_CLASS_CTORDTORS} - {$DEFINE HAS_UNIT_RTTI} - {$DEFINE SUPPORTS_CAST_INTERFACE_TO_OBJ} - {$DEFINE SUPPORTS_DELAYED_LOADING} -{$ENDIF COMPILER14_UP} - -{$IFDEF RTL130_UP} - {$DEFINE HAS_UNIT_CONTNRS} -{$ENDIF RTL130_UP} - -{$IFDEF RTL140_UP} - {$IFDEF LINUX} - {$DEFINE HAS_UNIT_LIBC} - {$ENDIF LINUX} - {$DEFINE HAS_UNIT_RTLCONSTS} - {$DEFINE HAS_UNIT_TYPES} - {$DEFINE HAS_UNIT_VARIANTS} - {$DEFINE HAS_UNIT_STRUTILS} - {$DEFINE HAS_UNIT_DATEUTILS} - {$DEFINE XPLATFORM_RTL} -{$ENDIF RTL140_UP} - -{$IFDEF RTL170_UP} - {$DEFINE HAS_UNIT_HTTPPROD} -{$ENDIF RTL170_UP} - -{$IFDEF RTL185_UP} - {$DEFINE HAS_UNIT_GIFIMG} -{$ENDIF RTL185_UP} - -{$IFDEF RTL200_UP} - {$DEFINE HAS_UNIT_ANSISTRINGS} - {$DEFINE HAS_UNIT_PNGIMAGE} -{$ENDIF RTL200_UP} - -{------------------------------------------------------------------------------} -{ Cross-platform related defines } -{------------------------------------------------------------------------------} - -{$IFNDEF CPUASM} - {$DEFINE PUREPASCAL} -{$ENDIF ~CPUASM} - -{$IFDEF WIN32} - {$DEFINE MSWINDOWS} // predefined for D6+/BCB6+ - {$DEFINE Win32API} -{$ENDIF} - -{$IFDEF DELPHILANGUAGE} - {$IFDEF LINUX} - {$DEFINE UNIX} - {$ENDIF} - - {$IFNDEF CONSOLE} - {$IFDEF LINUX} - {$DEFINE VisualCLX} - {$ENDIF} - {$IFNDEF VisualCLX} - {$DEFINE VCL} - {$ENDIF} - {$ENDIF ~CONSOLE} -{$ENDIF DELPHILANGUAGE} - -{------------------------------------------------------------------------------} -{ Compiler settings } -{------------------------------------------------------------------------------} - -{$IFOPT A+} {$DEFINE ALIGN_ON} {$ENDIF} -{$IFOPT B+} {$DEFINE BOOLEVAL_ON} {$ENDIF} -{$IFDEF COMPILER2_UP} - {$IFOPT C+} {$DEFINE ASSERTIONS_ON} {$ENDIF} -{$ENDIF} -{$IFOPT D+} {$DEFINE DEBUGINFO_ON} {$ENDIF} -{$IFOPT G+} {$DEFINE IMPORTEDDATA_ON} {$ENDIF} -{$IFDEF COMPILER2_UP} - {$IFOPT H+} {$DEFINE LONGSTRINGS_ON} {$ENDIF} -{$ENDIF} - -// Hints -{$IFOPT I+} {$DEFINE IOCHECKS_ON} {$ENDIF} -{$IFDEF COMPILER2_UP} - {$IFOPT J+} {$DEFINE WRITEABLECONST_ON} {$ENDIF} -{$ENDIF} -{$IFOPT L+} {$DEFINE LOCALSYMBOLS} {$DEFINE LOCALSYMBOLS_ON} {$ENDIF} -{$IFOPT M+} {$DEFINE TYPEINFO_ON} {$ENDIF} -{$IFOPT O+} {$DEFINE OPTIMIZATION_ON} {$ENDIF} -{$IFOPT P+} {$DEFINE OPENSTRINGS_ON} {$ENDIF} -{$IFOPT Q+} {$DEFINE OVERFLOWCHECKS_ON} {$ENDIF} -{$IFOPT R+} {$DEFINE RANGECHECKS_ON} {$ENDIF} - -// Real compatibility -{$IFOPT T+} {$DEFINE TYPEDADDRESS_ON} {$ENDIF} -{$IFOPT U+} {$DEFINE SAFEDIVIDE_ON} {$ENDIF} -{$IFOPT V+} {$DEFINE VARSTRINGCHECKS_ON} {$ENDIF} -{$IFOPT W+} {$DEFINE STACKFRAMES_ON} {$ENDIF} - -// Warnings -{$IFOPT X+} {$DEFINE EXTENDEDSYNTAX_ON} {$ENDIF} - -// for Delphi/BCB trial versions remove the point from the line below -{.$UNDEF SUPPORTS_WEAKPACKAGEUNIT} - -{$ENDIF ~JEDI_INC} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-11 13:08:22
|
Revision: 3188 http://jcl.svn.sourceforge.net/jcl/?rev=3188&view=rev Author: outchy Date: 2010-02-11 12:14:06 +0000 (Thu, 11 Feb 2010) Log Message: ----------- Added unit versioning info to all JCL runtime units. Style cleaning in JclNotify. All JCL runtime units (including JPP) have to include jcl.inc rather than jedi.inc. moved unitversioning records from JclUnitVersioning and JclUnitVersioningProviders to unit interface section. Modified Paths: -------------- trunk/jcl/devtools/jpp/JppLexer.pas trunk/jcl/devtools/jpp/JppParser.pas trunk/jcl/devtools/jpp/JppState.pas trunk/jcl/source/common/JclNotify.pas trunk/jcl/source/common/JclUnitVersioning.pas trunk/jcl/source/common/JclUnitVersioningProviders.pas trunk/jcl/source/common/pcre.pas trunk/jcl/source/common/zlibh.pas trunk/jcl/source/prototypes/Hardlinks.pas trunk/jcl/source/windows/Hardlinks.pas trunk/jcl/source/windows/MSHelpServices_TLB.pas trunk/jcl/source/windows/MSTask.pas trunk/jcl/source/windows/Snmp.pas trunk/jcl/source/windows/mscoree_TLB.pas trunk/jcl/source/windows/mscorlib_TLB.pas trunk/jcl/source/windows/sevenzip.pas Modified: trunk/jcl/devtools/jpp/JppLexer.pas =================================================================== --- trunk/jcl/devtools/jpp/JppLexer.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/devtools/jpp/JppLexer.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -48,9 +48,14 @@ unit JppLexer; +{$I jcl.inc} + interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} SysUtils, Classes, JclStrHashMap, JclStrings; @@ -88,6 +93,18 @@ property RawComment: string read FRawComment; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\devtools\jpp'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation { TJppLexer } @@ -390,5 +407,13 @@ NextTok; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/devtools/jpp/JppParser.pas =================================================================== --- trunk/jcl/devtools/jpp/JppParser.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/devtools/jpp/JppParser.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -42,12 +42,15 @@ unit JppParser; -{$I jedi.inc} +{$I jcl.inc} interface uses SysUtils, Classes, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JppState, JppLexer; type @@ -100,6 +103,18 @@ function Parse: string; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\devtools\jpp'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -777,4 +792,12 @@ end; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/devtools/jpp/JppState.pas =================================================================== --- trunk/jcl/devtools/jpp/JppState.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/devtools/jpp/JppState.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -48,7 +48,11 @@ {$I jcl.inc} uses - SysUtils, Classes, JclBase, JclContainerIntf; + SysUtils, Classes, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + JclBase, JclContainerIntf; type EPppState = class(Exception); @@ -109,6 +113,18 @@ property DefineTriState[const ASymbol: string]: TTriState read GetDefineTriState write SetDefineTriState; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\devtools\jpp'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -437,4 +453,12 @@ AMacros.Remove(AMacroNames.GetString); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclNotify.pas =================================================================== --- trunk/jcl/source/common/JclNotify.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/common/JclNotify.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -37,10 +37,13 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase, {$IFDEF THREADSAFE} JclSynch, - {$ENDIF} + {$ENDIF THREADSAFE} Classes; { The following interfaces provide a basic notifier/listener setup. Whenever code issues a notification through the @@ -98,12 +101,24 @@ procedure Remove(listener: IJclListener); stdcall; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses SysUtils; -{ TJclBaseNotifier } +//=== { TJclBaseNotifier } =================================================== constructor TJclBaseNotifier.Create; begin @@ -180,11 +195,19 @@ {$ENDIF THREADSAFE} end; -{ TJclBaseListener } +//=== { TJclBaseListener } =================================================== procedure TJclBaseListener.Notification(msg: IJclNotificationMessage); begin // do nothing; descendants should override this method to process incoming notifications end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclUnitVersioning.pas =================================================================== --- trunk/jcl/source/common/JclUnitVersioning.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/common/JclUnitVersioning.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -143,6 +143,16 @@ function GetUnitVersioning: TUnitVersioning; +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common'; + Extra: ''; + Data: nil + ); + implementation uses @@ -670,16 +680,6 @@ UnitVersioning.UnregisterModule(Instance); end; -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\source\common'; - Extra: ''; - Data: nil - ); - initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/common/JclUnitVersioningProviders.pas =================================================================== --- trunk/jcl/source/common/JclUnitVersioningProviders.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/common/JclUnitVersioningProviders.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -100,6 +100,16 @@ AUnitList: TJclUnitVersioningList): Boolean; {$ENDIF MSWINDOWS} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common'; + Extra: ''; + Data: nil + ); + implementation const @@ -394,16 +404,6 @@ FModules.Delete(Idx); end; -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\source\common'; - Extra: ''; - Data: nil - ); - initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/common/pcre.pas =================================================================== --- trunk/jcl/source/common/pcre.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/common/pcre.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -45,6 +45,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase; (************************************************* @@ -574,6 +577,18 @@ function LoadPCRE: Boolean; procedure UnloadPCRE; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -1129,5 +1144,13 @@ function pcre_version; external libpcremodulename name PCREVersionExportName; {$ENDIF PCRE_LINKDLL} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/zlibh.pas =================================================================== --- trunk/jcl/source/common/zlibh.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/common/zlibh.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -63,6 +63,9 @@ {$IFDEF HAS_UNIT_LIBC} Libc, {$ENDIF HAS_UNIT_LIBC} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase; {$IFNDEF FPC} @@ -1990,6 +1993,18 @@ function LoadZLib: Boolean; procedure UnloadZLib; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -2348,8 +2363,13 @@ function get_crc_table; external szZLIB name ZLIBget_crc_tableExportName; {$ENDIF ZLIB_LINKDLL} -end. +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +end. - Modified: trunk/jcl/source/prototypes/Hardlinks.pas =================================================================== --- trunk/jcl/source/prototypes/Hardlinks.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/prototypes/Hardlinks.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -171,6 +171,9 @@ interface {$IFDEF JCL // ALL enabled by default for Project JEDI } + +{$I jcl.inc} + {$DEFINE STDCALL // Make functions STDCALL always } {$DEFINE RTDL // Use runtime dynamic linking } {$DEFINE PREFERAPI // Prefer the "real" Windows API on systems on which it exists @@ -190,6 +193,9 @@ 6 | X X X *) uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Windows; {$IFDEF PREFERAPI} @@ -222,6 +228,18 @@ bRtdlFunctionsLoaded: Boolean = False; // To show wether the RTDL functions had been loaded {$ENDIF RTDL} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation const @@ -817,6 +835,10 @@ hKernel32: THandle = 0; initialization + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + // GetModuleHandle because this DLL is loaded into any Win32 subsystem process anyway // implicitly. And Delphi cannot create applications for other subsystems without // major changes in SysInit und System units. @@ -877,6 +899,10 @@ end; // if not (Assigned(@CreateHardLinkA) and Assigned(@CreateHardLinkW)) then ... {$ENDIF PREFERAPI} + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + {$IFNDEF JCL} //-------------------------------------------------------------------------------------------------- {$ENDIF ~JCL} Modified: trunk/jcl/source/windows/Hardlinks.pas =================================================================== --- trunk/jcl/source/windows/Hardlinks.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/Hardlinks.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -52,6 +52,9 @@ interface +{$I jcl.inc} + + (* All possible combinations of the above DEFINEs have been tested and work fine. @@ -65,6 +68,9 @@ 6 | X X X *) uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Windows; @@ -84,6 +90,18 @@ hNtDll: THandle = 0; // For runtime dynamic linking bRtdlFunctionsLoaded: Boolean = False; // To show wether the RTDL functions had been loaded +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation const @@ -618,6 +636,10 @@ hKernel32: THandle = 0; initialization + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + // GetModuleHandle because this DLL is loaded into any Win32 subsystem process anyway // implicitly. And Delphi cannot create applications for other subsystems without // major changes in SysInit und System units. @@ -672,6 +694,10 @@ @CreateHardLinkW := @MyCreateHardLinkW; end; // if not (Assigned(@CreateHardLinkA) and Assigned(@CreateHardLinkW)) then ... + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/MSHelpServices_TLB.pas =================================================================== --- trunk/jcl/source/windows/MSHelpServices_TLB.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/MSHelpServices_TLB.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -55,7 +55,7 @@ { $WRITEABLECONST ON} { $VARPROPSETTER ON} -{$I jedi.inc} +{$I jcl.inc} {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} {$WEAKPACKAGEUNIT ON} @@ -63,7 +63,11 @@ interface -uses ActiveX, Classes; +uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + ActiveX, Classes; // *********************************************************************// @@ -1582,6 +1586,18 @@ class function CreateRemote(const MachineName: string): IHxRegisterProtocol; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses ComObj; @@ -1626,4 +1642,12 @@ Result := CreateRemoteComObject(MachineName, CLASS_HxRegisterProtocol) as IHxRegisterProtocol; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/MSTask.pas =================================================================== --- trunk/jcl/source/windows/MSTask.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/MSTask.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -41,9 +41,10 @@ {$I jcl.inc} uses - {$IFDEF BORLAND} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} ActiveX, - {$ENDIF BORLAND} Windows; @@ -656,7 +657,27 @@ {$EXTERNALSYM CLSID_CSchedulingAgent} CLSID_CSchedulingAgent: TCLSID = (D1: $148BD52A; D2: $A2AB; D3: $11CE; D4: ($B1, $1F, $00, $AA, $00, $53, $05, $03)); +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/Snmp.pas =================================================================== --- trunk/jcl/source/windows/Snmp.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/Snmp.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -59,6 +59,9 @@ {$ENDIF} uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Windows, SysUtils; (*$HPPEMIT '#include <snmp.h>'*) @@ -663,6 +666,18 @@ {$ENDIF SNMP_DYNAMIC_LINK_EXPLICIT} {$ENDIF SNMP_DYNAMIC_LINK} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation const @@ -888,16 +903,34 @@ {$ENDIF ~SNMP_DYNAMIC_LINK} -{$IFDEF SNMP_DYNAMIC_LINK} -{$IFNDEF SNMP_DYNAMIC_LINK_EXPLICIT} +procedure InitializeSnmp; +begin + {$IFDEF SNMP_DYNAMIC_LINK} + {$IFNDEF SNMP_DYNAMIC_LINK_EXPLICIT} + LoadSnmp; + {$ENDIF ~SNMP_DYNAMIC_LINK_EXPLICIT} + {$ENDIF SNMP_DYNAMIC_LINK} +end; +procedure FinalizeSnmp; +begin + {$IFDEF SNMP_DYNAMIC_LINK} + {$IFNDEF SNMP_DYNAMIC_LINK_EXPLICIT} + UnloadSnmp; + {$ENDIF ~SNMP_DYNAMIC_LINK_EXPLICIT} + {$ENDIF SNMP_DYNAMIC_LINK} +end; + initialization - LoadSnmp; + InitializeSnmp; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} finalization - UnloadSnmp; + FinalizeSnmp; + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} -{$ENDIF ~SNMP_DYNAMIC_LINK_EXPLICIT} -{$ENDIF SNMP_DYNAMIC_LINK} - end. Modified: trunk/jcl/source/windows/mscoree_TLB.pas =================================================================== --- trunk/jcl/source/windows/mscoree_TLB.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/mscoree_TLB.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -38,7 +38,7 @@ { $WRITEABLECONST ON} { $VARPROPSETTER ON} -{$I jedi.inc} +{$I jcl.inc} {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} {$WEAKPACKAGEUNIT ON} @@ -46,7 +46,12 @@ interface -uses ActiveX, Classes; +uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + ActiveX, + Classes; {$HPPEMIT '#include <winnt.h>'} @@ -428,6 +433,18 @@ class function CreateRemote(const MachineName: string): ICorRuntimeHost; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses ComObj; @@ -452,4 +469,12 @@ Result := CreateRemoteComObject(MachineName, CLASS_CorRuntimeHost) as ICorRuntimeHost; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/mscorlib_TLB.pas =================================================================== --- trunk/jcl/source/windows/mscorlib_TLB.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/mscorlib_TLB.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -56,7 +56,7 @@ { $WRITEABLECONST ON} { $VARPROPSETTER ON} -{$I jedi.inc} +{$I jcl.inc} {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} {$WEAKPACKAGEUNIT ON} @@ -64,7 +64,12 @@ interface -uses ActiveX, Classes; +uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + ActiveX, + Classes; // *********************************************************************// @@ -26618,6 +26623,18 @@ class function CreateRemote(const MachineName: string): _EnumBuilder; end; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation uses ComObj; @@ -32332,4 +32349,12 @@ Result := CreateRemoteComObject(MachineName, CLASS_EnumBuilder) as _EnumBuilder; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/sevenzip.pas =================================================================== --- trunk/jcl/source/windows/sevenzip.pas 2010-02-11 11:59:59 UTC (rev 3187) +++ trunk/jcl/source/windows/sevenzip.pas 2010-02-11 12:14:06 UTC (rev 3188) @@ -60,6 +60,9 @@ uses Windows, ActiveX, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase; // Guid.txt @@ -624,6 +627,18 @@ function Is7ZipLoaded: Boolean; procedure Unload7Zip; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows'; + Extra: ''; + Data: nil + ); +{$ENDIF UNITVERSIONING} + implementation type @@ -720,4 +735,12 @@ {$ENDIF 7ZIP_LINKONREQUEST} end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-11 12:00:06
|
Revision: 3187 http://jcl.svn.sourceforge.net/jcl/?rev=3187&view=rev Author: outchy Date: 2010-02-11 11:59:59 +0000 (Thu, 11 Feb 2010) Log Message: ----------- regenerated with stripped deprecated code. Modified Paths: -------------- trunk/jcl/source/vcl/JclGraphUtils.pas Modified: trunk/jcl/source/vcl/JclGraphUtils.pas =================================================================== --- trunk/jcl/source/vcl/JclGraphUtils.pas 2010-02-07 13:32:08 UTC (rev 3186) +++ trunk/jcl/source/vcl/JclGraphUtils.pas 2010-02-11 11:59:59 UTC (rev 3187) @@ -240,13 +240,9 @@ function RGBToHLS(const RGB: TColorVector): TColorVector; overload; function RGBToHLS(const RGBColor: TColorRef): THLSVector; overload; -{$IFDEF KEEP_DEPRECATED} // obsolete; use corresponding HLS aliases instead -procedure HSLToRGB(const H, S, L: Single; out R, G, B: Single); overload; - {$IFDEF SUPPORTS_DEPRECATED} deprecated; {$ENDIF} -procedure RGBToHSL(const R, G, B: Single; out H, S, L: Single); overload; - {$IFDEF SUPPORTS_DEPRECATED} deprecated; {$ENDIF} -{$ENDIF KEEP_DEPRECATED} +//procedure HSLToRGB(const H, S, L: Single; out R, G, B: Single); overload; +//procedure RGBToHSL(const R, G, B: Single; out H, S, L: Single); overload; // keep HSL identifier to avoid ambiguity with HLS overload function HSLToRGB(const H, S, L: Single): TColor32; overload; @@ -1911,13 +1907,6 @@ end; end; -{$IFDEF KEEP_DEPRECATED} -procedure HSLToRGB(const H, S, L: Single; out R, G, B: Single); -begin - HLSToRGB(H, L, S, R, G, B); -end; -{$ENDIF KEEP_DEPRECATED} - function HSLToRGB(const H, S, L: Single): TColor32; var R, G, B: Single; @@ -1964,13 +1953,6 @@ end; end; -{$IFDEF KEEP_DEPRECATED} -procedure RGBToHSL(const R, G, B: Single; out H, S, L: Single); -begin - RGBToHLS(R, G, B, H, L, S); -end; -{$ENDIF KEEP_DEPRECATED} - procedure RGBToHSL(const RGB: TColor32; out H, S, L: Single); begin RGBToHLS(RedComponent(RGB) / 255, GreenComponent(RGB) / 255, BlueComponent(RGB) / 255, H, L, S); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-07 13:32:18
|
Revision: 3186 http://jcl.svn.sourceforge.net/jcl/?rev=3186&view=rev Author: outchy Date: 2010-02-07 13:32:08 +0000 (Sun, 07 Feb 2010) Log Message: ----------- Mantis 5156: Delphi 2010 features in jedi.inc. Modified Paths: -------------- trunk/jcl/source/include/jedi.inc Modified: trunk/jcl/source/include/jedi.inc =================================================================== --- trunk/jcl/source/include/jedi.inc 2010-02-06 10:26:04 UTC (rev 3185) +++ trunk/jcl/source/include/jedi.inc 2010-02-07 13:32:08 UTC (rev 3186) @@ -424,7 +424,10 @@ XPLATFORM_RTL The RTL supports crossplatform function names (e.g. RaiseLastOSError) (D6+/BCB6+/FPC) SUPPORTS_UNICODE string type is aliased to an unicode string (WideString or UnicodeString) (DX.NET, D12+) SUPPORTS_UNICODE_STRING Compiler supports UnicodeString (D12+) - SUPPORTS_INT_ALIASES Types Int8, Int16, Int32, UInt8, UInt16 and UInt32 are defined in the unit System + SUPPORTS_INT_ALIASES Types Int8, Int16, Int32, UInt8, UInt16 and UInt32 are defined in the unit System (D12+) + HAS_UNIT_RTTI Unit RTTI is available (D14+) + SUPPORTS_CAST_INTERFACE_TO_OBJ The compiler supports casts from interfaces to objects (D14+) + SUPPORTS_DELAYED_LOADING The compiler generates stubs for delaying imported function loads (D14+) - Compiler Settings @@ -1149,6 +1152,7 @@ {$IFDEF COMPILER12_UP} {$DEFINE SUPPORTS_GENERICS} {$DEFINE SUPPORTS_DEPRECATED_DETAILS} + {$DEFINE SUPPORTS_INT_ALIASES} {$IFNDEF CLR} {$DEFINE SUPPORTS_UNICODE} {$DEFINE SUPPORTS_UNICODE_STRING} @@ -1157,6 +1161,9 @@ {$IFDEF COMPILER14_UP} {$DEFINE SUPPORTS_CLASS_CTORDTORS} + {$DEFINE HAS_UNIT_RTTI} + {$DEFINE SUPPORTS_CAST_INTERFACE_TO_OBJ} + {$DEFINE SUPPORTS_DELAYED_LOADING} {$ENDIF COMPILER14_UP} {$IFDEF RTL130_UP} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-06 10:26:14
|
Revision: 3185 http://jcl.svn.sourceforge.net/jcl/?rev=3185&view=rev Author: outchy Date: 2010-02-06 10:26:04 +0000 (Sat, 06 Feb 2010) Log Message: ----------- Mantis 5155: Feature request for SUPPORTS_INT_ALIASES. Modified Paths: -------------- trunk/jcl/source/include/jedi.inc Modified: trunk/jcl/source/include/jedi.inc =================================================================== --- trunk/jcl/source/include/jedi.inc 2010-02-06 03:55:11 UTC (rev 3184) +++ trunk/jcl/source/include/jedi.inc 2010-02-06 10:26:04 UTC (rev 3185) @@ -424,6 +424,7 @@ XPLATFORM_RTL The RTL supports crossplatform function names (e.g. RaiseLastOSError) (D6+/BCB6+/FPC) SUPPORTS_UNICODE string type is aliased to an unicode string (WideString or UnicodeString) (DX.NET, D12+) SUPPORTS_UNICODE_STRING Compiler supports UnicodeString (D12+) + SUPPORTS_INT_ALIASES Types Int8, Int16, Int32, UInt8, UInt16 and UInt32 are defined in the unit System - Compiler Settings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sf...@us...> - 2010-02-06 03:55:20
|
Revision: 3184 http://jcl.svn.sourceforge.net/jcl/?rev=3184&view=rev Author: sfarrow Date: 2010-02-06 03:55:11 +0000 (Sat, 06 Feb 2010) Log Message: ----------- Committing the WiX binaries. Requires the .net framework to build the installer. Added Paths: ----------- branches/jcl-msi/thirdparty/Windows Installer/Installer/BlankFile.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/BurnTasks.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/CPL.TXT branches/jcl-msi/thirdparty/Windows Installer/Installer/CustomActionCPP_2005.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/CustomActionCPP_2008.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/IncludeFile.ico branches/jcl-msi/thirdparty/Windows Installer/Installer/IncludeFile.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/LocalizationFile.ico branches/jcl-msi/thirdparty/Windows Installer/Installer/LocalizationFile.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/Microsoft.Deployment.WindowsInstaller.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/ProductFile.ico branches/jcl-msi/thirdparty/Windows Installer/Installer/ProjectFile.ico branches/jcl-msi/thirdparty/Windows Installer/Installer/SetupBuilder.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/TextFile.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/WixComPlusExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixCop.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/WixDifxAppExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixDirectXExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixFirewallExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixGamingExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixIIsExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixIsolatedAppExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixLibrary.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/WixLibraryFile.ico branches/jcl-msi/thirdparty/Windows Installer/Installer/WixMergeModule.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/WixMsmqExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixNetFxExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixOfficeExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixPSExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixProject.zip branches/jcl-msi/thirdparty/Windows Installer/Installer/WixSqlExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixTasks.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixUIExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixUtilExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/WixVSExtension.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.targets branches/jcl-msi/thirdparty/Windows Installer/Installer/burnstub.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/darice.cub branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_ia64.wixlib branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_x64.wixlib branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_x86.wixlib branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/ branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/DTF.chm branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/DTFAPI.chm branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/difxapp.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/firewall.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/gaming.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/iis.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/msmq.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/netfx.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/ps.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/sql.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/util.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/vs.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/wix.chm branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/wix.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/wixloc.xsd branches/jcl-msi/thirdparty/Windows Installer/Installer/heat.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/heat.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/insignia.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/insignia.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/light.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/light.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/lit.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/lit.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/melt.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/melt.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/mergemod.cub branches/jcl-msi/thirdparty/Windows Installer/Installer/mergemod.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/mspatchc.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/pyro.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/pyro.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/sconce2005.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sconce2008.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sconce2010.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/ branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/DocCompiler.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/MakeSfxCA.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Compression.Cab.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Compression.Cab.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Compression.Zip.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Compression.Zip.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Compression.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Compression.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Resources.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.Resources.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.WindowsInstaller.Linq.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.WindowsInstaller.Linq.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.WindowsInstaller.Package.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.WindowsInstaller.Package.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.WindowsInstaller.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/Microsoft.Deployment.WindowsInstaller.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/MsgGen.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/XsdGen.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/XsdStitch.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/ branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/IBurnCore.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/IBurnUserExperience.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/aclutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/apuputil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/atomutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/buffutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/cabcutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/cabutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/certutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/conutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/dictutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/dirutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/dutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/fileutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/gdiputil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/inetutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/locutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/logutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/memutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/metautil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/osutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/pathutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/perfutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/procutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/resrutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/reswutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/rexutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/rssutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/shelutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/sqlutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/strutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/thmutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/timeutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/uriutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/userutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/wcautil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/wcawow64.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/wcawrapquery.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/wiutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/inc/xmlutil.h branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/ branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/buxutil.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/buxutil_2005.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/buxutil_2005_x64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/buxutil_x64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/dutil.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/dutil_2005.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/dutil_2005_ia64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/dutil_2005_x64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/dutil_ia64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/dutil_x64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/wcautil.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/wcautil_2005.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/wcautil_2005_ia64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/wcautil_2005_x64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/wcautil_ia64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/lib/wcautil_x64.lib branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/wix.ca.targets branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/x64/ branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/x64/sfxca.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/x86/ branches/jcl-msi/thirdparty/Windows Installer/Installer/sdk/x86/sfxca.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/setup.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/setupbld.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/smoke.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/smoke.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/stdux.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/stdux.png branches/jcl-msi/thirdparty/Windows Installer/Installer/thm.xml branches/jcl-msi/thirdparty/Windows Installer/Installer/torch.exe branches/jcl-msi/thirdparty/Windows Installer/Installer/torch.exe.config branches/jcl-msi/thirdparty/Windows Installer/Installer/tou.htm branches/jcl-msi/thirdparty/Windows Installer/Installer/votive2005.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/votive2008.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/votive2010.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/wconsole.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/winterop.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/wix.dll branches/jcl-msi/thirdparty/Windows Installer/Installer/wix.targets branches/jcl-msi/thirdparty/Windows Installer/Installer/wix2010.targets branches/jcl-msi/thirdparty/Windows Installer/Installer/wui.dll Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/BlankFile.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/BlankFile.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/BurnTasks.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/BurnTasks.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/CPL.TXT =================================================================== --- branches/jcl-msi/thirdparty/Windows Installer/Installer/CPL.TXT (rev 0) +++ branches/jcl-msi/thirdparty/Windows Installer/Installer/CPL.TXT 2010-02-06 03:55:11 UTC (rev 3184) @@ -0,0 +1,94 @@ +Common Public License Version 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the Program. + +Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. + + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/CustomActionCPP_2005.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/CustomActionCPP_2005.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/CustomActionCPP_2008.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/CustomActionCPP_2008.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/IncludeFile.ico =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/IncludeFile.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/IncludeFile.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/IncludeFile.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/LocalizationFile.ico =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/LocalizationFile.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/LocalizationFile.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/LocalizationFile.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/Microsoft.Deployment.WindowsInstaller.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/Microsoft.Deployment.WindowsInstaller.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/ProductFile.ico =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/ProductFile.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/ProjectFile.ico =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/ProjectFile.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/SetupBuilder.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/SetupBuilder.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/TextFile.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/TextFile.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixComPlusExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixComPlusExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixCop.exe =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixCop.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixDifxAppExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixDifxAppExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixDirectXExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixDirectXExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixFirewallExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixFirewallExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixGamingExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixGamingExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixIIsExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixIIsExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixIsolatedAppExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixIsolatedAppExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixLibrary.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixLibrary.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixLibraryFile.ico =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixLibraryFile.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixMergeModule.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixMergeModule.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixMsmqExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixMsmqExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixNetFxExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixNetFxExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixOfficeExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixOfficeExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixPSExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixPSExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixProject.zip =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixProject.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixSqlExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixSqlExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixTasks.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixTasks.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixUIExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixUIExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixUtilExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixUtilExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixVSExtension.dll =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/WixVSExtension.dll ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe.config =================================================================== --- branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe.config (rev 0) +++ branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.exe.config 2010-02-06 03:55:11 UTC (rev 3184) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. +--> +<configuration> + <startup useLegacyV2RuntimeActivationPolicy="true"> + <supportedRuntime version="v4.0" /> + <supportedRuntime version="v2.0.50727" /> + </startup> +</configuration> Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.targets =================================================================== --- branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.targets (rev 0) +++ branches/jcl-msi/thirdparty/Windows Installer/Installer/burn.targets 2010-02-06 03:55:11 UTC (rev 3184) @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +**************************************************************************************************** +burn.targets + +This file defines the steps in the standard build process for Burn projects (.burnproj), inheriting +and overriding those of WiX projects (.wixproj). + +Copyright (c) Microsoft Corporation. All rights reserved. +**************************************************************************************************** +--> +<Project + xmlns="http://schemas.microsoft.com/developer/msbuild/2003" + InitialTargets="_CheckRequiredProperties; + _SetDefaultPathValues"> + + <!-- Extension point: Define CustomBeforeBurnTargets to a custom .targets file that you want to include after this file. --> + <Import Project="$(CustomBeforeBurnTargets)" Condition=" '$(CustomBeforeBurnTargets)' != '' and Exists('$(CustomBeforeBurnTargets)')" /> + + <!-- These properties can be overridden to support non-default installations. --> + <PropertyGroup> + <OutputName Condition=" '$(OutputName)' == '' ">$(MSBuildProjectName)</OutputName> + <OutputType>Bundle</OutputType> + <IntermediateExt Condition=" '$(IntermediateExt)' == '' ">.burnmanifest.xml</IntermediateExt> + <BaseInputPaths Condition=" '$(WixToolPath)' != '' ">$(BaseInputPaths);$(WixToolPath)</BaseInputPaths> + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Wix.targets</WixTargetsPath> + <BurnTargetsPath Condition=" '$(BurnTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\Burn.targets</BurnTargetsPath> + <BurnTasksPath Condition=" '$(BurnTasksPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\BurnTasks.dll</BurnTasksPath> + </PropertyGroup> + + <!-- Let wix.targets do all the heavy lifting of project references and MSBuild voodoogoo --> + <Import Project="$(WixTargetsPath)" /> + + <!-- This makes the project files a dependency of all targets so that things rebuild if they change --> + <PropertyGroup> + <MSBuildAllProjects Condition="Exists('$(BurnTargetsPath)')">$(MSBuildAllProjects);$(BurnTargetsPath)</MSBuildAllProjects> + <MSBuildAllProjects Condition="Exists('$(CustomBeforeBurnTargets)')">$(MSBuildAllProjects);$(CustomBeforeBurnTargets)</MSBuildAllProjects> + <MSBuildAllProjects Condition="Exists('$(CustomAfterBurnTargets)')">$(MSBuildAllProjects);$(CustomAfterBurnTargets)</MSBuildAllProjects> + </PropertyGroup> + + <!-- These tasks can be used as general-purpose build tasks. --> + <UsingTask TaskName="BurnBundleBuilder" AssemblyFile="$(BurnTasksPath)" /> + <UsingTask TaskName="BurnTask" AssemblyFile="$(BurnTasksPath)" /> + + + <!-- + ================================================================================================== + _CheckRequiredProperties + + Checks properties that must be set in the main project file or on the command line before + using this .TARGETS file. + + ================================================================================================== + --> + <Target Name="_CheckRequiredProperties"> + <Error + Code="BURNTARGETS100" + Condition=" '@(BurnManifest)' != '' And '@(Chain)' != '' " + Text="Both BurnManifest and Chain item groups are specified; at most one can be specified in one project." /> + </Target> + + <!-- + ////////////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////// + Build Targets + ////////////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////// + --> + + <PropertyGroup> + <CompileAndLinkDependsOn> + ResolveReferences; + BeforeCompileAndLink; + _TimeStampBeforeCompileAndLink; + GenerateManifest; + BuildBurnBundle; + _TimeStampAfterCompileAndLink; + AfterCompileAndLink + </CompileAndLinkDependsOn> + </PropertyGroup> + + <!-- + ================================================================================================ + GenerateManifest + + Builds a Burn bundle by generating a chainer manifest and calling burn.exe + + [IN] + @(Chain) - The list of packages to bundle. + @(UX) - Files that the bundle uses for the UI/UX. + + [OUT] + $(GeneratedManifest) - The manifest generated from Chain and UX. + ================================================================================================ + --> + <PropertyGroup> + <GenerateManifestDependsOn> + PrepareForBuild; + </GenerateManifestDependsOn> + </PropertyGroup> + <Target + Name="GenerateManifest" + Inputs="@(Chain); + @(UX); + @(_ResolvedProjectReferencePaths); + $(MSBuildAllProjects)" + Outputs="$(IntermediateOutputPath)$(OutputName)$(IntermediateExt)" + DependsOnTargets="$(GenerateManifestDependsOn)" + Condition=" '@(Chain)' != '' "> + + <BurnBundleBuilder + Chain="@(Chain)" + LogLevel="$(LogLevel)" + LogMode="$(LogMode)" + LogPath="$(LogPath)" + Manifest="$(IntermediateOutputPath)$(OutputName)$(IntermediateExt)" + StubPath="$(StubPath)" + UX="@(UX)"> + + <Output TaskParameter="Manifest" ItemName="BurnManifest" /> + </BurnBundleBuilder> + </Target> + + <!-- + ================================================================================================ + BuildBurnBundle + + Builds a Burn bundle by generating a chainer manifest and calling burn.exe + + [IN] + @(Chain) - The list of packages to bundle. + @(UX) - Files that the bundle uses for the UI/UX. + + [OUT] + $(TargetPath) - The compiled .exe bundle. + TODO: Multiple outputs, including external resources. + ================================================================================================ + --> + <PropertyGroup> + <BuildBurnBundleDependsOn> + PrepareForBuild; + </BuildBurnBundleDependsOn> + </PropertyGroup> + <Target + Name="BuildBurnBundle" + Inputs="@(BurnManifest); + @(_ResolvedProjectReferencePaths); + $(MSBuildAllProjects)" + Outputs="$(TargetPath)" + DependsOnTargets="$(BuildBurnBundleDependsOn)" + Condition=" '@(BurnManifest)' != '' "> + + <BurnTask + BaseInputPaths="$(BaseInputPaths)" + DefaultCompressionLevel="$(DefaultCompressionLevel)" + DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)" + IncludeSearchPaths="$(IncludeSearchPaths)" + Manifest="@(BurnManifest)" + NoLogo="$(NoLogo)" + OutputFile="$(TargetPath)" + ToolPath="$(WixToolPath)" + VerboseOutput="$(CompilerVerboseOutput)" + /> + </Target> + + <!-- Extension point: Define CustomAfterBurnTargets to a custom .targets file that you want to include after this file. --> + <Import Project="$(CustomAfterBurnTargets)" Condition=" '$(CustomAfterBurnTargets)' != '' and Exists('$(CustomAfterBurnTargets)')" /> +</Project> Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/burnstub.exe =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/burnstub.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe.config =================================================================== --- branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe.config (rev 0) +++ branches/jcl-msi/thirdparty/Windows Installer/Installer/candle.exe.config 2010-02-06 03:55:11 UTC (rev 3184) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. +--> +<configuration> + <startup useLegacyV2RuntimeActivationPolicy="true"> + <supportedRuntime version="v4.0" /> + <supportedRuntime version="v2.0.50727" /> + </startup> +</configuration> Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/darice.cub =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/darice.cub ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe.config =================================================================== --- branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe.config (rev 0) +++ branches/jcl-msi/thirdparty/Windows Installer/Installer/dark.exe.config 2010-02-06 03:55:11 UTC (rev 3184) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. +--> +<configuration> + <appSettings> + <add key="extensions" value="WixDifxAppExtension;WixDirectXExtension;WixFirewallExtension;WixGamingExtension;WixIIsExtension;WixNetFxExtension;WixSqlExtension;WixUIExtension;WixUtilExtension;WixVSExtension" /> + </appSettings> + <startup useLegacyV2RuntimeActivationPolicy="true"> + <supportedRuntime version="v4.0" /> + <supportedRuntime version="v2.0.50727" /> + </startup> +</configuration> Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_ia64.wixlib =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_ia64.wixlib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_x64.wixlib =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_x64.wixlib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_x86.wixlib =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/difxapp_x86.wixlib ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/doc ___________________________________________________________________ Added: tsvn:projectlanguage + 1033 Added: bugtraq:url + http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID% Added: bugtraq:message + (Mantis #%BUGID%) Added: bugtraq:logregex + [Mm]antis #?(\d+)(,? ?#?(\d+))+ (\d+) Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/DTF.chm =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/DTF.chm ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/DTFAPI.chm =================================================================== (Binary files differ) Property changes on: branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/DTFAPI.chm ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/difxapp.xsd =================================================================== --- branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/difxapp.xsd (rev 0) +++ branches/jcl-msi/thirdparty/Windows Installer/Installer/doc/difxapp.xsd 2010-02-06 03:55:11 UTC (rev 3184) @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema xmlns:html="http://www.w3.org/1999/xhtml" + xmlns:wix="http://schemas.microsoft.com/wix/2006/wi" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xse="http://schemas.microsoft.com/wix/2005/XmlSchemaExtension" + targetNamespace="http://schemas.microsoft.com/wix/DifxAppExtension" + xmlns="http://schemas.microsoft.com/wix/DifxAppExtension"> + <xs:annotation> + <xs:documentation> + Copyright (c) Microsoft Corporation. All rights reserved. + + The use and distribution terms for this software are covered by the + Common Public License 1.0 (http://opensource.org/licenses/cpl.php) + which can be found in the file CPL.TXT at the root of this distribution. + By using this software in any fashion, you are agreeing to be bound by + the terms of this license. + + You must not remove this notice, or any other, from this software. + + The source code schema for the Windows Installer XML Toolset Driver Install Frameworks for Applications Extension. + </xs:documentation> + </xs:annotation> + + <xs:import namespace="http://schemas.microsoft.com/wix/2006/wi" /> + + <xs:element name="Driver"> + <xs:annotation> + <xs:appinfo> + <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Component" /> + </xs:appinfo> + <xs:documentation> + Installs a driver. To use this element, you need to reference the WixDifxAppExtension extension and add the + .wixlib appropriate for the target platform (difxapp_x86.wixlib, difxapp_x64.wixlib, or difxapp_ia64.wixlib) + to your project. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="AddRemovePrograms" type="YesNoType"> + <xs:annotation> + <xs:documentation> + Specifies that the DIFxApp CustomActions should add an entry in the Add/Remove Programs Control + Panel applet. The default is 'yes'. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="DeleteFiles" type="YesNoType"> + <xs:annotation> + <xs:documentation> + If set to "yes", configures DIFxApp to delete binary files that were copied to the system from the driver + store when a driver package was installed. If this attribute is set to "no" or not present, DIFxApp does not + remove these files from a system. Note that configuring DIFxApp to delete these files is controlled by the + Flags entry value of the component that represents the driver package in the MsiDriverPackages custom table. + Setting DriverDeleteFiles to "yes" sets the corresponding bit in the Flags entry value. Setting DriverLegacy + to "no" clears the corresponding bit in the Flags entry value. If this attribute is not present, DIFxApp uses + a default value of "no". + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="ForceInstall" type="YesNoType"> + <xs:annotation> + <xs:documentation> + Specifies that the DIFxApp CustomActions should force the installation of a new Plug and Play driver + on a device, even if the currently installed driver on the device is a better match than the new driver. + Specifying 'no' is an excellent way to ensure the DIFxApp CustomActions recognize the Component contains + a driver for installation. The default is null which means the Component does not install a driver via + DIFxApp CustomActions. See <html:a href='http://www.microsoft.com/whdc/driver/install/difxtools.mspx'>http://www.microsoft.com/whdc/driver/install/difxtools.mspx</html:a> + for more information. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="Legacy" type="YesNoType"> + <xs:annotation> + <xs:documentation> + If set to "yes", configures DIFxApp to install unsigned driver packages and driver packages with missing + files. For more information, see "Installing Unsigned Driver Packages in Legacy Mode" earlier in this paper. + If this attribute is set to "no" or not present, DIFxApp will install only signed driver packages. Note + that configuring DIFxApp to install unsigned drivers is controlled by the Flags entry value of the component + that represents the driver package in the MsiDriverPackages custom table. Setting DriverLegacy to "yes" sets + the corresponding bit in the Flags entry value. Setting DriverLegacy to "no" clears the bit in the Flags + entry value that configures DIFxApp to install unsigned driver packages. If this attribute is not present, +... [truncated message content] |
From: <sf...@us...> - 2010-02-06 03:25:44
|
Revision: 3183 http://jcl.svn.sourceforge.net/jcl/?rev=3183&view=rev Author: sfarrow Date: 2010-02-06 03:25:37 +0000 (Sat, 06 Feb 2010) Log Message: ----------- Remove all windows installer related code--recommitting later. Removed Paths: ------------- branches/jcl-msi/thirdparty/Windows Installer/Custom Action/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-05 21:47:45
|
Revision: 3182 http://jcl.svn.sourceforge.net/jcl/?rev=3182&view=rev Author: outchy Date: 2010-02-05 21:47:38 +0000 (Fri, 05 Feb 2010) Log Message: ----------- Mantis 5137: Can't extract files from a split 7z or zip archive. Modified Paths: -------------- trunk/jcl/source/common/JclCompression.pas Modified: trunk/jcl/source/common/JclCompression.pas =================================================================== --- trunk/jcl/source/common/JclCompression.pas 2010-02-05 16:38:51 UTC (rev 3181) +++ trunk/jcl/source/common/JclCompression.pas 2010-02-05 21:47:38 UTC (rev 3182) @@ -7012,7 +7012,7 @@ begin if not FOpened then begin - if (FVolumeMaxSize <> 0) or (FVolumes.Count <> 0) then + if (VolumeFileNameMask <> '') or (VolumeMaxSize <> 0) or (FVolumes.Count <> 0) then begin SplitStream := TJclDynamicSplitStream.Create(False); SplitStream.OnVolume := NeedStream; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2010-02-05 16:39:00
|
Revision: 3181 http://jcl.svn.sourceforge.net/jcl/?rev=3181&view=rev Author: jfudickar Date: 2010-02-05 16:38:51 +0000 (Fri, 05 Feb 2010) Log Message: ----------- Converted to ANSI (D7 compatible) Modified Paths: -------------- trunk/jcl/source/common/JclDevToolsResources.pas Modified: trunk/jcl/source/common/JclDevToolsResources.pas =================================================================== --- trunk/jcl/source/common/JclDevToolsResources.pas 2010-02-05 12:21:47 UTC (rev 3180) +++ trunk/jcl/source/common/JclDevToolsResources.pas 2010-02-05 16:38:51 UTC (rev 3181) @@ -1,4 +1,4 @@ -{**************************************************************************************************} +{**************************************************************************************************} { } { Project JEDI Code Library (JCL) } { } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-05 13:10:46
|
Revision: 3179 http://jcl.svn.sourceforge.net/jcl/?rev=3179&view=rev Author: outchy Date: 2010-02-05 12:18:47 +0000 (Fri, 05 Feb 2010) Log Message: ----------- Mantis 5149: JCLFileUtils.DeleteDirectory is not working when MoveToRecycleBin=true and when the directory has a trailing path separator. Modified Paths: -------------- trunk/jcl/source/windows/JclShell.pas Modified: trunk/jcl/source/windows/JclShell.pas =================================================================== --- trunk/jcl/source/windows/JclShell.pas 2010-02-05 11:57:29 UTC (rev 3178) +++ trunk/jcl/source/windows/JclShell.pas 2010-02-05 12:18:47 UTC (rev 3179) @@ -273,7 +273,7 @@ Exclude(Options, doFilesOnly); Result := SHDeleteFiles(Parent, PathAddSeparator(Folder) + '*.*', Options); if Result then - SHDeleteFiles(Parent, Folder, Options); + Result := SHDeleteFiles(Parent, PathRemoveSeparator(Folder), Options); end; // Helper function to map a TSHRenameOptions set to a cardinal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-05 12:45:29
|
Revision: 3180 http://jcl.svn.sourceforge.net/jcl/?rev=3180&view=rev Author: outchy Date: 2010-02-05 12:21:47 +0000 (Fri, 05 Feb 2010) Log Message: ----------- Mantis 5142: JclEDI.StringReplace does not return expected results. Modified Paths: -------------- trunk/jcl/source/common/JclEDI.pas Modified: trunk/jcl/source/common/JclEDI.pas =================================================================== --- trunk/jcl/source/common/JclEDI.pas 2010-02-05 12:18:47 UTC (rev 3179) +++ trunk/jcl/source/common/JclEDI.pas 2010-02-05 12:21:47 UTC (rev 3180) @@ -502,13 +502,13 @@ if rfReplaceAll in Flags then while SearchResult <> 0 do begin - Inc(SearchResult); + Inc(SearchResult, SearchPatternLength); // Increment match position, by length of match Inc(ReplaceCount); SearchResult := StrSearch(SearchPattern, SearchString, SearchResult); end else - if SearchResult <> 0 then - Inc(ReplaceCount); + if SearchResult <> 0 then + Inc(ReplaceCount); SetLength(Result, Length(S) + ((ReplacePatternLength - SearchPatternLength) * ReplaceCount)); // Copy the characters by looping through the result and source at the same time ReplaceCount := 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-05 11:57:36
|
Revision: 3178 http://jcl.svn.sourceforge.net/jcl/?rev=3178&view=rev Author: outchy Date: 2010-02-05 11:57:29 +0000 (Fri, 05 Feb 2010) Log Message: ----------- Mantis 5152 the uses expert failed to compile avec the unit JclUsesParser is moved to runtime code. Modified Paths: -------------- trunk/jcl/experts/useswizard/JCLUsesWizard.pas Modified: trunk/jcl/experts/useswizard/JCLUsesWizard.pas =================================================================== --- trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2010-02-05 11:51:15 UTC (rev 3177) +++ trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2010-02-05 11:57:29 UTC (rev 3178) @@ -125,7 +125,7 @@ uses IniFiles, - JclFileUtils, JclParseUses, JclRegistry, JclStrings, JclStringConversions, + JclFileUtils, JclUsesUtils, JclRegistry, JclStrings, JclStringConversions, JclUsesDialog, JclOtaConsts, JclOtaResources; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-05 11:51:29
|
Revision: 3177 http://jcl.svn.sourceforge.net/jcl/?rev=3177&view=rev Author: outchy Date: 2010-02-05 11:51:15 +0000 (Fri, 05 Feb 2010) Log Message: ----------- The RegHelper utility failed to compile. Modified Paths: -------------- trunk/jcl/install/RegHelper.dpr Modified: trunk/jcl/install/RegHelper.dpr =================================================================== --- trunk/jcl/install/RegHelper.dpr 2010-02-03 22:02:49 UTC (rev 3176) +++ trunk/jcl/install/RegHelper.dpr 2010-02-05 11:51:15 UTC (rev 3177) @@ -17,8 +17,6 @@ { } { Contributor(s): } { } -{ Last modified: $Date$ } -{ } {**************************************************************************************************} { } { Last modified: $Date:: $ } @@ -33,7 +31,7 @@ uses SysUtils, Windows, ActiveX, - JclAnsiStrings, JclIDEUtils, JclSysUtils; + JclAnsiStrings, JclHelpUtils, JclSysUtils; {$R ..\source\windows\JclNoDepAdmin.res} {$R RegHelper.res} @@ -312,7 +310,7 @@ try CoInitialize(nil); // Help2 interfaces are COM try - Help2Manager := TJclHelp2Manager.Create; + Help2Manager := TJclHelp2Manager.Create(0); try Assign(RegHelperOutput, ''); // stdout Rewrite(RegHelperOutput); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 22:02:55
|
Revision: 3176 http://jcl.svn.sourceforge.net/jcl/?rev=3176&view=rev Author: outchy Date: 2010-02-03 22:02:49 +0000 (Wed, 03 Feb 2010) Log Message: ----------- JPP runtime code for all targets. Modified Paths: -------------- trunk/jcl/packages/cs1/JclDeveloperTools.dpk trunk/jcl/packages/d8/JclDeveloperTools.dpk trunk/jcl/packages/fpc/JclDeveloperTools.lpk trunk/jcl/packages/fpc/JclDeveloperTools.pas trunk/jcl/packages/xml/JclDeveloperTools-R.xml Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) +++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-02-03 22:02:49 UTC (rev 3176) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 21:45:31 UTC + Last generated: 03-02-2010 22:01:05 UTC ----------------------------------------------------------------------------- } @@ -44,6 +44,9 @@ ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d8/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) +++ trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-02-03 22:02:49 UTC (rev 3176) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 21:45:31 UTC + Last generated: 03-02-2010 22:01:04 UTC ----------------------------------------------------------------------------- } @@ -44,6 +44,9 @@ ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/fpc/JclDeveloperTools.lpk =================================================================== --- trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-02-03 21:53:34 UTC (rev 3175) +++ trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-02-03 22:02:49 UTC (rev 3176) @@ -11,7 +11,7 @@ <PathDelim Value="\"/> <SearchPaths> <IncludeFiles Value="..\..\source\include\"/> - <OtherUnitFiles Value=".;..\..\source\common;..\..\source\windows;"/> + <OtherUnitFiles Value=".;..\..\devtools\jpp;..\..\source\common;..\..\source\windows;"/> <UnitOutputDirectory Value="..\..\lib\fpc\$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <Parsing> @@ -39,31 +39,43 @@ <Description Value="JEDI Code Library Developer Tools package"/> <License Value="Copyright (C) 1999, 2009 Project JEDI"/> <Version Major="2" Minor="2" Release="0" Build="3537"/> - <Files Count="6"> + <Files Count="9"> <Item1> + <Filename Value="..\..\devtools\jpp\JppState.pas"/> + <UnitName Value="JppState"/> + </Item1> + <Item2> + <Filename Value="..\..\devtools\jpp\JppLexer.pas"/> + <UnitName Value="JppLexer"/> + </Item2> + <Item3> + <Filename Value="..\..\devtools\jpp\JppParser.pas"/> + <UnitName Value="JppParser"/> + </Item3> + <Item4> <Filename Value="..\..\source\common\JclCompilerUtils.pas"/> <UnitName Value="JclCompilerUtils"/> - </Item1> - <Item2> + </Item4> + <Item5> <Filename Value="..\..\source\common\JclDevToolsResources.pas"/> <UnitName Value="JclDevToolsResources"/> - </Item2> - <Item3> + </Item5> + <Item6> <Filename Value="..\..\source\common\JclIDEUtils.pas"/> <UnitName Value="JclIDEUtils"/> - </Item3> - <Item4> + </Item6> + <Item7> <Filename Value="..\..\source\common\JclUsesUtils.pas"/> <UnitName Value="JclUsesUtils"/> - </Item4> - <Item5> + </Item7> + <Item8> <Filename Value="..\..\source\windows\JclHelpUtils.pas"/> <UnitName Value="JclHelpUtils"/> - </Item5> - <Item6> + </Item8> + <Item9> <Filename Value="..\..\source\windows\MSHelpServices_TLB.pas"/> <UnitName Value="MSHelpServices_TLB"/> - </Item6> + </Item9> </Files> <RequiredPkgs Count="3"> <Item1> Modified: trunk/jcl/packages/fpc/JclDeveloperTools.pas =================================================================== --- trunk/jcl/packages/fpc/JclDeveloperTools.pas 2010-02-03 21:53:34 UTC (rev 3175) +++ trunk/jcl/packages/fpc/JclDeveloperTools.pas 2010-02-03 22:02:49 UTC (rev 3176) @@ -3,7 +3,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 21:45:31 UTC + Last generated: 03-02-2010 22:01:00 UTC ----------------------------------------------------------------------------- } @@ -12,6 +12,9 @@ interface uses + JppState, + JppLexer, + JppParser, JclCompilerUtils, JclDevToolsResources, JclIDEUtils, Modified: trunk/jcl/packages/xml/JclDeveloperTools-R.xml =================================================================== --- trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-02-03 21:53:34 UTC (rev 3175) +++ trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-02-03 22:02:49 UTC (rev 3176) @@ -15,9 +15,9 @@ <Package Name="JclContainers-R" Targets="all" Condition=""/> </Requires> <Contains> - <File Name="..\..\devtools\jpp\JppState.pas" Targets="runtimeIDE" Formname="" Condition=""/> - <File Name="..\..\devtools\jpp\JppLexer.pas" Targets="runtimeIDE" Formname="" Condition=""/> - <File Name="..\..\devtools\jpp\JppParser.pas" Targets="runtimeIDE" Formname="" Condition=""/> + <File Name="..\..\devtools\jpp\JppState.pas" Targets="all" Formname="" Condition=""/> + <File Name="..\..\devtools\jpp\JppLexer.pas" Targets="all" Formname="" Condition=""/> + <File Name="..\..\devtools\jpp\JppParser.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclCompilerUtils.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclDevToolsResources.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclIDEUtils.pas" Targets="all" Formname="" Condition=""/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 21:53:41
|
Revision: 3175 http://jcl.svn.sourceforge.net/jcl/?rev=3175&view=rev Author: outchy Date: 2010-02-03 21:53:34 +0000 (Wed, 03 Feb 2010) Log Message: ----------- moved/renamed JclParseUses to JCL runtime code with name JclUsesUtils.pas. Modified Paths: -------------- trunk/jcl/experts/common/JclOtaResources.pas trunk/jcl/packages/c6/JclDeveloperTools.bpk trunk/jcl/packages/c6/JclDeveloperTools.dpk trunk/jcl/packages/c6/JclUsesExpert.bpk trunk/jcl/packages/c6/JclUsesExpert.dpk trunk/jcl/packages/c6/JclUsesExpertDLL.bpf trunk/jcl/packages/c6/JclUsesExpertDLL.bpr trunk/jcl/packages/c6/JclUsesExpertDLL.dof trunk/jcl/packages/cs1/JclDeveloperTools.dpk trunk/jcl/packages/d10/JclDeveloperTools.dpk trunk/jcl/packages/d11/JclDeveloperTools.dpk trunk/jcl/packages/d11/JclDeveloperTools.dproj trunk/jcl/packages/d12/JclDeveloperTools.dpk trunk/jcl/packages/d12/JclDeveloperTools.dproj trunk/jcl/packages/d14/JclDeveloperTools.dpk trunk/jcl/packages/d14/JclDeveloperTools.dproj trunk/jcl/packages/d6/JclDeveloperTools.dpk trunk/jcl/packages/d6/JclUsesExpert.dpk trunk/jcl/packages/d6/JclUsesExpertDLL.dof trunk/jcl/packages/d6/JclUsesExpertDLL.dpr trunk/jcl/packages/d7/JclDeveloperTools.dpk trunk/jcl/packages/d7/JclUsesExpert.dpk trunk/jcl/packages/d7/JclUsesExpert.res trunk/jcl/packages/d7/JclUsesExpertDLL.dof trunk/jcl/packages/d7/JclUsesExpertDLL.dpr trunk/jcl/packages/d8/JclDeveloperTools.dpk trunk/jcl/packages/d9/JclDeveloperTools.dpk trunk/jcl/packages/fpc/JclDeveloperTools.lpk trunk/jcl/packages/fpc/JclDeveloperTools.pas trunk/jcl/packages/xml/JclDeveloperTools-R.xml trunk/jcl/packages/xml/JclUsesExpert-D.xml trunk/jcl/packages/xml/JclUsesExpertDLL-L.xml trunk/jcl/source/common/JclDevToolsResources.pas Added Paths: ----------- trunk/jcl/source/common/JclUsesUtils.pas Removed Paths: ------------- trunk/jcl/experts/useswizard/JclParseUses.pas Modified: trunk/jcl/experts/common/JclOtaResources.pas =================================================================== --- trunk/jcl/experts/common/JclOtaResources.pas 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/experts/common/JclOtaResources.pas 2010-02-03 21:53:34 UTC (rev 3175) @@ -206,14 +206,6 @@ RsUndeclIdent = '[Error] %s(%d) Undeclared identifier: ''%s'''; RsConfirmChanges = '%s: Confirm changes'; -//=== JclParseUses.pas ======================================================= -resourcestring - RsEDuplicateUnit = 'Duplicate unit ''%s'''; - RsEInvalidLibrary = 'Invalid library'; - RsEInvalidProgram = 'Invalid program'; - RsEInvalidUnit = 'Invalid unit'; - RsEInvalidUses = 'Invalid uses clause'; - //=== ProjAnalyserImpl.pas =================================================== resourcestring RsAnalyzeActionCaption = 'Analyze project %s'; Deleted: trunk/jcl/experts/useswizard/JclParseUses.pas =================================================================== --- trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:53:34 UTC (rev 3175) @@ -1,930 +0,0 @@ -{**************************************************************************************************} -{ } -{ Project JEDI Code Library (JCL) } -{ } -{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); } -{ you may not use this file except in compliance with the License. You may obtain a copy of the } -{ License at http://www.mozilla.org/MPL/ } -{ } -{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF } -{ ANY KIND, either express or implied. See the License for the specific language governing rights } -{ and limitations under the License. } -{ } -{ The Original Code is JclParseUses.pas. } -{ } -{ The Initial Developer of the Original Code is TOndrej (tondrej att t-online dott de). } -{ Portions created by TOndrej are Copyright (C) of TOndrej. } -{ } -{ Contributors: } -{ } -{**************************************************************************************************} -{ } -{ Last modified: $Date:: $ } -{ Revision: $Rev:: $ } -{ Author: $Author:: $ } -{ } -{**************************************************************************************************} - -unit JclParseUses; - -{$I jcl.inc} - -interface - -uses - Classes, SysUtils, - {$IFDEF UNITVERSIONING} - JclUnitVersioning, - {$ENDIF UNITVERSIONING} - Windows, - JclBase; - -type - EUsesListError = class(EJclError); - - TUsesList = class - private - FText: string; - function GetCount: Integer; - function GetItems(Index: Integer): string; - public - constructor Create(const AText: PChar); - function Add(const UnitName: string): Integer; - function IndexOf(const UnitName: string): Integer; - procedure Insert(Index: Integer; const UnitName: string); - procedure Remove(Index: Integer); - property Text: string read FText; - property Count: Integer read GetCount; - property Items[Index: Integer]: string read GetItems; default; - end; - - TCustomGoal = class - public - constructor Create(Text: PChar); virtual; abstract; - end; - - TProgramGoal = class(TCustomGoal) - private - FTextAfterUses: string; - FTextBeforeUses: string; - FUsesList: TUsesList; - public - constructor Create(Text: PChar); override; - destructor Destroy; override; - property TextAfterUses: string read FTextAfterUses; - property TextBeforeUses: string read FTextBeforeUses; - property UsesList: TUsesList read FUsesList; - end; - - TLibraryGoal = class(TCustomGoal) - private - FTextAfterUses: string; - FTextBeforeUses: string; - FUsesList: TUsesList; - public - constructor Create(Text: PChar); override; - destructor Destroy; override; - property TextAfterUses: string read FTextAfterUses; - property TextBeforeUses: string read FTextBeforeUses; - property UsesList: TUsesList read FUsesList; - end; - - TUnitGoal = class(TCustomGoal) - private - FTextAfterImpl: string; - FTextAfterIntf: string; - FTextBeforeIntf: string; - FUsesImpl: TUsesList; - FUsesIntf: TUsesList; - public - constructor Create(Text: PChar); override; - destructor Destroy; override; - property TextAfterImpl: string read FTextAfterImpl; - property TextAfterIntf: string read FTextAfterIntf; - property TextBeforeIntf: string read FTextBeforeIntf; - property UsesImpl: TUsesList read FUsesImpl; - property UsesIntf: TUsesList read FUsesIntf; - end; - -function CreateGoal(Text: PChar): TCustomGoal; - -{$IFDEF UNITVERSIONING} -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\experts\useswizard'; - Extra: ''; - Data: nil - ); -{$ENDIF UNITVERSIONING} - -implementation - -uses - RtlConsts, - JclStrings, JclOtaResources; - -const - SLibrary = 'library'; - SProgram = 'program'; - SUnit = 'unit'; - SUses = 'uses'; - -function CharIsNotWhiteSpace(const C: Char): Boolean; -begin - Result := not CharIsWhiteSpace(C); -end; - -function PeekIdentifier(var P:PChar):boolean;forward; - -function PeekKeyword(var P: PChar; Keyword: PChar): Boolean; forward; -function ReadIdentifier(var P: PChar): string; forward; -procedure SkipCommentsAndBlanks(var P: PChar); forward; - -function CheckIdentifier(var P: PChar): Boolean; -begin - Result := CharIsAlpha(P^) or (P^ = '_'); - if Result then - begin - Inc(P); - while CharIsValidIdentifierLetter(P^) do - Inc(P); - end; -end; - -function CheckKeyword(var P: PChar; Keyword: PChar): Boolean; -var - KeywordLen: Integer; -begin - KeywordLen := StrLen(Keyword); - Result := StrLIComp(P, Keyword, KeywordLen) = 0; - if Result then - Inc(P, KeywordLen); -end; - -function CreateGoal(Text: PChar): TCustomGoal; -var - P: PChar; -begin - Result := nil; - P := Text; - - SkipCommentsAndBlanks(P); - if PeekKeyword(P, SProgram) then - Result := TProgramGoal.Create(Text) - else - if PeekKeyword(P, SLibrary) then - Result := TLibraryGoal.Create(Text) - else - if PeekKeyword(P, SUnit) then - Result := TUnitGoal.Create(Text); -end; - -function PeekKeyword(var P: PChar; Keyword: PChar): Boolean; -var - KeywordLen: Integer; -begin - KeywordLen := StrLen(Keyword); - Result := StrLIComp(P, KeyWord, KeywordLen) = 0; -end; - -//---------------------------------------------------------------------------- - -function PeekIdentifier(var P: PChar):boolean; -var Q:PChar; -begin - Q := P; - Result := CheckIdentifier(P); - P := Q; -end; - - -function ReadIdentifier(var P: PChar): string; -var - PStart: PChar; -begin - Result := ''; - - if CharIsAlpha(P^) then - begin - PStart := P; - - Inc(P); - while CharIsValidIdentifierLetter(P^) do - Inc(P); - - SetString(Result, PStart, P - PStart); - end; -end; - -procedure SkipComments(var P: PChar); -var - Test: PChar; -begin - if P^ = '{' then - begin - Test := StrScan(P, '}'); - if Test <> nil then - P := Test + 1; - end - else - if StrLComp(P, '(*', 2) = 0 then - begin - Test := StrPos(P, '*)'); - if Test <> nil then - P := Test + 2; - end - else - if StrLComp(P, '//', 2) = 0 then - begin - Test := StrPos(P, #13#10); - if Test <> nil then - P := Test + 2; - end; -end; - -procedure SkipCommentsAndBlanks(var P: PChar); -var - Test: PChar; -begin - repeat - Test := P; - StrSkipChars(P, CharIsWhiteSpace); - SkipComments(P); - until Test = P; -end; - -//=== { TUsesList } ========================================================== - -constructor TUsesList.Create(const AText: PChar); -var - P, PStart: PChar; -begin - inherited Create; - FText := ''; - if AText = nil then - Exit; - - PStart := PChar(AText); - P := PStart; - if CheckKeyword(P, SUses) then - begin - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - SkipCommentsAndBlanks(P); - - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',': - Inc(P); - ';': - begin - Inc(P); - Break; - end; - else - if not PeekIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; - - SetString(FText, PStart, P - PStart); - end; -end; - -function TUsesList.GetCount: Integer; -var - P: PChar; -begin - Result := 0; - - if FText = '' then - Exit; - - P := PChar(FText); - // an empty uses clause consisting of only blanks and comments - // (resulting from removal of the last unit) is valid too - SkipCommentsAndBlanks(P); - if P^ = #0 then - Exit; - - if not CheckKeyword(P, SUses) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(Result); - SkipCommentsAndBlanks(P); - - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',': - Inc(P); - ';': - Break; - else - if not PeekIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; -end; - -function TUsesList.GetItems(Index: Integer): string; -var - P, PIdentifier: PChar; - I: Integer; -begin - Result := ''; - - if (Index < 0) or (Index > Count - 1) then - raise EUsesListError.CreateResFmt(@SListIndexError, [Index]); - - P := PChar(FText); - if not CheckKeyword(P, SUses) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - I := -1; - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - PIdentifier := P; - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - Inc(I); - if I = Index then - begin - while CharIsValidIdentifierLetter(PIdentifier^) do - begin - Result := Result + PIdentifier^; - Inc(PIdentifier); - end; - Exit; - end; - SkipCommentsAndBlanks(P); - - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',': - Inc(P); - ';': - Break; - else - if not PeekIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; -end; - -function TUsesList.Add(const UnitName: string): Integer; -var - I: Integer; - P: PChar; -begin - Result := -1; - - I := IndexOf(UnitName); - if I <> -1 then - raise EUsesListError.CreateResFmt(@RsEDuplicateUnit, [UnitName]); - - if FText = '' then - begin - FText := Format('%s'#13#10' %s;'#13#10#13#10, [SUses, UnitName]); - try - Result := IndexOf(UnitName); - except - FText := ''; - raise; - end; - end - else - begin - P := PChar(FText); - if not CheckKeyword(P, SUses) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - SkipCommentsAndBlanks(P); - - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',': - Inc(P); - ';': - begin - System.Insert(Format(', %s', [UnitName]), FText, P - PChar(FText) + 1); - Result := IndexOf(UnitName); - Break; - end; - else - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; - end; -end; - -function TUsesList.IndexOf(const UnitName: string): Integer; -var - P, PIdentifier: PChar; - Identifier: string; - I: Integer; -begin - Result := -1; - - if FText = '' then - Exit; - - P := PChar(FText); - if not CheckKeyword(P, SUses) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - I := -1; - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - PIdentifier := P; - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - SetString(Identifier, PIdentifier, P - PIdentifier); - - Inc(I); - if AnsiCompareText(UnitName, Identifier) = 0 then - begin - Result := I; - Exit; - end; - SkipCommentsAndBlanks(P); - - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',': - Inc(P); - ';': - Break; - else - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; -end; - -procedure TUsesList.Insert(Index: Integer; const UnitName: string); -var - I: Integer; - P: PChar; -begin - if (Index < 0) or (Index > Count - 1) then - raise EUsesListError.CreateResFmt(@SListIndexError, [Index]); - I := IndexOf(UnitName); - if I <> -1 then - raise EUsesListError.CreateResFmt(@RsEDuplicateUnit, [UnitName]); - - if FText = '' then - begin - FText := Format('%s'#13#10' %s;'#13#10#13#10, [SUses, UnitName]); - try - if Index <> IndexOf(UnitName) then - Exit; - except - FText := ''; - raise; - end; - end - else - begin - P := PChar(FText); - if not CheckKeyword(P, SUses) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - I := -1; - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - Inc(I); - if I = Index then - begin - System.Insert(Format('%s, ', [UnitName]), FText, P - PChar(FText) + 1); - Exit; - end; - - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - SkipCommentsAndBlanks(P); - - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',': - Inc(P); - else - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; - end; -end; - -procedure TUsesList.Remove(Index: Integer); -var - Count, I, DelPos: Integer; - P, PIdentifier: PChar; -begin - Count := GetCount; - if (Index < 0) or (Index > Count - 1) then - raise EUsesListError.CreateResFmt(@SListIndexError, [Index]); - - P := PChar(FText); - if not CheckKeyword(P, SUses) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - if (Count = 1) and (Index = 0) then - begin - Delete(FText, 1, Length(SUses)); - P := PChar(FText); - end; - - I := -1; - while P^ <> #0 do - begin - SkipCommentsAndBlanks(P); - Inc(I); - - if I = Index then - begin - // remove unit - PIdentifier := P; - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - DelPos := PIdentifier - PChar(FText) + 1; - Delete(FText, DelPos, P - PIdentifier); - // skip comments and blanks - P := PChar(FText) + DelPos - 1; - PIdentifier := P; - SkipCommentsAndBlanks(P); - // check <unitname> in <filename> syntax - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - DelPos := PIdentifier - PChar(FText) + 1; - Delete(FText, DelPos, P - PIdentifier); - P := PChar(FText) + DelPos - 1; - end; - - // remove separator - case P^ of - ',', ';': - begin - DelPos := P - PChar(FText) + 1; - Delete(FText, DelPos, 1); - end; - else - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - // remove trailing spaces, if any - PIdentifier := PChar(FText) + DelPos - 1; - P := PIdentifier; - StrSkipChars(P, CharIsWhiteSpace); - DelPos := PIdentifier - PChar(FText) + 1; - Delete(FText, DelPos, P - PIdentifier); - // skip further comments and blanks - P := PChar(FText) + DelPos - 1; - SkipCommentsAndBlanks(P); - Exit; - end; - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUses); - - SkipCommentsAndBlanks(P); - if PeekKeyword(P, 'in') then - begin - Inc(P, 2); - SkipCommentsAndBlanks(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - - while (P^ <> #0) and (P^ <> '''') do - Inc(P); - if P^ <> '''' then - raise EUsesListError.CreateRes(@RsEInvalidUses); - Inc(P); - SkipCommentsAndBlanks(P); - end; - - case P^ of - ',', ';': - begin - // make sure semicolon is the last separator in case the last unit is going to be removed - if (Index = Count - 1) and (I = Index - 1) then - P^ := ';'; - Inc(P); - end; - else - raise EUsesListError.CreateRes(@RsEInvalidUses); - end; - end; -end; - -//=== { TProgramGoal } ======================================================= - -constructor TProgramGoal.Create(Text: PChar); -var - P, PStart: PChar; -begin - FTextBeforeUses := ''; - FTextAfterUses := ''; - - PStart := Text; - P := PStart; - - // check 'program' label - SkipCommentsAndBlanks(P); - if not CheckKeyword(P, SProgram) then - raise EUsesListError.CreateRes(@RsEInvalidProgram); - SkipCommentsAndBlanks(P); - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidProgram); - SkipCommentsAndBlanks(P); - if P^ <> ';' then - raise EUsesListError.CreateRes(@RsEInvalidProgram); - Inc(P); - SkipCommentsAndBlanks(P); - - // remember text before uses - SetString(FTextBeforeUses, PStart, P - PStart); - - if PeekKeyword(P, SUses) then - begin - FUsesList := TUsesList.Create(P); - PStart := P + Length(FUsesList.Text); - end - else // empty uses list - begin - FUsesList := TUsesList.Create(nil); - PStart := P; - end; - // remember text after uses - P := StrEnd(PStart); - SetString(FTextAfterUses, PStart, P - PStart); -end; - -destructor TProgramGoal.Destroy; -begin - FUsesList.Free; - inherited Destroy; -end; - -//=== { TLibraryGoal } ======================================================= - -constructor TLibraryGoal.Create(Text: PChar); -var - P, PStart: PChar; -begin - FTextBeforeUses := ''; - FTextAfterUses := ''; - - PStart := Text; - P := PStart; - - // check 'library' label - SkipCommentsAndBlanks(P); - if not CheckKeyword(P, SLibrary) then - raise EUsesListError.CreateRes(@RsEInvalidLibrary); - SkipCommentsAndBlanks(P); - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidLibrary); - SkipCommentsAndBlanks(P); - if P^ <> ';' then - raise EUsesListError.CreateRes(@RsEInvalidLibrary); - Inc(P); - SkipCommentsAndBlanks(P); - - // remember text before uses - SetString(FTextBeforeUses, PStart, P - PStart); - - if PeekKeyword(P, SUses) then - begin - FUsesList := TUsesList.Create(P); - PStart := P + Length(FUsesList.Text); - end - else // empty uses list - begin - FUsesList := TUsesList.Create(nil); - PStart := P; - end; - // remember text after uses - P := StrEnd(PStart); - SetString(FTextAfterUses, PStart, P - PStart); -end; - -destructor TLibraryGoal.Destroy; -begin - FUsesList.Free; - inherited Destroy; -end; - -//=== { TUnitGoal } ========================================================== - -constructor TUnitGoal.Create(Text: PChar); -var - P, PStart: PChar; -begin - FTextBeforeIntf := ''; - FTextAfterIntf := ''; - FTextAfterImpl := ''; - - PStart := Text; - P := PStart; - - // check 'unit' label - SkipCommentsAndBlanks(P); - while (P^ <> #0) and not PeekKeyword(P, 'unit') do - begin - StrSkipChars(P, CharIsNotWhiteSpace); - SkipCommentsAndBlanks(P); - end; - if not CheckKeyword(P, SUnit) then - raise EUsesListError.CreateRes(@RsEInvalidUnit); - SkipCommentsAndBlanks(P); - if not CheckIdentifier(P) then - raise EUsesListError.CreateRes(@RsEInvalidUnit); - SkipCommentsAndBlanks(P); - if P^ <> ';' then - raise EUsesListError.CreateRes(@RsEInvalidUnit); - Inc(P); - // check 'interface' label -// SkipCommentsAndBlanks(P); - while (P^ <> #0) and not PeekKeyword(P, 'interface') do - begin - StrSkipChars(P, CharIsNotWhiteSpace); - SkipCommentsAndBlanks(P); - end; - if not CheckKeyword(P, 'interface') then - raise EUsesListError.CreateRes(@RsEInvalidUnit); - SkipCommentsAndBlanks(P); - - // remember text before interface uses - SetString(FTextBeforeIntf, PStart, P - PStart); - if PeekKeyword(P, SUses) then - begin - FUsesIntf := TUsesList.Create(P); - PStart := P + Length(FUsesIntf.Text); - end - else - begin - FUsesIntf := TUsesList.Create(nil); - PStart := P; - end; - // locate implementation - while (P^ <> #0) and not PeekKeyword(P, 'implementation') do - begin - StrSkipChars(P, CharIsNotWhiteSpace); - SkipCommentsAndBlanks(P); - end; - if not CheckKeyword(P, 'implementation') then - raise EUsesListError.CreateRes(@RsEInvalidUnit); - SkipCommentsAndBlanks(P); - - // remember text after interface uses - SetString(FTextAfterIntf, PStart, P - PStart); - if PeekKeyword(P, SUses) then - begin - FUsesImpl := TUsesList.Create(P); - PStart := P + Length(FUsesImpl.Text); - end - else - begin - FUsesImpl := TUsesList.Create(nil); - PStart := P; - end; - // remember text after implementation uses - P := StrEnd(PStart); - SetString(FTextAfterImpl, PStart, P - PStart); -end; - -destructor TUnitGoal.Destroy; -begin - FUsesIntf.Free; - FUsesImpl.Free; - inherited Destroy; -end; - -{$IFDEF UNITVERSIONING} -initialization - RegisterUnitVersion(HInstance, UnitVersioning); - -finalization - UnregisterUnitVersion(HInstance); -{$ENDIF UNITVERSIONING} - -end. Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk =================================================================== --- trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:46 UTC + Last generated: 03-02-2010 21:45:31 UTC ***************************************************************************** --> <PROJECT> @@ -20,6 +20,7 @@ ..\..\lib\c6\JclCompilerUtils.obj ..\..\lib\c6\JclDevToolsResources.obj ..\..\lib\c6\JclIDEUtils.obj + ..\..\lib\c6\JclUsesUtils.obj ..\..\lib\c6\JclHelpUtils.obj ..\..\lib\c6\MSHelpServices_TLB.obj "/> @@ -82,6 +83,7 @@ <FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\source\common\JclUsesUtils.pas" FORMNAME="" UNITNAME="JclUsesUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\windows\JclHelpUtils.pas" FORMNAME="" UNITNAME="JclHelpUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\windows\MSHelpServices_TLB.pas" FORMNAME="" UNITNAME="MSHelpServices_TLB" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> </FILELIST> Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:46 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -50,6 +50,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/c6/JclUsesExpert.bpk =================================================================== --- trunk/jcl/packages/c6/JclUsesExpert.bpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclUsesExpert.bpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpert-D.xml) - Last generated: 28-06-2009 20:45:12 UTC + Last generated: 03-02-2010 21:50:42 UTC ***************************************************************************** --> <PROJECT> @@ -17,7 +17,6 @@ ..\..\lib\c6\JCLUsesWizard.obj ..\..\lib\c6\JCLOptionsFrame.obj ..\..\lib\c6\JclUsesDialog.obj - ..\..\lib\c6\JclParseUses.obj "/> <RESFILES value="JclUsesExpert.res"/> <IDLFILES value=""/> @@ -36,6 +35,7 @@ vcl.bpi designide.bpi Jcl.bpi + JclDeveloperTools.bpi JclBaseExpert.bpi "/> <PATHCPP value=".;"/> @@ -77,11 +77,11 @@ <FILE FILENAME="vcl.bpi" FORMNAME="" UNITNAME="vcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="designide.bpi" FORMNAME="" UNITNAME="designide" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\useswizard\JCLUsesWizard.pas" FORMNAME="" UNITNAME="JCLUsesWizard" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\useswizard\JCLOptionsFrame.pas" FORMNAME="FrameJclOptions" UNITNAME="JCLOptionsFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\useswizard\JclUsesDialog.pas" FORMNAME="FormUsesConfirm" UNITNAME="JclUsesDialog" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\experts\useswizard\JclParseUses.pas" FORMNAME="" UNITNAME="JclParseUses" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> </FILELIST> <BUILDTOOLS> </BUILDTOOLS> Modified: trunk/jcl/packages/c6/JclUsesExpert.dpk =================================================================== --- trunk/jcl/packages/c6/JclUsesExpert.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclUsesExpert.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpert-D.xml) - Last generated: 14-03-2009 14:35:13 UTC + Last generated: 03-02-2010 21:50:42 UTC ----------------------------------------------------------------------------- } @@ -43,12 +43,12 @@ vcl, designide, Jcl, + JclDeveloperTools, JclBaseExpert ; contains JCLUsesWizard in '..\..\experts\useswizard\JCLUsesWizard.pas' , JCLOptionsFrame in '..\..\experts\useswizard\JCLOptionsFrame.pas' {FrameJclOptions: TFrame}, - JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm}, - JclParseUses in '..\..\experts\useswizard\JclParseUses.pas' + JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm} ; end. Modified: trunk/jcl/packages/c6/JclUsesExpertDLL.bpf =================================================================== --- trunk/jcl/packages/c6/JclUsesExpertDLL.bpf 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclUsesExpertDLL.bpf 2010-02-03 21:53:34 UTC (rev 3175) @@ -1,7 +1,6 @@ USEUNIT("..\..\experts\useswizard\JCLUsesWizard.pas"); USEUNIT("..\..\experts\useswizard\JCLOptionsFrame.pas"); USEUNIT("..\..\experts\useswizard\JclUsesDialog.pas"); -USEUNIT("..\..\experts\useswizard\JclParseUses.pas"); USEDEF("JclUsesExpertDLL.def"); Project file DllEntryPoint Modified: trunk/jcl/packages/c6/JclUsesExpertDLL.bpr =================================================================== --- trunk/jcl/packages/c6/JclUsesExpertDLL.bpr 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclUsesExpertDLL.bpr 2010-02-03 21:53:34 UTC (rev 3175) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpertDLL-L.xml) - Last generated: 28-06-2009 20:45:12 UTC + Last generated: 03-02-2010 21:50:42 UTC ***************************************************************************** --> <PROJECT> @@ -17,7 +17,6 @@ ..\..\lib\c6\JCLUsesWizard.obj ..\..\lib\c6\JCLOptionsFrame.obj ..\..\lib\c6\JclUsesDialog.obj - ..\..\lib\c6\JclParseUses.obj "/> <RESFILES value=""/> <IDLFILES value=""/> @@ -36,6 +35,7 @@ vcl.bpi designide.bpi Jcl.bpi + JclDeveloperTools.bpi JclBaseExpert.bpi "/> <PATHCPP value=".;"/> @@ -76,11 +76,11 @@ <FILE FILENAME="vcl.bpi" FORMNAME="" UNITNAME="vcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="designide.bpi" FORMNAME="" UNITNAME="designide" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\useswizard\JCLUsesWizard.pas" FORMNAME="" UNITNAME="JCLUsesWizard" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\useswizard\JCLOptionsFrame.pas" FORMNAME="FrameJclOptions" UNITNAME="JCLOptionsFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\useswizard\JclUsesDialog.pas" FORMNAME="FormUsesConfirm" UNITNAME="JclUsesDialog" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\experts\useswizard\JclParseUses.pas" FORMNAME="" UNITNAME="JclParseUses" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> </FILELIST> <BUILDTOOLS> </BUILDTOOLS> Modified: trunk/jcl/packages/c6/JclUsesExpertDLL.dof =================================================================== --- trunk/jcl/packages/c6/JclUsesExpertDLL.dof 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/c6/JclUsesExpertDLL.dof 2010-02-03 21:53:34 UTC (rev 3175) @@ -5,5 +5,5 @@ [Compiler] PackageNoLink=1 [Linker] -Packages=rtl;vcl;designide;Jcl;JclBaseExpert +Packages=rtl;vcl;designide;Jcl;JclDeveloperTools;JclBaseExpert Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -46,7 +46,8 @@ contains JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , - JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' + JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' ; end. Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -51,6 +51,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/d11/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -51,6 +51,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/d11/JclDeveloperTools.dproj =================================================================== --- trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-02-03 21:53:34 UTC (rev 3175) @@ -94,6 +94,7 @@ <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/> <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/> <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/> + <DCCReference Include="..\..\source\common\JclUsesUtils.pas"/> <DCCReference Include="..\..\source\windows\JclHelpUtils.pas"/> <DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas"/> </ItemGroup> Modified: trunk/jcl/packages/d12/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -51,6 +51,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/d12/JclDeveloperTools.dproj =================================================================== --- trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-02-03 21:53:34 UTC (rev 3175) @@ -69,6 +69,7 @@ <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/> <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/> <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/> + <DCCReference Include="..\..\source\common\JclUsesUtils.pas"/> <DCCReference Include="..\..\source\windows\JclHelpUtils.pas"/> <DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas"/> <BuildConfiguration Include="Base"> Modified: trunk/jcl/packages/d14/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:32 UTC ----------------------------------------------------------------------------- } @@ -51,6 +51,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/d14/JclDeveloperTools.dproj =================================================================== --- trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-02-03 21:53:34 UTC (rev 3175) @@ -71,6 +71,7 @@ <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/> <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/> <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/> + <DCCReference Include="..\..\source\common\JclUsesUtils.pas"/> <DCCReference Include="..\..\source\windows\JclHelpUtils.pas"/> <DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas"/> <BuildConfiguration Include="Base"> Modified: trunk/jcl/packages/d6/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:46 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -50,6 +50,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/d6/JclUsesExpert.dpk =================================================================== --- trunk/jcl/packages/d6/JclUsesExpert.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d6/JclUsesExpert.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpert-D.xml) - Last generated: 14-03-2009 14:35:13 UTC + Last generated: 03-02-2010 21:50:42 UTC ----------------------------------------------------------------------------- } @@ -42,14 +42,14 @@ vcl, designide, Jcl, + JclDeveloperTools, JclBaseExpert ; contains JCLUsesWizard in '..\..\experts\useswizard\JCLUsesWizard.pas' , JCLOptionsFrame in '..\..\experts\useswizard\JCLOptionsFrame.pas' {FrameJclOptions: TFrame}, - JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm}, - JclParseUses in '..\..\experts\useswizard\JclParseUses.pas' + JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm} ; end. Modified: trunk/jcl/packages/d6/JclUsesExpertDLL.dof =================================================================== --- trunk/jcl/packages/d6/JclUsesExpertDLL.dof 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d6/JclUsesExpertDLL.dof 2010-02-03 21:53:34 UTC (rev 3175) @@ -5,5 +5,5 @@ [Compiler] PackageNoLink=1 [Linker] -Packages=rtl;vcl;designide;Jcl;JclBaseExpert +Packages=rtl;vcl;designide;Jcl;JclDeveloperTools;JclBaseExpert Modified: trunk/jcl/packages/d6/JclUsesExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d6/JclUsesExpertDLL.dpr 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d6/JclUsesExpertDLL.dpr 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpertDLL-L.xml) - Last generated: 14-03-2009 14:35:13 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -40,8 +40,7 @@ ToolsAPI, JCLUsesWizard in '..\..\experts\useswizard\JCLUsesWizard.pas' , JCLOptionsFrame in '..\..\experts\useswizard\JCLOptionsFrame.pas' {FrameJclOptions: TFrame}, - JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm}, - JclParseUses in '..\..\experts\useswizard\JclParseUses.pas' + JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm} ; exports Modified: trunk/jcl/packages/d7/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -50,6 +50,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/d7/JclUsesExpert.dpk =================================================================== --- trunk/jcl/packages/d7/JclUsesExpert.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d7/JclUsesExpert.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpert-D.xml) - Last generated: 14-03-2009 14:35:14 UTC + Last generated: 03-02-2010 21:50:42 UTC ----------------------------------------------------------------------------- } @@ -42,14 +42,14 @@ vcl, designide, Jcl, + JclDeveloperTools, JclBaseExpert ; contains JCLUsesWizard in '..\..\experts\useswizard\JCLUsesWizard.pas' , JCLOptionsFrame in '..\..\experts\useswizard\JCLOptionsFrame.pas' {FrameJclOptions: TFrame}, - JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm}, - JclParseUses in '..\..\experts\useswizard\JclParseUses.pas' + JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm} ; end. Modified: trunk/jcl/packages/d7/JclUsesExpert.res =================================================================== (Binary files differ) Modified: trunk/jcl/packages/d7/JclUsesExpertDLL.dof =================================================================== --- trunk/jcl/packages/d7/JclUsesExpertDLL.dof 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d7/JclUsesExpertDLL.dof 2010-02-03 21:53:34 UTC (rev 3175) @@ -5,5 +5,5 @@ [Compiler] PackageNoLink=1 [Linker] -Packages=rtl;vcl;designide;Jcl;JclBaseExpert +Packages=rtl;vcl;designide;Jcl;JclDeveloperTools;JclBaseExpert Modified: trunk/jcl/packages/d7/JclUsesExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d7/JclUsesExpertDLL.dpr 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d7/JclUsesExpertDLL.dpr 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclUsesExpertDLL-L.xml) - Last generated: 14-03-2009 14:35:14 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -40,8 +40,7 @@ ToolsAPI, JCLUsesWizard in '..\..\experts\useswizard\JCLUsesWizard.pas' , JCLOptionsFrame in '..\..\experts\useswizard\JCLOptionsFrame.pas' {FrameJclOptions: TFrame}, - JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm}, - JclParseUses in '..\..\experts\useswizard\JclParseUses.pas' + JclUsesDialog in '..\..\experts\useswizard\JclUsesDialog.pas' {FormUsesConfirm} ; exports Modified: trunk/jcl/packages/d8/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -46,7 +46,8 @@ contains JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , - JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' + JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' ; end. Modified: trunk/jcl/packages/d9/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 20:05:47 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -50,6 +50,7 @@ JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , + JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' , JclHelpUtils in '..\..\source\windows\JclHelpUtils.pas' , MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ; Modified: trunk/jcl/packages/fpc/JclDeveloperTools.lpk =================================================================== --- trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-02-03 21:53:34 UTC (rev 3175) @@ -39,7 +39,7 @@ <Description Value="JEDI Code Library Developer Tools package"/> <License Value="Copyright (C) 1999, 2009 Project JEDI"/> <Version Major="2" Minor="2" Release="0" Build="3537"/> - <Files Count="5"> + <Files Count="6"> <Item1> <Filename Value="..\..\source\common\JclCompilerUtils.pas"/> <UnitName Value="JclCompilerUtils"/> @@ -53,13 +53,17 @@ <UnitName Value="JclIDEUtils"/> </Item3> <Item4> + <Filename Value="..\..\source\common\JclUsesUtils.pas"/> + <UnitName Value="JclUsesUtils"/> + </Item4> + <Item5> <Filename Value="..\..\source\windows\JclHelpUtils.pas"/> <UnitName Value="JclHelpUtils"/> - </Item4> - <Item5> + </Item5> + <Item6> <Filename Value="..\..\source\windows\MSHelpServices_TLB.pas"/> <UnitName Value="MSHelpServices_TLB"/> - </Item5> + </Item6> </Files> <RequiredPkgs Count="3"> <Item1> Modified: trunk/jcl/packages/fpc/JclDeveloperTools.pas =================================================================== --- trunk/jcl/packages/fpc/JclDeveloperTools.pas 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/fpc/JclDeveloperTools.pas 2010-02-03 21:53:34 UTC (rev 3175) @@ -3,7 +3,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:54 UTC + Last generated: 03-02-2010 21:45:31 UTC ----------------------------------------------------------------------------- } @@ -15,6 +15,7 @@ JclCompilerUtils, JclDevToolsResources, JclIDEUtils, + JclUsesUtils, JclHelpUtils, MSHelpServices_TLB ; Modified: trunk/jcl/packages/xml/JclDeveloperTools-R.xml =================================================================== --- trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-02-03 21:53:34 UTC (rev 3175) @@ -21,6 +21,7 @@ <File Name="..\..\source\common\JclCompilerUtils.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclDevToolsResources.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclIDEUtils.pas" Targets="all" Formname="" Condition=""/> + <File Name="..\..\source\common\JclUsesUtils.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\windows\JclHelpUtils.pas" Targets="Windows" Formname="" Condition=""/> <File Name="..\..\source\windows\MSHelpServices_TLB.pas" Targets="Windows" Formname="" Condition=""/> </Contains> Modified: trunk/jcl/packages/xml/JclUsesExpert-D.xml =================================================================== --- trunk/jcl/packages/xml/JclUsesExpert-D.xml 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/xml/JclUsesExpert-D.xml 2010-02-03 21:53:34 UTC (rev 3175) @@ -11,12 +11,12 @@ <Package Name="vcl" Targets="Delphi,Bcb,Bds" Condition=""/> <Package Name="designide" Targets="Delphi,Bcb,Bds" Condition=""/> <Package Name="Jcl-R" Targets="all" Condition=""/> + <Package Name="JclDeveloperTools-R" Targets="all" Condition=""/> <Package Name="JclBaseExpert-D" Targets="all" Condition=""/> </Requires> <Contains> <File Name="..\..\experts\useswizard\JCLUsesWizard.pas" Targets="OldStyleIDE" Formname="" Condition=""/> <File Name="..\..\experts\useswizard\JCLOptionsFrame.pas" Targets="OldStyleIDE" Formname="FrameJclOptions: TFrame" Condition=""/> <File Name="..\..\experts\useswizard\JclUsesDialog.pas" Targets="OldStyleIDE" Formname="FormUsesConfirm" Condition=""/> - <File Name="..\..\experts\useswizard\JclParseUses.pas" Targets="OldStyleIDE" Formname="" Condition=""/> </Contains> </Package> Modified: trunk/jcl/packages/xml/JclUsesExpertDLL-L.xml =================================================================== --- trunk/jcl/packages/xml/JclUsesExpertDLL-L.xml 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/packages/xml/JclUsesExpertDLL-L.xml 2010-02-03 21:53:34 UTC (rev 3175) @@ -11,12 +11,12 @@ <Package Name="vcl" Targets="Delphi,Bcb,Bds" Condition=""/> <Package Name="designide" Targets="Delphi,Bcb,Bds" Condition=""/> <Package Name="Jcl-R" Targets="all" Condition=""/> + <Package Name="JclDeveloperTools-R" Targets="all" Condition=""/> <Package Name="JclBaseExpert-D" Targets="all" Condition=""/> </Requires> <Contains> <File Name="..\..\experts\useswizard\JCLUsesWizard.pas" Targets="OldStyleIDE" Formname="" Condition=""/> <File Name="..\..\experts\useswizard\JCLOptionsFrame.pas" Targets="OldStyleIDE" Formname="FrameJclOptions: TFrame" Condition=""/> <File Name="..\..\experts\useswizard\JclUsesDialog.pas" Targets="OldStyleIDE" Formname="FormUsesConfirm" Condition=""/> - <File Name="..\..\experts\useswizard\JclParseUses.pas" Targets="OldStyleIDE" Formname="" Condition=""/> </Contains> </Package> Modified: trunk/jcl/source/common/JclDevToolsResources.pas =================================================================== --- trunk/jcl/source/common/JclDevToolsResources.pas 2010-02-03 21:41:24 UTC (rev 3174) +++ trunk/jcl/source/common/JclDevToolsResources.pas 2010-02-03 21:53:34 UTC (rev 3175) @@ -1,4 +1,4 @@ -{**************************************************************************************************} +{**************************************************************************************************} { } { Project JEDI Code Library (JCL) ... [truncated message content] |
From: <ou...@us...> - 2010-02-03 21:41:32
|
Revision: 3174 http://jcl.svn.sourceforge.net/jcl/?rev=3174&view=rev Author: outchy Date: 2010-02-03 21:41:24 +0000 (Wed, 03 Feb 2010) Log Message: ----------- complete merge with changes made in "jvcl\examples\JvDiagramShape\3. DependencyWalker\JclParseUses.pas". Modified Paths: -------------- trunk/jcl/experts/useswizard/JclParseUses.pas Modified: trunk/jcl/experts/useswizard/JclParseUses.pas =================================================================== --- trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:31:36 UTC (rev 3173) +++ trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:41:24 UTC (rev 3174) @@ -19,7 +19,7 @@ { } {**************************************************************************************************} { } -{ Last modified: $Date:: $ } +{ Last modified: $Date:: $ } { Revision: $Rev:: $ } { Author: $Author:: $ } { } @@ -303,6 +303,7 @@ Break; end; else + if not PeekIdentifier(P) then raise EUsesListError.CreateRes(@RsEInvalidUses); end; end; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 21:31:42
|
Revision: 3173 http://jcl.svn.sourceforge.net/jcl/?rev=3173&view=rev Author: outchy Date: 2010-02-03 21:31:36 +0000 (Wed, 03 Feb 2010) Log Message: ----------- merge with changes made in "jvcl\examples\JvDiagramShape\3. DependencyWalker\JclParseUses.pas". Modified Paths: -------------- trunk/jcl/experts/useswizard/JclParseUses.pas Modified: trunk/jcl/experts/useswizard/JclParseUses.pas =================================================================== --- trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:17:17 UTC (rev 3172) +++ trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:31:36 UTC (rev 3173) @@ -19,7 +19,7 @@ { } {**************************************************************************************************} { } -{ Last modified: $Date:: $ } +{ Last modified: $Date:: $ } { Revision: $Rev:: $ } { Author: $Author:: $ } { } @@ -36,12 +36,13 @@ {$IFDEF UNITVERSIONING} JclUnitVersioning, {$ENDIF UNITVERSIONING} - JclOtaUtils; + Windows, + JclBase; type - EUsesListError = class(EJclExpertException); + EUsesListError = class(EJclError); - TUsesList = class(TObject) + TUsesList = class private FText: string; function GetCount: Integer; @@ -57,7 +58,7 @@ property Items[Index: Integer]: string read GetItems; default; end; - TCustomGoal = class(TObject) + TCustomGoal = class public constructor Create(Text: PChar); virtual; abstract; end; @@ -122,13 +123,8 @@ implementation uses - {$IFDEF HAS_UNIT_RTLCONSTS} RtlConsts, - {$ELSE} - Consts, - {$ENDIF HAS_UNIT_RTLCONSTS} - JclStrings, - JclOtaResources; + JclStrings, JclOtaResources; const SLibrary = 'library'; @@ -141,6 +137,8 @@ Result := not CharIsWhiteSpace(C); end; +function PeekIdentifier(var P:PChar):boolean;forward; + function PeekKeyword(var P: PChar; Keyword: PChar): Boolean; forward; function ReadIdentifier(var P: PChar): string; forward; procedure SkipCommentsAndBlanks(var P: PChar); forward; @@ -161,7 +159,7 @@ KeywordLen: Integer; begin KeywordLen := StrLen(Keyword); - Result := StrLComp(P, Keyword, KeywordLen) = 0; + Result := StrLIComp(P, Keyword, KeywordLen) = 0; if Result then Inc(P, KeywordLen); end; @@ -189,9 +187,20 @@ KeywordLen: Integer; begin KeywordLen := StrLen(Keyword); - Result := StrLComp(P, Keyword, KeywordLen) = 0; + Result := StrLIComp(P, KeyWord, KeywordLen) = 0; end; +//---------------------------------------------------------------------------- + +function PeekIdentifier(var P: PChar):boolean; +var Q:PChar; +begin + Q := P; + Result := CheckIdentifier(P); + P := Q; +end; + + function ReadIdentifier(var P: PChar): string; var PStart: PChar; @@ -351,6 +360,7 @@ ';': Break; else + if not PeekIdentifier(P) then raise EUsesListError.CreateRes(@RsEInvalidUses); end; end; @@ -411,6 +421,7 @@ ';': Break; else + if not PeekIdentifier(P) then raise EUsesListError.CreateRes(@RsEInvalidUses); end; end; @@ -836,6 +847,11 @@ // check 'unit' label SkipCommentsAndBlanks(P); + while (P^ <> #0) and not PeekKeyword(P, 'unit') do + begin + StrSkipChars(P, CharIsNotWhiteSpace); + SkipCommentsAndBlanks(P); + end; if not CheckKeyword(P, SUnit) then raise EUsesListError.CreateRes(@RsEInvalidUnit); SkipCommentsAndBlanks(P); @@ -846,7 +862,12 @@ raise EUsesListError.CreateRes(@RsEInvalidUnit); Inc(P); // check 'interface' label - SkipCommentsAndBlanks(P); +// SkipCommentsAndBlanks(P); + while (P^ <> #0) and not PeekKeyword(P, 'interface') do + begin + StrSkipChars(P, CharIsNotWhiteSpace); + SkipCommentsAndBlanks(P); + end; if not CheckKeyword(P, 'interface') then raise EUsesListError.CreateRes(@RsEInvalidUnit); SkipCommentsAndBlanks(P); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 21:17:23
|
Revision: 3172 http://jcl.svn.sourceforge.net/jcl/?rev=3172&view=rev Author: outchy Date: 2010-02-03 21:17:17 +0000 (Wed, 03 Feb 2010) Log Message: ----------- This unit was moved to jcl/source/common in revision 3167. Revision Links: -------------- http://jcl.svn.sourceforge.net/jcl/?rev=3167&view=rev Modified Paths: -------------- trunk/jcl/source/windows/JclHelpUtils.pas Modified: trunk/jcl/source/windows/JclHelpUtils.pas =================================================================== --- trunk/jcl/source/windows/JclHelpUtils.pas 2010-02-03 21:15:39 UTC (rev 3171) +++ trunk/jcl/source/windows/JclHelpUtils.pas 2010-02-03 21:17:17 UTC (rev 3172) @@ -115,7 +115,7 @@ RCSfile: '$URL$'; Revision: '$Revision$'; Date: '$Date$'; - LogPath: 'JCL\source\common'; + LogPath: 'JCL\source\windows'; Extra: ''; Data: nil ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 21:15:45
|
Revision: 3171 http://jcl.svn.sourceforge.net/jcl/?rev=3171&view=rev Author: outchy Date: 2010-02-03 21:15:39 +0000 (Wed, 03 Feb 2010) Log Message: ----------- Unicode compatibility. Modified Paths: -------------- trunk/jcl/experts/useswizard/JCLUsesWizard.pas trunk/jcl/experts/useswizard/JclParseUses.pas Modified: trunk/jcl/experts/useswizard/JCLUsesWizard.pas =================================================================== --- trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2010-02-03 20:57:44 UTC (rev 3170) +++ trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2010-02-03 21:15:39 UTC (rev 3171) @@ -125,7 +125,7 @@ uses IniFiles, - JclFileUtils, JclParseUses, JclRegistry, JclStrings, + JclFileUtils, JclParseUses, JclRegistry, JclStrings, JclStringConversions, JclUsesDialog, JclOtaConsts, JclOtaResources; @@ -764,7 +764,7 @@ try Writer.CopyTo(Length(TextBeforeUses)); Writer.DeleteTo(Length(TextBeforeUses) + IntfLength); - Writer.Insert(PChar(UsesList.Text)); + Writer.Insert(PAnsiChar(StringToUTF8(UsesList.Text))); Writer.CopyTo(Length(GoalSource)); finally Writer := nil; @@ -810,7 +810,7 @@ try Writer.CopyTo(Length(TextBeforeUses)); Writer.DeleteTo(Length(TextBeforeUses) + IntfLength); - Writer.Insert(PChar(UsesList.Text)); + Writer.Insert(PAnsiChar(StringToUTF8(UsesList.Text))); Writer.CopyTo(Length(GoalSource)); finally Writer := nil; @@ -886,10 +886,10 @@ try Writer.CopyTo(Length(TextBeforeIntf)); Writer.DeleteTo(Length(TextBeforeIntf) + IntfLength); - Writer.Insert(PChar(UsesIntf.Text)); + Writer.Insert(PAnsiChar(StringToUTF8(UsesIntf.Text))); Writer.CopyTo(Length(TextBeforeIntf) + IntfLength + Length(TextAfterIntf)); Writer.DeleteTo(Length(TextBeforeIntf) + IntfLength + Length(TextAfterIntf) + ImplLength); - Writer.Insert(PChar(UsesImpl.Text)); + Writer.Insert(PAnsiChar(StringToUTF8(UsesImpl.Text))); Writer.CopyTo(Length(GoalSource)); finally Writer := nil; Modified: trunk/jcl/experts/useswizard/JclParseUses.pas =================================================================== --- trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 20:57:44 UTC (rev 3170) +++ trunk/jcl/experts/useswizard/JclParseUses.pas 2010-02-03 21:15:39 UTC (rev 3171) @@ -127,26 +127,31 @@ {$ELSE} Consts, {$ENDIF HAS_UNIT_RTLCONSTS} + JclStrings, JclOtaResources; const - Blanks: TSysCharSet = [#9, #10, #13, ' ']; SLibrary = 'library'; SProgram = 'program'; SUnit = 'unit'; SUses = 'uses'; +function CharIsNotWhiteSpace(const C: Char): Boolean; +begin + Result := not CharIsWhiteSpace(C); +end; + function PeekKeyword(var P: PChar; Keyword: PChar): Boolean; forward; function ReadIdentifier(var P: PChar): string; forward; procedure SkipCommentsAndBlanks(var P: PChar); forward; function CheckIdentifier(var P: PChar): Boolean; begin - Result := P^ in ['A'..'Z', '_', 'a'..'z']; + Result := CharIsAlpha(P^) or (P^ = '_'); if Result then begin Inc(P); - while P^ in ['0'..'9', 'A'..'Z', '_', 'a'..'z'] do + while CharIsValidIdentifierLetter(P^) do Inc(P); end; end; @@ -193,24 +198,18 @@ begin Result := ''; - if P^ in ['A'..'Z', '_', 'a'..'z'] then + if CharIsAlpha(P^) then begin PStart := P; - + Inc(P); - while P^ in ['0'..'9', 'A'..'Z', '_', 'a'..'z'] do + while CharIsValidIdentifierLetter(P^) do Inc(P); SetString(Result, PStart, P - PStart); end; end; -procedure SkipChars(var P: PChar; Chars: TSysCharSet); -begin - while P^ in Chars do - Inc(P); -end; - procedure SkipComments(var P: PChar); var Test: PChar; @@ -243,7 +242,7 @@ begin repeat Test := P; - SkipChars(P, Blanks); + StrSkipChars(P, CharIsWhiteSpace); SkipComments(P); until Test = P; end; @@ -278,7 +277,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -338,7 +337,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -381,7 +380,7 @@ Inc(I); if I = Index then begin - while PIdentifier^ in ['0'..'9', 'A'..'Z', '_', 'a'..'z'] do + while CharIsValidIdentifierLetter(PIdentifier^) do begin Result := Result + PIdentifier^; Inc(PIdentifier); @@ -398,7 +397,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -460,7 +459,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -524,7 +523,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -594,7 +593,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -658,7 +657,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -682,7 +681,7 @@ // remove trailing spaces, if any PIdentifier := PChar(FText) + DelPos - 1; P := PIdentifier; - SkipChars(P, Blanks); + StrSkipChars(P, CharIsWhiteSpace); DelPos := PIdentifier - PChar(FText) + 1; Delete(FText, DelPos, P - PIdentifier); // skip further comments and blanks @@ -702,7 +701,7 @@ raise EUsesListError.CreateRes(@RsEInvalidUses); Inc(P); - while not (P^ in [#0, '''']) do + while (P^ <> #0) and (P^ <> '''') do Inc(P); if P^ <> '''' then raise EUsesListError.CreateRes(@RsEInvalidUses); @@ -867,7 +866,7 @@ // locate implementation while (P^ <> #0) and not PeekKeyword(P, 'implementation') do begin - SkipChars(P, [#1..#255] - Blanks); + StrSkipChars(P, CharIsNotWhiteSpace); SkipCommentsAndBlanks(P); end; if not CheckKeyword(P, 'implementation') then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 20:57:50
|
Revision: 3170 http://jcl.svn.sourceforge.net/jcl/?rev=3170&view=rev Author: outchy Date: 2010-02-03 20:57:44 +0000 (Wed, 03 Feb 2010) Log Message: ----------- removed the UTF8 BOMs. Modified Paths: -------------- trunk/jcl/source/common/JclDevToolsResources.pas trunk/jcl/source/common/JclIDEUtils.pas Modified: trunk/jcl/source/common/JclDevToolsResources.pas =================================================================== --- trunk/jcl/source/common/JclDevToolsResources.pas 2010-02-03 20:12:16 UTC (rev 3169) +++ trunk/jcl/source/common/JclDevToolsResources.pas 2010-02-03 20:57:44 UTC (rev 3170) @@ -1,4 +1,4 @@ -{**************************************************************************************************} +{**************************************************************************************************} { } { Project JEDI Code Library (JCL) } { } Modified: trunk/jcl/source/common/JclIDEUtils.pas =================================================================== --- trunk/jcl/source/common/JclIDEUtils.pas 2010-02-03 20:12:16 UTC (rev 3169) +++ trunk/jcl/source/common/JclIDEUtils.pas 2010-02-03 20:57:44 UTC (rev 3170) @@ -1,4 +1,4 @@ -{**************************************************************************************************} +{**************************************************************************************************} { } { Project JEDI Code Library (JCL) } { } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 20:12:23
|
Revision: 3169 http://jcl.svn.sourceforge.net/jcl/?rev=3169&view=rev Author: outchy Date: 2010-02-03 20:12:16 +0000 (Wed, 03 Feb 2010) Log Message: ----------- SVN properties cleanup. Modified Paths: -------------- trunk/thirdparty/svn_cleaner/SvnCleaner.xml Property Changed: ---------------- trunk/jcl/devtools/jpp/ Property changes on: trunk/jcl/devtools/jpp ___________________________________________________________________ Modified: svn:ignore - __history *.identcache *.local *.cfg *.drc *.dcu *.dproj *.bdsproj + __history *.identcache *.local *.cfg *.drc *.dcu *.dproj *.bdsproj *.hpp Modified: trunk/thirdparty/svn_cleaner/SvnCleaner.xml =================================================================== --- trunk/thirdparty/svn_cleaner/SvnCleaner.xml 2010-02-03 20:09:46 UTC (rev 3168) +++ trunk/thirdparty/svn_cleaner/SvnCleaner.xml 2010-02-03 20:12:16 UTC (rev 3169) @@ -129,6 +129,7 @@ <value>*.dcu</value> <value>*.dproj</value> <value>*.bdsproj</value> + <value>*.hpp</value> </property> </setting> </setting> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ou...@us...> - 2010-02-03 20:10:15
|
Revision: 3168 http://jcl.svn.sourceforge.net/jcl/?rev=3168&view=rev Author: outchy Date: 2010-02-03 20:09:46 +0000 (Wed, 03 Feb 2010) Log Message: ----------- moved JPP to JCL runtime code in package JclDeveloperTools. Modified Paths: -------------- trunk/jcl/packages/c6/JclDeveloperTools.bpk trunk/jcl/packages/c6/JclDeveloperTools.dpk trunk/jcl/packages/c6/JclRepositoryExpert.bpk trunk/jcl/packages/c6/JclRepositoryExpert.dpk trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj trunk/jcl/packages/cs1/JclDeveloperTools.dpk trunk/jcl/packages/d10/JclDeveloperTools.bdsproj trunk/jcl/packages/d10/JclDeveloperTools.dpk trunk/jcl/packages/d10/JclRepositoryExpert.dpk trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr trunk/jcl/packages/d11/JclDeveloperTools.dpk trunk/jcl/packages/d11/JclDeveloperTools.dproj trunk/jcl/packages/d11/JclRepositoryExpert.dpk trunk/jcl/packages/d11/JclRepositoryExpert.dproj trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj trunk/jcl/packages/d12/JclDeveloperTools.dpk trunk/jcl/packages/d12/JclDeveloperTools.dproj trunk/jcl/packages/d12/JclRepositoryExpert.dpk trunk/jcl/packages/d12/JclRepositoryExpert.dproj trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj trunk/jcl/packages/d14/JclDeveloperTools.dpk trunk/jcl/packages/d14/JclDeveloperTools.dproj trunk/jcl/packages/d14/JclRepositoryExpert.dpk trunk/jcl/packages/d14/JclRepositoryExpert.dproj trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj trunk/jcl/packages/d6/JclDeveloperTools.dpk trunk/jcl/packages/d6/JclRepositoryExpert.dpk trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr trunk/jcl/packages/d7/JclDeveloperTools.dpk trunk/jcl/packages/d7/JclRepositoryExpert.dpk trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr trunk/jcl/packages/d8/JclDeveloperTools.bdsproj trunk/jcl/packages/d8/JclDeveloperTools.dpk trunk/jcl/packages/d9/JclDeveloperTools.bdsproj trunk/jcl/packages/d9/JclDeveloperTools.dpk trunk/jcl/packages/d9/JclRepositoryExpert.dpk trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr trunk/jcl/packages/fpc/JclDeveloperTools.lpk trunk/jcl/packages/xml/JclDeveloperTools-R.xml trunk/jcl/packages/xml/JclRepositoryExpert-D.xml trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk =================================================================== --- trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/c6/JclDeveloperTools.bpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:54 UTC + Last generated: 03-02-2010 20:05:46 UTC ***************************************************************************** --> <PROJECT> @@ -14,6 +14,9 @@ <PROJECT value="JclDeveloperToolsC60.bpl"/> <OBJFILES value=" ..\..\lib\c6\JclDeveloperTools.obj + ..\..\lib\c6\JppState.obj + ..\..\lib\c6\JppLexer.obj + ..\..\lib\c6\JppParser.obj ..\..\lib\c6\JclCompilerUtils.obj ..\..\lib\c6\JclDevToolsResources.obj ..\..\lib\c6\JclIDEUtils.obj @@ -33,9 +36,10 @@ <PACKAGES value=" rtl.bpi Jcl.bpi + JclContainers.bpi "/> <PATHCPP value=".;"/> - <PATHPAS value=".;..\..\source\common;..\..\source\windows;"/> + <PATHPAS value=".;..\..\devtools\jpp;..\..\source\common;..\..\source\windows;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> <DEBUGLIBPATH value="$(BCB)\lib\debug"/> @@ -45,7 +49,7 @@ <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/> <MAINSOURCE value="JclDeveloperTools.cpp"/> <INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value="..\..\source\common;..\..\source\common;..\..\source\windows;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> + <LIBPATH value="..\..\devtools\jpp;..\..\devtools\jpp;..\..\source\common;..\..\source\windows;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> <WARNINGS value="-w-par"/> <OTHERFILES value=""/> </MACROS> @@ -71,6 +75,10 @@ <FILE FILENAME="JclDeveloperTools.cpp" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\devtools\jpp\JppState.pas" FORMNAME="" UNITNAME="JppState" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\devtools\jpp\JppLexer.pas" FORMNAME="" UNITNAME="JppLexer" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> + <FILE FILENAME="..\..\devtools\jpp\JppParser.pas" FORMNAME="" UNITNAME="JppParser" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/c6/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:46 UTC ----------------------------------------------------------------------------- } @@ -40,9 +40,13 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/c6/JclRepositoryExpert.bpk =================================================================== --- trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/c6/JclRepositoryExpert.bpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:53 UTC + Last generated: 03-02-2010 20:03:03 UTC ***************************************************************************** --> <PROJECT> @@ -14,9 +14,6 @@ <PROJECT value="JclRepositoryExpertC60.bpl"/> <OBJFILES value=" ..\..\lib\c6\JclRepositoryExpert.obj - ..\..\lib\c6\JppState.obj - ..\..\lib\c6\JppLexer.obj - ..\..\lib\c6\JppParser.obj ..\..\lib\c6\JclOtaTemplates.obj ..\..\lib\c6\JclOtaRepositoryUtils.obj ..\..\lib\c6\JclOtaExcDlgRepository.obj @@ -59,7 +56,7 @@ JclDeveloperTools.bpi "/> <PATHCPP value=".;"/> - <PATHPAS value=".;..\..\devtools\jpp;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;"/> + <PATHPAS value=".;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> <DEBUGLIBPATH value="$(BCB)\lib\debug"/> @@ -69,7 +66,7 @@ <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/> <MAINSOURCE value="JclRepositoryExpert.cpp"/> <INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value="..\..\devtools\jpp;..\..\devtools\jpp;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> + <LIBPATH value="..\..\experts\repository;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> <WARNINGS value="-w-par"/> <OTHERFILES value=""/> </MACROS> @@ -100,9 +97,6 @@ <FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\devtools\jpp\JppState.pas" FORMNAME="" UNITNAME="JppState" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\devtools\jpp\JppLexer.pas" FORMNAME="" UNITNAME="JppLexer" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\devtools\jpp\JppParser.pas" FORMNAME="" UNITNAME="JppParser" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\repository\JclOtaTemplates.pas" FORMNAME="" UNITNAME="JclOtaTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> Modified: trunk/jcl/packages/c6/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/c6/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:53 UTC + Last generated: 03-02-2010 20:03:03 UTC ----------------------------------------------------------------------------- } @@ -48,9 +48,6 @@ JclDeveloperTools ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf =================================================================== --- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf 2010-02-03 20:09:46 UTC (rev 3168) @@ -1,6 +1,3 @@ -USEUNIT("..\..\devtools\jpp\JppState.pas"); -USEUNIT("..\..\devtools\jpp\JppLexer.pas"); -USEUNIT("..\..\devtools\jpp\JppParser.pas"); USEUNIT("..\..\experts\repository\JclOtaTemplates.pas"); USEUNIT("..\..\experts\repository\JclOtaRepositoryUtils.pas"); USEUNIT("..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"); Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr =================================================================== --- trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -5,7 +5,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 02-02-2010 14:38:53 UTC + Last generated: 03-02-2010 20:03:03 UTC ***************************************************************************** --> <PROJECT> @@ -14,9 +14,6 @@ <PROJECT value="JclRepositoryExpertDLLC60.dll"/> <OBJFILES value=" ..\..\lib\c6\JclRepositoryExpertDLL.obj - ..\..\lib\c6\JppState.obj - ..\..\lib\c6\JppLexer.obj - ..\..\lib\c6\JppParser.obj ..\..\lib\c6\JclOtaTemplates.obj ..\..\lib\c6\JclOtaRepositoryUtils.obj ..\..\lib\c6\JclOtaExcDlgRepository.obj @@ -59,7 +56,7 @@ JclDeveloperTools.bpi "/> <PATHCPP value=".;"/> - <PATHPAS value=".;..\..\devtools\jpp;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;"/> + <PATHPAS value=".;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;"/> <PATHRC value=".;"/> <PATHASM value=".;"/> <DEBUGLIBPATH value="$(BCB)\lib\debug"/> @@ -69,7 +66,7 @@ <SYSDEFINES value="NO_STRICT;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="JclRepositoryExpertDLL.cpp"/> <INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;$(BCB)\include;$(BCB)\include\vcl"/> - <LIBPATH value="..\..\devtools\jpp;..\..\devtools\jpp;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> + <LIBPATH value="..\..\experts\repository;..\..\experts\repository;..\..\experts\repository\ExceptionDialog;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/> <WARNINGS value="-w-par"/> <OTHERFILES value=""/> </MACROS> @@ -99,9 +96,6 @@ <FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="JclBaseExpert.bpi" FORMNAME="" UNITNAME="JclBaseExpert" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="JclDeveloperTools.bpi" FORMNAME="" UNITNAME="JclDeveloperTools" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\devtools\jpp\JppState.pas" FORMNAME="" UNITNAME="JppState" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\devtools\jpp\JppLexer.pas" FORMNAME="" UNITNAME="JppLexer" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> - <FILE FILENAME="..\..\devtools\jpp\JppParser.pas" FORMNAME="" UNITNAME="JppParser" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\repository\JclOtaTemplates.pas" FORMNAME="" UNITNAME="JclOtaTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\repository\JclOtaRepositoryUtils.pas" FORMNAME="" UNITNAME="JclOtaRepositoryUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> <FILE FILENAME="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" FORMNAME="" UNITNAME="JclOtaExcDlgRepository" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/> Modified: trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj =================================================================== --- trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -122,7 +122,7 @@ <Directories Name="PackageDLLOutputDir"></Directories> <Directories Name="PackageDCPOutputDir">..\..\lib\cs1</Directories> <Directories Name="SearchPath">..\..\lib\cs1;..\..\source\include</Directories> - <Directories Name="Packages">rtl;Jcl</Directories> + <Directories Name="Packages">rtl;Jcl;JclContainers</Directories> <Directories Name="Conditionals">RELEASE</Directories> <Directories Name="DebugSourceDirs"></Directories> <Directories Name="UsePackages">True</Directories> Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -39,7 +39,8 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains Modified: trunk/jcl/packages/d10/JclDeveloperTools.bdsproj =================================================================== --- trunk/jcl/packages/d10/JclDeveloperTools.bdsproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d10/JclDeveloperTools.bdsproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -124,7 +124,7 @@ <Directories Name="OutputDir"></Directories> <Directories Name="PackageDLLOutputDir"></Directories> <Directories Name="PackageDCPOutputDir">..\..\lib\d10</Directories> - <Directories Name="Packages">rtl;Jcl</Directories> + <Directories Name="Packages">rtl;Jcl;JclContainers</Directories> <Directories Name="Conditionals">BCB;RELEASE</Directories> <Directories Name="DebugSourceDirs"></Directories> <Directories Name="UsePackages">True</Directories> Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d10/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -40,10 +40,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d10/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d10/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:56 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -49,9 +49,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:47 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -39,9 +39,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d11/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d11/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -40,10 +40,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d11/JclDeveloperTools.dproj =================================================================== --- trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d11/JclDeveloperTools.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -5,7 +5,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <DCC_DCCCompiler>DCC32</DCC_DCCCompiler> - <DCC_UsePackage>rtl;Jcl</DCC_UsePackage> + <DCC_UsePackage>rtl;Jcl;JclContainers</DCC_UsePackage> <DCC_Define>BCB;RELEASE</DCC_Define> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> @@ -87,6 +87,10 @@ </DelphiCompile> <DCCReference Include="rtl.dcp"/> <DCCReference Include="Jcl.dcp"/> + <DCCReference Include="JclContainers.dcp"/> + <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> + <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> + <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/> <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/> <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/> Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d11/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d11/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:56 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -49,9 +49,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dproj =================================================================== --- trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -92,9 +92,6 @@ <DCCReference Include="JclContainers.dcp"/> <DCCReference Include="JclBaseExpert.dcp"/> <DCCReference Include="JclDeveloperTools.dcp"/> - <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/> <DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/> Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:47 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -39,9 +39,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj =================================================================== --- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -92,9 +92,6 @@ <DCCReference Include="JclContainers.dcp"/> <DCCReference Include="JclBaseExpert.dcp"/> <DCCReference Include="JclDeveloperTools.dcp"/> - <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/> <DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/> Modified: trunk/jcl/packages/d12/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d12/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -40,10 +40,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d12/JclDeveloperTools.dproj =================================================================== --- trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d12/JclDeveloperTools.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -27,7 +27,7 @@ <GenDll>true</GenDll> <GenPackage>true</GenPackage> <DCC_ImageBase>$48000000</DCC_ImageBase> - <DCC_UsePackage>rtl;Jcl</DCC_UsePackage> + <DCC_UsePackage>rtl;Jcl;JclContainers</DCC_UsePackage> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_Release)'!=''"> <DCC_AssertionsAtRuntime>false</DCC_AssertionsAtRuntime> @@ -62,6 +62,10 @@ </DelphiCompile> <DCCReference Include="rtl.dcp"/> <DCCReference Include="Jcl.dcp"/> + <DCCReference Include="JclContainers.dcp"/> + <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> + <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> + <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/> <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/> <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/> Modified: trunk/jcl/packages/d12/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d12/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d12/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:56 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -49,9 +49,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d12/JclRepositoryExpert.dproj =================================================================== --- trunk/jcl/packages/d12/JclRepositoryExpert.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d12/JclRepositoryExpert.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -67,9 +67,6 @@ <DCCReference Include="JclContainers.dcp"/> <DCCReference Include="JclBaseExpert.dcp"/> <DCCReference Include="JclDeveloperTools.dcp"/> - <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/> <DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/> Modified: trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d12/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:47 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -39,9 +39,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj =================================================================== --- trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -67,9 +67,6 @@ <DCCReference Include="JclContainers.dcp"/> <DCCReference Include="JclBaseExpert.dcp"/> <DCCReference Include="JclDeveloperTools.dcp"/> - <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/> <DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/> Modified: trunk/jcl/packages/d14/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d14/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -40,10 +40,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d14/JclDeveloperTools.dproj =================================================================== --- trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d14/JclDeveloperTools.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -29,7 +29,7 @@ <GenDll>true</GenDll> <GenPackage>true</GenPackage> <DCC_ImageBase>$48000000</DCC_ImageBase> - <DCC_UsePackage>rtl;Jcl</DCC_UsePackage> + <DCC_UsePackage>rtl;Jcl;JclContainers</DCC_UsePackage> </PropertyGroup> <PropertyGroup Condition="'$(Cfg_Release)'!=''"> <DCC_AssertionsAtRuntime>false</DCC_AssertionsAtRuntime> @@ -64,6 +64,10 @@ </DelphiCompile> <DCCReference Include="rtl.dcp"/> <DCCReference Include="Jcl.dcp"/> + <DCCReference Include="JclContainers.dcp"/> + <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> + <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> + <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/> <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/> <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/> Modified: trunk/jcl/packages/d14/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d14/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d14/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:57 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -49,9 +49,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d14/JclRepositoryExpert.dproj =================================================================== --- trunk/jcl/packages/d14/JclRepositoryExpert.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d14/JclRepositoryExpert.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -69,9 +69,6 @@ <DCCReference Include="JclContainers.dcp"/> <DCCReference Include="JclBaseExpert.dcp"/> <DCCReference Include="JclDeveloperTools.dcp"/> - <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/> <DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/> Modified: trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d14/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:47 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -39,9 +39,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj =================================================================== --- trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -69,9 +69,6 @@ <DCCReference Include="JclContainers.dcp"/> <DCCReference Include="JclBaseExpert.dcp"/> <DCCReference Include="JclDeveloperTools.dcp"/> - <DCCReference Include="..\..\devtools\jpp\JppState.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppLexer.pas"/> - <DCCReference Include="..\..\devtools\jpp\JppParser.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas"/> <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas"/> <DCCReference Include="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas"/> Modified: trunk/jcl/packages/d6/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d6/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:46 UTC ----------------------------------------------------------------------------- } @@ -39,10 +39,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d6/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d6/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d6/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:54 UTC + Last generated: 03-02-2010 20:03:03 UTC ----------------------------------------------------------------------------- } @@ -48,9 +48,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:46 UTC + Last generated: 03-02-2010 20:03:03 UTC ----------------------------------------------------------------------------- } @@ -38,9 +38,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d7/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d7/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -39,10 +39,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d7/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d7/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d7/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:54 UTC + Last generated: 03-02-2010 20:03:03 UTC ----------------------------------------------------------------------------- } @@ -48,9 +48,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:46 UTC + Last generated: 03-02-2010 20:03:03 UTC ----------------------------------------------------------------------------- } @@ -38,9 +38,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d8/JclDeveloperTools.bdsproj =================================================================== --- trunk/jcl/packages/d8/JclDeveloperTools.bdsproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d8/JclDeveloperTools.bdsproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -122,7 +122,7 @@ <Directories Name="PackageDLLOutputDir"></Directories> <Directories Name="PackageDCPOutputDir">..\..\lib\d8</Directories> <Directories Name="SearchPath">..\..\lib\d8;..\..\source\include</Directories> - <Directories Name="Packages">rtl;Jcl</Directories> + <Directories Name="Packages">rtl;Jcl;JclContainers</Directories> <Directories Name="Conditionals">RELEASE</Directories> <Directories Name="DebugSourceDirs"></Directories> <Directories Name="UsePackages">True</Directories> Modified: trunk/jcl/packages/d8/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d8/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -39,7 +39,8 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains Modified: trunk/jcl/packages/d9/JclDeveloperTools.bdsproj =================================================================== --- trunk/jcl/packages/d9/JclDeveloperTools.bdsproj 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d9/JclDeveloperTools.bdsproj 2010-02-03 20:09:46 UTC (rev 3168) @@ -122,7 +122,7 @@ <Directories Name="PackageDLLOutputDir"></Directories> <Directories Name="PackageDCPOutputDir">..\..\lib\d9</Directories> <Directories Name="SearchPath">..\..\lib\d9;..\..\source\include</Directories> - <Directories Name="Packages">rtl;Jcl</Directories> + <Directories Name="Packages">rtl;Jcl;JclContainers</Directories> <Directories Name="Conditionals">RELEASE</Directories> <Directories Name="DebugSourceDirs"></Directories> <Directories Name="UsePackages">True</Directories> Modified: trunk/jcl/packages/d9/JclDeveloperTools.dpk =================================================================== --- trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d9/JclDeveloperTools.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml) - Last generated: 03-02-2010 19:54:55 UTC + Last generated: 03-02-2010 20:05:47 UTC ----------------------------------------------------------------------------- } @@ -39,10 +39,14 @@ requires rtl, - Jcl + Jcl, + JclContainers ; contains + JppState in '..\..\devtools\jpp\JppState.pas' , + JppLexer in '..\..\devtools\jpp\JppLexer.pas' , + JppParser in '..\..\devtools\jpp\JppParser.pas' , JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' , JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' , JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' , Modified: trunk/jcl/packages/d9/JclRepositoryExpert.dpk =================================================================== --- trunk/jcl/packages/d9/JclRepositoryExpert.dpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d9/JclRepositoryExpert.dpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpert-D.xml) - Last generated: 02-02-2010 14:38:55 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -48,9 +48,6 @@ ; contains - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr =================================================================== --- trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr 2010-02-03 20:09:46 UTC (rev 3168) @@ -4,7 +4,7 @@ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR ALWAYS EDIT THE RELATED XML FILE (JclRepositoryExpertDLL-L.xml) - Last generated: 21-01-2010 17:29:47 UTC + Last generated: 03-02-2010 20:03:04 UTC ----------------------------------------------------------------------------- } @@ -38,9 +38,6 @@ uses ToolsAPI, - JppState in '..\..\devtools\jpp\JppState.pas' , - JppLexer in '..\..\devtools\jpp\JppLexer.pas' , - JppParser in '..\..\devtools\jpp\JppParser.pas' , JclOtaTemplates in '..\..\experts\repository\JclOtaTemplates.pas' , JclOtaRepositoryUtils in '..\..\experts\repository\JclOtaRepositoryUtils.pas' , JclOtaExcDlgRepository in '..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas' , Modified: trunk/jcl/packages/fpc/JclDeveloperTools.lpk =================================================================== --- trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/fpc/JclDeveloperTools.lpk 2010-02-03 20:09:46 UTC (rev 3168) @@ -61,13 +61,16 @@ <UnitName Value="MSHelpServices_TLB"/> </Item5> </Files> - <RequiredPkgs Count="2"> + <RequiredPkgs Count="3"> <Item1> <PackageName Value="FCL"/> </Item1> <Item2> <PackageName Value="Jcl"/> </Item2> + <Item3> + <PackageName Value="JclContainers"/> + </Item3> </RequiredPkgs> <UsageOptions> <UnitPath Value="$(PkgOutDir)\"/> Modified: trunk/jcl/packages/xml/JclDeveloperTools-R.xml =================================================================== --- trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/xml/JclDeveloperTools-R.xml 2010-02-03 20:09:46 UTC (rev 3168) @@ -12,8 +12,12 @@ <Package Name="rtl" Targets="Delphi,Bcb,Bds" Condition=""/> <Package Name="FCL" Targets="fpc" Condition=""/> <Package Name="Jcl-R" Targets="all" Condition=""/> + <Package Name="JclContainers-R" Targets="all" Condition=""/> </Requires> <Contains> + <File Name="..\..\devtools\jpp\JppState.pas" Targets="runtimeIDE" Formname="" Condition=""/> + <File Name="..\..\devtools\jpp\JppLexer.pas" Targets="runtimeIDE" Formname="" Condition=""/> + <File Name="..\..\devtools\jpp\JppParser.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\source\common\JclCompilerUtils.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclDevToolsResources.pas" Targets="all" Formname="" Condition=""/> <File Name="..\..\source\common\JclIDEUtils.pas" Targets="all" Formname="" Condition=""/> Modified: trunk/jcl/packages/xml/JclRepositoryExpert-D.xml =================================================================== --- trunk/jcl/packages/xml/JclRepositoryExpert-D.xml 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/xml/JclRepositoryExpert-D.xml 2010-02-03 20:09:46 UTC (rev 3168) @@ -16,9 +16,6 @@ <Package Name="JclDeveloperTools-R" Targets="all" Condition=""/> </Requires> <Contains> - <File Name="..\..\devtools\jpp\JppState.pas" Targets="runtimeIDE" Formname="" Condition=""/> - <File Name="..\..\devtools\jpp\JppLexer.pas" Targets="runtimeIDE" Formname="" Condition=""/> - <File Name="..\..\devtools\jpp\JppParser.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\experts\repository\JclOtaTemplates.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\experts\repository\JclOtaRepositoryUtils.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" Targets="runtimeIDE" Formname="" Condition=""/> Modified: trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml =================================================================== --- trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml 2010-02-03 20:00:25 UTC (rev 3167) +++ trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml 2010-02-03 20:09:46 UTC (rev 3168) @@ -16,9 +16,6 @@ <Package Name="JclDeveloperTools-R" Targets="all" Condition=""/> </Requires> <Contains> - <File Name="..\..\devtools\jpp\JppState.pas" Targets="runtimeIDE" Formname="" Condition=""/> - <File Name="..\..\devtools\jpp\JppLexer.pas" Targets="runtimeIDE" Formname="" Condition=""/> - <File Name="..\..\devtools\jpp\JppParser.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\experts\repository\JclOtaTemplates.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\experts\repository\JclOtaRepositoryUtils.pas" Targets="runtimeIDE" Formname="" Condition=""/> <File Name="..\..\experts\repository\ExceptionDialog\JclOtaExcDlgRepository.pas" Targets="runtimeIDE" Formname="" Condition=""/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |