Menu
▾
▴
jcl-checkins-diff — SVN file check-in notifications with file differences included
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...> - 2006-08-03 15:06:25
|
Revision: 1708 Author: outchy Date: 2006-08-03 08:06:11 -0700 (Thu, 03 Aug 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1708&view=rev Log Message: ----------- updated default values Modified Paths: -------------- trunk/jcl/source/jcld5.inc Modified: trunk/jcl/source/jcld5.inc =================================================================== --- trunk/jcl/source/jcld5.inc 2006-08-03 14:36:17 UTC (rev 1707) +++ trunk/jcl/source/jcld5.inc 2006-08-03 15:06:11 UTC (rev 1708) @@ -47,7 +47,7 @@ // JclHookExcept support for hooking exceptions from DLLs -{$DEFINE HOOK_DLL_EXCEPTIONS} +{.$DEFINE HOOK_DLL_EXCEPTIONS} //Threadsafe directive (added for DCL support) @@ -59,7 +59,7 @@ //Support for JclUnitVersioning.pas) -{.$DEFINE UNITVERSIONING} +{$DEFINE UNITVERSIONING} // debug sources // defining these symbols will the debug source to be automatically registered This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-08-03 14:36:33
|
Revision: 1707 Author: outchy Date: 2006-08-03 07:36:17 -0700 (Thu, 03 Aug 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1707&view=rev Log Message: ----------- default values for EDI_WEAK_PACKAGE_UNITS Modified Paths: -------------- trunk/jcl/source/jclc5.inc trunk/jcl/source/jclc6.inc trunk/jcl/source/jclcs1.inc trunk/jcl/source/jcld10.inc trunk/jcl/source/jcld10.net.inc trunk/jcl/source/jcld6.inc trunk/jcl/source/jcld7.inc trunk/jcl/source/jcld9.inc trunk/jcl/source/jcld9.net.inc Modified: trunk/jcl/source/jclc5.inc =================================================================== --- trunk/jcl/source/jclc5.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jclc5.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,5 +70,5 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jclc6.inc =================================================================== --- trunk/jcl/source/jclc6.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jclc6.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jclcs1.inc =================================================================== --- trunk/jcl/source/jclcs1.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jclcs1.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld10.inc =================================================================== --- trunk/jcl/source/jcld10.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jcld10.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld10.net.inc =================================================================== --- trunk/jcl/source/jcld10.net.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jcld10.net.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -65,4 +65,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld6.inc =================================================================== --- trunk/jcl/source/jcld6.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jcld6.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld7.inc =================================================================== --- trunk/jcl/source/jcld7.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jcld7.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld9.inc =================================================================== --- trunk/jcl/source/jcld9.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jcld9.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld9.net.inc =================================================================== --- trunk/jcl/source/jcld9.net.inc 2006-08-03 14:10:29 UTC (rev 1706) +++ trunk/jcl/source/jcld9.net.inc 2006-08-03 14:36:17 UTC (rev 1707) @@ -70,4 +70,4 @@ {.$DEFINE DEBUG_NO_SYMBOLS} // mark EDI units as weak package units (to avoid conflicts with the EDI package) -{$DEFINE EDI_WEAK_PACKAGE_UNITS} +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-08-03 14:10:41
|
Revision: 1706 Author: marquardt Date: 2006-08-03 07:10:29 -0700 (Thu, 03 Aug 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1706&view=rev Log Message: ----------- style cleaning Modified Paths: -------------- trunk/jcl/source/common/JclComplex.pas Modified: trunk/jcl/source/common/JclComplex.pas =================================================================== --- trunk/jcl/source/common/JclComplex.pas 2006-08-03 06:27:08 UTC (rev 1705) +++ trunk/jcl/source/common/JclComplex.pas 2006-08-03 14:10:29 UTC (rev 1706) @@ -307,19 +307,17 @@ FCoord.Y := FCoord.R * Sin(FCoord.Theta); end; crRectangular: + if FCoord.X = 0.0 then begin - if FCoord.X = 0.0 then - begin - FCoord.R := Abs(FCoord.Y); - FCoord.Theta := PiOn2 * Sgn(FCoord.Y); - end - else - begin - FCoord.R := AbsoluteValue; - FCoord.Theta := {$IFDEF CLR}Borland.Delphi.{$ENDIF}System.ArcTan(FCoord.Y / FCoord.X); - if FCoord.X < 0.0 then - FCoord.Theta := FCoord.Theta + Pi * Sgn(FCoord.Y); - end; + FCoord.R := Abs(FCoord.Y); + FCoord.Theta := PiOn2 * Sgn(FCoord.Y); + end + else + begin + FCoord.R := AbsoluteValue; + FCoord.Theta := {$IFDEF CLR}Borland.Delphi.{$ENDIF}System.ArcTan(FCoord.Y / FCoord.X); + if FCoord.X < 0.0 then + FCoord.Theta := FCoord.Theta + Pi * Sgn(FCoord.Y); end; end; MiscalcComplex; @@ -367,6 +365,8 @@ end; function TJclComplex.GetRectangularString: string; +const + cImaginary = 'i'; begin MiscalcComplex; if (FCoord.X = 0.0) and (FCoord.Y = 0.0) then @@ -381,10 +381,10 @@ if FCoord.Y < 0.0 then Result := Result + '-'; if FCoord.Y <> 0.0 then - Result := Result + FormatExtended(Abs(FCoord.Y)) + 'i'; + Result := Result + FormatExtended(Abs(FCoord.Y)) + cImaginary; end else - Result := FormatExtended(FCoord.Y) + 'i'; + Result := FormatExtended(FCoord.Y) + cImaginary; end; function TJclComplex.GetPolarString: string; @@ -1305,23 +1305,23 @@ function TJclComplex.CoreI0(const Value: TRectCoord): TRectCoord; var - zSQR25, term: TRectCoord; - i: Integer; + ZSqr25, Term: TRectCoord; + I: Integer; SizeSqr: Float; begin Result := RectOne; - zSQR25 := CoreMul(Value, Value); - zSQR25 := RectCoord(0.25 * zSQR25.X, 0.25 * zSQR25.Y); - term := zSQR25; - Result := CoreAdd(Result, zSQR25); - i := 1; + ZSqr25 := CoreMul(Value, Value); + ZSqr25 := RectCoord(0.25 * ZSqr25.X, 0.25 * ZSqr25.Y); + Term := ZSqr25; + Result := CoreAdd(Result, ZSqr25); + I := 1; repeat - term := CoreMul(zSQR25, term); - Inc(i); - term := RectCoord(term.X / Sqr(i), term.Y / Sqr(i)); - Result := CoreAdd(Result, term); - SizeSqr := Sqr(term.X) + Sqr(term.Y); - until (i > MaxTerm) or (SizeSqr < EpsilonSqr) + Term := CoreMul(ZSqr25, Term); + Inc(I); + Term := RectCoord(Term.X / Sqr(I), Term.Y / Sqr(I)); + Result := CoreAdd(Result, Term); + SizeSqr := Sqr(Term.X) + Sqr(Term.Y); + until (I > MaxTerm) or (SizeSqr < EpsilonSqr); end; function TJclComplex.CI0: TJclComplex; @@ -1345,29 +1345,29 @@ function TJclComplex.CoreJ0(const Value: TRectCoord): TRectCoord; var - zSQR25, term: TRectCoord; - i: Integer; + ZSqr25, Term: TRectCoord; + I: Integer; SizeSqr: Float; - addFlag: Boolean; + AddFlag: Boolean; begin Result := RectOne; - zSQR25 := CoreMul(Value, Value); - zSQR25 := RectCoord(0.25 * zSQR25.X, 0.25 * zSQR25.Y); - term := zSQR25; - Result := CoreSub(Result, zSQR25); - addFlag := False; - i := 1; + ZSqr25 := CoreMul(Value, Value); + ZSqr25 := RectCoord(0.25 * ZSqr25.X, 0.25 * ZSqr25.Y); + Term := ZSqr25; + Result := CoreSub(Result, ZSqr25); + AddFlag := False; + I := 1; repeat - term := CoreMul(zSQR25, term); - Inc(i); - addFlag := not addFlag; - term := RectCoord(term.X / Sqr(i), term.Y / Sqr(i)); - if addFlag then - Result := CoreAdd(Result, term) + Term := CoreMul(ZSqr25, Term); + Inc(I); + AddFlag := not AddFlag; + Term := RectCoord(Term.X / Sqr(I), Term.Y / Sqr(I)); + if AddFlag then + Result := CoreAdd(Result, Term) else - Result := CoreSub(Result, term); - SizeSqr := Sqr(term.X) + Sqr(term.Y); - until (i > MaxTerm) or (SizeSqr < EpsilonSqr) + Result := CoreSub(Result, Term); + SizeSqr := Sqr(Term.X) + Sqr(Term.Y); + until (I > MaxTerm) or (SizeSqr < EpsilonSqr); end; function TJclComplex.CJ0: TJclComplex; @@ -1391,29 +1391,29 @@ function TJclComplex.CoreApproxLnGamma(const Value: TRectCoord): TRectCoord; const - c: array [1..8] of Float = + C: array [1..8] of Float = (1.0 / 12.0, -1.0 / 360.0, 1.0 / 1260.0, -1.0 / 1680.0, 1.0 / 1188.0, -691.0 / 360360.0, 1.0 / 156.0, -3617.0 / 122400.0); var - i: Integer; + I: Integer; Powers: array [1..8] of TRectCoord; - temp1, temp2: TRectCoord; + Temp1, Temp2: TRectCoord; begin - temp1 := CoreLn(Value); - temp2 := RectCoord(Value.X - 0.5, Value.Y); - Result := CoreAdd(temp1, temp2); + Temp1 := CoreLn(Value); + Temp2 := RectCoord(Value.X - 0.5, Value.Y); + Result := CoreAdd(Temp1, Temp2); Result := CoreSub(Result, Value); Result.X := Result.X + hLn2PI; - temp1 := RectOne; - Powers[1] := CoreDiv(temp1, Value); - temp2 := CoreMul(powers[1], Powers[1]); - for i := 2 to 8 do - Powers[i] := CoreMul(Powers[i - 1], temp2); - for i := 8 downto 1 do + Temp1 := RectOne; + Powers[1] := CoreDiv(Temp1, Value); + Temp2 := CoreMul(powers[1], Powers[1]); + for I := 2 to 8 do + Powers[I] := CoreMul(Powers[I - 1], Temp2); + for I := 8 downto 1 do begin - temp1 := RectCoord(c[i] * Powers[i].X, c[i] * Powers[i].Y); - Result := CoreAdd(Result, temp1); + Temp1 := RectCoord(C[I] * Powers[I].X, C[I] * Powers[I].Y); + Result := CoreAdd(Result, Temp1); end; end; @@ -1438,7 +1438,7 @@ function TJclComplex.CoreLnGamma(Value: TRectCoord): TRectCoord; var - lna, temp: TRectCoord; + LNA, Temp: TRectCoord; begin if (Value.X <= 0.0) and (MiscalcSingle(Value.Y) = 0.0) then if MiscalcSingle(Int(Value.X - 1E-8) - Value.X) = 0.0 then @@ -1457,10 +1457,10 @@ begin if Value.X < 9.0 then begin - lna := CoreLn(Value); + LNA := CoreLn(Value); Value := RectCoord(Value.X + 1, Value.Y); - temp := CoreLnGamma(Value); - Result := CoreSub(temp, lna); + Temp := CoreLnGamma(Value); + Result := CoreSub(Temp, LNA); end else CoreApproxLnGamma(Value); @@ -1488,16 +1488,16 @@ function TJclComplex.CoreGamma(const Value: TRectCoord): TRectCoord; var - lnz: TRectCoord; + LNZ: TRectCoord; begin - lnz := CoreLnGamma(Value); - if lnz.X > 75.0 then + LNZ := CoreLnGamma(Value); + if LNZ.X > 75.0 then Result := RectInfinity else - if lnz.X < -200.0 then + if LNZ.X < -200.0 then Result := RectZero else - Result := CoreExp(lnz); + Result := CoreExp(LNZ); end; function TJclComplex.CGamma: TJclComplex; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-08-03 06:27:19
|
Revision: 1705 Author: marquardt Date: 2006-08-02 23:27:08 -0700 (Wed, 02 Aug 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1705&view=rev Log Message: ----------- style cleaning Modified Paths: -------------- trunk/jcl/source/common/JclBorlandTools.pas Modified: trunk/jcl/source/common/JclBorlandTools.pas =================================================================== --- trunk/jcl/source/common/JclBorlandTools.pas 2006-07-31 11:20:47 UTC (rev 1704) +++ trunk/jcl/source/common/JclBorlandTools.pas 2006-08-03 06:27:08 UTC (rev 1705) @@ -73,7 +73,7 @@ // Various definitions type - EJclBorRADException = class (Exception); + EJclBorRADException = class(Exception); TJclBorRADToolKind = (brDelphi, brCppBuilder, brBorlandDevStudio); {$IFDEF KYLIX} @@ -84,9 +84,9 @@ TJclBorRADToolPath = string; const - SupportedDelphiVersions = [5, 6, 7, 8, 9, 10]; - SupportedBCBVersions = [5, 6, 10]; - SupportedBDSVersions = [1, 2, 3, 4]; + SupportedDelphiVersions = [5, 6, 7, 8, 9, 10]; + SupportedBCBVersions = [5, 6, 10]; + SupportedBDSVersions = [1, 2, 3, 4]; // Object Repository BorRADToolRepositoryPagesSection = 'Repository Pages'; @@ -139,16 +139,16 @@ ProjectTypeLibrary = 'library'; ProjectTypeProgram = 'program'; - Personality32Bit = '32 bit'; - Personality64Bit = '64 bit'; - PersonalityDelphi = 'Delphi'; + Personality32Bit = '32 bit'; + Personality64Bit = '64 bit'; + PersonalityDelphi = 'Delphi'; PersonalityDelphiDotNet = 'Delphi.net'; - PersonalityBCB = 'C++Builder'; - PersonalityCSB = 'C#Builder'; - PersonalityVB = 'Visual Basic'; - PersonalityDesign = 'Design'; - PersonalityUnknown = 'Unknown personality'; - PersonalityBDS = 'Borland Developer Studio'; + PersonalityBCB = 'C++Builder'; + PersonalityCSB = 'C#Builder'; + PersonalityVB = 'Visual Basic'; + PersonalityDesign = 'Design'; + PersonalityUnknown = 'Unknown personality'; + PersonalityBDS = 'Borland Developer Studio'; DOFDirectoriesSection = 'Directories'; DOFUnitOutputDirKey = 'UnitOutputDir'; @@ -181,23 +181,25 @@ const JclBorPersonalityDescription: array [TJclBorPersonality] of string = - ( Personality32Bit + ' ' + PersonalityDelphi, - Personality64Bit + ' ' + PersonalityDelphi, - Personality32Bit + ' ' + PersonalityBCB, - Personality64Bit + ' ' + PersonalityBCB, - Personality32Bit + ' ' + PersonalityDelphiDotNet, - Personality64Bit + ' ' + PersonalityDelphiDotNet, - Personality32Bit + ' ' + PersonalityCSB, - Personality64Bit + ' ' + PersonalityCSB, - Personality32Bit + ' ' + PersonalityVB, - Personality64Bit + ' ' + PersonalityVB, - PersonalityDesign, - PersonalityUnknown ); + ( + Personality32Bit + ' ' + PersonalityDelphi, + Personality64Bit + ' ' + PersonalityDelphi, + Personality32Bit + ' ' + PersonalityBCB, + Personality64Bit + ' ' + PersonalityBCB, + Personality32Bit + ' ' + PersonalityDelphiDotNet, + Personality64Bit + ' ' + PersonalityDelphiDotNet, + Personality32Bit + ' ' + PersonalityCSB, + Personality64Bit + ' ' + PersonalityCSB, + Personality32Bit + ' ' + PersonalityVB, + Personality64Bit + ' ' + PersonalityVB, + PersonalityDesign, + PersonalityUnknown + ); JclBorDesignerDescription: array [TJclBorDesigner] of string = - ( DesignerVCL, DesignerCLX ); + (DesignerVCL, DesignerCLX); JclBorDesignerFormExtension: array [TJclBorDesigner] of string = - ( SourceExtensionDFM, SourceExtensionXFM ); + (SourceExtensionDFM, SourceExtensionXFM); type TJclBorRADToolInstallation = class; @@ -249,8 +251,7 @@ destructor Destroy; override; function CreateTransaction: Boolean; function CommitTransaction: Boolean; - function RegisterNameSpace(const Name, Collection, - Description: WideString): Boolean; + function RegisterNameSpace(const Name, Collection, Description: WideString): Boolean; function UnregisterNameSpace(const Name: WideString): Boolean; function RegisterHelpFile(const NameSpace, Identifier: WideString; const LangId: Integer; const HxSFile, HxIFile: WideString): Boolean; @@ -487,7 +488,6 @@ property Pages: TStrings read GetPages; end; - TCommandLineTool = (clAsm, clBcc32, clDcc32, clDccIL, clMake, clProj2Mak); TCommandLineTools = set of TCommandLineTool; @@ -1034,8 +1034,8 @@ BinaryExtension := BinaryExtensionLibrary; if AnsiStrLIComp(PChar(S), DelphiBinaryExtOption, Length(DelphiBinaryExtOption)) = 0 then BinaryExtension := StrTrimQuotes(Copy(S, Length(DelphiBinaryExtOption), Length(S) - Length(DelphiBinaryExtOption))); - if Assigned(LibSuffix) - and (AnsiStrLIComp(PChar(S), DelphiLibSuffixOption, Length(DelphiLibSuffixOption)) = 0) then + if Assigned(LibSuffix) and + (AnsiStrLIComp(PChar(S), DelphiLibSuffixOption, Length(DelphiLibSuffixOption)) = 0) then LibSuffix^ := StrTrimQuotes(Copy(S, Length(DelphiLibSuffixOption), Length(S) - Length(DelphiLibSuffixOption))); end; finally @@ -1049,7 +1049,7 @@ I, J: Integer; S, SubS1, SubS2, SubS3: string; BPKFile: TStringList; - LProjectPos, BinaryFileNamePos, EndFileNamePos, LFlagsPos, DSwitchPos, + LProjectPos, BinaryFileNamePos, EndFileNamePos, LFlagsPos, DSwitchPos: Integer; SemiColonPos, AmpPos: Integer; begin BPKFile := TStringList.Create; @@ -1062,14 +1062,14 @@ begin S := BPKFile[I]; - LProjectPos := Pos(BCBProjectOption,S); - if (LProjectPos > 0) then + LProjectPos := Pos(BCBProjectOption, S); + if LProjectPos > 0 then begin - SubS1 := Copy(S,LProjectPos,Length(S)); + SubS1 := Copy(S, LProjectPos, Length(S)); J := 1; - while (Pos('>',SubS1) = 0) and ((I+J)<BPKFile.Count) do + while (Pos('>', SubS1) = 0) and ((I + J) < BPKFile.Count) do begin - SubS1 := SubS1 + BPKFile[I+J]; + SubS1 := SubS1 + BPKFile[I + J]; Inc(J); end; @@ -1084,27 +1084,27 @@ end; end; - LFlagsPos := Pos(BCBLFlagsOption,S); - if (LFlagsPos > 0) then + LFlagsPos := Pos(BCBLFlagsOption, S); + if LFlagsPos > 0 then begin - SubS1 := Copy(S,LFlagsPos,Length(S)); + SubS1 := Copy(S, LFlagsPos, Length(S)); J := 1; - while (Pos('>',SubS1) = 0) and ((I+J)<BPKFile.Count) do + while (Pos('>', SubS1) = 0) and ((I + J) < BPKFile.Count) do begin - SubS1 := SubS1 + BPKFile[I+J]; + SubS1 := SubS1 + BPKFile[I + J]; Inc(J); end; - DSwitchPos := Pos(BCBDSwitchOption,SubS1); + DSwitchPos := Pos(BCBDSwitchOption, SubS1); if DSwitchPos > 0 then begin - SubS2 := Copy(SubS1,DSwitchPos,Length(SubS1)); - SemiColonPos := Pos(';',SubS2); + SubS2 := Copy(SubS1, DSwitchPos, Length(SubS1)); + SemiColonPos := Pos(';', SubS2); if SemiColonPos > 0 then begin - SubS3 := Copy(SubS2,SemiColonPos+1,Length(SubS2)); - AmpPos := Pos('&',SubS3); + SubS3 := Copy(SubS2, SemiColonPos+1, Length(SubS2)); + AmpPos := Pos('&', SubS3); if (Description <> nil) and (AmpPos > 0) then - Description^ := Copy(SubS3,1,AmpPos-1); + Description^ := Copy(SubS3, 1, AmpPos - 1); end; end; end; @@ -1167,14 +1167,14 @@ begin S := BPKFile[I]; - LProjectPos := Pos(BCBProjectOption,S); + LProjectPos := Pos(BCBProjectOption, S); if Assigned(BinaryFileName) and (LProjectPos > 0) then begin - SubS1 := Copy(S,LProjectPos,Length(S)); + SubS1 := Copy(S,LProjectPos, Length(S)); J := 1; - while (Pos('>',SubS1) = 0) and ((I+J)<BPKFile.Count) do + while (Pos('>', SubS1) = 0) and ((I + J) < BPKFile.Count) do begin - SubS1 := SubS1 + BPKFile[I+J]; + SubS1 := SubS1 + BPKFile[I + J]; Inc(J); end; @@ -1189,28 +1189,28 @@ end; end; - LFlagsPos := Pos(BCBLFlagsOption,S); - if (LFlagsPos > 0) then + LFlagsPos := Pos(BCBLFlagsOption, S); + if LFlagsPos > 0 then begin - SubS1 := Copy(S,LFlagsPos,Length(S)); + SubS1 := Copy(S, LFlagsPos, Length(S)); J := 1; - while (Pos('>',SubS1) = 0) and ((I+J)<BPKFile.Count) do + while (Pos('>', SubS1) = 0) and ((I + J) < BPKFile.Count) do begin - SubS1 := SubS1 + BPKFile[I+J]; + SubS1 := SubS1 + BPKFile[I + J]; Inc(J); end; - DSwitchPos := Pos(BCBDSwitchOption,SubS1); - GprPos := Pos(BCBGprSwitchOption,SubS1); + DSwitchPos := Pos(BCBDSwitchOption, SubS1); + GprPos := Pos(BCBGprSwitchOption, SubS1); if DSwitchPos > 0 then begin - SubS2 := Copy(SubS1,DSwitchPos,Length(SubS1)); - SemiColonPos := Pos(';',SubS2); + SubS2 := Copy(SubS1, DSwitchPos, Length(SubS1)); + SemiColonPos := Pos(';', SubS2); if SemiColonPos > 0 then begin - SubS3 := Copy(SubS2,SemiColonPos+1,Length(SubS2)); - AmpPos := Pos('&',SubS3); + SubS3 := Copy(SubS2, SemiColonPos + 1, Length(SubS2)); + AmpPos := Pos('&', SubS3); if (Description <> nil) and (AmpPos > 0) then - Description^ := Copy(SubS3,1,AmpPos-1); + Description^ := Copy(SubS3, 1, AmpPos - 1); end; end; if GprPos > 0 then @@ -1427,12 +1427,12 @@ with Installation do begin case RadToolKind of - brDelphi : + brDelphi: if VersionNumber <= 6 then S := 'delphi' else S := 'd'; - brCppBuilder : + brCppBuilder: S := 'bcb'; else //brBorlandDevStudio : @@ -1498,19 +1498,6 @@ Help2BorlandNameSpace = 'Borland.BDS%d'; Help2DefaultKeyWord = '_DEFAULT'; -function TJclHelp2Manager.CommitTransaction: Boolean; -begin - Result := RequireObject([hoRegisterSession]); - if Result then - begin - try - FHxRegisterSession.CommitTransaction; - except - Result := False; - end; - end; -end; - constructor TJclHelp2Manager.Create(AInstallation: TJclBorRADToolInstallation); begin inherited Create(AInstallation); @@ -1524,25 +1511,38 @@ Create(nil); end; -function TJclHelp2Manager.CreateTransaction: Boolean; +destructor TJclHelp2Manager.Destroy; begin + FHxRegisterSession := nil; + FHxRegister := nil; + FHxPlugin := nil; + inherited Destroy; +end; + +function TJclHelp2Manager.CommitTransaction: Boolean; +begin Result := RequireObject([hoRegisterSession]); if Result then begin try - FHxRegisterSession.CreateTransaction(''); + FHxRegisterSession.CommitTransaction; except Result := False; end; end; end; -destructor TJclHelp2Manager.Destroy; +function TJclHelp2Manager.CreateTransaction: Boolean; begin - FHxRegisterSession := nil; - FHxRegister := nil; - FHxPlugin := nil; - inherited Destroy; + Result := RequireObject([hoRegisterSession]); + if Result then + begin + try + FHxRegisterSession.CreateTransaction(''); + except + Result := False; + end; + end; end; function TJclHelp2Manager.GetHxPlugin: IHxPlugin; @@ -1563,8 +1563,7 @@ Result := FHxRegisterSession; end; -function TJclHelp2Manager.PlugNameSpaceIn(const SourceNameSpace, - TargetNameSpace: WideString): Boolean; +function TJclHelp2Manager.PlugNameSpaceIn(const SourceNameSpace, TargetNameSpace: WideString): Boolean; var Help2Default: WideString; begin @@ -1584,13 +1583,12 @@ function TJclHelp2Manager.PlugNameSpaceInBorlandHelp( const NameSpace: WideString): Boolean; begin - Result := Assigned(FInstallation) and (Installation.RadToolKind = brBorlandDevStudio) - and PlugNameSpaceIn(NameSpace, Format(Help2BorlandNameSpace, [Installation.VersionNumber])); + Result := Assigned(FInstallation) and (Installation.RadToolKind = brBorlandDevStudio) and + PlugNameSpaceIn(NameSpace, Format(Help2BorlandNameSpace, [Installation.VersionNumber])); end; -function TJclHelp2Manager.RegisterHelpFile(const NameSpace, - Identifier: WideString; const LangId: Integer; const HxSFile, - HxIFile: WideString): Boolean; +function TJclHelp2Manager.RegisterHelpFile(const NameSpace, Identifier: WideString; + const LangId: Integer; const HxSFile, HxIFile: WideString): Boolean; begin Result := RequireObject([hoRegister]); if Result then @@ -1604,8 +1602,7 @@ end; end; -function TJclHelp2Manager.RegisterNameSpace(const Name, Collection, - Description: WideString): Boolean; +function TJclHelp2Manager.RegisterNameSpace(const Name, Collection, Description: WideString): Boolean; begin Result := RequireObject([hoRegister]); if Result then @@ -1621,7 +1618,7 @@ function TJclHelp2Manager.RequireObject(HelpObjects: TJclHelp2Objects): Boolean; begin // dependencies - if (hoRegister in HelpObjects) or (hoPlugin in HelpObjects)then + if (hoRegister in HelpObjects) or (hoPlugin in HelpObjects) then Include(HelpObjects, hoRegisterSession); Result := True; @@ -1638,7 +1635,8 @@ if Result and (hoRegister in HelpObjects) and not Assigned(FHxRegister) then begin try - Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxRegister), IHxRegister, FHxRegister); + Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxRegister), + IHxRegister, FHxRegister); except Result := False; end; @@ -1647,15 +1645,15 @@ if Result and (hoPlugin in HelpObjects) and not Assigned(FHxPlugin) then begin try - Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxPlugIn), IHxPlugin, FHxPlugin); + Result := Supports(FHxRegisterSession.GetRegistrationObject(HxRegisterSession_IHxPlugIn), + IHxPlugin, FHxPlugin); except Result := False; end; end; end; -function TJclHelp2Manager.UnPlugNameSpace(const SourceNameSpace, - TargetNameSpace: WideString): Boolean; +function TJclHelp2Manager.UnPlugNameSpace(const SourceNameSpace, TargetNameSpace: WideString): Boolean; var Help2Default: WideString; begin @@ -1672,15 +1670,14 @@ end; end; -function TJclHelp2Manager.UnPlugNameSpaceFromBorlandHelp( - const NameSpace: WideString): Boolean; +function TJclHelp2Manager.UnPlugNameSpaceFromBorlandHelp(const NameSpace: WideString): Boolean; begin - Result := Assigned(FInstallation) and (Installation.RadToolKind = brBorlandDevStudio) - and UnPlugNameSpace(NameSpace, Format(Help2BorlandNameSpace, [Installation.VersionNumber])); + Result := Assigned(FInstallation) and (Installation.RadToolKind = brBorlandDevStudio) and + UnPlugNameSpace(NameSpace, Format(Help2BorlandNameSpace, [Installation.VersionNumber])); end; -function TJclHelp2Manager.UnregisterHelpFile(const NameSpace, - Identifier: WideString; const LangId: Integer): Boolean; +function TJclHelp2Manager.UnregisterHelpFile(const NameSpace, Identifier: WideString; + const LangId: Integer): Boolean; begin Result := RequireObject([hoRegister]); if Result then @@ -1783,10 +1780,10 @@ begin for I := Index to Count - 2 do begin - Parameters[I] := Parameters[I+1]; - Path[I] := Path[I+1]; - Title[I] := Title[I+1]; - WorkingDir[Index] := WorkingDir[I+1]; + Parameters[I] := Parameters[I + 1]; + Path[I] := Path[I + 1]; + Title[I] := Title[I + 1]; + WorkingDir[Index] := WorkingDir[I + 1]; end; Count := Count - 1; end; @@ -1858,8 +1855,7 @@ ReadPackages; end; -function TJclBorRADToolIdePackages.AddExpert(const FileName, - Description: string): Boolean; +function TJclBorRADToolIdePackages.AddExpert(const FileName, Description: string): Boolean; begin Result := True; RemoveDisabled(FileName); @@ -1885,8 +1881,7 @@ Result := FExperts.Count; end; -function TJclBorRADToolIdePackages.GetExpertDescriptions( - Index: Integer): string; +function TJclBorRADToolIdePackages.GetExpertDescriptions(Index: Integer): string; begin Result := FExperts.Names[Index]; end; @@ -1932,6 +1927,8 @@ end; procedure TJclBorRADToolIdePackages.ReadPackages; +var + I: Integer; procedure ReadPackageList(const Name: string; List: TStringList); var @@ -1944,8 +1941,6 @@ List.Sorted := ListIsSorted; end; -var - I: Integer; begin if (Installation.RadToolKind = brBorlandDevStudio) then ReadPackageList(KnownIDEPackagesKeyName, FKnownIDEPackages); @@ -1970,8 +1965,7 @@ end; end; -function TJclBorRADToolIdePackages.RemoveExpert( - const FileName: string): Boolean; +function TJclBorRADToolIdePackages.RemoveExpert(const FileName: string): Boolean; var I: Integer; KnownExpertDescription, KnownExpert, KnownExpertFileName: string; @@ -2167,8 +2161,7 @@ procedure TJclDCC32.AddProjectOptions(const ProjectFileName, DCPPath: string); var - SearchPath, DynamicPackages, SearchDcpPath, ConfigurationFileName, - OptionsFileName: string; + SearchPath, DynamicPackages, SearchDcpPath, ConfigurationFileName, OptionsFileName: string; OptionsFile: TIniFile; begin ConfigurationFileName := ChangeFileExt(ProjectFileName, ConfigurationExtension); @@ -2208,11 +2201,11 @@ begin {$IFDEF MSWINDOWS} // quotes not required with short path names - Result := Execute(PathGetShortName(ExtractFileDir(ProjectFileName)) - + DirDelimiter + ExtractFileName(ProjectFileName)); + Result := Execute(PathGetShortName(ExtractFileDir(ProjectFileName)) + + DirDelimiter + ExtractFileName(ProjectFileName)); {$ELSE} Result := Execute(StrDoubleQuote(StrTrimQuotes(ProjectFileName))); - {$ENDIF} + {$ENDIF MSWINDOWS} end; constructor TJclDCC32.Create(AInstallation: TJclBorRADToolInstallation); @@ -2238,6 +2231,11 @@ procedure TJclDCC32.SaveOptionsToFile(const ConfigFileName: string); {$IFDEF MSWINDOWS} +var + I, J: Integer; + List: TStringList; + S: string; + F: TextFile; function IsPathOption(const S: string; out Len: Integer): Boolean; begin @@ -2266,11 +2264,6 @@ end; end; -var - I, J: Integer; - List: TStringList; - S: string; - F: TextFile; begin if Assigned(FOnBeforeSaveOptionsToFile) then FOnBeforeSaveOptionsToFile(Self); @@ -2294,10 +2287,10 @@ Write(F, List[J], PathSep); Write(F, List[List.Count - 1]); end; - WriteLn(F, '"'); + Writeln(F, '"'); end else - WriteLn(F, S); + Writeln(F, S); end; finally List.Free; @@ -2316,7 +2309,7 @@ Result := DCC32ExeName; end; -function TJclDCC32.MakePackage(const PackageName, BPLPath, DCPPath: string; ExtraOptions:string): Boolean; +function TJclDCC32.MakePackage(const PackageName, BPLPath, DCPPath: string; ExtraOptions: string): Boolean; var SaveDir: string; begin @@ -2360,8 +2353,8 @@ begin AddPathOption('U', Installation.LibFolderName + PathAddSeparator('obj')); {$IFNDEF KYLIX} - if (Installation.RadToolKind <> brBorlandDevStudio) - and (Installation.VersionNumber = 5) then + if (Installation.RadToolKind <> brBorlandDevStudio) and + (Installation.VersionNumber = 5) then Options.Add('-LUvcl50') else Options.Add('-LUrtl'); @@ -2557,8 +2550,7 @@ FIniFile.WriteString(SectionName, BorRADToolRepositoryObjectAuthor, Author); if Ancestor <> '' then FIniFile.WriteString(SectionName, BorRADToolRepositoryObjectAncestor, Ancestor); - if (Installation.RadToolKind = brBorlandDevStudio) - or (Installation.VersionNumber >= 6) then + if (Installation.RadToolKind = brBorlandDevStudio) or (Installation.VersionNumber >= 6) then FIniFile.WriteString(SectionName, BorRADToolRepositoryObjectDesigner, Designer); FIniFile.WriteBool(SectionName, BorRADToolRepositoryObjectNewForm, False); FIniFile.WriteBool(SectionName, BorRADToolRepositoryObjectMainForm, False); @@ -2578,12 +2570,10 @@ if I >= 0 then Result := Pages[I] else - begin - if OptionalIndex < Pages.Count then - Result := Pages[OptionalIndex] - else - Result := ''; - end; + if OptionalIndex < Pages.Count then + Result := Pages[OptionalIndex] + else + Result := ''; end; function TJclBorRADToolRepository.GetIniFile: TIniFile; @@ -2746,8 +2736,7 @@ StrToStrings(Path, PathSep, List); end; -function TJclBorRADToolInstallation.CompileBCBPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.CompileBCBPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var SaveDir, PackagePath, MakeFileName, BinaryFileName: string; RunOnly: Boolean; @@ -2776,8 +2765,9 @@ GetBPKFileInfo(PackageName, RunOnly, @BinaryFileName); - Result := Result and Make.Execute(Format('%s -f%s', [StringsToStr(Make.Options, ' '), StrDoubleQuote(MakeFileName)])) - and ProcessMapFile(PathAddSeparator(BPLPath) + BinaryFileName); + Result := Result and + Make.Execute(Format('%s -f%s', [StringsToStr(Make.Options, ' '), StrDoubleQuote(MakeFileName)])) and + ProcessMapFile(PathAddSeparator(BPLPath) + BinaryFileName); finally SetCurrentDir(SaveDir); end; @@ -2788,8 +2778,7 @@ OutputString(RsCompilationFailed); end; -function TJclBorRADToolInstallation.CompileBCBProject(const ProjectName, - OutputDir, DcpSearchPath: string): Boolean; +function TJclBorRADToolInstallation.CompileBCBProject(const ProjectName, OutputDir, DcpSearchPath: string): Boolean; var SaveDir, PackagePath, MakeFileName, BinaryFileName: string; begin @@ -2815,8 +2804,9 @@ GetBPRFileInfo(ProjectName, BinaryFileName); - Result := Result and Make.Execute(Format('%s -f%s', [StringsToStr(Make.Options, ' '), StrDoubleQuote(MakeFileName)])) - and ProcessMapFile(PathAddSeparator(OutputDir) + BinaryFileName); + Result := Result and + Make.Execute(Format('%s -f%s', [StringsToStr(Make.Options, ' '), StrDoubleQuote(MakeFileName)])) and + ProcessMapFile(PathAddSeparator(OutputDir) + BinaryFileName); finally SetCurrentDir(SaveDir); end; @@ -2850,10 +2840,11 @@ NewOptions := ExtraOptions; GetDPKFileInfo(PackageName, RunOnly, @LibSuffix); - BinaryFileName := PathAddSeparator(BPLPath) + PathExtractFileNameNoExt(PackageName) + LibSuffix + BinaryExtensionPackage; + BinaryFileName := PathAddSeparator(BPLPath) + + PathExtractFileNameNoExt(PackageName) + LibSuffix + BinaryExtensionPackage; - Result := DCC32.MakePackage(PackageName, BPLPath, DCPPath, NewOptions) - and ProcessMapFile(BinaryFileName); + Result := DCC32.MakePackage(PackageName, BPLPath, DCPPath, NewOptions) and + ProcessMapFile(BinaryFileName); if Result then OutputString(RsCompilationOk) @@ -2877,10 +2868,11 @@ ExtraOptions := ''; GetDPRFileInfo(ProjectName, BinaryExtension, @LibSuffix); - BinaryFileName := PathAddSeparator(OutputDir) + PathExtractFileNameNoExt(ProjectName) + LibSuffix + BinaryExtension; + BinaryFileName := PathAddSeparator(OutputDir) + + PathExtractFileNameNoExt(ProjectName) + LibSuffix + BinaryExtension; - Result := DCC32.MakeProject(ProjectName, OutputDir, DcpSearchPath, ExtraOptions) - and ProcessMapFile(BinaryFileName); + Result := DCC32.MakeProject(ProjectName, OutputDir, DcpSearchPath, ExtraOptions) and + ProcessMapFile(BinaryFileName); if Result then OutputString(RsCompilationOk) @@ -3043,8 +3035,8 @@ if FEnvironmentVariables = nil then begin FEnvironmentVariables := TStringList.Create; - if ((VersionNumber >= 6) or (RadToolKind = brBorlandDevStudio)) - and ConfigData.SectionExists(EnvVariablesKeyName) then + if ((VersionNumber >= 6) or (RadToolKind = brBorlandDevStudio)) and + ConfigData.SectionExists(EnvVariablesKeyName) then begin EnvNames := TStringList.Create; try @@ -3052,7 +3044,8 @@ for I := 0 to EnvNames.Count - 1 do begin EnvVarKeyName := EnvNames[I]; - FEnvironmentVariables.Values[EnvVarKeyName] := ConfigData.ReadString(EnvVariablesKeyName, EnvVarKeyName, ''); + FEnvironmentVariables.Values[EnvVarKeyName] := + ConfigData.ReadString(EnvVariablesKeyName, EnvVarKeyName, ''); end; finally EnvNames.Free; @@ -3166,11 +3159,11 @@ function TJclBorRADToolInstallation.GetSupportsLibSuffix: Boolean; begin -{$IFDEF KYLIX} + {$IFDEF KYLIX} Result := True; -{$ELSE} + {$ELSE} Result := (RadToolKind = brBorlandDevStudio) or (VersionNumber >= 6); -{$ENDIF KYLIX} + {$ENDIF KYLIX} end; function TJclBorRADToolInstallation.GetUpdateNeeded: Boolean; @@ -3190,8 +3183,7 @@ Result := ''; end; -function TJclBorRADToolInstallation.InstallBCBExpert(const ProjectName, - OutputDir, DcpSearchPath: string): Boolean; +function TJclBorRADToolInstallation.InstallBCBExpert(const ProjectName, OutputDir, DcpSearchPath: string): Boolean; var BinaryFileName, Description: string; begin @@ -3200,14 +3192,13 @@ GetBPRFileInfo(ProjectName, BinaryFileName, @Description); BinaryFileName := PathAddSeparator(OutputDir) + BinaryFileName; - Result := CompileBCBProject(ProjectName, OutputDir, DcpSearchPath) - and RegisterExpert(BinaryFileName, Description); + Result := CompileBCBProject(ProjectName, OutputDir, DcpSearchPath) and + RegisterExpert(BinaryFileName, Description); OutputString(RsExpertInstallationFinished); end; -function TJclBorRADToolInstallation.InstallBCBIdePackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.InstallBCBIdePackage(const PackageName, BPLPath, DCPPath: string): Boolean; var RunOnly: Boolean; BinaryFileName, Description: string; @@ -3219,14 +3210,13 @@ if RunOnly then raise EJclBorRadException.CreateResFmt(@RsCannotInstallRunOnly, [PackageName]); - Result := CompileBCBPackage(PackageName, BPLPath, DCPPath) - and RegisterIdePackage(BinaryFileName, Description); + Result := CompileBCBPackage(PackageName, BPLPath, DCPPath) and + RegisterIdePackage(BinaryFileName, Description); OutputString(RsIdePackageInstallationFinished); end; -function TJclBorRADToolInstallation.InstallBCBPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.InstallBCBPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var RunOnly: Boolean; BinaryFileName, Description: string; @@ -3238,14 +3228,13 @@ if RunOnly then raise EJclBorRadException.CreateResFmt(@RsCannotInstallRunOnly, [PackageName]); - Result := CompileBCBPackage(PackageName, BPLPath, DCPPath) - and RegisterPackage(BinaryFileName, Description); + Result := CompileBCBPackage(PackageName, BPLPath, DCPPath) and + RegisterPackage(BinaryFileName, Description); OutputString(RsPackageInstallationFinished); end; -function TJclBorRADToolInstallation.InstallDelphiExpert(const ProjectName, - OutputDir, DcpSearchPath: string): Boolean; +function TJclBorRADToolInstallation.InstallDelphiExpert(const ProjectName, OutputDir, DcpSearchPath: string): Boolean; var LibSuffix, BinaryFileName, BinaryExtension, BaseName: string; begin @@ -3259,14 +3248,13 @@ BinaryFileName := PathAddSeparator(OutputDir) + BaseName + LibSuffix + BinaryExtension; - Result := CompileDelphiProject(ProjectName, OutputDir, DcpSearchPath) - and RegisterExpert(BinaryFileName, BaseName); + Result := CompileDelphiProject(ProjectName, OutputDir, DcpSearchPath) and + RegisterExpert(BinaryFileName, BaseName); OutputString(RsExpertInstallationFinished); end; -function TJclBorRADToolInstallation.InstallDelphiIdePackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.InstallDelphiIdePackage(const PackageName, BPLPath, DCPPath: string): Boolean; var RunOnly: Boolean; LibSuffix, BPLFileName, Description: string; @@ -3276,16 +3264,16 @@ GetDPKFileInfo(PackageName, RunOnly, @LibSuffix, @Description); if RunOnly then raise EJclBorRadException.CreateResFmt(@RsCannotInstallRunOnly, [PackageName]); - BPLFileName := PathAddSeparator(BPLPath) + PathExtractFileNameNoExt(PackageName) + LibSuffix + BinaryExtensionPackage; + BPLFileName := PathAddSeparator(BPLPath) + PathExtractFileNameNoExt(PackageName) + + LibSuffix + BinaryExtensionPackage; - Result := CompileDelphiPackage(PackageName, BPLPath, DCPPath) - and RegisterIdePackage(BPLFileName, Description); + Result := CompileDelphiPackage(PackageName, BPLPath, DCPPath) and + RegisterIdePackage(BPLFileName, Description); OutputString(RsIdePackageInstallationFinished); end; -function TJclBorRADToolInstallation.InstallDelphiPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.InstallDelphiPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var RunOnly: Boolean; LibSuffix, BPLFileName, Description: string; @@ -3295,16 +3283,16 @@ GetDPKFileInfo(PackageName, RunOnly, @LibSuffix, @Description); if RunOnly then raise EJclBorRadException.CreateResFmt(@RsCannotInstallRunOnly, [PackageName]); - BPLFileName := PathAddSeparator(BPLPath) + PathExtractFileNameNoExt(PackageName) + LibSuffix + BinaryExtensionPackage; + BPLFileName := PathAddSeparator(BPLPath) + PathExtractFileNameNoExt(PackageName) + + LibSuffix + BinaryExtensionPackage; - Result := CompileDelphiPackage(PackageName, BPLPath, DCPPath) - and RegisterPackage(BPLFileName, Description); + Result := CompileDelphiPackage(PackageName, BPLPath, DCPPath) and + RegisterPackage(BPLFileName, Description); OutputString(RsPackageInstallationFinished); end; -function TJclBorRADToolInstallation.InstallExpert(const ProjectName, - OutputDir, DcpSearchPath: string): Boolean; +function TJclBorRADToolInstallation.InstallExpert(const ProjectName, OutputDir, DcpSearchPath: string): Boolean; var ProjectExtension: string; begin @@ -3318,8 +3306,7 @@ raise EJclBorRADException.CreateResFmt(@RsUnknownProjectExtension, [ProjectExtension]); end; -function TJclBorRADToolInstallation.InstallIDEPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.InstallIDEPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var PackageExtension: string; begin @@ -3363,8 +3350,7 @@ Result := PathAddSeparator(RootDir) + PathAddSeparator('lib'); end; -function TJclBorRADToolInstallation.ProcessMapFile( - const BinaryFileName: string): Boolean; +function TJclBorRADToolInstallation.ProcessMapFile(const BinaryFileName: string): Boolean; var MAPFileName, LinkerBugUnit: string; MAPFileSize, JclDebugDataSize: Integer; @@ -3378,7 +3364,7 @@ begin OutputString(Format(RsInsertingJdbg, [BinaryFileName])); Result := InsertDebugDataIntoExecutableFile(BinaryFileName, MAPFileName, - LinkerBugUnit, MAPFileSize, JclDebugDataSize); + LinkerBugUnit, MAPFileSize, JclDebugDataSize); OutputString(Format(RsJdbgInfo, [LinkerBugUnit, MAPFileSize, JclDebugDataSize])); end else @@ -3389,7 +3375,6 @@ if Result then begin OutputString(RsJdbgInfoOk); - if MapDelete then OutputFileDelete(MAPFileName); end @@ -3403,8 +3388,7 @@ {$ENDIF MSWINDOWS} end; -function TJclBorRADToolInstallation.OutputFileDelete( - const FileName: string): Boolean; +function TJclBorRADToolInstallation.OutputFileDelete(const FileName: string): Boolean; begin OutputString(Format(RsDeletingFile, [FileName])); Result := FileDelete(FileName); @@ -3486,15 +3470,15 @@ {$ENDIF ~KYLIX} case RadToolKind of - brDelphi : + brDelphi: FVersionNumberStr := Format('d%d', [VersionNumber]); - brCppBuilder : + brCppBuilder: FVersionNumberStr := Format('c%d', [VersionNumber]); - brBorlandDevStudio : + brBorlandDevStudio: if VersionNumber = 1 then FVersionNumberStr := 'cs1' else - FVersionNumberStr := Format('d%d', [VersionNumber+6]); // BDS 2 goes to D8 + FVersionNumberStr := Format('d%d', [VersionNumber + 6]); // BDS 2 goes to D8 end; FRootDir := PathRemoveSeparator(Globals.Values[RootDirValueName]); @@ -3520,8 +3504,7 @@ end; end; -function TJclBorRADToolInstallation.RegisterExpert(const BinaryFileName, - Description: string): Boolean; +function TJclBorRADToolInstallation.RegisterExpert(const BinaryFileName, Description: string): Boolean; var InternalDescription: string; begin @@ -3539,8 +3522,7 @@ OutputString(RsRegistrationFailed); end; -function TJclBorRADToolInstallation.RegisterIDEPackage(const BinaryFileName, - Description: string): Boolean; +function TJclBorRADToolInstallation.RegisterIDEPackage(const BinaryFileName, Description: string): Boolean; var InternalDescription: string; begin @@ -3558,8 +3540,7 @@ OutputString(RsRegistrationFailed); end; -function TJclBorRADToolInstallation.RegisterPackage(const BinaryFileName, - Description: string): Boolean; +function TJclBorRADToolInstallation.RegisterPackage(const BinaryFileName, Description: string): Boolean; var InternalDescription: string; begin @@ -3645,8 +3626,7 @@ ConfigData.WriteString(LibraryKeyName, LibrarySearchPathValueName, Value); end; -procedure TJclBorRADToolInstallation.SetOutputCallback( - const Value: TTextHandler); +procedure TJclBorRADToolInstallation.SetOutputCallback(const Value: TTextHandler); begin FOutputCallback := Value; //if clAsm in CommandLineTools then @@ -3701,8 +3681,7 @@ {$ENDIF KYLIX} end; -function TJclBorRADToolInstallation.UninstallBCBExpert(const ProjectName, - OutputDir: string): Boolean; +function TJclBorRADToolInstallation.UninstallBCBExpert(const ProjectName, OutputDir: string): Boolean; var BinaryFileName: string; begin @@ -3724,8 +3703,7 @@ OutputString(RsExpertUninstallationFinished); end; -function TJclBorRADToolInstallation.UninstallBCBIdePackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.UninstallBCBIdePackage(const PackageName, BPLPath, DCPPath: string): Boolean; var MAPFileName, TDSFileName, BPIFileName, LIBFileName, BPLFileName: string; @@ -3766,8 +3744,7 @@ OutputString(RsIdePackageUninstallationFinished); end; -function TJclBorRADToolInstallation.UninstallBCBPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.UninstallBCBPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var MAPFileName, TDSFileName, BPIFileName, LIBFileName, BPLFileName: string; @@ -3808,8 +3785,7 @@ OutputString(RsPackageUninstallationFinished); end; -function TJclBorRADToolInstallation.UninstallDelphiExpert(const ProjectName, - OutputDir: string): Boolean; +function TJclBorRADToolInstallation.UninstallDelphiExpert(const ProjectName, OutputDir: string): Boolean; var BinaryFileName: string; BaseName, LibSuffix, BinaryExtension: string; @@ -3835,8 +3811,7 @@ OutputString(RsExpertUninstallationFinished); end; -function TJclBorRADToolInstallation.UninstallDelphiIdePackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.UninstallDelphiIdePackage(const PackageName, BPLPath, DCPPath: string): Boolean; var MAPFileName, BPLFileName, DCPFileName: string; @@ -3872,8 +3847,7 @@ OutputString(RsIdePackageUninstallationFinished); end; -function TJclBorRADToolInstallation.UninstallDelphiPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.UninstallDelphiPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var MAPFileName, BPLFileName, DCPFileName: string; @@ -3909,8 +3883,7 @@ OutputString(RsPackageUninstallationFinished); end; -function TJclBorRADToolInstallation.UninstallExpert(const ProjectName, - OutputDir: string): Boolean; +function TJclBorRADToolInstallation.UninstallExpert(const ProjectName, OutputDir: string): Boolean; var ProjectExtension: string; begin @@ -3924,8 +3897,7 @@ raise EJclBorRadException.CreateResFmt(@RsUnknownProjectExtension, [ProjectExtension]); end; -function TJclBorRADToolInstallation.UninstallIDEPackage(const PackageName, - BPLPath, DCPPath: string): Boolean; +function TJclBorRADToolInstallation.UninstallIDEPackage(const PackageName, BPLPath, DCPPath: string): Boolean; var PackageExtension: string; begin @@ -3953,8 +3925,7 @@ raise EJclBorRadException.CreateResFmt(@RsUnknownPackageExtension, [PackageExtension]); end; -function TJclBorRADToolInstallation.UnregisterExpert( - const BinaryFileName: string): Boolean; +function TJclBorRADToolInstallation.UnregisterExpert(const BinaryFileName: string): Boolean; begin OutputString(Format(RsUnregisteringExpert, [BinaryFileName])); @@ -3965,8 +3936,7 @@ OutputString(RsUnregistrationFailed); end; -function TJclBorRADToolInstallation.UnregisterIDEPackage( - const BinaryFileName: string): Boolean; +function TJclBorRADToolInstallation.UnregisterIDEPackage(const BinaryFileName: string): Boolean; begin OutputString(Format(RsUnregisteringIDEPackage, [BinaryFileName])); @@ -3977,8 +3947,7 @@ OutputString(RsUnregistrationFailed); end; -function TJclBorRADToolInstallation.UnregisterPackage( - const BinaryFileName: string): Boolean; +function TJclBorRADToolInstallation.UnregisterPackage(const BinaryFileName: string): Boolean; begin OutputString(Format(RsUnregisteringPackage, [BinaryFileName])); @@ -4021,9 +3990,12 @@ class function TJclBCBInstallation.GetLatestUpdatePackForVersion(Version: Integer): Integer; begin case Version of - 5: Result := 0; - 6: Result := 4; - 10: Result := 0; + 5: + Result := 0; + 6: + Result := 4; + 10: + Result := 0; else Result := 0; end; @@ -4039,7 +4011,7 @@ Result := SourceExtensionBCBProject; end; -{class }class function TJclBCBInstallation.RadToolKind: TJclBorRadToolKind; +class function TJclBCBInstallation.RadToolKind: TJclBorRadToolKind; begin Result := brCppBuilder; end; @@ -4051,16 +4023,8 @@ //=== { TJclDelphiInstallation } ============================================= -{$IFDEF KYLIX} -function TJclDelphiInstallation.ConfigFileName(const Extension: string): string; +constructor TJclDelphiInstallation.Create(const AConfigDataLocation: string); begin - Result := Format('%s/.borland/delphi%d%s', [GetPersonalFolder, IDs[VersionNumber], Extension]); -end; -{$ENDIF KYLIX} - -constructor TJclDelphiInstallation.Create( - const AConfigDataLocation: string); -begin inherited Create(AConfigDataLocation); FPersonalities := [bpDelphi32]; end; @@ -4070,6 +4034,13 @@ inherited Destroy; end; +{$IFDEF KYLIX} +function TJclDelphiInstallation.ConfigFileName(const Extension: string): string; +begin + Result := Format('%s/.borland/delphi%d%s', [GetPersonalFolder, IDs[VersionNumber], Extension]); +end; +{$ENDIF KYLIX} + function TJclDelphiInstallation.GetEnvironmentVariables: TStrings; begin Result := inherited GetEnvironmentVariables; @@ -4080,16 +4051,18 @@ class function TJclDelphiInstallation.GetLatestUpdatePackForVersion(Version: Integer): Integer; begin case Version of - 5: Result := 1; - 6: Result := 2; - 7: Result := 0; + 5: + Result := 1; + 6: + Result := 2; + 7: + Result := 0; else Result := 0; end; end; -function TJclDelphiInstallation.InstallPackage(const PackageName, BPLPath, - DCPPath: string): Boolean; +function TJclDelphiInstallation.InstallPackage(const PackageName, BPLPath, DCPPath: string): Boolean; begin Result := InstallDelphiPackage(PackageName, BPLPath, DCPPath); end; @@ -4104,7 +4077,7 @@ Result := SourceExtensionDelphiProject; end; -{class }class function TJclDelphiInstallation.RadToolKind: TJclBorRadToolKind; +class function TJclDelphiInstallation.RadToolKind: TJclBorRadToolKind; begin Result := brDelphi; end; @@ -4118,8 +4091,38 @@ {$IFDEF MSWINDOWS} -function TJclBDSInstallation.AddToCppBrowsingPath( - const Path: string): Boolean; +constructor TJclBDSInstallation.Create(const AConfigDataLocation: string); +const + PersonalitiesSection = 'Personalities'; +begin + inherited Create(AConfigDataLocation); + FHelp2Manager := TJclHelp2Manager.Create(Self); + + { TODO : .net 64 bit } + if ConfigData.ReadString(PersonalitiesSection, 'C#Builder', '') <> '' then + Include(FPersonalities, bpCSBuilder32); + if ConfigData.ReadString(PersonalitiesSection, 'BCB', '') <> '' then + Include(FPersonalities, bpBCBuilder32); + if ConfigData.ReadString(PersonalitiesSection, 'Delphi.Win32', '') <> '' then + Include(FPersonalities, bpDelphi32); + if (ConfigData.ReadString(PersonalitiesSection, 'Delphi.NET', '') <> '') or + (ConfigData.ReadString(PersonalitiesSection, 'Delphi8', '') <> '') then + Include(FPersonalities, bpDelphiNet32); + + if clDcc32 in CommandLineTools then + Include(FPersonalities, bpDelphi32); + + if FPersonalities = [] then + raise EJclBorRadException.CreateRes(@RsNoSupportedPersonality); +end; + +destructor TJclBDSInstallation.Destroy; +begin + FHelp2Manager.Free; + inherited Destroy; +end; + +function TJclBDSInstallation.AddToCppBrowsingPath(const Path: string): Boolean; var TempCppPath: TJclBorRADToolPath; begin @@ -4134,8 +4137,7 @@ Result := False; end; -function TJclBDSInstallation.AddToCppSearchPath( - const Path: string): Boolean; +function TJclBDSInstallation.AddToCppSearchPath(const Path: string): Boolean; var TempCppPath: TJclBorRADToolPath; begin @@ -4150,8 +4152,7 @@ Result := False; end; -function TJclBDSInstallation.CleanPackageCache( - const BinaryFileName: string): Boolean; +function TJclBDSInstallation.CleanPackageCache(const BinaryFileName: string): Boolean; var FileName: string; begin @@ -4164,8 +4165,8 @@ try OutputString(Format(RsCleaningPackageCache, [FileName])); - Result := RegDeleteKeyTree(HKCU, PathAddSeparator(ConfigDataLocation) - + PackageCacheKeyName + '\' + FileName); + Result := RegDeleteKeyTree(HKCU, PathAddSeparator(ConfigDataLocation) + + PackageCacheKeyName + '\' + FileName); if Result then OutputString(RsCleaningOk) @@ -4177,8 +4178,7 @@ end; end; -function TJclBDSInstallation.CompileDelphiPackage(const PackageName, BPLPath, - DCPPath, ExtraOptions: string): Boolean; +function TJclBDSInstallation.CompileDelphiPackage(const PackageName, BPLPath, DCPPath, ExtraOptions: string): Boolean; var NewOptions: string; begin @@ -4196,8 +4196,7 @@ Result := inherited CompileDelphiPackage(PackageName, BPLPath, DCPPath, NewOptions); end; -function TJclBDSInstallation.CompileDelphiProject(const ProjectName, - OutputDir, DcpSearchPath: string): Boolean; +function TJclBDSInstallation.CompileDelphiProject(const ProjectName, OutputDir, DcpSearchPath: string): Boolean; var ExtraOptions, BinaryExtension, LibSuffix, BinaryFileName: string; begin @@ -4216,10 +4215,11 @@ GetDPRFileInfo(ProjectName, BinaryExtension, @LibSuffix); if BinaryExtension = '' then BinaryExtension := BinaryExtensionLibrary; - BinaryFileName := PathAddSeparator(OutputDir) + PathExtractFileNameNoExt(ProjectName) + LibSuffix + BinaryExtension; + BinaryFileName := PathAddSeparator(OutputDir) + PathExtractFileNameNoExt(ProjectName) + + LibSuffix + BinaryExtension; - Result := DCC32.MakeProject(ProjectName, OutputDir, DcpSearchPath, ExtraOptions) - and ProcessMapFile(BinaryFileName); + Result := DCC32.MakeProject(ProjectName, OutputDir, DcpSearchPath, ExtraOptions) and + ProcessMapFile(BinaryFileName); if Result then OutputString(RsCompilationOk) @@ -4230,43 +4230,12 @@ Result := inherited CompileDelphiProject(ProjectName, DcpSearchPath, OutputDir); end; -constructor TJclBDSInstallation.Create(const AConfigDataLocation: string); -const - PersonalitiesSection = 'Personalities'; -begin - inherited Create(AConfigDataLocation); - FHelp2Manager := TJclHelp2Manager.Create(Self); - - { TODO : .net 64 bit } - if ConfigData.ReadString(PersonalitiesSection, 'C#Builder', '') <> '' then - Include(FPersonalities, bpCSBuilder32); - if ConfigData.ReadString(PersonalitiesSection, 'BCB', '') <> '' then - Include(FPersonalities, bpBCBuilder32); - if ConfigData.ReadString(PersonalitiesSection, 'Delphi.Win32', '') <> '' then - Include(FPersonalities, bpDelphi32); - if (ConfigData.ReadString(PersonalitiesSection, 'Delphi.NET', '') <> '') - or (ConfigData.ReadString(PersonalitiesSection, 'Delphi8', '') <> '') then - Include(FPersonalities, bpDelphiNet32); - - if clDcc32 in CommandLineTools then - Include(FPersonalities, bpDelphi32); - - if FPersonalities = [] then - raise EJclBorRadException.CreateRes(@RsNoSupportedPersonality); -end; - -destructor TJclBDSInstallation.Destroy; -begin - FHelp2Manager.Free; - inherited Destroy; -end; - { TODO -cHelp : Donator: Adreas Hausladen } function TJclBDSInstallation.GetBorlandStudioProjectsDir: string; var - h: HMODULE; - LocaleName: array[0..4] of Char; - Filename: string; + H: HMODULE; + LocaleName: array [0..4] of Char; + FileName: string; begin Result := 'Borland Studio Projects'; // do not localize @@ -4274,27 +4243,27 @@ GetLocaleInfo(GetThreadLocale, LOCALE_SABBREVLANGNAME, LocaleName, SizeOf(LocaleName)); if LocaleName[0] <> #0 then begin - Filename := RootDir + '\Bin\coreide' + BDSVersions[IDEVersionNumber].CoreIdeVersion + '.'; - if FileExists(Filename + LocaleName) then - Filename := Filename + LocaleName + FileName := RootDir + '\Bin\coreide' + BDSVersions[IDEVersionNumber].CoreIdeVersion + '.'; + if FileExists(FileName + LocaleName) then + FileName := FileName + LocaleName else begin LocaleName[2] := #0; - if FileExists(Filename + LocaleName) then - Filename := Filename + LocaleName + if FileExists(FileName + LocaleName) then + FileName := FileName + LocaleName else - Filename := ''; + FileName := ''; end; - if Filename <> '' then + if FileName <> '' then begin - h := LoadLibraryEx(PChar(Filename), 0, - LOAD_LIBRARY_AS_DATAFILE or DONT_RESOLVE_DLL_REFERENCES); - if h <> 0 then + H := LoadLibraryEx(PChar(FileName), 0, LOAD_LIBRARY_AS_DATAFILE or DONT_RESOLVE_DLL_REFERENCES); + if H <> 0 then begin SetLength(Result, 1024); - SetLength(Result, LoadString(h, BDSVersions[IDEVersionNumber].ProjectsDirResId, PChar(Result), Length(Result) - 1)); - FreeLibrary(h); + SetLength(Result, LoadString(H, BDSVersions[IDEVersionNumber].ProjectsDirResId, + PChar(Result), Length(Result) - 1)); + FreeLibrary(H); end; end; end; @@ -4304,8 +4273,8 @@ function TJclBDSInstallation.GetBPLOutputPath: string; begin -// BDS 1 (C#Builder 1) and BDS 2 (Delphi 8) don't have a valid BPL output path -// set in the registry + // BDS 1 (C#Builder 1) and BDS 2 (Delphi 8) don't have a valid BPL output path + // set in the registry if VersionNumber <= 2 then Result := PathAddSeparator(GetDefaultProjectsDir) + 'bpl' else @@ -4348,12 +4317,13 @@ end; end; -class function TJclBDSInstallation.GetLatestUpdatePackForVersion( - Version: Integer): Integer; +class function TJclBDSInstallation.GetLatestUpdatePackForVersion(Version: Integer): Integer; begin case Version of - 9: Result := 1; // personal version is only update pack 1 - 10: Result := 1; // update 1 is out + 9: + Result := 1; // personal version is only update pack 1 + 10: + Result := 1; // update 1 is out else Result := 0; end; @@ -4397,8 +4367,7 @@ Result := RsBDSName; end; -function TJclBDSInstallation.RegisterPackage(const BinaryFileName, - Description: string): Boolean; +function TJclBDSInstallation.RegisterPackage(const BinaryFileName, Description: string): Boolean; begin if VersionNumber >= 3 then CleanPackageCache(BinaryFileName); @@ -4406,8 +4375,7 @@ Result := inherited RegisterPackage(BinaryFileName, Description); end; -function TJclBDSInstallation.RemoveFromCppBrowsingPath( - const Path: string): Boolean; +function TJclBDSInstallation.RemoveFromCppBrowsingPath(const Path: string): Boolean; var TempCppPath: TJclBorRADToolPath; begin @@ -4421,8 +4389,7 @@ Result := False; end; -function TJclBDSInstallation.RemoveFromCppSearchPath( - const Path: string): Boolean; +function TJclBDSInstallation.RemoveFromCppSearchPath(const Path: string): Boolean; var TempCppPath: TJclBorRADToolPath; begin @@ -4436,8 +4403,7 @@ Result := False; end; -procedure TJclBDSInstallation.SetCppBrowsingPath( - const Value: TJclBorRADToolPath); +procedure TJclBDSInstallation.SetCppBrowsingPath(const Value: TJclBorRADToolPath); begin ConfigData.WriteString(CppPathsKeyName, CppBrowsingPathValueName, Value); end; @@ -4454,12 +4420,10 @@ FDualPackageInstallation := Value; end; -function TJclBDSInstallation.UnregisterPackage( - const BinaryFileName: string): Boolean; +function TJclBDSInstallation.UnregisterPackage(const BinaryFileName: string): Boolean; begin if VersionNumber >= 3 then CleanPackageCache(BinaryFileName); - Result := inherited UnregisterPackage(BinaryFileName); end; @@ -4547,7 +4511,7 @@ Break; end; brBorlandDevStudio: - if (VersionNumber >= 8) and (Installations[I].VersionNumber = (VersionNumber-6)) then + if (VersionNumber >= 8) and (Installations[I].VersionNumber = (VersionNumber - 6)) then begin Result := Installations[I]; Break; @@ -4565,23 +4529,21 @@ Result := BCBInstallationFromVersion[VersionNumber] <> nil; end; -function TJclBorRADToolInstallations.GetBDSInstallationFromVersion( - VersionNumber: Integer): TJclBorRADToolInstallation; +function TJclBorRADToolInstallations.GetBDSInstallationFromVersion(VersionNumber: Integer): TJclBorRADToolInstallation; var I: Integer; begin Result := nil; for I := 0 to Count - 1 do - if (Installations[I].VersionNumber = VersionNumber) - and (Installations[I].RadToolKind = brBorlandDevStudio) then + if (Installations[I].VersionNumber = VersionNumber) and + (Installations[I].RadToolKind = brBorlandDevStudio) then begin Result := Installations[I]; Break; end; end; -function TJclBorRADToolInstallations.GetBDSVersionInstalled( - VersionNumber: Integer): Boolean; +function TJclBorRADToolInstallations.GetBDSVersionInstalled(VersionNumber: Integer): Boolean; begin Result := BDSInstallationFromVersion[VersionNumber] <> nil; end; @@ -4634,7 +4596,8 @@ var VersionNumbers: TStringList; - function EnumVersions(const KeyName: string; const Personalities: array of string; CreateClass: TJclBorRADToolInstallationClass) : Boolean; + function EnumVersions(const KeyName: string; const Personalities: array of string; + CreateClass: TJclBorRADToolInstallationClass): Boolean; var I, J: Integer; VersionKeyName, PersonalitiesKeyName: string; @@ -4694,7 +4657,7 @@ try EnumVersions(DelphiKeyName, [], TJclDelphiInstallation); EnumVersions(BCBKeyName, [], TJclBCBInstallation); - EnumVersions(BDSKeyName, ['Delphi.Win32','BCB','Delphi8','C#Builder'], TJclBDSInstallation); + EnumVersions(BDSKeyName, ['Delphi.Win32', 'BCB', 'Delphi8', 'C#Builder'], TJclBDSInstallation); finally VersionNumbers.Free; end; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-31 11:20:55
|
Revision: 1704 Author: outchy Date: 2006-07-31 04:20:47 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1704&view=rev Log Message: ----------- Mantis 3823 TJclAnsiRegEx.GetCaptures() fails when the captures have embedded zeros Modified Paths: -------------- trunk/jcl/source/common/JclPCRE.pas Modified: trunk/jcl/source/common/JclPCRE.pas =================================================================== --- trunk/jcl/source/common/JclPCRE.pas 2006-07-31 09:32:00 UTC (rev 1703) +++ trunk/jcl/source/common/JclPCRE.pas 2006-07-31 11:20:47 UTC (rev 1704) @@ -209,9 +209,12 @@ function TJclAnsiRegEx.GetCaptures(Index: Integer): AnsiString; var Buffer: array [0..1024] of Char; + Len: Integer; begin - PCRECheck(pcre_copy_substring(PChar(FSubject), @FVector, FStringCount, Index, Buffer, SizeOf(Buffer))); - Result := AnsiString(Buffer); + Len := pcre_copy_substring(PChar(FSubject), @FVector, FStringCount, Index, Buffer, SizeOf(Buffer)); + PCRECheck(Len); + + SetString(Result, Buffer, Len); end; function TJclAnsiRegEx.GetCapturesOffset(Index: Integer): TJclAnsiCaptureOffset; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-31 09:32:17
|
Revision: 1703 Author: outchy Date: 2006-07-31 02:32:00 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1703&view=rev Log Message: ----------- New feature: JDBG file creation at runtime and install time. Modified Paths: -------------- trunk/jcl/install/JclInstall.pas trunk/jcl/install/JediInstall.pas trunk/jcl/source/common/JclBorlandTools.pas trunk/jcl/source/common/JclResources.pas Modified: trunk/jcl/install/JclInstall.pas =================================================================== --- trunk/jcl/install/JclInstall.pas 2006-07-31 09:27:12 UTC (rev 1702) +++ trunk/jcl/install/JclInstall.pas 2006-07-31 09:32:00 UTC (rev 1703) @@ -261,8 +261,9 @@ RsDefEDIWeakPackageUnits = 'EDI weak package units'; RsMapCreate = 'Create MAP files'; - RsMapLink = 'Link MAP files'; - RsMapDelete = 'Delete MAP files after the link'; + RsJdbgCreate = 'Create Jedi Debug Informations'; + RsJdbgInsert = 'Insert Jedi Debug Informations in the librairies'; + RsMapDelete = 'Do not keep MAP files'; RsEnvironment = 'Environment'; RsEnvLibPath = 'Add JCL to IDE Library Path'; @@ -319,8 +320,9 @@ RsHintJclDefDebugNoSymbols = 'Disable support for Microsoft debug symbols (PDB and DBG files)'; RsHintJclDefEDIWeakPackageUnits = 'Mark EDI units as weak package units (check if you use the original EDI package)'; RsHintJclMapCreate = 'Create detailled MAP files for each libraries'; - RsHintJclMapLink = 'Link MAP files as a resource in the output library or executable, the stack can be traced on exceptions'; - RsHintJclMapDelete = 'Once linked in the binary, delete the original MAP file'; + RsHintJclJdbgCreate = 'Create Jedi Debug Informations from the MAP files'; + RsHintJclJdbgInsert = 'Insert Jedi Debug Informations into the libraries (only the BPL has to be redistributed)'; + RsHintJclMapDelete = 'The original MAP file is not kept once Jedi Debug Informations are generated'; RsHintJclEnv = 'Set selected environment items'; RsHintJclEnvLibPath = 'Add JCL precompiled unit directories to library path'; RsHintJclEnvBrowsingPath = 'Add JCL source directories to browsing path'; @@ -435,10 +437,13 @@ (Parent: ioJCL; // ioJclMapCreate Caption: RsMapCreate; Hint: RsHintJclMapCreate), - (Parent: ioJclMapCreate; // ioJclMapLink - Caption: RsMapLink; - Hint: RsHintJclMapLink), - (Parent: ioJclMapLink; // ioJclMapDelete + (Parent: ioJclMapCreate; // ioJclJdbgCreate + Caption: RsJdbgCreate; + Hint: RsHintJclJdbgCreate), + (Parent: ioJclMapCreate; // ioJclJdbgInsert + Caption: RsJdbgInsert; + Hint: RsHintJclJdbgInsert), + (Parent: ioJclJdbgCreate; // ioJclMapDelete Caption: RsMapDelete; Hint: RsHintJclMapDelete), (Parent: ioJCL; // ioJclEnv @@ -1255,7 +1260,7 @@ {$ENDIF MSWINDOWS} InstallationNode, ProductNode, PackagesNode, ExpertsNode, DemosNode, MakeNode, EnvNode, HelpNode, HelpHxSNode, RepositoryNode, MapCreateNode, - MapLinkNode, BCBNode: TObject; + JDbgCreateNode, BCBNode: TObject; RunTimeInstallation: Boolean; function AddNode(Parent: TObject; Option: TJediInstallOption; @@ -1401,8 +1406,9 @@ MapCreateNode := AddNode(PackagesNode, ioJclMapCreate, [goExpandable, goStandaloneParent, goNoAutoCheck]); {$IFDEF MSWINDOWS} - MapLinkNode := AddNode(MapCreateNode, ioJclMapLink, [goExpandable, goStandaloneParent, goNoAutoCheck]); - AddNode(MapLinkNode,ioJclMapDelete, [goNoAutoCheck]); + JDbgCreateNode := AddNode(MapCreateNode, ioJclJdbgCreate, [goExpandable, goStandaloneParent]); + AddNode(JDbgCreateNode, ioJclJdbgInsert, [goNoAutoCheck]); + AddNode(JDbgCreateNode, ioJclMapDelete, [goNoAutoCheck]); if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber = 3) and (Target.Edition = deStd) then @@ -1476,7 +1482,8 @@ CleanupRepository; Defines.Clear; Target.MapCreate := False; - Target.MapLink := False; + Target.JdbgCreate := False; + Target.JdbgInsert := False; Target.MapDelete := False; {$IFDEF MSWINDOWS} if Target is TJclBDSInstallation then @@ -1523,8 +1530,10 @@ Defines.Add('EDI_WEAK_PACKAGE_UNITS'); ioJclMapCreate: Target.MapCreate := True; - ioJclMapLink: - Target.MapLink := True; + ioJclJdbgCreate: + Target.JdbgCreate := True; + ioJclJdbgInsert: + Target.JdbgInsert := True; ioJclMapDelete: Target.MapDelete := True; ioJclEnvLibPath: Modified: trunk/jcl/install/JediInstall.pas =================================================================== --- trunk/jcl/install/JediInstall.pas 2006-07-31 09:27:12 UTC (rev 1702) +++ trunk/jcl/install/JediInstall.pas 2006-07-31 09:32:00 UTC (rev 1703) @@ -49,7 +49,8 @@ ioJclDefDebugNoSymbols, ioJclDefEDIWeakPackageUnits, ioJclMapCreate, - ioJclMapLink, + ioJclJdbgCreate, + ioJclJdbgInsert, ioJclMapDelete, ioJclEnv, ioJclEnvLibPath, Modified: trunk/jcl/source/common/JclBorlandTools.pas =================================================================== --- trunk/jcl/source/common/JclBorlandTools.pas 2006-07-31 09:27:12 UTC (rev 1702) +++ trunk/jcl/source/common/JclBorlandTools.pas 2006-07-31 09:32:00 UTC (rev 1703) @@ -520,7 +520,8 @@ FIDEVersionNumber: Integer; // Delphi 2005: 3 - Delphi 7: 7 FMapCreate: Boolean; {$IFDEF MSWINDOWS} - FMapLink: Boolean; + FJdbgCreate: Boolean; + FJdbgInsert: Boolean; FMapDelete: Boolean; {$ENDIF MSWINDOWS} FCommandLineTools: TCommandLineTools; @@ -552,7 +553,7 @@ protected constructor Create(const AConfigDataLocation: string); virtual; - function LinkMapFile(const BinaryFileName: string): Boolean; + function ProcessMapFile(const BinaryFileName: string): Boolean; // compilation functions function CompileDelphiPackage(const PackageName, BPLPath, DCPPath: string): Boolean; overload; virtual; @@ -669,7 +670,8 @@ {$ENDIF MSWINDOWS} property MapCreate: Boolean read FMapCreate write FMapCreate; {$IFDEF MSWINDOWS} - property MapLink: Boolean read FMapLink write FMapLink; + property JdbgCreate: Boolean read FJdbgCreate write FJdbgCreate; + property JdbgInsert: Boolean read FJdbgInsert write FJdbgInsert; property MapDelete: Boolean read FMapDelete write FMapDelete; {$ENDIF MSWINDOWS} property ConfigData: TCustomIniFile read FConfigData; @@ -2642,7 +2644,8 @@ {$ENDIF ~MSWINDOWS} FMapCreate := False; {$IFDEF MSWINDOWS} - FMapLink := False; + FJdbgCreate := False; + FJdbgInsert := False; FMapDelete := False; {$ENDIF ~MSWINDOWS} if FileExists(BinFolderName + AsmExeName) then @@ -2774,7 +2777,7 @@ GetBPKFileInfo(PackageName, RunOnly, @BinaryFileName); Result := Result and Make.Execute(Format('%s -f%s', [StringsToStr(Make.Options, ' '), StrDoubleQuote(MakeFileName)])) - and LinkMapFile(PathAddSeparator(BPLPath) + BinaryFileName); + and ProcessMapFile(PathAddSeparator(BPLPath) + BinaryFileName); finally SetCurrentDir(SaveDir); end; @@ -2813,7 +2816,7 @@ GetBPRFileInfo(ProjectName, BinaryFileName); Result := Result and Make.Execute(Format('%s -f%s', [StringsToStr(Make.Options, ' '), StrDoubleQuote(MakeFileName)])) - and LinkMapFile(PathAddSeparator(OutputDir) + BinaryFileName); + and ProcessMapFile(PathAddSeparator(OutputDir) + BinaryFileName); finally SetCurrentDir(SaveDir); end; @@ -2850,7 +2853,7 @@ BinaryFileName := PathAddSeparator(BPLPath) + PathExtractFileNameNoExt(PackageName) + LibSuffix + BinaryExtensionPackage; Result := DCC32.MakePackage(PackageName, BPLPath, DCPPath, NewOptions) - and LinkMapFile(BinaryFileName); + and ProcessMapFile(BinaryFileName); if Result then OutputString(RsCompilationOk) @@ -2877,7 +2880,7 @@ BinaryFileName := PathAddSeparator(OutputDir) + PathExtractFileNameNoExt(ProjectName) + LibSuffix + BinaryExtension; Result := DCC32.MakeProject(ProjectName, OutputDir, DcpSearchPath, ExtraOptions) - and LinkMapFile(BinaryFileName); + and ProcessMapFile(BinaryFileName); if Result then OutputString(RsCompilationOk) @@ -3360,28 +3363,38 @@ Result := PathAddSeparator(RootDir) + PathAddSeparator('lib'); end; -function TJclBorRADToolInstallation.LinkMapFile( +function TJclBorRADToolInstallation.ProcessMapFile( const BinaryFileName: string): Boolean; var MAPFileName, LinkerBugUnit: string; MAPFileSize, JclDebugDataSize: Integer; begin {$IFDEF MSWINDOWS} - if MapLink then + if JdbgCreate then begin - OutputString(Format(RsLinkingMap, [BinaryFileName])); - MAPFileName := ChangeFileExt(BinaryFileName,'.MAP'); - Result := InsertDebugDataIntoExecutableFile(BinaryFileName, MAPFileName, - LinkerBugUnit, MAPFileSize, JclDebugDataSize); + MAPFileName := ChangeFileExt(BinaryFileName, CompilerExtensionMAP); + + if JdbgInsert then + begin + OutputString(Format(RsInsertingJdbg, [BinaryFileName])); + Result := InsertDebugDataIntoExecutableFile(BinaryFileName, MAPFileName, + LinkerBugUnit, MAPFileSize, JclDebugDataSize); + OutputString(Format(RsJdbgInfo, [LinkerBugUnit, MAPFileSize, JclDebugDataSize])); + end + else + begin + OutputString(Format(RsCreatingJdbg, [BinaryFileName])); + Result := ConvertMapFileToJdbgFile(MAPFileName); + end; if Result then begin - OutputString(RsLinkMapOk); - OutputString(Format(RsLinkMapInfo, [LinkerBugUnit, MAPFileSize, JclDebugDataSize])); + OutputString(RsJdbgInfoOk); + if MapDelete then OutputFileDelete(MAPFileName); end else - OutputString(RsLinkMapFailed); + OutputString(RsJdbgInfoFailed); end else Result := True; @@ -4206,7 +4219,7 @@ BinaryFileName := PathAddSeparator(OutputDir) + PathExtractFileNameNoExt(ProjectName) + LibSuffix + BinaryExtension; Result := DCC32.MakeProject(ProjectName, OutputDir, DcpSearchPath, ExtraOptions) - and LinkMapFile(BinaryFileName); + and ProcessMapFile(BinaryFileName); if Result then OutputString(RsCompilationOk) Modified: trunk/jcl/source/common/JclResources.pas =================================================================== --- trunk/jcl/source/common/JclResources.pas 2006-07-31 09:27:12 UTC (rev 1702) +++ trunk/jcl/source/common/JclResources.pas 2006-07-31 09:32:00 UTC (rev 1703) @@ -123,10 +123,11 @@ RsCompilingProject = 'Compiling project %s'; RsCompilationOk = 'Compilation success'; RsCompilationFailed = 'Compilation failure'; - RsLinkingMap = 'Linking MAP file in %s'; - RsLinkMapOk = 'Map link success'; - RsLinkMapInfo = 'Bug unit: %s; MAP size: %d; Debug size: %d'; - RsLinkMapFailed = 'Map link failure'; + RsCreatingJdbg = 'Creating Jedi Debug informations for %s'; + RsInsertingJdbg = 'Inserting Jedi Debug informations in %s'; + RsJdbgInfo = 'Bug unit: %s; MAP size: %d; Debug size: %d'; + RsJdbgInfoOk = 'JDBG successfully generated'; + RsJdbgInfoFailed = 'Cannot generate JDBG informations'; RsDeletingFile = 'Deleting file %s'; RsFileDeletionOk = 'File deletion success'; RsFileDeletionFailed = 'File deletion failure'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-31 09:27:19
|
Revision: 1702 Author: outchy Date: 2006-07-31 02:27:12 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1702&view=rev Log Message: ----------- Mantis 3843 SHCopy donated by kogerbnz Modified Paths: -------------- trunk/jcl/source/windows/JclShell.pas Modified: trunk/jcl/source/windows/JclShell.pas =================================================================== --- trunk/jcl/source/windows/JclShell.pas 2006-07-31 09:23:20 UTC (rev 1701) +++ trunk/jcl/source/windows/JclShell.pas 2006-07-31 09:27:12 UTC (rev 1702) @@ -26,6 +26,8 @@ { Olivier Sannier (obones) } { Matthias Thoma (mthoma) } { Petr Vones (pvones) } +{ kogerbnz } +{ Florent Ouchet (outchy) } { } {**************************************************************************************************} { } @@ -59,6 +61,10 @@ TSHDeleteOptions = set of TSHDeleteOption; TSHRenameOption = (roSilent, roRenameOnCollision); TSHRenameOptions = set of TSHRenameOption; + TSHCopyOption = (coSilent, coAllowUndo, coFilesOnly, coNoConfirmation); + TSHCopyOptions = set of TSHCopyOption; + TSHMoveOption = (moSilent, moAllowUndo, moFilesOnly, moNoConfirmation); + TSHMoveOptions = set of TSHMoveOption; TUnicodePath = array [0..MAX_PATH-1] of WideChar; TAnsiPath = array [0..MAX_PATH-1] of char; @@ -66,6 +72,8 @@ function SHDeleteFiles(Parent: THandle; const Files: string; Options: TSHDeleteOptions): Boolean; function SHDeleteFolder(Parent: THandle; const Folder: string; Options: TSHDeleteOptions): Boolean; function SHRenameFile(const Src, Dest: string; Options: TSHRenameOptions): Boolean; +function SHCopy(Parent: THandle; const Src, Dest: string; Options: TSHCopyOptions): Boolean; +function SHMove(Parent: THandle; const Src, Dest: string; Options: TSHMoveOptions): Boolean; type TEnumFolderFlag = (efFolders, efNonFolders, efIncludeHidden); @@ -304,6 +312,80 @@ {$ENDIF FPC} end; +function CopyOptionsToCardinal(Options: TSHCopyOptions): Cardinal; +begin + Result := 0; + if coSilent in Options then + Result := Result or FOF_SILENT; + if coAllowUndo in Options then + Result := Result or FOF_ALLOWUNDO; + if coFilesOnly in Options then + Result := Result or FOF_FILESONLY; + if coNoConfirmation in Options then + Result := Result or FOF_NOCONFIRMATION or FOF_NOCONFIRMMKDIR; +end; + +function SHCopy(Parent: THandle; const Src, Dest: string; Options: TSHCopyOptions): Boolean; +var + FileOp: TSHFileOpStruct; + Source, Destination: string; +begin + FillChar(FileOp,SizeOf(FileOp),0); + {$IFDEF FPC} + FileOp.THandle := Parent; + {$ELSE} + FileOp.Wnd := Parent; + {$ENDIF FPC} + FileOp.wFunc := FO_COPY; + Source := Src + #0#0; + Destination := Dest + #0#0; + FileOp.pFrom := PChar(Source); + FileOp.pTo := PChar(Destination); + FileOp.fFlags := CopyOptionsToCardinal(Options); + {$IFDEF FPC} + Result := SHFileOperation(@FileOp) = 0; + {$ELSE} + Result := SHFileOperation(FileOp) = 0; + {$ENDIF FPC} +end; + +function MoveOptionsToCardinal(Options: TSHMoveOptions): Cardinal; +begin + Result := 0; + if moSilent in Options then + Result := Result or FOF_SILENT; + if moAllowUndo in Options then + Result := Result or FOF_ALLOWUNDO; + if moFilesOnly in Options then + Result := Result or FOF_FILESONLY; + if moNoConfirmation in Options then + Result := Result or FOF_NOCONFIRMATION; +end; + +function SHMove(Parent: THandle; const Src, Dest: string; Options: TSHMoveOptions): Boolean; +var + FileOp: TSHFileOpStruct; + Source, Destination: string; +begin + FillChar(FileOp,SizeOf(FileOp),0); + {$IFDEF FPC} + FileOp.THandle := Parent; + {$ELSE} + FileOp.Wnd := Parent; + {$ENDIF FPC} + FileOp.wFunc := FO_MOVE; + Source := Src + #0#0; + Destination := Dest + #0#0; + FileOp.pFrom := PChar(Source); + FileOp.pTo := PChar(Destination); + FileOp.fFlags := MoveOptionsToCardinal(Options); + {$IFDEF FPC} + Result := SHFileOperation(@FileOp) = 0; + {$ELSE} + Result := SHFileOperation(FileOp) = 0; + {$ENDIF FPC} +end; + function EnumFolderFlagsToCardinal(Flags: TEnumFolderFlags): Cardinal; begin Result := 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-31 09:23:27
|
Revision: 1701 Author: outchy Date: 2006-07-31 02:23:20 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1701&view=rev Log Message: ----------- Mantis 3842: donation of RegValueExists by kogerbnz Modified Paths: -------------- trunk/jcl/source/windows/JclRegistry.pas Modified: trunk/jcl/source/windows/JclRegistry.pas =================================================================== --- trunk/jcl/source/windows/JclRegistry.pas 2006-07-30 19:48:09 UTC (rev 1700) +++ trunk/jcl/source/windows/JclRegistry.pas 2006-07-31 09:23:20 UTC (rev 1701) @@ -27,6 +27,7 @@ { Robert Rossmair (rrossmair) } { Olivier Sannier (obones) } { Petr Vones (pvones) } +{ kogerbnz } { } {**************************************************************************************************} { } @@ -217,6 +218,7 @@ end; } function RegKeyExists(const RootKey: DelphiHKEY; const Key: string): Boolean; +function RegValueExists(const RootKey: DelphiHKEY; const Key, Name: string): Boolean; function UnregisterAutoExec(ExecKind: TExecKind; const Name: string): Boolean; function RegisterAutoExec(ExecKind: TExecKind; const Name, Cmdline: string): Boolean; @@ -1573,6 +1575,18 @@ RegCloseKey(RegKey); end; +function RegValueExists(const RootKey: DelphiHKEY; const Key, Name: string): Boolean; +var + RegKey: HKEY; +begin + Result := (RegOpenKeyEx(RootKey, RelativeKey(RootKey, PChar(Key)), 0, KEY_READ, RegKey) = ERROR_SUCCESS); + if Result then + begin + Result := RegQueryValueEx(RegKey, PChar(Name), nil, nil, nil, nil) = ERROR_SUCCESS; + RegCloseKey(RegKey); + end; +end; + function RegSaveList(const RootKey: DelphiHKEY; const Key: string; const ListName: string; const Items: TStrings): Boolean; var This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-30 19:48:26
|
Revision: 1700 Author: outchy Date: 2006-07-30 12:48:09 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1700&view=rev Log Message: ----------- unit versioning for VCL and CLX units Modified Paths: -------------- trunk/jcl/source/prototypes/_GraphUtils.pas trunk/jcl/source/prototypes/_Graphics.pas trunk/jcl/source/vcl/JclGraphUtils.pas trunk/jcl/source/vcl/JclGraphics.pas trunk/jcl/source/visclx/JclQGraphUtils.pas trunk/jcl/source/visclx/JclQGraphics.pas Modified: trunk/jcl/source/prototypes/_GraphUtils.pas =================================================================== --- trunk/jcl/source/prototypes/_GraphUtils.pas 2006-07-30 19:18:34 UTC (rev 1699) +++ trunk/jcl/source/prototypes/_GraphUtils.pas 2006-07-30 19:48:09 UTC (rev 1700) @@ -57,6 +57,9 @@ {$IFDEF VisualCLX} Qt, QGraphics, {$ENDIF VisualCLX} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase; type @@ -293,6 +296,21 @@ BlendLine: TBlendLine; BlendLineEx: TBlendLineEx; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + {$IFDEF VCL} + LogPath: 'JCL\source\vcl' + {$ENDIF VCL} + {$IFDEF VisualCLX} + LogPath: 'JCL\source\visclx' + {$ENDIF VisualCLX} + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -2622,9 +2640,15 @@ SetupFunctions; if MMX_ACTIVE then GenAlphaTable; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} finalization if MMX_ACTIVE then FreeAlphaTable; + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} end. Modified: trunk/jcl/source/prototypes/_Graphics.pas =================================================================== --- trunk/jcl/source/prototypes/_Graphics.pas 2006-07-30 19:18:34 UTC (rev 1699) +++ trunk/jcl/source/prototypes/_Graphics.pas 2006-07-30 19:48:09 UTC (rev 1700) @@ -56,6 +56,9 @@ Windows, {$ENDIF MSWINDOWS} Classes, SysUtils, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} {$IFDEF VisualCLX} Types, QGraphics, JclQGraphUtils, {$ELSE} @@ -548,6 +551,21 @@ procedure SetGamma(Gamma: Single = 0.7); {$ENDIF Bitmap32} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + {$IFDEF VCL} + LogPath: 'JCL\source\vcl' + {$ENDIF VCL} + {$IFDEF VisualCLX} + LogPath: 'JCL\source\visclx' + {$ENDIF VisualCLX} + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -5685,5 +5703,11 @@ initialization SetIdentityMatrix; SetGamma(0.7); +{$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/vcl/JclGraphUtils.pas =================================================================== --- trunk/jcl/source/vcl/JclGraphUtils.pas 2006-07-30 19:18:34 UTC (rev 1699) +++ trunk/jcl/source/vcl/JclGraphUtils.pas 2006-07-30 19:48:09 UTC (rev 1700) @@ -46,6 +46,9 @@ Windows, SysUtils, Graphics, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase; type @@ -270,6 +273,16 @@ BlendLine: TBlendLine; BlendLineEx: TBlendLineEx; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\vcl' + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -2577,9 +2590,15 @@ SetupFunctions; if MMX_ACTIVE then GenAlphaTable; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} finalization if MMX_ACTIVE then FreeAlphaTable; + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} end. Modified: trunk/jcl/source/vcl/JclGraphics.pas =================================================================== --- trunk/jcl/source/vcl/JclGraphics.pas 2006-07-30 19:18:34 UTC (rev 1699) +++ trunk/jcl/source/vcl/JclGraphics.pas 2006-07-30 19:48:09 UTC (rev 1700) @@ -50,6 +50,9 @@ uses Windows, Classes, SysUtils, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Graphics, JclGraphUtils, Controls, JclBase; @@ -518,6 +521,16 @@ procedure ApplyLUT(Dst, Src: TJclBitmap32; const LUT: TLUT8); procedure SetGamma(Gamma: Single = 0.7); +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\vcl' + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -5607,5 +5620,11 @@ initialization SetIdentityMatrix; SetGamma(0.7); +{$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/visclx/JclQGraphUtils.pas =================================================================== --- trunk/jcl/source/visclx/JclQGraphUtils.pas 2006-07-30 19:18:34 UTC (rev 1699) +++ trunk/jcl/source/visclx/JclQGraphUtils.pas 2006-07-30 19:48:09 UTC (rev 1700) @@ -46,6 +46,9 @@ {$ENDIF MSWINDOWS} SysUtils, Qt, QGraphics, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} JclBase; type @@ -272,6 +275,16 @@ BlendLine: TBlendLine; BlendLineEx: TBlendLineEx; +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\visclx' + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -2500,9 +2513,15 @@ SetupFunctions; if MMX_ACTIVE then GenAlphaTable; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} finalization if MMX_ACTIVE then FreeAlphaTable; + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} end. Modified: trunk/jcl/source/visclx/JclQGraphics.pas =================================================================== --- trunk/jcl/source/visclx/JclQGraphics.pas 2006-07-30 19:18:34 UTC (rev 1699) +++ trunk/jcl/source/visclx/JclQGraphics.pas 2006-07-30 19:48:09 UTC (rev 1700) @@ -52,6 +52,9 @@ Windows, {$ENDIF MSWINDOWS} Classes, SysUtils, + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Types, QGraphics, JclQGraphUtils, JclBase; @@ -179,6 +182,16 @@ +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\visclx' + ); +{$ENDIF UNITVERSIONING} + implementation uses @@ -1466,5 +1479,11 @@ initialization SetIdentityMatrix; SetGamma(0.7); +{$IFDEF UNITVERSIONING} + 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...> - 2006-07-30 19:19:06
|
Revision: 1699 Author: outchy Date: 2006-07-30 12:18:34 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1699&view=rev Log Message: ----------- EDI units being weak package units is now an option. unit version info are added when EDI units are not weak package units. Modified Paths: -------------- trunk/jcl/install/JclInstall.pas trunk/jcl/install/JediInstall.pas trunk/jcl/source/common/JclEDI.pas trunk/jcl/source/common/JclEDISEF.pas trunk/jcl/source/common/JclEDITranslators.pas trunk/jcl/source/common/JclEDIXML.pas trunk/jcl/source/common/JclEDI_ANSIX12.pas trunk/jcl/source/common/JclEDI_ANSIX12_Ext.pas trunk/jcl/source/common/JclEDI_UNEDIFACT.pas trunk/jcl/source/common/JclEDI_UNEDIFACT_Ext.pas trunk/jcl/source/jclc5.inc trunk/jcl/source/jclc6.inc trunk/jcl/source/jclcs1.inc trunk/jcl/source/jcld10.inc trunk/jcl/source/jcld10.net.inc trunk/jcl/source/jcld5.inc trunk/jcl/source/jcld6.inc trunk/jcl/source/jcld7.inc trunk/jcl/source/jcld8.inc trunk/jcl/source/jcld9.inc trunk/jcl/source/jcld9.net.inc trunk/jcl/source/jclk3.inc Modified: trunk/jcl/install/JclInstall.pas =================================================================== --- trunk/jcl/install/JclInstall.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/install/JclInstall.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -258,6 +258,8 @@ RsDefDebugNoExports = 'No debug source from function export table for libraries'; RsDefDebugNoSymbols = 'No debug source from Microsoft debug symbols'; + RsDefEDIWeakPackageUnits = 'EDI weak package units'; + RsMapCreate = 'Create MAP files'; RsMapLink = 'Link MAP files'; RsMapDelete = 'Delete MAP files after the link'; @@ -315,6 +317,7 @@ RsHintJclDefDebugNoTD32 = 'Disable support for TD32 informations'; RsHintJclDefDebugNoExports = 'Disable support for export names of libraries'; RsHintJclDefDebugNoSymbols = 'Disable support for Microsoft debug symbols (PDB and DBG files)'; + RsHintJclDefEDIWeakPackageUnits = 'Mark EDI units as weak package units (check if you use the original EDI package)'; RsHintJclMapCreate = 'Create detailled MAP files for each libraries'; RsHintJclMapLink = 'Link MAP files as a resource in the output library or executable, the stack can be traced on exceptions'; RsHintJclMapDelete = 'Once linked in the binary, delete the original MAP file'; @@ -426,6 +429,9 @@ (Parent: ioJCL; // ioJclDefDebugNoSymbols Caption: RsDefDebugNoSymbols; Hint: RsHintJclDefDebugNoSymbols), + (Parent: ioJCL; // ioJclDefEDIWeakPackageUnits + Caption: RsDefEDIWeakPackageUnits; + Hint: RsHintJclDefEDIWeakPackageUnits), (Parent: ioJCL; // ioJclMapCreate Caption: RsMapCreate; Hint: RsHintJclMapCreate), @@ -1326,6 +1332,7 @@ AddNode(ProductNode, ioJclDefDebugNoMap, [goNoAutoCheck]); AddNode(ProductNode, ioJclDefDebugNoExports, [goNoAutoCheck]); AddNode(ProductNode, ioJclDefDebugNoSymbols, [goNoAutoCheck]); + AddNode(ProductNode, ioJclDefEDIWeakPackageUnits, [goNoAutoCheck]); EnvNode := AddNode(ProductNode, ioJclEnv); AddNode(EnvNode, ioJclEnvLibPath); @@ -1512,6 +1519,8 @@ Defines.Add('DEBUG_NO_EXPORTS'); ioJclDefDebugNoSymbols: Defines.Add('DEBUG_NO_SYMBOLS'); + ioJclDefEDIWeakPackageUnits: + Defines.Add('EDI_WEAK_PACKAGE_UNITS'); ioJclMapCreate: Target.MapCreate := True; ioJclMapLink: Modified: trunk/jcl/install/JediInstall.pas =================================================================== --- trunk/jcl/install/JediInstall.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/install/JediInstall.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -47,6 +47,7 @@ ioJclDefDebugNoMap, ioJclDefDebugNoExports, ioJclDefDebugNoSymbols, + ioJclDefEDIWeakPackageUnits, ioJclMapCreate, ioJclMapLink, ioJclMapDelete, Modified: trunk/jcl/source/common/JclEDI.pas =================================================================== --- trunk/jcl/source/common/JclEDI.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDI.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -40,10 +40,11 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} - +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} // Add the following directive in project options for debugging memory leaks. // {$DEFINE ENABLE_EDI_DEBUGGING} @@ -51,6 +52,11 @@ uses SysUtils, Classes, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclBase; const @@ -370,6 +376,18 @@ function StringRemove(const S, Pattern: string; Flags: TReplaceFlags): string; function StringReplace(const S, OldPattern, NewPattern: string; Flags: TReplaceFlags): string; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation uses @@ -1638,4 +1656,13 @@ Result := Peek; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} end. Modified: trunk/jcl/source/common/JclEDISEF.pas =================================================================== --- trunk/jcl/source/common/JclEDISEF.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDISEF.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -39,14 +39,21 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} interface uses SysUtils, Classes, Contnrs, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI; const @@ -793,6 +800,18 @@ function InsertTableInto(DataObjectGroup: TEDISEFDataObjectGroup; Table: TEDISEFTable; BeforeObject: TEDISEFDataObject): TEDISEFTable; overload; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation uses @@ -4674,4 +4693,14 @@ end; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/common/JclEDITranslators.pas =================================================================== --- trunk/jcl/source/common/JclEDITranslators.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDITranslators.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -39,14 +39,21 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} interface uses - SysUtils, + SysUtils, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI, JclEDI_ANSIX12, JclEDISEF; type @@ -81,6 +88,18 @@ destructor Destroy; override; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation uses @@ -394,4 +413,14 @@ inherited Destroy; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/common/JclEDIXML.pas =================================================================== --- trunk/jcl/source/common/JclEDIXML.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDIXML.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -43,14 +43,21 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} interface uses SysUtils, Classes, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI, JclEDI_ANSIX12; const @@ -435,6 +442,18 @@ XMLTransactionSet: TEDIXMLTransactionSet): TEDITransactionSet; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation uses @@ -2669,5 +2688,15 @@ end; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/common/JclEDI_ANSIX12.pas =================================================================== --- trunk/jcl/source/common/JclEDI_ANSIX12.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDI_ANSIX12.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -39,9 +39,11 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} // (Default) Enable the following directive to use the optimized JclEDI.StringReplace function. {$DEFINE OPTIMIZED_STRINGREPLACE} @@ -49,7 +51,12 @@ interface uses - SysUtils, Classes, + SysUtils, Classes, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI; const @@ -614,6 +621,18 @@ function InternalCreateInterchangeControl: TEDIInterchangeControl; override; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation uses @@ -3255,4 +3274,14 @@ EDIObject := TEDITransactionSetLoop(Loop[I]); end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/common/JclEDI_ANSIX12_Ext.pas =================================================================== --- trunk/jcl/source/common/JclEDI_ANSIX12_Ext.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDI_ANSIX12_Ext.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -39,14 +39,21 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} interface uses - SysUtils, Classes, Contnrs, JclResources, + SysUtils, Classes, Contnrs, JclResources, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI, JclEDI_ANSIX12, JclEDISEF; type @@ -87,6 +94,18 @@ property ErrorOccured: Boolean read FErrorOccured; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation constructor TEDI_ANSIX12_Document.Create(Parent: TEDIDataObject; @@ -257,4 +276,14 @@ end; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/common/JclEDI_UNEDIFACT.pas =================================================================== --- trunk/jcl/source/common/JclEDI_UNEDIFACT.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDI_UNEDIFACT.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -39,9 +39,11 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} -{$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} // (Default) Enable the following directive to use the optimized JclEDI.StringReplace function. {$DEFINE OPTIMIZED_STRINGREPLACE} @@ -50,6 +52,11 @@ uses SysUtils, Classes, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI; const @@ -422,6 +429,18 @@ TEDIFileArray = array of TEDIFile; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation uses @@ -2310,4 +2329,14 @@ end; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/common/JclEDI_UNEDIFACT_Ext.pas =================================================================== --- trunk/jcl/source/common/JclEDI_UNEDIFACT_Ext.pas 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/common/JclEDI_UNEDIFACT_Ext.pas 2006-07-30 19:18:34 UTC (rev 1699) @@ -39,14 +39,21 @@ {$I jcl.inc} -{$IFDEF SUPPORTS_WEAKPACKAGEUNIT} - {$WEAKPACKAGEUNIT ON} -{$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$IFDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF SUPPORTS_WEAKPACKAGEUNIT} + {$WEAKPACKAGEUNIT ON} + {$ENDIF SUPPORTS_WEAKPACKAGEUNIT} +{$ENDIF EDI_WEAK_PACKAGE_UNITS} interface uses - SysUtils, Classes, Contnrs, JclResources, + SysUtils, Classes, Contnrs, JclResources, + {$IFNDEF EDI_WEAK_PACKAGE_UNITS} + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} + {$ENDIF ~EDI_WEAK_PACKAGE_UNITS} JclEDI, JclEDI_UNEDIFACT, JclEDISEF; type @@ -90,6 +97,18 @@ property ErrorOccured: Boolean read FErrorOccured; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + implementation // { TEDI_UNEDIFACT_Document } @@ -262,4 +281,14 @@ end; end; +{$IFNDEF EDI_WEAK_PACKAGE_UNITS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} +{$ENDIF ~EDI_WEAK_PACKAGE_UNITS} + end. Modified: trunk/jcl/source/jclc5.inc =================================================================== --- trunk/jcl/source/jclc5.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jclc5.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,6 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} + Modified: trunk/jcl/source/jclc6.inc =================================================================== --- trunk/jcl/source/jclc6.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jclc6.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jclcs1.inc =================================================================== --- trunk/jcl/source/jclcs1.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jclcs1.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld10.inc =================================================================== --- trunk/jcl/source/jcld10.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld10.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld10.net.inc =================================================================== --- trunk/jcl/source/jcld10.net.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld10.net.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -64,3 +64,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld5.inc =================================================================== --- trunk/jcl/source/jcld5.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld5.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -47,7 +47,7 @@ // JclHookExcept support for hooking exceptions from DLLs -{.$DEFINE HOOK_DLL_EXCEPTIONS} +{$DEFINE HOOK_DLL_EXCEPTIONS} //Threadsafe directive (added for DCL support) @@ -59,7 +59,7 @@ //Support for JclUnitVersioning.pas) -{$DEFINE UNITVERSIONING} +{.$DEFINE UNITVERSIONING} // debug sources // defining these symbols will the debug source to be automatically registered @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{.$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld6.inc =================================================================== --- trunk/jcl/source/jcld6.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld6.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld7.inc =================================================================== --- trunk/jcl/source/jcld7.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld7.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld8.inc =================================================================== --- trunk/jcl/source/jcld8.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld8.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld9.inc =================================================================== --- trunk/jcl/source/jcld9.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld9.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jcld9.net.inc =================================================================== --- trunk/jcl/source/jcld9.net.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jcld9.net.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} Modified: trunk/jcl/source/jclk3.inc =================================================================== --- trunk/jcl/source/jclk3.inc 2006-07-30 18:35:45 UTC (rev 1698) +++ trunk/jcl/source/jclk3.inc 2006-07-30 19:18:34 UTC (rev 1699) @@ -69,3 +69,5 @@ {.$DEFINE DEBUG_NO_EXPORTS} {.$DEFINE DEBUG_NO_SYMBOLS} +// mark EDI units as weak package units (to avoid conflicts with the EDI package) +{$DEFINE EDI_WEAK_PACKAGE_UNITS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-30 18:36:15
|
Revision: 1698 Author: outchy Date: 2006-07-30 11:35:45 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1698&view=rev Log Message: ----------- Minor style cleaning in the installer Installation options saved to an include file per target Customization for debug sources, exception hook and math extreme numbers Modified Paths: -------------- trunk/jcl/install/JclInstall.pas trunk/jcl/install/JediInstall.pas trunk/jcl/source/jcl.inc Added Paths: ----------- trunk/jcl/source/jclc5.inc trunk/jcl/source/jclc6.inc trunk/jcl/source/jclcs1.inc trunk/jcl/source/jcld10.inc trunk/jcl/source/jcld10.net.inc trunk/jcl/source/jcld5.inc trunk/jcl/source/jcld6.inc trunk/jcl/source/jcld7.inc trunk/jcl/source/jcld8.inc trunk/jcl/source/jcld9.inc trunk/jcl/source/jcld9.net.inc trunk/jcl/source/jclk3.inc Modified: trunk/jcl/install/JclInstall.pas =================================================================== --- trunk/jcl/install/JclInstall.pas 2006-07-29 11:32:57 UTC (rev 1697) +++ trunk/jcl/install/JclInstall.pas 2006-07-30 18:35:45 UTC (rev 1698) @@ -96,6 +96,7 @@ protected constructor Create(JclDistribution: TJclDistribution; InstallTarget: TJclBorRADToolInstallation); function CompileLibraryUnits(const SubDir: string; Debug: Boolean): Boolean; + function SaveDefines: Boolean; {$IFDEF MSWINDOWS} procedure AddHelpToIdeTools; procedure AddHelpToOpenHelp; @@ -246,9 +247,17 @@ RsDefMathPrecSingle = 'Single float precision'; RsDefMathPrecDouble = 'Double float precision'; RsDefMathPrecExtended = 'Extended float precision'; - - RsUnitVersioning = 'Include Unit Versioning'; + RsDefMathExtremeValues = 'Support for infinite and NaN'; + RsDefUnitVersioning = 'Include Unit Versioning'; + + RsDefHookDllExceptions = 'Hook exceptions in DLL'; + RsDefDebugNoBinary = 'No debug source from Jedi debug informations'; + RsDefDebugNoTD32 = 'No debug source from TD32 debug symbols'; + RsDefDebugNoMap = 'No debug source from Map files'; + RsDefDebugNoExports = 'No debug source from function export table for libraries'; + RsDefDebugNoSymbols = 'No debug source from Microsoft debug symbols'; + RsMapCreate = 'Create MAP files'; RsMapLink = 'Link MAP files'; RsMapDelete = 'Delete MAP files after the link'; @@ -298,7 +307,14 @@ RsHintJclDefMathPrecSingle = 'type Float = Single'; RsHintJclDefMathPrecDouble = 'type Float = Double'; RsHintJclDefMathPrecExtended = 'type Float = Extended'; - RsHintJclUnitVersioning = 'Includes JCL Unit Versioning informations into each jcl unit (see also JclUnitVersioning.pas)'; + RsHintJclDefMathExtremeValues = 'Exp en Power functions accept and return infinite and NaN'; + RsHintJclDefUnitVersioning = 'Includes JCL Unit Versioning informations into each jcl unit (see also JclUnitVersioning.pas)'; + RsHintJclDefHookDllExceptions = 'Hook exceptions raised in DLL compiled with the JCL'; + RsHintJclDefDebugNoBinary = 'Disable support for JDBG files'; + RsHintJclDefDebugNoMap = 'Disable support for MAP files'; + RsHintJclDefDebugNoTD32 = 'Disable support for TD32 informations'; + RsHintJclDefDebugNoExports = 'Disable support for export names of libraries'; + RsHintJclDefDebugNoSymbols = 'Disable support for Microsoft debug symbols (PDB and DBG files)'; RsHintJclMapCreate = 'Create detailled MAP files for each libraries'; RsHintJclMapLink = 'Link MAP files as a resource in the output library or executable, the stack can be traced on exceptions'; RsHintJclMapDelete = 'Once linked in the binary, delete the original MAP file'; @@ -386,9 +402,30 @@ (Parent: ioJCL; // ioJclDefMathPrecExtended Caption: RsDefMathPrecExtended; Hint: RsHintJclDefMathPrecExtended), - (Parent: ioJCL; // ioJclUnitVersioning - Caption: RsUnitVersioning; - Hint: RsHintJclUnitVersioning), + (Parent: ioJCL; // ioJclDefMathExtremeValues + Caption: RsDefMathExtremeValues; + Hint: RsHintJclDefMathExtremeValues), + (Parent: ioJCL; // ioJclDefUnitVersioning + Caption: RsDefUnitVersioning; + Hint: RsHintJclDefUnitVersioning), + (Parent: ioJCL; // ioJclDefHookDllExceptions + Caption: RsDefHookDllExceptions; + Hint: RsHintJclDefHookDllExceptions), + (Parent: ioJCL; // ioJclDefDebugNoBinary + Caption: RsDefDebugNoBinary; + Hint: RsHintJclDefDebugNoBinary), + (Parent: ioJCL; // ioJclDefDebugNoTD32 + Caption: RsDefDebugNoTD32; + Hint: RsHintJclDefDebugNoTD32), + (Parent: ioJCL; // ioJclDefDebugNoMap + Caption: RsDefDebugNoMap; + Hint: RsHintJclDefDebugNoMap), + (Parent: ioJCL; // ioJclDefDebugNoExports + Caption: RsDefDebugNoExports; + Hint: RsHintJclDefDebugNoExports), + (Parent: ioJCL; // ioJclDefDebugNoSymbols + Caption: RsDefDebugNoSymbols; + Hint: RsHintJclDefDebugNoSymbols), (Parent: ioJCL; // ioJclMapCreate Caption: RsMapCreate; Hint: RsHintJclMapCreate), @@ -895,7 +932,7 @@ with Target.DCC32 do begin SetDefaultOptions; - Options.Add('-D' + StringsToStr(Defines, ';')); + //Options.Add('-D' + StringsToStr(Defines, ';')); Options.Add('-M'); if Target.RADToolKind = brCppBuilder then begin @@ -1281,7 +1318,14 @@ AddNode(ProductNode, ioJclDefMathPrecSingle, [goRadioButton]); AddNode(ProductNode, ioJclDefMathPrecDouble, [goRadioButton]); AddNode(ProductNode, ioJclDefMathPrecExtended, [goRadioButton, goChecked]); - AddNode(ProductNode, ioJclUnitVersioning); + AddNode(ProductNode, ioJclDefMathExtremeValues, [goChecked]); + AddNode(ProductNode, ioJclDefUnitVersioning, [goChecked]); + AddNode(ProductNode, ioJclDefHookDllExceptions, [goNoAutoCheck]); + AddNode(ProductNode, ioJclDefDebugNoBinary, [goNoAutoCheck]); + AddNode(ProductNode, ioJclDefDebugNoTD32, [goNoAutoCheck]); + AddNode(ProductNode, ioJclDefDebugNoMap, [goNoAutoCheck]); + AddNode(ProductNode, ioJclDefDebugNoExports, [goNoAutoCheck]); + AddNode(ProductNode, ioJclDefDebugNoSymbols, [goNoAutoCheck]); EnvNode := AddNode(ProductNode, ioJclEnv); AddNode(EnvNode, ioJclEnvLibPath); @@ -1452,8 +1496,22 @@ Defines.Add('MATH_DOUBLE_PRECISION'); ioJclDefMathPrecExtended: Defines.Add('MATH_EXTENDED_PRECISION'); - ioJclUnitVersioning: + ioJclDefMathExtremeValues: + Defines.Add('MATH_EXT_EXTREMEVALUES'); + ioJclDefUnitVersioning: Defines.Add('UNITVERSIONING'); + ioJclDefHookDllExceptions: + Defines.Add('HOOK_DLL_EXCEPTIONS'); + ioJclDefDebugNoBinary: + Defines.Add('DEBUG_NO_BINARY'); + ioJclDefDebugNoTD32: + Defines.Add('DEBUG_NO_TD32'); + ioJclDefDebugNoMap: + Defines.Add('DEBUG_NO_MAP'); + ioJclDefDebugNoExports: + Defines.Add('DEBUG_NO_EXPORTS'); + ioJclDefDebugNoSymbols: + Defines.Add('DEBUG_NO_SYMBOLS'); ioJclMapCreate: Target.MapCreate := True; ioJclMapLink: @@ -1505,7 +1563,8 @@ ioJclEnvDebugDCUPath: if Target.AddToDebugDCUPath(DebugDcuDir) then WriteLog(Format(LineBreak + 'Added "%s" to Debug DCU Path.', [DebugDcuDir])); - // ioJclMake: + ioJclMake: + Result := SaveDefines; ioJclMakeRelease: Result := MakeUnits(False); // ioJclMakeReleaseVClx: handled with ioJclMakeRelease @@ -2087,6 +2146,17 @@ end; {$ENDIF MSWINDOWS} +function TJclInstallation.RemoveSettings: Boolean; +var + JclSettingsKey: string; +begin + JclSettingsKey := Target.ConfigDataLocation + '\Jedi\JCL'; + if RegKeyExists(HKCU, JclSettingsKey) then + Result := RegDeleteKeyTree(HKCU, JclSettingsKey) + else + Result := True; +end; + function TJclInstallation.Run: Boolean; procedure EnsureDirectoryExists(const DirectoryName, DisplayName: string); begin @@ -2136,6 +2206,68 @@ SaveOptions; end; +function TJclInstallation.SaveDefines: Boolean; +var + IncludeFileName, IncludeLine, Symbol: string; + IncludeFile: TStrings; + IndexLine, DefinePos, SymbolEnd: Integer; + Defined, NotDefined: Boolean; +const + DefineText = '$DEFINE'; + NotDefineText = '.' + DefineText; +begin + WriteLog('Saving conditional defines...'); + Result := True; + IncludeFileName := Format('%sjcl%s.inc', [PathAddSeparator(Distribution.SourceDir), Target.VersionNumberStr]); + + try + IncludeFile := TStringList.Create; + try + IncludeFile.LoadFromFile(IncludeFileName); + WriteLog('Include file loaded'); + + for IndexLine := 0 to IncludeFile.Count - 1 do + begin + IncludeLine := IncludeFile.Strings[IndexLine]; + DefinePos := AnsiPos(DefineText, UpperCase(IncludeLine)); + if DefinePos > 1 then + begin + Defined := IncludeLine[DefinePos - 1] = '{'; + NotDefined := IncludeLine[DefinePos - 1] = '.'; + if Defined or NotDefined then + begin + Inc(DefinePos, Length(DefineText)); + while IncludeLine[DefinePos] in AnsiWhiteSpace do + Inc(DefinePos); + SymbolEnd := DefinePos; + while IncludeLine[SymbolEnd] in AnsiValidIdentifierLetters do + Inc(SymbolEnd); + + Symbol := Copy(IncludeLine, DefinePos, SymbolEnd - DefinePos); + + DefinePos := Defines.IndexOf(Symbol); + + if (DefinePos >= 0) and NotDefined then + IncludeLine := StringReplace(IncludeLine, NotDefineText, DefineText, [rfIgnoreCase]); + + if (DefinePos < 0) and Defined then + IncludeLine := StringReplace(IncludeLine, DefineText, NotDefineText, [rfIgnoreCase]); + + IncludeFile.Strings[IndexLine] := IncludeLine; + end; + end; + end; + + IncludeFile.SaveToFile(IncludeFileName); + WriteLog('Include file saved'); + finally + IncludeFile.Free; + end; + except + Result := False; + end; +end; + function TJclInstallation.Undo: Boolean; begin Result := True; @@ -2144,17 +2276,6 @@ SaveOptions; end; -function TJclInstallation.RemoveSettings: Boolean; -var - JclSettingsKey: string; -begin - JclSettingsKey := Target.ConfigDataLocation + '\Jedi\JCL'; - if RegKeyExists(HKCU, JclSettingsKey) then - Result := RegDeleteKeyTree(HKCU, JclSettingsKey) - else - Result := True; -end; - function TJclInstallation.UninstallPackage(const Name: string): Boolean; var PackageFileName: string; Modified: trunk/jcl/install/JediInstall.pas =================================================================== --- trunk/jcl/install/JediInstall.pas 2006-07-29 11:32:57 UTC (rev 1697) +++ trunk/jcl/install/JediInstall.pas 2006-07-30 18:35:45 UTC (rev 1698) @@ -39,7 +39,14 @@ ioJclDefMathPrecSingle, ioJclDefMathPrecDouble, ioJclDefMathPrecExtended, - ioJclUnitVersioning, + ioJclDefMathExtremeValues, + ioJclDefUnitVersioning, + ioJclDefHookDllExceptions, + ioJclDefDebugNoBinary, + ioJclDefDebugNoTD32, + ioJclDefDebugNoMap, + ioJclDefDebugNoExports, + ioJclDefDebugNoSymbols, ioJclMapCreate, ioJclMapLink, ioJclMapDelete, Modified: trunk/jcl/source/jcl.inc =================================================================== --- trunk/jcl/source/jcl.inc 2006-07-29 11:32:57 UTC (rev 1697) +++ trunk/jcl/source/jcl.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -1,33 +1,35 @@ -{**************************************************************************************************} -{ } -{ 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 jcl.inc } -{ } -{ The Initial Developer of the Original Code is Marcel van Brakel. } -{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } -{ } -{ Contributors: } -{ Marcel van Brakel } -{ Matthias Thoma (mthoma) } -{ Petr Vones } -{ Robert Marquardt (marquardt) } -{ Robert Rossmair (rrossmair) } -{ } -{**************************************************************************************************} -{ } -{ This include file defines various JCL specific defines. The more generic defines are defined in } -{ the jedi.inc file which is shared with the JEDI VCL. } -{ } -{**************************************************************************************************} +{****************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ } +{****************************************************************************} +{ } +{ This include file defines various JCL specific defines. The more generic } +{ defines are defined in the jedi.inc file which is shared with the JEDI VCL.} +{ } +{****************************************************************************} {$B-} // Boolean shortcut evaluation {$H+} // Long strings @@ -41,12 +43,96 @@ // secure against old versions of jedi.inc. {$ENDIF ~JEDI_INC} -// Math precision selection, mutually exclusive +{$IFDEF CLR} + {----------------------------} + { BDS } + {----------------------------} + {$IFDEF BDS3} + {$I jcld9.net.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BDS3} + {----------------------------} + {$IFDEF BDS4} + {$I jcld10.net.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BDS4} + {----------------------------} +{$ELSE CLR} + {----------------------------} + { Kylix } + {----------------------------} + {$IFDEF KYLIX3} + {$I jclk3.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF KYLIX3} + {----------------------------} + { C++Builder } + {----------------------------} + {$IFDEF BCB5} + {$I jclc5.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BCB5} + {----------------------------} + {$IFDEF BCB6} + {$I jclc6.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BCB6} + {----------------------------} + { Delphi } + {----------------------------} + {$IFDEF DELPHI5} + {$I jcld5.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF DELPIH5} + {----------------------------} + {$IFDEF DELPHI6} + {$I jcld6.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF DELPIH6} + {----------------------------} + {$IFDEF DELPHI7} + {$I jcld7.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF DELPIH7} + {----------------------------} + { BDS } + {----------------------------} + {$IFDEF BDS1} + {$I jclcs1.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BDS1} + {----------------------------} + {$IFDEF BDS2} + {$I jcld8.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BDS2} + {----------------------------} + {$IFDEF BDS3} + {$I jcld9.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BDS3} + {----------------------------} + {$IFDEF BDS4} + {$I jcld10.inc} + {$DEFINE JCL_CONFIGURED} + {$ENDIF BDS4} + {----------------------------} +{$ENDIF ~CLR} -{$DEFINE MATH_EXTENDED_PRECISION} -{.$DEFINE MATH_DOUBLE_PRECISION} -{.$DEFINE MATH_SINGLE_PRECISION} +// check configuration +{$IFNDEF JCL_CONFIGURED} + {$IFDEF SUPPORTS_COMPILETIME_MESSAGES} + {$MESSAGE FATAL 'Your Delphi/BCB version is not supported by this JCL version!'} + {$ELSE} + 'Your Delphi/BCB version is not supported by this JCL version!' + {$ENDIF SUPPORTS_COMPILETIME_MESSAGES} +{$ENDIF !JCL_CONFIGURED} +// Math precision selection, mutually exclusive +{$IFDEF MATH_EXTENDED_PRECISION} + {$UNDEF MATH_SINGLE_PRECISION} + {$UNDEF MATH_DOUBLE_PRECISION} +{$ENDIF} {$IFDEF MATH_DOUBLE_PRECISION} {$UNDEF MATH_SINGLE_PRECISION} {$UNDEF MATH_EXTENDED_PRECISION} @@ -56,42 +142,24 @@ {$UNDEF MATH_EXTENDED_PRECISION} {$ENDIF} -{.$DEFINE MATH_EXT_EXTREMEVALUES} +{$IFNDEF MATH_EXTENDED_PRECISION} + {$IFNDEF MATH_DOUBLE_PRECISION} + {$IFNDEF MATH_SINGLE_PRECISION} + {$DEFINE MATH_EXTENDED_PRECISION} + {$ENDIF} + {$ENDIF} +{$ENDIF} -// JclHookExcept support for hooking exceptions from DLLs - -{.$DEFINE HOOK_DLL_EXCEPTIONS} - {$IFDEF SUPPORTS_UNSAFE_WARNINGS} {$WARN UNSAFE_TYPE OFF} {$WARN UNSAFE_CODE OFF} {$WARN UNSAFE_CAST OFF} {$ENDIF} - -//Threadsafe directive (added for DCL support) -{.DEFINE THREADSAFE} - -// To exclude obsolete code from compilation, remove the point from the line below -{.$DEFINE DROP_OBSOLETE_CODE} - {$IFNDEF DROP_OBSOLETE_CODE} {$DEFINE KEEP_DEPRECATED} {$ENDIF} -//Support for JclUnitVersioning.pas) -{.$DEFINE UNITVERSIONING} - - -// debug sources - -// defining these symbols will the debug source to be automatically registered -{.$DEFINE DEBUG_NO_BINARY} -{.$DEFINE DEBUG_NO_TD32} -{.$DEFINE DEBUG_NO_MAP} -{.$DEFINE DEBUG_NO_EXPORTS} -{.$DEFINE DEBUG_NO_SYMBOLS} - {$IFDEF CLR} {$WARN UNSAFE_TYPE ON} {$WARN UNSAFE_CODE ON} Added: trunk/jcl/source/jclc5.inc =================================================================== --- trunk/jcl/source/jclc5.inc (rev 0) +++ trunk/jcl/source/jclc5.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for C++Builder 5. } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jclc6.inc =================================================================== --- trunk/jcl/source/jclc6.inc (rev 0) +++ trunk/jcl/source/jclc6.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for C++Builder 6. } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jclcs1.inc =================================================================== --- trunk/jcl/source/jclcs1.inc (rev 0) +++ trunk/jcl/source/jclcs1.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for C#Builder 1. } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{.$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{.$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{.$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{.$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jcld10.inc =================================================================== --- trunk/jcl/source/jcld10.inc (rev 0) +++ trunk/jcl/source/jcld10.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for BDS 2006 (Delphi Win32 and C++). } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jcld10.net.inc =================================================================== --- trunk/jcl/source/jcld10.net.inc (rev 0) +++ trunk/jcl/source/jcld10.net.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,66 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for BDS 2006 (Delphi.net and C#). } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{.$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{.$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{.$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{.$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jcld5.inc =================================================================== --- trunk/jcl/source/jcld5.inc (rev 0) +++ trunk/jcl/source/jcld5.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for Delphi 5. } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jcld6.inc =================================================================== --- trunk/jcl/source/jcld6.inc (rev 0) +++ trunk/jcl/source/jcld6.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for Delphi 6. } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jcld7.inc =================================================================== --- trunk/jcl/source/jcld7.inc (rev 0) +++ trunk/jcl/source/jcld7.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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 jcl.inc } +{ } +{ The Initial Developer of the Original Code is Marcel van Brakel. } +{ Portions created by Marcel van Brakel are Copyright (C) Marcel van Brakel. } +{ } +{ Contributors: } +{ Marcel van Brakel } +{ Matthias Thoma (mthoma) } +{ Petr Vones } +{ Robert Marquardt (marquardt) } +{ Robert Rossmair (rrossmair) } +{ Florent Ouchet (outchy) } +{ } +{**************************************************************************************************} +{ } +{ This include file defines various JCL specific defines for Delphi 7. } +{ The more generic JCL defines are defined in jcl.inc and the generic defines in the jedi.inc file } +{ which is shared with the JEDI VCL. } +{ } +{**************************************************************************************************} +{ } +{ This file is filled by the JCL installer, all the changes made in its content will be lost the } +{ next time the JCL is installed. } +{ } +{**************************************************************************************************} + +// Math precision selection, mutually exclusive +{$DEFINE MATH_EXTENDED_PRECISION} +{.$DEFINE MATH_DOUBLE_PRECISION} +{.$DEFINE MATH_SINGLE_PRECISION} + + +// Math functions takes care of infinites and NaN +{$DEFINE MATH_EXT_EXTREMEVALUES} + + +// JclHookExcept support for hooking exceptions from DLLs +{.$DEFINE HOOK_DLL_EXCEPTIONS} + + +//Threadsafe directive (added for DCL support) +{$DEFINE THREADSAFE} + + +// To exclude obsolete code from compilation, remove the point from the line below +{$DEFINE DROP_OBSOLETE_CODE} + + +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + +// debug sources +// defining these symbols will the debug source to be automatically registered +{.$DEFINE DEBUG_NO_BINARY} +{.$DEFINE DEBUG_NO_TD32} +{.$DEFINE DEBUG_NO_MAP} +{.$DEFINE DEBUG_NO_EXPORTS} +{.$DEFINE DEBUG_NO_SYMBOLS} + Added: trunk/jcl/source/jcld8.inc =================================================================== --- trunk/jcl/source/jcld8.inc (rev 0) +++ trunk/jcl/source/jcld8.inc 2006-07-30 18:35:45 UTC (rev 1698) @@ -0,0 +1,71 @@ +{**************************************************************************************************} +{ } +{ 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/ ... [truncated message content] |
|
From: <ou...@us...> - 2006-07-29 11:33:06
|
Revision: 1697 Author: outchy Date: 2006-07-29 04:32:57 -0700 (Sat, 29 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1697&view=rev Log Message: ----------- unitversioning is not defined by default Modified Paths: -------------- trunk/jcl/source/jcl.inc Modified: trunk/jcl/source/jcl.inc =================================================================== --- trunk/jcl/source/jcl.inc 2006-07-26 05:42:36 UTC (rev 1696) +++ trunk/jcl/source/jcl.inc 2006-07-29 11:32:57 UTC (rev 1697) @@ -80,7 +80,7 @@ {$ENDIF} //Support for JclUnitVersioning.pas) -{$DEFINE UNITVERSIONING} +{.$DEFINE UNITVERSIONING} // debug sources This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-07-28 22:18:38
|
Revision: 1696 Author: marquardt Date: 2006-07-25 22:42:36 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1696&view=rev Log Message: ----------- IFNDEF ELSE changed to IFDEF ELSE Modified Paths: -------------- trunk/jcl/source/common/JclEDISEF.pas trunk/jcl/source/common/JclEDI_ANSIX12.pas trunk/jcl/source/common/JclFileUtils.pas Modified: trunk/jcl/source/common/JclEDISEF.pas =================================================================== --- trunk/jcl/source/common/JclEDISEF.pas 2006-07-25 05:56:46 UTC (rev 1695) +++ trunk/jcl/source/common/JclEDISEF.pas 2006-07-26 05:42:36 UTC (rev 1696) @@ -1408,12 +1408,7 @@ procedure ParseSEGSDataOfSETSDefinition(Data: string; Segment: TEDISEFSegment; SEFFile: TEDISEFFile); - {$IFNDEF CLR} - function ToPChar(const S: string): PChar; - begin - Result := PChar(S); - end; - {$ELSE} + {$IFDEF CLR} function ToPChar(const S: string): string; var I: Integer; @@ -1426,7 +1421,12 @@ end; Result := S; end; - {$ENDIF ~CLR} + {$ELSE} + function ToPChar(const S: string): PChar; + begin + Result := PChar(S); + end; + {$ENDIF CLR} var Temp: TStringList; Modified: trunk/jcl/source/common/JclEDI_ANSIX12.pas =================================================================== --- trunk/jcl/source/common/JclEDI_ANSIX12.pas 2006-07-25 05:56:46 UTC (rev 1695) +++ trunk/jcl/source/common/JclEDI_ANSIX12.pas 2006-07-26 05:42:36 UTC (rev 1696) @@ -282,8 +282,8 @@ FSESegment: TEDISegment; function GetSegment(Index: Integer): TEDISegment; procedure SetSegment(Index: Integer; Segment: TEDISegment); - procedure SetSTSegment({$IFNDEF BCB6}const {$ENDIF !BCB6}STSegment: TEDISegment); - procedure SetSESegment({$IFNDEF BCB6}const {$ENDIF !BCB6}SESegment: TEDISegment); + procedure SetSTSegment({$IFNDEF BCB6} const {$ENDIF} STSegment: TEDISegment); + procedure SetSESegment({$IFNDEF BCB6} const {$ENDIF} SESegment: TEDISegment); protected procedure InternalCreateHeaderTrailerSegments; virtual; function InternalCreateSegment: TEDISegment; virtual; @@ -703,13 +703,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := AppendEDIDataObjects(TEDIDataObjectArray(ElementArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(ElementArray)); for I := 0 to High(ElementArray) do HelpArray[I] := TEDIDataObject(ElementArray[I]); Result := AppendEDIDataObjects(HelpArray); + {$ELSE} + Result := AppendEDIDataObjects(TEDIDataObjectArray(ElementArray)); {$ENDIF CLR} end; @@ -725,11 +725,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError036); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError036); - {$ELSE} - raise EJclEDIError.Create(RsEDIError036); - {$ENDIF ~CLR} + {$ENDIF CLR} end; FData := FSegmentId; @@ -782,11 +782,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError035); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError035); - {$ELSE} - raise EJclEDIError.Create(RsEDIError035); - {$ENDIF ~CLR} + {$ENDIF CLR} end; // Continue StartPos := 1; @@ -844,13 +844,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(ElementArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(ElementArray)); for I := 0 to High(ElementArray) do HelpArray[I] := TEDIDataObject(ElementArray[I]); Result := InsertEDIDataObjects(InsertIndex, HelpArray); + {$ELSE} + Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(ElementArray)); {$ENDIF CLR} end; @@ -1003,13 +1003,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := AppendEDIDataObjects(TEDIDataObjectArray(SegmentArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(SegmentArray)); for I := 0 to High(SegmentArray) do HelpArray[I] := TEDIDataObject(SegmentArray[I]); Result := AppendEDIDataObjects(HelpArray); + {$ELSE} + Result := AppendEDIDataObjects(TEDIDataObjectArray(SegmentArray)); {$ENDIF CLR} end; @@ -1024,11 +1024,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError026); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError026); - {$ELSE} - raise EJclEDIError.Create(RsEDIError026); - {$ENDIF ~CLR} + {$ENDIF CLR} end; FData := FSTSegment.Assemble; @@ -1085,11 +1085,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError025); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError025); - {$ELSE} - raise EJclEDIError.Create(RsEDIError025); - {$ENDIF ~CLR} + {$ENDIF CLR} end; // Find the first segment StartPos := 1; @@ -1163,13 +1163,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(SegmentArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(SegmentArray)); for I := 0 to High(SegmentArray) do HelpArray[I] := TEDIDataObject(SegmentArray[I]); Result := InsertEDIDataObjects(InsertIndex, HelpArray); + {$ELSE} + Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(SegmentArray)); {$ENDIF CLR} end; @@ -1205,7 +1205,7 @@ SetEDIDataObject(Index, Segment); end; -procedure TEDITransactionSet.SetSESegment({$IFNDEF BCB6}const {$ENDIF !BCB6}SESegment: TEDISegment); +procedure TEDITransactionSet.SetSESegment({$IFNDEF BCB6} const {$ENDIF} SESegment: TEDISegment); begin FreeAndNil(FSESegment); FSESegment := SESegment; @@ -1213,7 +1213,7 @@ FSESegment.Parent := Self; end; -procedure TEDITransactionSet.SetSTSegment({$IFNDEF BCB6}const {$ENDIF !BCB6}STSegment: TEDISegment); +procedure TEDITransactionSet.SetSTSegment({$IFNDEF BCB6} const {$ENDIF} STSegment: TEDISegment); begin FreeAndNil(FSTSegment); FSTSegment := STSegment; @@ -1268,13 +1268,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := AppendEDIDataObjects(TEDIDataObjectArray(TransactionSetArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(TransactionSetArray)); for I := 0 to High(TransactionSetArray) do HelpArray[I] := TEDIDataObject(TransactionSetArray[I]); Result := AppendEDIDataObjects(HelpArray); + {$ELSE} + Result := AppendEDIDataObjects(TEDIDataObjectArray(TransactionSetArray)); {$ENDIF CLR} end; @@ -1289,11 +1289,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError020); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError020); - {$ELSE} - raise EJclEDIError.Create(RsEDIError020); - {$ENDIF ~CLR} + {$ENDIF CLR} end; FData := FGSSegment.Assemble; FGSSegment.Data := ''; @@ -1348,11 +1348,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError019); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError019); - {$ELSE} - raise EJclEDIError.Create(RsEDIError019); - {$ENDIF ~CLR} + {$ENDIF CLR} end; // Find Functional Group Header Segment StartPos := 1; @@ -1367,26 +1367,26 @@ FGSSegment.Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError021); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError021); - {$ELSE} - raise EJclEDIError.Create(RsEDIError021); - {$ENDIF ~CLR} + {$ENDIF CLR} end -else - {$IFNDEF CLR} + else + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError022); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError022); - {$ELSE} - raise EJclEDIError.Create(RsEDIError022); - {$ENDIF ~CLR} + {$ENDIF CLR} // Search for Transaction Set Header SearchResult := StrSearch(FDelimiters.SD + TSHSegmentId + FDelimiters.ED, FData, StartPos); if SearchResult <= 0 then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError027); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError027); - {$ELSE} - raise EJclEDIError.Create(RsEDIError027); - {$ENDIF ~CLR} + {$ENDIF CLR} // Set next start position StartPos := SearchResult + FDelimiters.SDLen; // Move past the delimiter // Continue @@ -1408,18 +1408,18 @@ FEDIDataObjects[I].Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError028); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError028); - {$ELSE} - raise EJclEDIError.Create(RsEDIError028); - {$ENDIF ~CLR} + {$ENDIF CLR} end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError029); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError029); - {$ELSE} - raise EJclEDIError.Create(RsEDIError029); - {$ENDIF ~CLR} + {$ENDIF CLR} // Set the next start position StartPos := SearchResult + FDelimiters.SDLen; // Move past the delimiter // @@ -1442,18 +1442,18 @@ FGESegment.Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError023); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError023); - {$ELSE} - raise EJclEDIError.Create(RsEDIError023); - {$ENDIF ~CLR} + {$ENDIF CLR} end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError024); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError024); - {$ELSE} - raise EJclEDIError.Create(RsEDIError024); - {$ENDIF ~CLR} + {$ENDIF CLR} FData := ''; FState := ediDisassembled; end; @@ -1482,13 +1482,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(TransactionSetArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(TransactionSetArray)); for I := 0 to High(TransactionSetArray) do HelpArray[I] := TEDIDataObject(TransactionSetArray[I]); Result := InsertEDIDataObjects(InsertIndex, HelpArray); + {$ELSE} + Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(TransactionSetArray)); {$ENDIF CLR} end; @@ -1590,13 +1590,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := AppendEDIDataObjects(TEDIDataObjectArray(FunctionalGroupArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(FunctionalGroupArray)); for I := 0 to High(FunctionalGroupArray) do HelpArray[I] := TEDIDataObject(FunctionalGroupArray[I]); Result := AppendEDIDataObjects(HelpArray); + {$ELSE} + Result := AppendEDIDataObjects(TEDIDataObjectArray(FunctionalGroupArray)); {$ENDIF CLR} end; @@ -1609,11 +1609,11 @@ Result := ''; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError013); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError013); - {$ELSE} - raise EJclEDIError.Create(RsEDIError013); - {$ENDIF ~CLR} + {$ENDIF CLR} FData := FISASegment.Assemble; FISASegment.Data := ''; @@ -1664,11 +1664,11 @@ DeleteFunctionalGroups; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError012); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError012); - {$ELSE} - raise EJclEDIError.Create(RsEDIError012); - {$ENDIF ~CLR} + {$ENDIF CLR} StartPos := 1; // Search for Interchange Control Header @@ -1681,18 +1681,18 @@ FISASegment.Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError014); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError014); - {$ELSE} - raise EJclEDIError.Create(RsEDIError014); - {$ENDIF ~CLR} + {$ENDIF CLR} end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError015); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError015); - {$ELSE} - raise EJclEDIError.Create(RsEDIError015); - {$ENDIF ~CLR} + {$ENDIF CLR} // Search for Functional Group Header SearchResult := StrSearch(FDelimiters.SD + FGHSegmentId + FDelimiters.ED, FData, StartPos); // Check for TA1 Segment @@ -1703,11 +1703,11 @@ SearchResult := I; end; if (SearchResult <= 0) and (not ProcessTA1) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError022); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError022); - {$ELSE} - raise EJclEDIError.Create(RsEDIError022); - {$ENDIF ~CLR} + {$ENDIF CLR} // Set next start positon StartPos := SearchResult + FDelimiters.SDLen; // Move past the delimiter // Continue @@ -1731,18 +1731,18 @@ FEDIDataObjects[I].Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError023); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError023); - {$ELSE} - raise EJclEDIError.Create(RsEDIError023); - {$ENDIF ~CLR} + {$ENDIF CLR} end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError024); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError024); - {$ELSE} - raise EJclEDIError.Create(RsEDIError024); - {$ENDIF ~CLR} + {$ENDIF CLR} // Set next start positon StartPos := SearchResult + FDelimiters.SDLen; // Move past the delimiter // Verify the next record is a Functional Group Header @@ -1789,18 +1789,18 @@ FIEASegment.Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError016); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError016); - {$ELSE} - raise EJclEDIError.Create(RsEDIError016); - {$ENDIF ~CLR} + {$ENDIF CLR} end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError017); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError017); - {$ELSE} - raise EJclEDIError.Create(RsEDIError017); - {$ENDIF ~CLR} + {$ENDIF CLR} FData := ''; FState := ediDisassembled; end; @@ -1834,13 +1834,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(FunctionalGroupArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(FunctionalGroupArray)); for I := 0 to High(FunctionalGroupArray) do HelpArray[I] := TEDIDataObject(FunctionalGroupArray[I]); Result := InsertEDIDataObjects(InsertIndex, HelpArray); + {$ELSE} + Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(FunctionalGroupArray)); {$ENDIF CLR} end; @@ -1928,13 +1928,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := AppendEDIDataObjects(TEDIDataObjectArray(InterchangeControlArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(InterchangeControlArray)); for I := 0 to High(InterchangeControlArray) do HelpArray[I] := TEDIDataObject(InterchangeControlArray[I]); Result := AppendEDIDataObjects(HelpArray); + {$ELSE} + Result := AppendEDIDataObjects(TEDIDataObjectArray(InterchangeControlArray)); {$ENDIF CLR} end; @@ -2019,11 +2019,11 @@ InternalDelimitersDetection(StartPos); end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError015); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError015); - {$ELSE} - raise EJclEDIError.Create(RsEDIError015); - {$ENDIF ~CLR} + {$ENDIF CLR} // Continue while (StartPos + Length(ICHSegmentId)) < Length(FData) do begin @@ -2044,18 +2044,18 @@ FEDIDataObjects[I].Disassemble; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError016); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError016); - {$ELSE} - raise EJclEDIError.Create(RsEDIError016); - {$ENDIF ~CLR} + {$ENDIF CLR} end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError017); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError017); - {$ELSE} - raise EJclEDIError.Create(RsEDIError017); - {$ENDIF ~CLR} + {$ENDIF CLR} // Set next start position, Move past the delimiter StartPos := SearchResult + FDelimiters.SDLen; // Verify the next record is an Interchange Control Header @@ -2073,11 +2073,11 @@ if foIgnoreGarbageAtEndOfFile in FEDIFileOptions then Break else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError018); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError018); - {$ELSE} - raise EJclEDIError.Create(RsEDIError018); - {$ENDIF ~CLR} + {$ENDIF CLR} end; end; FData := ''; @@ -2113,13 +2113,13 @@ I: Integer; {$ENDIF CLR} begin - {$IFNDEF CLR} - Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(InterchangeControlArray)); - {$ELSE} + {$IFDEF CLR} SetLength(HelpArray, Length(InterchangeControlArray)); for I := 0 to High(InterchangeControlArray) do HelpArray[I] := TEDIDataObject(InterchangeControlArray[I]); Result := InsertEDIDataObjects(InsertIndex, HelpArray); + {$ELSE} + Result := InsertEDIDataObjects(InsertIndex, TEDIDataObjectArray(InterchangeControlArray)); {$ENDIF CLR} end; @@ -2135,24 +2135,24 @@ begin EDIFileStream := TFileStream.Create(FFileName, fmOpenRead or fmShareDenyNone); try - {$IFNDEF CLR} - SetLength(FData, EDIFileStream.Size); - EDIFileStream.Read(Pointer(FData)^, EDIFileStream.Size); - {$ELSE} + {$IFDEF CLR} SetLength(Buf, EDIFileStream.Size); EDIFileStream.Read(Buf, EDIFileStream.Size); FData := StringOf(Buf); - {$ENDIF ~CLR} + {$ELSE} + SetLength(FData, EDIFileStream.Size); + EDIFileStream.Read(Pointer(FData)^, EDIFileStream.Size); + {$ENDIF CLR} finally EDIFileStream.Free; end; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError001); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError001); - {$ELSE} - raise EJclEDIError.Create(RsEDIError001); - {$ENDIF ~CLR} + {$ENDIF CLR} end; procedure TEDIFile.LoadFromFile(const FileName: string); @@ -2176,21 +2176,21 @@ begin EDIFileStream := TFileStream.Create(FFileName, fmCreate or fmShareDenyNone); try - {$IFNDEF CLR} + {$IFDEF CLR} + EDIFileStream.Write(BytesOf(FData), Length(FData)); + {$ELSE} EDIFileStream.Write(Pointer(FData)^, Length(FData)); - {$ELSE} - EDIFileStream.Write(BytesOf(FData), Length(FData)); - {$ENDIF ~CLR} + {$ENDIF CLR} finally EDIFileStream.Free; end; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError002); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError002); - {$ELSE} - raise EJclEDIError.Create(RsEDIError002); - {$ENDIF ~CLR} + {$ENDIF CLR} end; procedure TEDIFile.SaveToFile; @@ -2201,21 +2201,21 @@ begin EDIFileStream := TFileStream.Create(FFileName, fmCreate or fmShareDenyNone); try - {$IFNDEF CLR} + {$IFDEF CLR} + EDIFileStream.Write(BytesOf(FData), Length(FData)); + {$ELSE} EDIFileStream.Write(Pointer(FData)^, Length(FData)); - {$ELSE} - EDIFileStream.Write(BytesOf(FData), Length(FData)); - {$ENDIF ~CLR} + {$ENDIF CLR} finally EDIFileStream.Free; end; end else - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError002); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError002); - {$ELSE} - raise EJclEDIError.Create(RsEDIError002); - {$ENDIF ~CLR} + {$ENDIF CLR} end; procedure TEDIFile.SetInterchangeControl(Index: Integer; Interchange: TEDIInterchangeControl); @@ -2700,11 +2700,11 @@ begin FDelimiters := InternalAssignDelimiters; if not Assigned(FDelimiters) then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.Create(RsEDIError035); + {$ELSE} raise EJclEDIError.CreateRes(@RsEDIError035); - {$ELSE} - raise EJclEDIError.Create(RsEDIError035); - {$ENDIF ~CLR} + {$ENDIF CLR} end; SearchResult := StrSearch(FDelimiters.ED + FDelimiters.SS, FData, 1); if SearchResult <> 0 then @@ -3214,11 +3214,11 @@ for I := 0 to DataSegment.ElementCount - 1 do begin if I > J then - {$IFNDEF CLR} + {$IFDEF CLR} + raise EJclEDIError.CreateFmt(RsEDIError002, + {$ELSE} raise EJclEDIError.CreateResFmt(@RsEDIError058, - {$ELSE} - raise EJclEDIError.CreateFmt(RsEDIError002, - {$ENDIF ~CLR} + {$ENDIF CLR} [IntToStr(I), DataSegment.SegmentID, IntToStr(DataSegment.GetIndexPositionFromParent)]); DataSegment.Element[I].SpecPointer := SpecSegment.Element[I]; Modified: trunk/jcl/source/common/JclFileUtils.pas =================================================================== --- trunk/jcl/source/common/JclFileUtils.pas 2006-07-25 05:56:46 UTC (rev 1695) +++ trunk/jcl/source/common/JclFileUtils.pas 2006-07-26 05:42:36 UTC (rev 1696) @@ -233,7 +233,7 @@ {$ENDIF ~CLR} function FileBackup(const FileName: string; Move: Boolean = False): Boolean; function FileCopy(const ExistingFileName, NewFileName: string; ReplaceExisting: Boolean = False): Boolean; -function FileDelete(const FileName: string {$IFNDEF CLR}; MoveToRecycleBin: Boolean = False{$ENDIF}): Boolean; +function FileDelete(const FileName: string {$IFNDEF CLR}; MoveToRecycleBin: Boolean = False {$ENDIF}): Boolean; function FileExists(const FileName: string): Boolean; function FileMove(const ExistingFileName, NewFileName: string; ReplaceExisting: Boolean = False): Boolean; function FileRestore(const FileName: string): Boolean; @@ -2905,7 +2905,7 @@ {$ENDIF ~CLR} end; -function FileDelete(const FileName: string {$IFNDEF CLR}; MoveToRecycleBin: Boolean = False{$ENDIF}): Boolean; +function FileDelete(const FileName: string {$IFNDEF CLR}; MoveToRecycleBin: Boolean = False {$ENDIF}): Boolean; {$IFDEF CLR} begin Result := True; @@ -5582,6 +5582,7 @@ end; {$IFNDEF CLR} + procedure TJclFileEnumerator.AfterConstruction; begin inherited AfterConstruction; @@ -5616,6 +5617,7 @@ Destroy; end; end; + {$ENDIF ~CLR} procedure TJclFileEnumerator.Assign(Source: TPersistent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-07-25 05:57:34
|
Revision: 1695 Author: marquardt Date: 2006-07-24 22:56:46 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1695&view=rev Log Message: ----------- style cleaning and fix for badly inserted UNITVERSIONING in some files Modified Paths: -------------- trunk/jcl/source/common/JclBinaryTrees.pas trunk/jcl/source/common/JclBorlandTools.pas trunk/jcl/source/common/JclHashMaps.pas trunk/jcl/source/common/JclRTTI.pas trunk/jcl/source/common/JclStrings.pas trunk/jcl/source/common/JclSysInfo.pas trunk/jcl/source/common/JclUnitConv.pas trunk/jcl/source/prototypes/JclWin32.pas trunk/jcl/source/vcl/JclPrint.pas trunk/jcl/source/windows/JclAppInst.pas trunk/jcl/source/windows/JclCIL.pas trunk/jcl/source/windows/JclCLR.pas trunk/jcl/source/windows/JclCOM.pas trunk/jcl/source/windows/JclConsole.pas trunk/jcl/source/windows/JclDebug.pas trunk/jcl/source/windows/JclDotNet.pas trunk/jcl/source/windows/JclHookExcept.pas trunk/jcl/source/windows/JclLANMan.pas trunk/jcl/source/windows/JclLocales.pas trunk/jcl/source/windows/JclMapi.pas trunk/jcl/source/windows/JclMiscel.pas trunk/jcl/source/windows/JclMsdosSys.pas trunk/jcl/source/windows/JclMultimedia.pas trunk/jcl/source/windows/JclNTFS.pas trunk/jcl/source/windows/JclPeImage.pas trunk/jcl/source/windows/JclRegistry.pas trunk/jcl/source/windows/JclSecurity.pas trunk/jcl/source/windows/JclShell.pas trunk/jcl/source/windows/JclStructStorage.pas trunk/jcl/source/windows/JclSvcCtrl.pas trunk/jcl/source/windows/JclSynch.pas trunk/jcl/source/windows/JclTD32.pas trunk/jcl/source/windows/JclTask.pas trunk/jcl/source/windows/JclUnicode.pas trunk/jcl/source/windows/JclWideFormat.pas trunk/jcl/source/windows/JclWin32.pas trunk/jcl/source/windows/JclWin32Ex.pas trunk/jcl/source/windows/JclWinMIDI.pas Modified: trunk/jcl/source/common/JclBinaryTrees.pas =================================================================== --- trunk/jcl/source/common/JclBinaryTrees.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclBinaryTrees.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -339,9 +339,9 @@ function TPreOrderIntfItr.Next: IInterface; var LastRet: PJclIntfBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -369,9 +369,9 @@ function TPreOrderIntfItr.Previous: IInterface; var LastRet: PJclIntfBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -406,9 +406,9 @@ function TInOrderIntfItr.Next: IInterface; var LastRet: PJclIntfBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -435,9 +435,9 @@ function TInOrderIntfItr.Previous: IInterface; var LastRet: PJclIntfBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -474,9 +474,9 @@ function TPostOrderIntfItr.Next: IInterface; var LastRet: PJclIntfBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -500,17 +500,18 @@ function TPostOrderIntfItr.Previous: IInterface; var LastRet: PJclIntfBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; {$ENDIF THREADSAFE} Result := FCursor.Obj; - if (FCursor.Right <> nil) then + if FCursor.Right <> nil then FCursor := FCursor.Right - else if (FCursor.Left <> nil) then + else + if FCursor.Left <> nil then FCursor := FCursor.Left else begin @@ -654,9 +655,9 @@ function TPreOrderStrItr.Next: string; var LastRet: PJclStrBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -684,9 +685,9 @@ function TPreOrderStrItr.Previous: string; var LastRet: PJclStrBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -721,9 +722,9 @@ function TInOrderStrItr.Next: string; var LastRet: PJclStrBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -750,9 +751,9 @@ function TInOrderStrItr.Previous: string; var LastRet: PJclStrBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -789,9 +790,9 @@ function TPostOrderStrItr.Next: string; var LastRet: PJclStrBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -815,17 +816,18 @@ function TPostOrderStrItr.Previous: string; var LastRet: PJclStrBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; {$ENDIF THREADSAFE} Result := FCursor.Str; - if (FCursor.Right <> nil) then + if FCursor.Right <> nil then FCursor := FCursor.Right - else if (FCursor.Left <> nil) then + else + if FCursor.Left <> nil then FCursor := FCursor.Left else begin @@ -971,9 +973,9 @@ function TPreOrderItr.Next: TObject; var LastRet: PJclBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -1001,9 +1003,9 @@ function TPreOrderItr.Previous: TObject; var LastRet: PJclBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -1038,9 +1040,9 @@ function TInOrderItr.Next: TObject; var LastRet: PJclBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -1067,9 +1069,9 @@ function TInOrderItr.Previous: TObject; var LastRet: PJclBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -1106,9 +1108,9 @@ function TPostOrderItr.Next: TObject; var LastRet: PJclBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; @@ -1132,17 +1134,18 @@ function TPostOrderItr.Previous: TObject; var LastRet: PJclBinaryNode; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin {$IFDEF THREADSAFE} CS := EnterCriticalSection; {$ENDIF THREADSAFE} Result := FCursor.Obj; - if (FCursor.Right <> nil) then + if FCursor.Right <> nil then FCursor := FCursor.Right - else if (FCursor.Left <> nil) then + else + if FCursor.Left <> nil then FCursor := FCursor.Left else begin Modified: trunk/jcl/source/common/JclBorlandTools.pas =================================================================== --- trunk/jcl/source/common/JclBorlandTools.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclBorlandTools.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -1230,7 +1230,9 @@ begin GetDPKFileInfo(PackageFileName, RunOnly, @LibSuffix); Result := PathExtractFileNameNoExt(PackageFileName) + LibSuffix + BinaryExtensionPackage; - end else if SameText(PackageExtension, SourceExtensionBCBPackage) then + end + else + if SameText(PackageExtension, SourceExtensionBCBPackage) then GetBPKFileInfo(PackageFileName, RunOnly, @Result) else raise EJclBorRadException.CreateResFmt(@RsUnknownPackageExtension, [PackageExtension]); @@ -1248,13 +1250,18 @@ begin GetDPKFileInfo(ProjectFileName, RunOnly, @LibSuffix); Result := PathExtractFileNameNoExt(ProjectFileName) + LibSuffix + BinaryExtensionPackage; - end else if SameText(ProjectExtension, SourceExtensionDelphiProject) then + end + else + if SameText(ProjectExtension, SourceExtensionDelphiProject) then begin GetDPRFileInfo(ProjectFileName, BinaryExtension, @LibSuffix); Result := PathExtractFileNameNoExt(ProjectFileName) + LibSuffix + BinaryExtension; - end else if SameText(ProjectExtension, SourceExtensionBCBPackage) then + end + else + if SameText(ProjectExtension, SourceExtensionBCBPackage) then GetBPKFileInfo(ProjectFileName, RunOnly, @Result) - else if SameText(ProjectExtension, SourceExtensionBCBProject) then + else + if SameText(ProjectExtension, SourceExtensionBCBProject) then GetBPRFileInfo(ProjectFileName, Result) else raise EJclBorRadException.CreateResFmt(@RsUnknownProjectExtension, [ProjectExtension]); @@ -2886,7 +2893,8 @@ PackageExtension := ExtractFileExt(PackageName); if SameText(PackageExtension,SourceExtensionBCBPackage) then Result := CompileBCBPackage(PackageName, BPLPath, DCPPath) - else if SameText(PackageExtension, SourceExtensionDelphiPackage) then + else + if SameText(PackageExtension, SourceExtensionDelphiPackage) then Result := CompileDelphiPackage(PackageName, BPLPath, DCPPath) else raise EJclBorRadException.CreateResFmt(@RsUnknownPackageExtension, [PackageExtension]); @@ -2900,7 +2908,8 @@ ProjectExtension := ExtractFileExt(ProjectName); if SameText(ProjectExtension,SourceExtensionBCBProject) then Result := CompileBCBProject(ProjectName, OutputDir, DcpSearchPath) - else if SameText(ProjectExtension, SourceExtensionDelphiProject) then + else + if SameText(ProjectExtension, SourceExtensionDelphiProject) then Result := CompileDelphiProject(ProjectName, OutputDir, DcpSearchPath) else raise EJclBorRadException.CreateResFmt(@RsUnknownProjectExtension, [ProjectExtension]); @@ -3299,7 +3308,8 @@ ProjectExtension := ExtractFileExt(ProjectName); if SameText(ProjectExtension, SourceExtensionBCBProject) then Result := InstallBCBExpert(ProjectName, OutputDir, DcpSearchPath) - else if SameText(ProjectExtension, SourceExtensionDelphiProject) then + else + if SameText(ProjectExtension, SourceExtensionDelphiProject) then Result := InstallDelphiExpert(ProjectName, OutputDir, DcpSearchPath) else raise EJclBorRADException.CreateResFmt(@RsUnknownProjectExtension, [ProjectExtension]); @@ -3313,7 +3323,8 @@ PackageExtension := ExtractFileExt(PackageName); if SameText(PackageExtension, SourceExtensionBCBPackage) then Result := InstallBCBIdePackage(PackageName, BPLPath, DCPPath) - else if SameText(PackageExtension, SourceExtensionDelphiPackage) then + else + if SameText(PackageExtension, SourceExtensionDelphiPackage) then Result := InstallDelphiIdePackage(PackageName, BPLPath, DCPPath) else raise EJclBorRADException.CreateResFmt(@RsUnknownIdePackageExtension, [PackageExtension]); @@ -3326,7 +3337,8 @@ PackageExtension := ExtractFileExt(PackageName); if SameText(PackageExtension, SourceExtensionBCBPackage) then Result := InstallBCBPackage(PackageName, BPLPath, DCPPath) - else if SameText(PackageExtension, SourceExtensionDelphiPackage) then + else + if SameText(PackageExtension, SourceExtensionDelphiPackage) then Result := InstallDelphiPackage(PackageName, BPLPath, DCPPath) else raise EJclBorRADException.CreateResFmt(@RsUnknownPackageExtension, [PackageExtension]); @@ -3892,7 +3904,8 @@ ProjectExtension := ExtractFileExt(ProjectName); if SameText(ProjectExtension,SourceExtensionBCBProject) then Result := UninstallBCBExpert(ProjectName, OutputDir) - else if SameText(ProjectExtension, SourceExtensionDelphiProject) then + else + if SameText(ProjectExtension, SourceExtensionDelphiProject) then Result := UninstallDelphiExpert(ProjectName, OutputDir) else raise EJclBorRadException.CreateResFmt(@RsUnknownProjectExtension, [ProjectExtension]); @@ -3906,7 +3919,8 @@ PackageExtension := ExtractFileExt(PackageName); if SameText(PackageExtension,SourceExtensionBCBPackage) then Result := UninstallBCBIdePackage(PackageName, BPLPath, DCPPath) - else if SameText(PackageExtension, SourceExtensionDelphiPackage) then + else + if SameText(PackageExtension, SourceExtensionDelphiPackage) then Result := UninstallDelphiIdePackage(PackageName, BPLPath, DCPPath) else raise EJclBorRadException.CreateResFmt(@RsUnknownIdePackageExtension, [PackageExtension]); @@ -3919,7 +3933,8 @@ PackageExtension := ExtractFileExt(PackageName); if SameText(PackageExtension,SourceExtensionBCBPackage) then Result := UninstallBCBPackage(PackageName, BPLPath, DCPPath) - else if SameText(PackageExtension, SourceExtensionDelphiPackage) then + else + if SameText(PackageExtension, SourceExtensionDelphiPackage) then Result := UninstallDelphiPackage(PackageName, BPLPath, DCPPath) else raise EJclBorRadException.CreateResFmt(@RsUnknownPackageExtension, [PackageExtension]); Modified: trunk/jcl/source/common/JclHashMaps.pas =================================================================== --- trunk/jcl/source/common/JclHashMaps.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclHashMaps.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -338,7 +338,8 @@ { Keep reference counting working } if FromIndex < ToIndex then FillChar(List[FromIndex], (ToIndex - FromIndex) * SizeOf(List[0]), 0) - else if FromIndex > ToIndex then + else + if FromIndex > ToIndex then FillChar(List[FromIndex + Count - 1], (FromIndex - ToIndex) * SizeOf(List[0]), 0); {$ENDIF CLR} end; @@ -360,7 +361,8 @@ { Keep reference counting working } if FromIndex < ToIndex then FillChar(List[FromIndex], (ToIndex - FromIndex) * SizeOf(List[0]), 0) - else if FromIndex > ToIndex then + else + if FromIndex > ToIndex then FillChar(List[FromIndex + Count - 1], (FromIndex - ToIndex) * SizeOf(List[0]), 0); {$ENDIF CLR} end; @@ -382,7 +384,8 @@ { Keep reference counting working } if FromIndex < ToIndex then FillChar(List[FromIndex], (ToIndex - FromIndex) * SizeOf(List[0]), 0) - else if FromIndex > ToIndex then + else + if FromIndex > ToIndex then FillChar(List[FromIndex + Count - 1], (FromIndex - ToIndex) * SizeOf(List[0]), 0); {$ENDIF CLR} end; @@ -404,7 +407,8 @@ { Keep reference counting working } if FromIndex < ToIndex then FillChar(List[FromIndex], (ToIndex - FromIndex) * SizeOf(List[0]), 0) - else if FromIndex > ToIndex then + else + if FromIndex > ToIndex then FillChar(List[FromIndex + Count - 1], (FromIndex - ToIndex) * SizeOf(List[0]), 0); {$ENDIF CLR} end; Modified: trunk/jcl/source/common/JclRTTI.pas =================================================================== --- trunk/jcl/source/common/JclRTTI.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclRTTI.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -2875,6 +2875,7 @@ end; {$IFNDEF CLR} + function JclGenerateSetType(BaseType: PTypeInfo; const TypeName: ShortString): PTypeInfo; var @@ -2944,6 +2945,7 @@ (OpCode2: Byte; EntryOffset: Longint); end; + {$ENDIF ~CLR} // Copied from System.pas (_IsClass function) Modified: trunk/jcl/source/common/JclStrings.pas =================================================================== --- trunk/jcl/source/common/JclStrings.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclStrings.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -1046,7 +1046,7 @@ end; end; - if val > 255 then + if Val > 255 then {$IFDEF CLR} raise EJclStringError.Create(RsNumericConstantTooLarge); {$ELSE} @@ -1082,7 +1082,7 @@ end; end; - if val > 255 then + if Val > 255 then {$IFDEF CLR} raise EJclStringError.Create(RsNumericConstantTooLarge); {$ELSE} @@ -4476,7 +4476,8 @@ // undo the RefCount change Dec(TInterfacedObjectAccess(V.VObject).FRefCount); end - else if InheritsFrom(V.VObject.ClassType, 'TComponent') and V.VObject.GetInterface(IToString, Intf) then + else + if InheritsFrom(V.VObject.ClassType, 'TComponent') and V.VObject.GetInterface(IToString, Intf) then Result := Intf.ToString else raise ArgumentNullException.CreateResFmt(@RsDotNetFormatArgumentNotSupported, [Index]); Modified: trunk/jcl/source/common/JclSysInfo.pas =================================================================== --- trunk/jcl/source/common/JclSysInfo.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclSysInfo.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -2364,8 +2364,8 @@ end else begin - if IsWin2k or IsWinXP or IsWin2003 or IsWin2003R2 or IsWinXP64 - or IsWinVista or IsWinLonghorn then + if IsWin2k or IsWinXP or IsWin2003 or IsWin2003R2 or IsWinXP64 or + IsWinVista or IsWinLonghorn then begin FileName := ProcessFileName(ProcEntry.th32ProcessID); if FileName = '' then @@ -2938,8 +2938,9 @@ GetNativeSystemInfo(SystemInfo); if GetSystemMetrics(SM_SERVERR2) <> 0 then Result := wvWin2003R2 - else if (SystemInfo.wProcessorArchitecture <> PROCESSOR_ARCHITECTURE_INTEL) - and GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then + else + if (SystemInfo.wProcessorArchitecture <> PROCESSOR_ARCHITECTURE_INTEL) and + GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then Result := wvWinXP64 else Result := wvWin2003; @@ -2979,7 +2980,8 @@ begin if (OSVersionInfo.wProductType = VER_NT_WORKSTATION) then Result := ptWorkstation - else if (OSVersionInfo.wSuiteMask and VER_SUITE_ENTERPRISE) = VER_SUITE_ENTERPRISE then + else + if (OSVersionInfo.wSuiteMask and VER_SUITE_ENTERPRISE) = VER_SUITE_ENTERPRISE then Result := ptEnterprise else Result := ptServer; @@ -2994,7 +2996,8 @@ begin if (OSVersionInfo.wSuiteMask and VER_SUITE_DATACENTER) <> 0 then Result := ptDatacenterServer - else if (OSVersionInfo.wSuiteMask and VER_SUITE_ENTERPRISE) <> 0 then + else + if (OSVersionInfo.wSuiteMask and VER_SUITE_ENTERPRISE) <> 0 then Result := ptAdvancedServer else Result := ptServer; @@ -3015,7 +3018,8 @@ else if (OSVersionInfo.wSuiteMask and VER_SUITE_ENTERPRISE) = VER_SUITE_ENTERPRISE then Result := ptEnterprise - else if (OSVersionInfo.wSuiteMask = VER_SUITE_BLADE) then + else + if (OSVersionInfo.wSuiteMask = VER_SUITE_BLADE) then Result := ptWebEdition else Result := ptServer; @@ -3125,8 +3129,7 @@ VersionInfo: TOSVersionInfoEx; begin Result := 0; - if IsWin2K or IsWinXP or IsWin2003 or IsWinXP64 or IsWin2003R2 or IsWinVista - or IsWinLonghorn then + if IsWin2K or IsWinXP or IsWin2003 or IsWinXP64 or IsWin2003R2 or IsWinVista or IsWinLonghorn then begin FillChar(VersionInfo, SizeOf(VersionInfo), 0); VersionInfo.dwOSVersionInfoSize := SizeOf(VersionInfo); Modified: trunk/jcl/source/common/JclUnitConv.pas =================================================================== --- trunk/jcl/source/common/JclUnitConv.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/common/JclUnitConv.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -459,6 +459,9 @@ end; function ConvertTemperature(const FromType, ToType: TTemperatureType; const Temperature: Float): Float; +const + cToType = 'ToType'; + cFromType = 'FromType'; begin case FromType of { All conversions from Celcius to other formats are listed here } @@ -475,9 +478,9 @@ Result := CelsiusToReaumur(Temperature); else {$IFDEF CLR} - raise EInvalidOp.CreateFmt(RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateFmt(RsTempConvTypeError, [cToType]); {$ELSE} - raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, [cToType]); {$ENDIF CLR} end; end; @@ -495,9 +498,9 @@ Result := FahrenheitToReaumur(Temperature); else {$IFDEF CLR} - raise EInvalidOp.CreateFmt(RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateFmt(RsTempConvTypeError, [cToType]); {$ELSE} - raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, [cToType]); {$ENDIF CLR} end; end; @@ -515,9 +518,9 @@ Result := KelvinToReaumur(Temperature); else {$IFDEF CLR} - raise EInvalidOp.CreateFmt(RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateFmt(RsTempConvTypeError, [cToType]); {$ELSE} - raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, [cToType]); {$ENDIF CLR} end; end; @@ -535,9 +538,9 @@ Result := RankineToReaumur(Temperature); else {$IFDEF CLR} - raise EInvalidOp.CreateFmt(RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateFmt(RsTempConvTypeError, [cToType]); {$ELSE} - raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, [cToType]); {$ENDIF CLR} end; end; @@ -555,17 +558,17 @@ Result := ReaumurToRankine(Temperature); else {$IFDEF CLR} - raise EInvalidOp.CreateFmt(RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateFmt(RsTempConvTypeError, [cToType]); {$ELSE} - raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, ['ToType']); + raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, [cToType]); {$ENDIF CLR} end; end; else {$IFDEF CLR} - raise EInvalidOp.CreateFmt(RsTempConvTypeError, ['FromType']); + raise EInvalidOp.CreateFmt(RsTempConvTypeError, [cFromType]); {$ELSE} - raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, ['FromType']); + raise EInvalidOp.CreateResFmt(@RsTempConvTypeError, [cFromType]); {$ENDIF CLR} end; end; Modified: trunk/jcl/source/prototypes/JclWin32.pas =================================================================== --- trunk/jcl/source/prototypes/JclWin32.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/prototypes/JclWin32.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -209,7 +209,6 @@ {$ENDIF ~CLR} {$ENDIF MSWINDOWS} - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -222,7 +221,6 @@ implementation - uses JclResources; Modified: trunk/jcl/source/vcl/JclPrint.pas =================================================================== --- trunk/jcl/source/vcl/JclPrint.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/vcl/JclPrint.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -35,9 +35,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, StdCtrls, SysUtils, JclBase; @@ -164,7 +164,6 @@ function DPGetDefaultPrinter(out PrinterName: string): Boolean; function DPSetDefaultPrinter(const PrinterName: string): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -177,7 +176,6 @@ implementation - uses Graphics, IniFiles, Messages, Printers, WinSpool, JclSysInfo, JclResources; Modified: trunk/jcl/source/windows/JclAppInst.pas =================================================================== --- trunk/jcl/source/windows/JclAppInst.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclAppInst.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -41,9 +41,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, Messages, JclFileUtils, JclSynch; @@ -112,7 +112,6 @@ procedure ReadMessageString(const Message: TMessage; var S: string); procedure ReadMessageStrings(const Message: TMessage; const Strings: TStrings); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -125,7 +124,6 @@ implementation - uses SysUtils, JclStrings; Modified: trunk/jcl/source/windows/JclCIL.pas =================================================================== --- trunk/jcl/source/windows/JclCIL.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclCIL.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -39,9 +39,9 @@ {$I jcl.inc} uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -199,7 +199,6 @@ EJclCliInstructionError = class(EJclError); EJclCliInstructionStreamInvalid = class(EJclCliInstructionError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -212,7 +211,6 @@ implementation - uses {$IFDEF HAS_UNIT_VARIANTS} Variants, Modified: trunk/jcl/source/windows/JclCLR.pas =================================================================== --- trunk/jcl/source/windows/JclCLR.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclCLR.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -38,9 +38,9 @@ {$I jcl.inc} uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -487,7 +487,6 @@ property VTableFixupCount: Integer read GetVTableFixupCount; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -500,7 +499,6 @@ implementation - uses Math, TypInfo, JclMetadata, JclResources, JclStrings, JclUnicode; Modified: trunk/jcl/source/windows/JclCOM.pas =================================================================== --- trunk/jcl/source/windows/JclCOM.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclCOM.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -38,9 +38,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, ActiveX, Classes, JclBase; @@ -117,7 +117,6 @@ procedure VariantArrayToStream(VarArray: OleVariant; var Stream: TStream); overload; procedure VariantArrayToStream(VarArray: OleVariant; var Stream: IStream); overload; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -130,7 +129,6 @@ implementation - uses {$IFDEF FPC} Types, @@ -663,7 +661,6 @@ end; end; - {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/windows/JclConsole.pas =================================================================== --- trunk/jcl/source/windows/JclConsole.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclConsole.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -46,9 +46,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, SysUtils, Contnrs, JclBase; @@ -391,7 +391,6 @@ property EventCount: DWORD read GetEventCount; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -404,7 +403,6 @@ implementation - uses {$IFDEF FPC} WinSysUt, JwaWinNT, Modified: trunk/jcl/source/windows/JclDebug.pas =================================================================== --- trunk/jcl/source/windows/JclDebug.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclDebug.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -732,7 +732,6 @@ EnvironmentVarNtSymbolPath = '_NT_SYMBOL_PATH'; // do not localize EnvironmentVarAlternateNtSymbolPath = '_NT_ALTERNATE_SYMBOL_PATH'; // do not localize - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -745,7 +744,6 @@ implementation - uses ImageHlp, {$IFDEF MSWINDOWS} @@ -2824,7 +2822,8 @@ begin if DebugSymbolsLoadFailed then Result := False - else if not DebugSymbolsInitialized then + else + if not DebugSymbolsInitialized then begin DebugSymbolsLoadFailed := LoadDebugFunctions; @@ -3618,7 +3617,8 @@ end; if DelayedTrace then DelayStoreStack - else if Raw then + else + if Raw then TraceStackRaw else TraceStackFrames; @@ -4477,13 +4477,11 @@ DebugInfoCritSect := TJclCriticalSection.Create; GlobalModulesList := TJclGlobalModulesList.Create; GlobalStackList := TJclGlobalStackList.Create; - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} Modified: trunk/jcl/source/windows/JclDotNet.pas =================================================================== --- trunk/jcl/source/windows/JclDotNet.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclDotNet.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -48,9 +48,9 @@ {$I jcl.inc} uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, ActiveX, {$ENDIF MSWINDOWS} @@ -288,7 +288,6 @@ const mscoree_dll = 'mscoree.dll'; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -301,7 +300,6 @@ implementation - uses ComObj, {$IFDEF HAS_UNIT_VARIANTS} Modified: trunk/jcl/source/windows/JclHookExcept.pas =================================================================== --- trunk/jcl/source/windows/JclHookExcept.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclHookExcept.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -36,9 +36,9 @@ {$I jcl.inc} uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, SysUtils; type @@ -74,7 +74,6 @@ // Hooking routines location info helper function JclBelongsHookedCode(Addr: Pointer): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -87,7 +86,6 @@ implementation - uses Classes, JclBase, JclPeImage, JclSysInfo, JclSysUtils; @@ -559,17 +557,14 @@ initialization Notifiers := TThreadList.Create; - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - {$IFDEF HOOK_DLL_EXCEPTIONS} FinalizeLibrariesHookExcept; {$ENDIF HOOK_DLL_EXCEPTIONS} Modified: trunk/jcl/source/windows/JclLANMan.pas =================================================================== --- trunk/jcl/source/windows/JclLANMan.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclLANMan.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -44,9 +44,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, SysUtils, Classes; // User Management @@ -86,7 +86,6 @@ procedure ParseAccountName(const QualifiedName: string; var Domain, UserName: string); function IsLocalAccount(const AccountName: string): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -99,7 +98,6 @@ implementation - uses JclBase, JclStrings, JclSysInfo, JclWin32; Modified: trunk/jcl/source/windows/JclLocales.pas =================================================================== --- trunk/jcl/source/windows/JclLocales.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclLocales.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -42,9 +42,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF FPC} JwaWinNLS, {$ENDIF FPC} @@ -305,7 +305,6 @@ // Various routines procedure JclLocalesInfoList(const Strings: TStrings; InfoType: Integer = LOCALE_SENGCOUNTRY); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -318,7 +317,6 @@ implementation - uses {$IFDEF FPC} WinSysUt, Modified: trunk/jcl/source/windows/JclMapi.pas =================================================================== --- trunk/jcl/source/windows/JclMapi.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclMapi.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -38,9 +38,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, Contnrs, Mapi, SysUtils, JclBase; @@ -273,7 +273,6 @@ function MapiErrorMessage(const ErrorCode: DWORD): string; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -286,7 +285,6 @@ implementation - uses JclFileUtils, JclLogic, JclRegistry, JclResources, JclStrings, JclSysInfo, JclSysUtils; Modified: trunk/jcl/source/windows/JclMiscel.pas =================================================================== --- trunk/jcl/source/windows/JclMiscel.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclMiscel.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -39,9 +39,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, JclBase; @@ -71,7 +71,6 @@ {$EXTERNALSYM ExitWindows} {$ENDIF SUPPORTS_EXTSYM} - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -84,7 +83,6 @@ implementation - uses SysUtils, JclResources, JclSecurity, JclStrings, JclSysUtils, JclWin32; Modified: trunk/jcl/source/windows/JclMsdosSys.pas =================================================================== --- trunk/jcl/source/windows/JclMsdosSys.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclMsdosSys.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -35,9 +35,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, SysUtils; type @@ -117,7 +117,6 @@ function GetMsdosSys: IJclMsdosSys; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -130,7 +129,6 @@ implementation - const cMsdosSys = 'C:\MSDOS.SYS'; Modified: trunk/jcl/source/windows/JclMultimedia.pas =================================================================== --- trunk/jcl/source/windows/JclMultimedia.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclMultimedia.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -39,28 +39,16 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, MMSystem, Contnrs, JclBase, JclSynch, JclStrings; type {$IFDEF FPC} // declarations missing from mmsystem.pp - // see also -{$IFDEF UNITVERSIONING} -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\source\windows' - ); -{$ENDIF UNITVERSIONING} - -implementation - section + // see also implementation section TTimeCaps = TIMECAPS; TMixerControl = MIXERCONTROL; TMixerCaps = MIXERCAPS; @@ -319,7 +307,6 @@ function GetCDAudioTrackList(var TrackList: TJclCdTrackInfoArray; Drive: Char = #0): TJclCdTrackInfo; overload; function GetCDAudioTrackList(TrackList: TStrings; IncludeTrackType: Boolean = False; Drive: Char = #0): string; overload; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -332,7 +319,6 @@ implementation - uses SysUtils, JclResources, JclSysUtils; Modified: trunk/jcl/source/windows/JclNTFS.pas =================================================================== --- trunk/jcl/source/windows/JclNTFS.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclNTFS.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -47,9 +47,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, JclBase, JclWin32; @@ -161,7 +161,6 @@ function NtfsFindHardLinks(const Path: string; const FileIndexHigh, FileIndexLow: Cardinal; const List: TStrings): Boolean; function NtfsDeleteHardLinks(const FileName: string): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -174,7 +173,6 @@ implementation - uses {$IFDEF FPC} WinSysUt, @@ -961,20 +959,8 @@ //=== Hard links ============================================================= (* - -{$IFDEF UNITVERSIONING} -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\source\windows' - ); -{$ENDIF UNITVERSIONING} + Implementation of CreateHardLink completely swapped to the unit Hardlink.pas -implementation - of CreateHardLink completely swapped to the unit Hardlink.pas - As with all APIs on the NT platform this version is completely implemented in UNICODE and calling the ANSI version results in conversion of parameters and call of the underlying UNICODE version of the function. @@ -983,19 +969,7 @@ *) // For a description see: NtfsCreateHardLink() -(* ANSI -{$IFDEF UNITVERSIONING} -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\source\windows' - ); -{$ENDIF UNITVERSIONING} - -implementation - of the function - calling UNICODE anyway ;-) *) +(* ANSI implementation of the function - calling UNICODE anyway ;-) *) function NtfsCreateHardLinkA(const LinkFileName, ExistingFileName: AnsiString): Boolean; begin // Invoke either (homegrown vs. API) function and supply NIL for security attributes @@ -1003,19 +977,7 @@ end; // For a description see: NtfsCreateHardLink() -(* UNICODE -{$IFDEF UNITVERSIONING} -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'JCL\source\windows' - ); -{$ENDIF UNITVERSIONING} - -implementation - of the function - we are on NT, aren't we ;-) *) +(* UNICODE implementation of the function - we are on NT, aren't we ;-) *) function NtfsCreateHardLinkW(const LinkFileName, ExistingFileName: WideString): Boolean; begin // Invoke either (homegrown vs. API) function and supply NIL for security attributes Modified: trunk/jcl/source/windows/JclPeImage.pas =================================================================== --- trunk/jcl/source/windows/JclPeImage.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclPeImage.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -44,9 +44,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, SysUtils, TypInfo, Contnrs, JclBase, JclDateTime, JclFileUtils, JclStrings, JclSysInfo, JclWin32; @@ -980,7 +980,6 @@ function PeUnmangleName(const Name: string; var Unmangled: string): TJclPeUmResult; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -993,7 +992,6 @@ implementation - uses JclLogic, JclResources, JclSysUtils; Modified: trunk/jcl/source/windows/JclRegistry.pas =================================================================== --- trunk/jcl/source/windows/JclRegistry.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclRegistry.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -45,9 +45,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, JclBase, JclStrings, JclWideStrings; @@ -227,7 +227,6 @@ const SaveTo: TStrings): Boolean; function RegDelList(const RootKey: DelphiHKEY; const Key: string; const ListName: string): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -240,7 +239,6 @@ implementation - uses SysUtils, {$IFDEF FPC} Modified: trunk/jcl/source/windows/JclSecurity.pas =================================================================== --- trunk/jcl/source/windows/JclSecurity.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclSecurity.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -43,9 +43,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, SysUtils, JclBase; @@ -74,7 +74,6 @@ function GetInteractiveUserName: string; {$ENDIF ~FPC} - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -87,7 +86,6 @@ implementation - uses {$IFDEF FPC} WinSysUt, Modified: trunk/jcl/source/windows/JclShell.pas =================================================================== --- trunk/jcl/source/windows/JclShell.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclShell.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -44,9 +44,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, SysUtils, {$IFNDEF FPC} ShlObj, @@ -188,7 +188,6 @@ RtdlMsiGetComponentPath: function(szProduct: LPCSTR; szComponent: LPCSTR; lpPathBuf: LPSTR; pcchBuf: LPDWORD): INSTALLSTATE stdcall = nil; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -201,7 +200,6 @@ implementation - uses ActiveX, {$IFNDEF FPC} @@ -1439,7 +1437,6 @@ {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - UnloadModule(rtdlMsiLibHandle); end. Modified: trunk/jcl/source/windows/JclStructStorage.pas =================================================================== --- trunk/jcl/source/windows/JclStructStorage.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclStructStorage.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -222,7 +222,6 @@ procedure CoMallocFree(P: Pointer); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -235,7 +234,6 @@ implementation - uses ComObj, JclResources; Modified: trunk/jcl/source/windows/JclSvcCtrl.pas =================================================================== --- trunk/jcl/source/windows/JclSvcCtrl.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclSvcCtrl.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -44,9 +44,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Classes, SysUtils, Contnrs, {$IFDEF FPC} JwaWinNT, JwaWinSvc, @@ -350,7 +350,6 @@ function StopServiceByName(const AServer, AServiceName: String):Boolean; function StartServiceByName(const AServer,AServiceName: String):Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -363,7 +362,6 @@ implementation - uses {$IFDEF FPC} WinSysUt, Modified: trunk/jcl/source/windows/JclSynch.pas =================================================================== --- trunk/jcl/source/windows/JclSynch.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclSynch.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -40,9 +40,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -305,7 +305,6 @@ EJclMutexError = class(EJclWin32Error); EJclMeteredSectionError = class(EJclError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -318,7 +317,6 @@ implementation - uses SysUtils, JclLogic, JclRegistry, JclResources, JclSysInfo, JclWin32; Modified: trunk/jcl/source/windows/JclTD32.pas =================================================================== --- trunk/jcl/source/windows/JclTD32.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclTD32.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -39,10 +39,10 @@ {$I jcl.inc} uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} -{$IFDEF MSWINDOWS} + {$ENDIF UNITVERSIONING} + {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} Classes, SysUtils, Contnrs, @@ -853,7 +853,6 @@ property TD32Scanner: TJclTD32InfoScanner read FTD32Scanner; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -866,7 +865,6 @@ implementation - uses JclResources, JclSysUtils; Modified: trunk/jcl/source/windows/JclTask.pas =================================================================== --- trunk/jcl/source/windows/JclTask.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclTask.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -38,9 +38,9 @@ {$I windowsonly.inc} uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Windows, Messages, Classes, SysUtils, Contnrs, MSTask, JclBase, JclSysUtils, JclSysInfo, JclWideStrings, JclWin32; @@ -212,7 +212,6 @@ property TaskFlags: DWORD read GetTaskFlags write SetTaskFlags; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -225,7 +224,6 @@ implementation - uses ActiveX, ComObj, CommCtrl, JclSvcCtrl; Modified: trunk/jcl/source/windows/JclUnicode.pas =================================================================== --- trunk/jcl/source/windows/JclUnicode.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclUnicode.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -163,9 +163,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -1117,7 +1117,6 @@ type EJclUnicodeError = class(EJclError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -1130,7 +1129,6 @@ implementation - {$IFDEF SUPPORTS_WIDESTRING} // Unicode data for case mapping, decomposition, numbers etc. This data is @@ -8536,17 +8534,14 @@ initialization PrepareUnicodeData; - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} - finalization {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - FreeUnicodeData; {$ENDIF SUPPORTS_WIDESTRING} Modified: trunk/jcl/source/windows/JclWideFormat.pas =================================================================== --- trunk/jcl/source/windows/JclWideFormat.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclWideFormat.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -43,7 +43,7 @@ interface {$IFDEF UNITVERSIONING} -Uses +uses JclUnitVersioning; {$ENDIF UNITVERSIONING} @@ -76,7 +76,6 @@ messages, the exception class is still EConvertError. } function WideFormat(const Format: WideString; const Args: array of const): WideString; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -89,7 +88,6 @@ implementation - uses Windows, // for MultiBytetoWideChar {$IFDEF FORMAT_EXTENSIONS} Modified: trunk/jcl/source/windows/JclWin32.pas =================================================================== --- trunk/jcl/source/windows/JclWin32.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclWin32.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -7743,7 +7743,6 @@ {$ENDIF ~CLR} - {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/windows/JclWin32Ex.pas =================================================================== --- trunk/jcl/source/windows/JclWin32Ex.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclWin32Ex.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -71,7 +71,6 @@ procedure JclCheckAndInitializeOpenGL; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -84,7 +83,6 @@ implementation - uses JclBase, JclResources; @@ -385,18 +383,14 @@ end; initialization - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} - finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - UnloadLibraries; end. Modified: trunk/jcl/source/windows/JclWinMIDI.pas =================================================================== --- trunk/jcl/source/windows/JclWinMIDI.pas 2006-07-24 05:34:39 UTC (rev 1694) +++ trunk/jcl/source/windows/JclWinMIDI.pas 2006-07-25 05:56:46 UTC (rev 1695) @@ -65,7 +65,6 @@ // MIDI In procedure MidiInCheck(Code: MMResult); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -78,7 +77,6 @@ implementation - uses JclResources, JclStrings; @@ -94,10 +92,8 @@ begin FMidiOutputs := TStringList.Create; for I := 0 to midiOutGetNumDevs - 1 do - begin if (midiOutGetDevCaps(I, @Caps, SizeOf(Caps)) = MMSYSERR_NOERROR) then FMidiOutputs.Add(Caps.szPName); - end; end; Result := FMidiOutputs; end; @@ -145,7 +141,7 @@ FHandle: HMIDIOUT; FDeviceID: Cardinal; FDeviceCaps: MIDIOUTCAPS; - FVolume: DWord; + FVolume: DWORD; function GetChannelVolume(Channel: TStereoChannel): Word; procedure SetChannelVolume(Channel: TStereoChannel; const Value: Word); function GetVolume: Word; @@ -220,7 +216,8 @@ Hdr.dwFlags := 0; MidiOutCheck(midiOutPrepareHeader(FHandle, @Hdr, SizeOf(Hdr))); MidiOutCheck(midiOutLongMsg(FHandle, @Hdr, SizeOf(Hdr))); - repeat until (Hdr.dwFlags and MHDR_DONE) <> 0; + repeat + until (Hdr.dwFlags and MHDR_DONE) <> 0; end; procedure TMidiOut.DoSendMessage(const Data: array of Byte); @@ -240,7 +237,8 @@ Msg.Bytes[I] := Data[I]; MidiOutCheck(midiOutShortMsg(FHandle, Msg.DWord)); end - else LongMessage(Data); + else + LongMessage(Data); end; function TMidiOut.GetChannelVolume(Channel: TStereoChannel): Word; @@ -269,7 +267,7 @@ procedure TMidiOut.SetLRVolume(const LeftValue, RightValue: Word); var - Value: DWord; + Value: DWORD; begin with LongRec(Value) do begin @@ -293,7 +291,6 @@ {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - FreeAndNil(FMidiOutputs); end. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-07-24 05:35:30
|
Revision: 1694 Author: marquardt Date: 2006-07-23 22:34:39 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1694&view=rev Log Message: ----------- style cleaned unitversioning entries Modified Paths: -------------- trunk/jcl/source/common/Jcl8087.pas trunk/jcl/source/common/JclAbstractContainers.pas trunk/jcl/source/common/JclAlgorithms.pas trunk/jcl/source/common/JclAnsiStrings.pas trunk/jcl/source/common/JclArrayLists.pas trunk/jcl/source/common/JclArraySets.pas trunk/jcl/source/common/JclBase.pas trunk/jcl/source/common/JclBinaryTrees.pas trunk/jcl/source/common/JclBorlandTools.pas trunk/jcl/source/common/JclComplex.pas trunk/jcl/source/common/JclCompression.pas trunk/jcl/source/common/JclContainerIntf.pas trunk/jcl/source/common/JclCounter.pas trunk/jcl/source/common/JclDateTime.pas trunk/jcl/source/common/JclExprEval.pas trunk/jcl/source/common/JclFileUtils.pas trunk/jcl/source/common/JclHashMaps.pas trunk/jcl/source/common/JclHashSets.pas trunk/jcl/source/common/JclIniFiles.pas trunk/jcl/source/common/JclLinkedLists.pas trunk/jcl/source/common/JclLogic.pas trunk/jcl/source/common/JclMIDI.pas trunk/jcl/source/common/JclMath.pas trunk/jcl/source/common/JclMime.pas trunk/jcl/source/common/JclPCRE.pas trunk/jcl/source/common/JclQueues.pas trunk/jcl/source/common/JclRTTI.pas trunk/jcl/source/common/JclResources.pas trunk/jcl/source/common/JclSchedule.pas trunk/jcl/source/common/JclStacks.pas trunk/jcl/source/common/JclStatistics.pas trunk/jcl/source/common/JclStrHashMap.pas trunk/jcl/source/common/JclStreams.pas trunk/jcl/source/common/JclStrings.pas trunk/jcl/source/common/JclSysInfo.pas trunk/jcl/source/common/JclSysUtils.pas trunk/jcl/source/common/JclUnitConv.pas trunk/jcl/source/common/JclValidation.pas trunk/jcl/source/common/JclVectors.pas trunk/jcl/source/common/JclWideStrings.pas Modified: trunk/jcl/source/common/Jcl8087.pas =================================================================== --- trunk/jcl/source/common/Jcl8087.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/Jcl8087.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -40,7 +40,7 @@ interface {$IFDEF UNITVERSIONING} -Uses +uses JclUnitVersioning; {$ENDIF UNITVERSIONING} @@ -73,7 +73,6 @@ function Mask8087Exceptions(Exceptions: T8087Exceptions): T8087Exceptions; function Unmask8087Exceptions(Exceptions: T8087Exceptions; ClearBefore: Boolean = True): T8087Exceptions; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -86,7 +85,6 @@ implementation - const X87ExceptBits = $3F; Modified: trunk/jcl/source/common/JclAbstractContainers.pas =================================================================== --- trunk/jcl/source/common/JclAbstractContainers.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclAbstractContainers.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -93,7 +93,6 @@ procedure LoadDelimited(const AString: string; const Separator: string = AnsiLineBreak); end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -106,7 +105,6 @@ implementation - //=== { TJclAbstractContainer } ============================================== {$IFDEF THREADSAFE} Modified: trunk/jcl/source/common/JclAlgorithms.pas =================================================================== --- trunk/jcl/source/common/JclAlgorithms.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclAlgorithms.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} JclBase, JclContainerIntf; // function pointer types @@ -115,7 +115,6 @@ procedure Sort(AList: IJclStrList; First, Last: Integer; AComparator: TStrCompare); overload; procedure Sort(AList: IJclList; First, Last: Integer; AComparator: TCompare); overload; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -128,7 +127,6 @@ implementation - uses SysUtils; Modified: trunk/jcl/source/common/JclAnsiStrings.pas =================================================================== --- trunk/jcl/source/common/JclAnsiStrings.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclAnsiStrings.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -54,9 +54,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -358,7 +358,6 @@ type EJclStringError = EJclError; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -371,7 +370,6 @@ implementation - uses {$IFDEF CLR} System.Globalization, @@ -3985,5 +3983,4 @@ UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - end. Modified: trunk/jcl/source/common/JclArrayLists.pas =================================================================== --- trunk/jcl/source/common/JclArrayLists.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclArrayLists.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf; @@ -164,7 +164,6 @@ property OwnsObjects: Boolean read FOwnsObjects; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -177,7 +176,6 @@ implementation - uses SysUtils, JclResources; Modified: trunk/jcl/source/common/JclArraySets.pas =================================================================== --- trunk/jcl/source/common/JclArraySets.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclArraySets.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf, JclArrayLists; type @@ -86,7 +86,6 @@ procedure Union(ACollection: IJclCollection); end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -99,7 +98,6 @@ implementation - uses SysUtils, JclResources; Modified: trunk/jcl/source/common/JclBase.pas =================================================================== --- trunk/jcl/source/common/JclBase.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclBase.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -38,9 +38,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Reflection, {$ELSE} @@ -156,7 +156,7 @@ {$IFNDEF CLR} // Redefinition of PByteArray to avoid range check exceptions. type - TJclByteArray = array[0..MaxInt div SizeOf(Byte) - 1] of Byte; + TJclByteArray = array [0..MaxInt div SizeOf(Byte) - 1] of Byte; PJclByteArray = ^TJclByteArray; TBytes = Pointer; // under .NET System.pas: TBytes = array of Byte; @@ -236,7 +236,6 @@ function ByteArrayToString(const Data: TBytes; Count: Integer): string; {$ENDIF CLR} - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -249,7 +248,6 @@ implementation - uses JclResources; @@ -270,7 +268,8 @@ { Keep reference counting working } if FromIndex < ToIndex then FillChar(List[FromIndex], (ToIndex - FromIndex) * SizeOf(List[0]), 0) - else if FromIndex > ToIndex then + else + if FromIndex > ToIndex then FillChar(List[FromIndex + Count - 1], (FromIndex - ToIndex) * SizeOf(List[0]), 0); {$ENDIF CLR} end; @@ -292,7 +291,8 @@ { Keep reference counting working } if FromIndex < ToIndex then FillChar(List[FromIndex], (ToIndex - FromIndex) * SizeOf(List[0]), 0) - else if FromIndex > ToIndex then + else + if FromIndex > ToIndex then FillChar(List[FromIndex + Count - 1], (FromIndex - ToIndex) * SizeOf(List[0]), 0); {$ENDIF CLR} end; @@ -335,16 +335,16 @@ var Dest: string; ToIndex, Count: Integer); {$IFDEF CLR} var - i: Integer; + I: Integer; Buf: array of Char; begin Buf := Dest.ToCharArray; if FromIndex <= ToIndex then - for i := 0 to Count - 1 do - Buf[ToIndex + i] := Source[FromIndex + i] + for I := 0 to Count - 1 do + Buf[ToIndex + I] := Source[FromIndex + I] else - for i := Count - 1 downto 0 do - Buf[ToIndex + i] := Source[FromIndex + i]; + for I := Count - 1 downto 0 do + Buf[ToIndex + I] := Source[FromIndex + I]; Dest := System.String.Create(Buf); {$ELSE} begin @@ -505,8 +505,6 @@ end; {$ENDIF ~XPLATFORM_RTL} - - {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/common/JclBinaryTrees.pas =================================================================== --- trunk/jcl/source/common/JclBinaryTrees.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclBinaryTrees.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -33,9 +33,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclAlgorithms, JclContainerIntf; Modified: trunk/jcl/source/common/JclBorlandTools.pas =================================================================== --- trunk/jcl/source/common/JclBorlandTools.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclBorlandTools.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -61,9 +61,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, MSHelpServices_TLB, @@ -824,7 +824,6 @@ procedure GetBPKFileInfo(const BPKFileName: string; out RunOnly: Boolean; const BinaryFileName: PString = nil; const Description: PString = nil); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -837,7 +836,6 @@ implementation - uses SysConst, {$IFDEF MSWINDOWS} Modified: trunk/jcl/source/common/JclComplex.pas =================================================================== --- trunk/jcl/source/common/JclComplex.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclComplex.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -38,9 +38,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} SysUtils, JclBase, JclMath, JclResources, JclStrings; @@ -231,7 +231,6 @@ MaxTerm: Byte = 35; EpsilonSqr: Float = 1E-20; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -244,7 +243,6 @@ implementation - const MaxFracLen = 18; RectOne: TRectCoord = (X: 1.0; Y: 0.0); Modified: trunk/jcl/source/common/JclCompression.pas =================================================================== --- trunk/jcl/source/common/JclCompression.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclCompression.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -44,9 +44,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -213,7 +213,6 @@ EJclCompressionError = class(EJclError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -226,7 +225,6 @@ implementation - uses JclResources; Modified: trunk/jcl/source/common/JclContainerIntf.pas =================================================================== --- trunk/jcl/source/common/JclContainerIntf.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclContainerIntf.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -35,9 +35,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, JclBase; @@ -456,7 +456,6 @@ EJclIllegalArgumentError = class(EJclError); EJclOperationNotSupportedError = class(EJclError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -469,7 +468,6 @@ implementation - {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/common/JclCounter.pas =================================================================== --- trunk/jcl/source/common/JclCounter.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclCounter.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -38,9 +38,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -82,7 +82,6 @@ type EJclCounterError = class(EJclError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -95,7 +94,6 @@ implementation - uses SysUtils, JclResources; Modified: trunk/jcl/source/common/JclDateTime.pas =================================================================== --- trunk/jcl/source/common/JclDateTime.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclDateTime.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -53,9 +53,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Globalization, System.Runtime.InteropServices, {$ELSE} @@ -203,7 +203,6 @@ type EJclDateTimeError = class(EJclError); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -216,7 +215,6 @@ implementation - const DaysInMonths: array [1..12] of Integer = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); Modified: trunk/jcl/source/common/JclExprEval.pas =================================================================== --- trunk/jcl/source/common/JclExprEval.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclExprEval.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -39,9 +39,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} SysUtils, Classes, JclBase, JclSysUtils, JclStrHashMap, JclResources; @@ -842,7 +842,6 @@ procedure Clear; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -855,7 +854,6 @@ implementation - //=== { TExprHashContext } =================================================== constructor TExprHashContext.Create(ACaseSensitive: Boolean; AHashSize: Integer); Modified: trunk/jcl/source/common/JclFileUtils.pas =================================================================== --- trunk/jcl/source/common/JclFileUtils.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclFileUtils.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -961,7 +961,6 @@ // return the index of an item function PathListItemIndex(const List, Item: string): Integer; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -969,12 +968,11 @@ Revision: '$Revision$'; Date: '$Date$'; LogPath: 'JCL\source\common' - ); + ); {$ENDIF UNITVERSIONING} implementation - uses {$IFDEF Win32API} ShellApi, Modified: trunk/jcl/source/common/JclHashMaps.pas =================================================================== --- trunk/jcl/source/common/JclHashMaps.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclHashMaps.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf; type @@ -305,7 +305,6 @@ property OwnsObjects: Boolean read FOwnsObjects; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -318,7 +317,6 @@ implementation - uses SysUtils, JclArrayLists, JclArraySets, JclResources; Modified: trunk/jcl/source/common/JclHashSets.pas =================================================================== --- trunk/jcl/source/common/JclHashSets.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclHashSets.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf, JclHashMaps; @@ -128,7 +128,6 @@ destructor Destroy; override; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -141,7 +140,6 @@ implementation - {$IFDEF CLR} var GlobalRefUnique: TObject = nil; @@ -624,7 +622,6 @@ {$ENDIF UNITVERSIONING} {$ENDIF FPC} - {$IFDEF UNITVERSIONING} finalization UnregisterUnitVersion(HInstance); Modified: trunk/jcl/source/common/JclIniFiles.pas =================================================================== --- trunk/jcl/source/common/JclIniFiles.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclIniFiles.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -33,9 +33,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} SysUtils, Classes, IniFiles; // Initialization (ini) Files @@ -50,7 +50,6 @@ procedure IniReadStrings(IniFile: TCustomIniFile; const Section: string; Strings: TStrings); procedure IniWriteStrings(IniFile: TCustomIniFile; const Section: string; Strings: TStrings); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -63,7 +62,6 @@ implementation - {$IFDEF CLR} type TIniFile = TMemIniFile; @@ -186,7 +184,6 @@ end; end; - {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/common/JclLinkedLists.pas =================================================================== --- trunk/jcl/source/common/JclLinkedLists.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclLinkedLists.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf; @@ -191,7 +191,6 @@ property OwnsObjects: Boolean read FOwnsObjects; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -204,7 +203,6 @@ implementation - uses SysUtils, JclResources; Modified: trunk/jcl/source/common/JclLogic.pas =================================================================== --- trunk/jcl/source/common/JclLogic.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclLogic.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -47,7 +47,7 @@ interface {$IFDEF UNITVERSIONING} -Uses +uses JclUnitVersioning; {$ENDIF UNITVERSIONING} @@ -285,7 +285,6 @@ CardinalMask = Cardinal($FFFFFFFF); Int64Mask = Int64($FFFFFFFFFFFFFFFF); - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -298,7 +297,6 @@ implementation - uses JclBase; Modified: trunk/jcl/source/common/JclMIDI.pas =================================================================== --- trunk/jcl/source/common/JclMIDI.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclMIDI.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -35,9 +35,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, JclBase; @@ -360,7 +360,6 @@ function MIDISingleNoteTuningData(Key: TMIDINote; Frequency: Single): TSingleNoteTuningData; function MIDINoteToStr(Note: TMIDINote): string; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -373,7 +372,6 @@ implementation - uses SysUtils, {$IFDEF MSWINDOWS} @@ -389,7 +387,7 @@ begin raise EJclInternalError.CreateRes(@RsMidiNotImplemented); end; - {$ENDIF UNIX} +{$ENDIF UNIX} function MIDIOut(DeviceID: Cardinal = 0): IJclMIDIOut; begin Modified: trunk/jcl/source/common/JclMath.pas =================================================================== --- trunk/jcl/source/common/JclMath.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclMath.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -625,7 +625,6 @@ function SecH(const Z: TRectComplex): TRectComplex; overload; function CscH(const Z: TRectComplex): TRectComplex; overload; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -638,7 +637,6 @@ implementation - uses {$IFDEF Win32API} Windows, @@ -4459,5 +4457,4 @@ UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - end. Modified: trunk/jcl/source/common/JclMime.pas =================================================================== --- trunk/jcl/source/common/JclMime.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclMime.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -54,9 +54,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Text, {$ENDIF CLR} @@ -121,7 +121,6 @@ MIME_DECODED_LINE_BREAK = MIME_ENCODED_LINE_BREAK div 4 * 3; MIME_BUFFER_SIZE = MIME_DECODED_LINE_BREAK * 3 * 4 * 4; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -134,7 +133,6 @@ implementation - // Caution: For MimeEncodeStream and all other kinds of multi-buffered // Mime encodings (i.e. Files etc.), BufferSize must be set to a multiple of 3. // Even though the implementation of the Mime decoding routines below Modified: trunk/jcl/source/common/JclPCRE.pas =================================================================== --- trunk/jcl/source/common/JclPCRE.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclPCRE.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -32,9 +32,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -92,7 +92,6 @@ property ErrorOffset: Integer read FErrorOffset; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -105,7 +104,6 @@ implementation - uses pcre, JclResources; @@ -258,19 +256,14 @@ initialization pcre.LibNotLoadedHandler := LibNotLoadedHandler; LoadPCRE; - - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} - - finalization {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - UnloadPCRE; end. Modified: trunk/jcl/source/common/JclQueues.pas =================================================================== --- trunk/jcl/source/common/JclQueues.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclQueues.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf; type @@ -88,7 +88,6 @@ constructor Create(ACapacity: Integer = DefaultContainerCapacity); end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -101,7 +100,6 @@ implementation - uses JclResources; Modified: trunk/jcl/source/common/JclRTTI.pas =================================================================== --- trunk/jcl/source/common/JclRTTI.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclRTTI.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -378,7 +378,6 @@ function JclIsClass(const AnObj: TObject; const AClass: TClass): Boolean; function JclIsClassByName(const AnObj: TObject; const AClass: TClass): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -391,7 +390,6 @@ implementation - uses {$IFDEF HAS_UNIT_RTLCONSTS} RtlConsts, @@ -3023,19 +3021,14 @@ {$IFNDEF CLR} initialization TypeList := TThreadList.Create; - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} - - finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - ClearInfoList; FreeAndNil(TypeList); Modified: trunk/jcl/source/common/JclResources.pas =================================================================== --- trunk/jcl/source/common/JclResources.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclResources.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -45,7 +45,7 @@ interface {$IFDEF UNITVERSIONING} -Uses +uses JclUnitVersioning; {$ENDIF UNITVERSIONING} @@ -1734,7 +1734,6 @@ RsMidiInUnknownError = 'Unknown MIDI-In error No. %d'; RsMidiOutUnknownError = 'Unknown MIDI-Out error No. %d'; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -1747,7 +1746,6 @@ implementation - {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jcl/source/common/JclSchedule.pas =================================================================== --- trunk/jcl/source/common/JclSchedule.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclSchedule.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -37,9 +37,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} SysUtils, JclBase; @@ -179,7 +179,6 @@ function EqualTimeStamps(const Stamp1, Stamp2: TTimeStamp): Boolean; function IsNullTimeStamp(const Stamp: TTimeStamp): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -192,7 +191,6 @@ implementation - uses JclDateTime, JclResources; Modified: trunk/jcl/source/common/JclStacks.pas =================================================================== --- trunk/jcl/source/common/JclStacks.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclStacks.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf; type @@ -88,7 +88,6 @@ constructor Create(ACapacity: Integer = DefaultContainerCapacity); end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -101,7 +100,6 @@ implementation - //=== { TJclIntfStack } ====================================================== constructor TJclIntfStack.Create(ACapacity: Integer = DefaultContainerCapacity); Modified: trunk/jcl/source/common/JclStatistics.pas =================================================================== --- trunk/jcl/source/common/JclStatistics.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclStatistics.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -42,9 +42,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} JclBase, JclMath; type @@ -83,7 +83,6 @@ function SumSquareFloatArray(const B: TDynFloatArray): Float; function SumPairProductFloatArray(const X, Y: TDynFloatArray): Float; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -96,7 +95,6 @@ implementation - uses JclLogic, {$IFNDEF CLR} Modified: trunk/jcl/source/common/JclStrHashMap.pas =================================================================== --- trunk/jcl/source/common/JclStrHashMap.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclStrHashMap.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -34,9 +34,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} SysUtils, JclBase, JclResources; @@ -164,7 +164,6 @@ function Compare(const L, R: string): Integer; override; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -177,7 +176,6 @@ implementation - // Case Sensitive & Insensitive Traits function TCaseSensitiveTraits.Compare(const L, R: string): Integer; begin @@ -867,18 +865,14 @@ end; initialization - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} - finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - FreeAndNil(GlobalCaseInsensitiveTraits); FreeAndNil(GlobalCaseSensitiveTraits); Modified: trunk/jcl/source/common/JclStreams.pas =================================================================== --- trunk/jcl/source/common/JclStreams.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclStreams.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -31,9 +31,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -273,7 +273,6 @@ procedure WriteSizedString(const Value: string); end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -286,7 +285,6 @@ implementation - uses JclBase, JclResources; Modified: trunk/jcl/source/common/JclStrings.pas =================================================================== --- trunk/jcl/source/common/JclStrings.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclStrings.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -55,9 +55,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -470,7 +470,6 @@ type EJclStringError = EJclError; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -483,7 +482,6 @@ implementation - uses {$IFDEF CLR} System.Globalization, @@ -4988,7 +4986,6 @@ end; {$ENDIF CLR} - {$IFNDEF CLR} initialization LoadCharTypes; // this table first @@ -5004,13 +5001,9 @@ {$ENDIF UNITVERSIONING} {$ENDIF ~CLR} - - {$IFDEF UNITVERSIONING} finalization UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - - end. Modified: trunk/jcl/source/common/JclSysInfo.pas =================================================================== --- trunk/jcl/source/common/JclSysInfo.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclSysInfo.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -62,9 +62,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} {$IFDEF HAS_UNIT_TYPES} Types, {$ENDIF HAS_UNIT_TYPES} @@ -1127,7 +1127,6 @@ PageSize: Cardinal = 0; {$ENDIF ~CLR} - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -1140,7 +1139,6 @@ implementation - uses SysUtils, {$IFNDEF CLR} @@ -5445,19 +5443,14 @@ initialization InitSysInfo; - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} - - finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - FinalizeSysInfo; {$ENDIF MSWINDOWS} Modified: trunk/jcl/source/common/JclSysUtils.pas =================================================================== --- trunk/jcl/source/common/JclSysUtils.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclSysUtils.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -521,7 +521,6 @@ property LogOpen: Boolean read GetLogOpen; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -534,7 +533,6 @@ implementation - uses {$IFDEF HAS_UNIT_TYPES} Types, @@ -3095,25 +3093,19 @@ end; initialization - {$IFDEF THREADSAFE} if not Assigned(GlobalMMFHandleListCS) then GlobalMMFHandleListCS := TJclIntfCriticalSection.Create; {$ENDIF THREADSAFE} - - {$IFDEF UNITVERSIONING} RegisterUnitVersion(HInstance, UnitVersioning); {$ENDIF UNITVERSIONING} finalization - {$IFDEF UNITVERSIONING} UnregisterUnitVersion(HInstance); {$ENDIF UNITVERSIONING} - FinalizeMMFHandleList; - {$IFDEF THREADSAFE} GlobalMMFHandleListCS.Free; {$ENDIF THREADSAFE} Modified: trunk/jcl/source/common/JclUnitConv.pas =================================================================== --- trunk/jcl/source/common/JclUnitConv.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclUnitConv.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -42,9 +42,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} SysUtils, JclBase; @@ -229,7 +229,6 @@ function WattToHpElectric(const W: Float): Float; function WattToHpMetric(const W: Float): Float; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -242,7 +241,6 @@ implementation - uses JclMath, JclResources; Modified: trunk/jcl/source/common/JclValidation.pas =================================================================== --- trunk/jcl/source/common/JclValidation.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclValidation.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -35,7 +35,6 @@ // ISBN: International Standard Book Number function IsValidISBN(const ISBN: string): Boolean; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -48,7 +47,6 @@ implementation - { TODO -cDoc : Donator: Ivo Bauer } function IsValidISBN(const ISBN: string): Boolean; // Modified: trunk/jcl/source/common/JclVectors.pas =================================================================== --- trunk/jcl/source/common/JclVectors.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclVectors.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -181,7 +181,6 @@ property OwnsObjects: Boolean read FOwnsObjects; end; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -194,7 +193,6 @@ implementation - uses JclResources; @@ -1486,6 +1484,7 @@ end; {$IFNDEF CLR} + procedure TJclVector.AfterConstruction; begin end; @@ -1493,6 +1492,7 @@ procedure TJclVector.BeforeDestruction; begin end; + {$ENDIF ~CLR} {$IFDEF UNITVERSIONING} Modified: trunk/jcl/source/common/JclWideStrings.pas =================================================================== --- trunk/jcl/source/common/JclWideStrings.pas 2006-07-23 17:31:36 UTC (rev 1693) +++ trunk/jcl/source/common/JclWideStrings.pas 2006-07-24 05:34:39 UTC (rev 1694) @@ -36,9 +36,9 @@ interface uses -{$IFDEF UNITVERSIONING} + {$IFDEF UNITVERSIONING} JclUnitVersioning, -{$ENDIF UNITVERSIONING} + {$ENDIF UNITVERSIONING} Classes, SysUtils; const @@ -284,7 +284,6 @@ function TrimLeftLengthW(const S: WideString): Integer; function TrimRightLengthW(const S: WideString): Integer; - {$IFDEF UNITVERSIONING} const UnitVersioning: TUnitVersionInfo = ( @@ -297,7 +296,6 @@ implementation - uses {$IFDEF HAS_UNIT_RTLCONSTS} RTLConsts, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jfu...@us...> - 2006-07-23 17:33:10
|
Revision: 1693 Author: jfudickar Date: 2006-07-23 10:31:36 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1693&view=rev Log Message: ----------- Support for DEFINE UNITVERSIONING Modified Paths: -------------- trunk/jcl/source/common/Jcl8087.pas trunk/jcl/source/common/JclAbstractContainers.pas trunk/jcl/source/common/JclAlgorithms.pas trunk/jcl/source/common/JclAnsiStrings.pas trunk/jcl/source/common/JclArrayLists.pas trunk/jcl/source/common/JclArraySets.pas trunk/jcl/source/common/JclBase.pas trunk/jcl/source/common/JclBinaryTrees.pas trunk/jcl/source/common/JclBorlandTools.pas trunk/jcl/source/common/JclComplex.pas trunk/jcl/source/common/JclCompression.pas trunk/jcl/source/common/JclContainerIntf.pas trunk/jcl/source/common/JclCounter.pas trunk/jcl/source/common/JclDateTime.pas trunk/jcl/source/common/JclExprEval.pas trunk/jcl/source/common/JclFileUtils.pas trunk/jcl/source/common/JclHashMaps.pas trunk/jcl/source/common/JclHashSets.pas trunk/jcl/source/common/JclIniFiles.pas trunk/jcl/source/common/JclLinkedLists.pas trunk/jcl/source/common/JclLogic.pas trunk/jcl/source/common/JclMIDI.pas trunk/jcl/source/common/JclMath.pas trunk/jcl/source/common/JclMime.pas trunk/jcl/source/common/JclPCRE.pas trunk/jcl/source/common/JclQueues.pas trunk/jcl/source/common/JclRTTI.pas trunk/jcl/source/common/JclResources.pas trunk/jcl/source/common/JclSchedule.pas trunk/jcl/source/common/JclStacks.pas trunk/jcl/source/common/JclStatistics.pas trunk/jcl/source/common/JclStrHashMap.pas trunk/jcl/source/common/JclStreams.pas trunk/jcl/source/common/JclStrings.pas trunk/jcl/source/common/JclSysInfo.pas trunk/jcl/source/common/JclSysUtils.pas trunk/jcl/source/common/JclUnitConv.pas trunk/jcl/source/common/JclValidation.pas trunk/jcl/source/common/JclVectors.pas trunk/jcl/source/common/JclWideStrings.pas trunk/jcl/source/jcl.inc trunk/jcl/source/prototypes/JclWin32.pas trunk/jcl/source/vcl/JclPrint.pas trunk/jcl/source/windows/JclAppInst.pas trunk/jcl/source/windows/JclCIL.pas trunk/jcl/source/windows/JclCLR.pas trunk/jcl/source/windows/JclCOM.pas trunk/jcl/source/windows/JclConsole.pas trunk/jcl/source/windows/JclDebug.pas trunk/jcl/source/windows/JclDotNet.pas trunk/jcl/source/windows/JclHookExcept.pas trunk/jcl/source/windows/JclLANMan.pas trunk/jcl/source/windows/JclLocales.pas trunk/jcl/source/windows/JclMapi.pas trunk/jcl/source/windows/JclMetadata.pas trunk/jcl/source/windows/JclMiscel.pas trunk/jcl/source/windows/JclMsdosSys.pas trunk/jcl/source/windows/JclMultimedia.pas trunk/jcl/source/windows/JclNTFS.pas trunk/jcl/source/windows/JclPeImage.pas trunk/jcl/source/windows/JclRegistry.pas trunk/jcl/source/windows/JclSecurity.pas trunk/jcl/source/windows/JclShell.pas trunk/jcl/source/windows/JclStructStorage.pas trunk/jcl/source/windows/JclSvcCtrl.pas trunk/jcl/source/windows/JclSynch.pas trunk/jcl/source/windows/JclTD32.pas trunk/jcl/source/windows/JclTask.pas trunk/jcl/source/windows/JclUnicode.pas trunk/jcl/source/windows/JclWideFormat.pas trunk/jcl/source/windows/JclWin32.pas trunk/jcl/source/windows/JclWin32Ex.pas trunk/jcl/source/windows/JclWinMIDI.pas Modified: trunk/jcl/source/common/Jcl8087.pas =================================================================== --- trunk/jcl/source/common/Jcl8087.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/Jcl8087.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -39,6 +39,11 @@ interface +{$IFDEF UNITVERSIONING} +Uses + JclUnitVersioning; +{$ENDIF UNITVERSIONING} + type T8087Precision = (pcSingle, pcReserved, pcDouble, pcExtended); T8087Rounding = (rcNearestOrEven, rcDownInfinity, rcUpInfinity, rcChopOrTruncate); @@ -68,8 +73,20 @@ function Mask8087Exceptions(Exceptions: T8087Exceptions): T8087Exceptions; function Unmask8087Exceptions(Exceptions: T8087Exceptions; ClearBefore: Boolean = True): T8087Exceptions; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + const X87ExceptBits = $3F; @@ -222,4 +239,12 @@ SetMasked8087Exceptions(Exceptions, ClearBefore); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclAbstractContainers.pas =================================================================== --- trunk/jcl/source/common/JclAbstractContainers.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclAbstractContainers.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -35,6 +35,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Threading, {$ELSE} @@ -90,8 +93,20 @@ procedure LoadDelimited(const AString: string; const Separator: string = AnsiLineBreak); end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + //=== { TJclAbstractContainer } ============================================== {$IFDEF THREADSAFE} @@ -227,5 +242,13 @@ AppendToStrings(Strings); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclAlgorithms.pas =================================================================== --- trunk/jcl/source/common/JclAlgorithms.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclAlgorithms.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} JclBase, JclContainerIntf; // function pointer types @@ -112,8 +115,20 @@ procedure Sort(AList: IJclStrList; First, Last: Integer; AComparator: TStrCompare); overload; procedure Sort(AList: IJclList; First, Last: Integer; AComparator: TCompare); overload; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils; @@ -576,5 +591,13 @@ SortProc(AList, First, Last, AComparator); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclAnsiStrings.pas =================================================================== --- trunk/jcl/source/common/JclAnsiStrings.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclAnsiStrings.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -54,6 +54,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -355,8 +358,20 @@ type EJclStringError = EJclError; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF CLR} System.Globalization, @@ -3963,5 +3978,12 @@ initialization LoadCharTypes; // this table first LoadCaseMap; // or this function does not work +{$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + + end. Modified: trunk/jcl/source/common/JclArrayLists.pas =================================================================== --- trunk/jcl/source/common/JclArrayLists.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclArrayLists.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf; @@ -161,8 +164,20 @@ property OwnsObjects: Boolean read FOwnsObjects; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclResources; @@ -2019,5 +2034,13 @@ Result.Add(FElementData[I]); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclArraySets.pas =================================================================== --- trunk/jcl/source/common/JclArraySets.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclArraySets.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf, JclArrayLists; type @@ -83,8 +86,20 @@ procedure Union(ACollection: IJclCollection); end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclResources; @@ -393,5 +408,13 @@ AddAll(ACollection); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclBase.pas =================================================================== --- trunk/jcl/source/common/JclBase.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclBase.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -38,6 +38,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Reflection, {$ELSE} @@ -233,8 +236,20 @@ function ByteArrayToString(const Data: TBytes; Count: Integer): string; {$ENDIF CLR} + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclResources; @@ -490,4 +505,14 @@ end; {$ENDIF ~XPLATFORM_RTL} + + +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclBinaryTrees.pas =================================================================== --- trunk/jcl/source/common/JclBinaryTrees.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclBinaryTrees.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -33,6 +33,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclAlgorithms, JclContainerIntf; @@ -189,8 +192,20 @@ destructor Destroy; override; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclResources; @@ -3271,5 +3286,13 @@ Result := FCount; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclBorlandTools.pas =================================================================== --- trunk/jcl/source/common/JclBorlandTools.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclBorlandTools.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -61,6 +61,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, MSHelpServices_TLB, @@ -821,8 +824,20 @@ procedure GetBPKFileInfo(const BPKFileName: string; out RunOnly: Boolean; const BinaryFileName: PString = nil; const Description: PString = nil); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysConst, {$IFDEF MSWINDOWS} @@ -4722,5 +4737,13 @@ FOutputCallback := CallbackMethod; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclComplex.pas =================================================================== --- trunk/jcl/source/common/JclComplex.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclComplex.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -38,6 +38,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} SysUtils, JclBase, JclMath, JclResources, JclStrings; @@ -228,8 +231,20 @@ MaxTerm: Byte = 35; EpsilonSqr: Float = 1E-20; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + const MaxFracLen = 18; RectOne: TRectCoord = (X: 1.0; Y: 0.0); @@ -1564,4 +1579,12 @@ Result := Value; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclCompression.pas =================================================================== --- trunk/jcl/source/common/JclCompression.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclCompression.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -44,6 +44,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -210,8 +213,20 @@ EJclCompressionError = class(EJclError); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclResources; @@ -752,5 +767,13 @@ end; *) +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclContainerIntf.pas =================================================================== --- trunk/jcl/source/common/JclContainerIntf.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclContainerIntf.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -35,6 +35,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, JclBase; @@ -453,7 +456,27 @@ EJclIllegalArgumentError = class(EJclError); EJclOperationNotSupportedError = class(EJclError); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclCounter.pas =================================================================== --- trunk/jcl/source/common/JclCounter.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclCounter.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -38,6 +38,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -79,8 +82,20 @@ type EJclCounterError = class(EJclError); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclResources; @@ -205,4 +220,12 @@ Counter.Continue; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclDateTime.pas =================================================================== --- trunk/jcl/source/common/JclDateTime.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclDateTime.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -53,6 +53,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Globalization, System.Runtime.InteropServices, {$ELSE} @@ -200,8 +203,20 @@ type EJclDateTimeError = class(EJclError); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + const DaysInMonths: array [1..12] of Integer = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); @@ -1191,5 +1206,13 @@ {$ENDIF MSWINDOWS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclExprEval.pas =================================================================== --- trunk/jcl/source/common/JclExprEval.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclExprEval.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -39,6 +39,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} SysUtils, Classes, JclBase, JclSysUtils, JclStrHashMap, JclResources; @@ -839,8 +842,20 @@ procedure Clear; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + //=== { TExprHashContext } =================================================== constructor TExprHashContext.Create(ACaseSensitive: Boolean; AHashSize: Integer); @@ -3990,4 +4005,12 @@ FExprHash.Iterate(nil, Iterate_FreeObjects); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclFileUtils.pas =================================================================== --- trunk/jcl/source/common/JclFileUtils.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclFileUtils.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -968,7 +968,7 @@ RCSfile: '$URL$'; Revision: '$Revision$'; Date: '$Date$'; - LogPath: 'jcl\source\common' + LogPath: 'JCL\source\common' ); {$ENDIF UNITVERSIONING} @@ -3199,19 +3199,7 @@ {$IFDEF UNIX} // Warning: Between the time the pathname is constructed and the file is created // another process might have created a file with the same name using tmpnam, -// leading to a possible security hole. The -{$IFDEF UNITVERSIONING} -const - UnitVersioning: TUnitVersionInfo = ( - RCSfile: '$URL$'; - Revision: '$Revision$'; - Date: '$Date$'; - LogPath: 'jcl\source\common' - ); -{$ENDIF UNITVERSIONING} - -implementation - generates names which +// leading to a possible security hole. The implementation generates names which // can hardly be predicted, but when opening the file you should use the O_EXCL // flag. Using tmpfile or mkstemp is a safe way to avoid this problem. var @@ -6129,4 +6117,12 @@ end; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclHashMaps.pas =================================================================== --- trunk/jcl/source/common/JclHashMaps.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclHashMaps.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf; type @@ -302,8 +305,20 @@ property OwnsObjects: Boolean read FOwnsObjects; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclArrayLists, JclArraySets, JclResources; @@ -2127,5 +2142,13 @@ Result.Add(FBuckets[I].Entries[J].Value); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclHashSets.pas =================================================================== --- trunk/jcl/source/common/JclHashSets.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclHashSets.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf, JclHashMaps; @@ -125,8 +128,20 @@ destructor Destroy; override; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + {$IFDEF CLR} var GlobalRefUnique: TObject = nil; @@ -599,7 +614,22 @@ {$IFDEF FPC} initialization RefUnique := @RefUnique; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} +{$ELSE} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); +{$ENDIF UNITVERSIONING} {$ENDIF FPC} + +{$IFDEF UNITVERSIONING} +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + + end. Modified: trunk/jcl/source/common/JclIniFiles.pas =================================================================== --- trunk/jcl/source/common/JclIniFiles.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclIniFiles.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -33,6 +33,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} SysUtils, Classes, IniFiles; // Initialization (ini) Files @@ -47,8 +50,20 @@ procedure IniReadStrings(IniFile: TCustomIniFile; const Section: string; Strings: TStrings); procedure IniWriteStrings(IniFile: TCustomIniFile; const Section: string; Strings: TStrings); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + {$IFDEF CLR} type TIniFile = TMemIniFile; @@ -171,4 +186,13 @@ end; end; + +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclLinkedLists.pas =================================================================== --- trunk/jcl/source/common/JclLinkedLists.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclLinkedLists.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf; @@ -188,8 +191,20 @@ property OwnsObjects: Boolean read FOwnsObjects; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclResources; @@ -2541,5 +2556,13 @@ end; } +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclLogic.pas =================================================================== --- trunk/jcl/source/common/JclLogic.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclLogic.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -46,6 +46,11 @@ interface +{$IFDEF UNITVERSIONING} +Uses + JclUnitVersioning; +{$ENDIF UNITVERSIONING} + // Conversion function OrdToBinary(Value: Byte): string; overload; function OrdToBinary(Value: ShortInt): string; overload; @@ -280,8 +285,20 @@ CardinalMask = Cardinal($FFFFFFFF); Int64Mask = Int64($FFFFFFFFFFFFFFFF); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclBase; @@ -1924,4 +1941,12 @@ Result := B2; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclMIDI.pas =================================================================== --- trunk/jcl/source/common/JclMIDI.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclMIDI.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -35,6 +35,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, JclBase; @@ -357,8 +360,20 @@ function MIDISingleNoteTuningData(Key: TMIDINote; Frequency: Single): TSingleNoteTuningData; function MIDINoteToStr(Note: TMIDINote): string; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, {$IFDEF MSWINDOWS} @@ -792,4 +807,12 @@ FActiveNotes[Channel] := []; // implicit All Notes Off end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclMath.pas =================================================================== --- trunk/jcl/source/common/JclMath.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclMath.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -47,6 +47,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Classes, SysUtils, JclBase; @@ -622,8 +625,20 @@ function SecH(const Z: TRectComplex): TRectComplex; overload; function CscH(const Z: TRectComplex): TRectComplex; overload; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF Win32API} Windows, @@ -4436,4 +4451,13 @@ {$ENDIF SUPPORTS_CLASS_OPERATORS} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + + end. Modified: trunk/jcl/source/common/JclMime.pas =================================================================== --- trunk/jcl/source/common/JclMime.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclMime.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -54,6 +54,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF CLR} System.Text, {$ENDIF CLR} @@ -118,8 +121,20 @@ MIME_DECODED_LINE_BREAK = MIME_ENCODED_LINE_BREAK div 4 * 3; MIME_BUFFER_SIZE = MIME_DECODED_LINE_BREAK * 3 * 4 * 4; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + // Caution: For MimeEncodeStream and all other kinds of multi-buffered // Mime encodings (i.e. Files etc.), BufferSize must be set to a multiple of 3. // Even though the implementation of the Mime decoding routines below @@ -962,4 +977,12 @@ OutputStream.Write(OutputBuffer, MimeDecodePartialEnd(OutputBuffer, ByteBuffer, ByteBufferSpace)); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclPCRE.pas =================================================================== --- trunk/jcl/source/common/JclPCRE.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclPCRE.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -32,6 +32,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -89,8 +92,20 @@ property ErrorOffset: Integer read FErrorOffset; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses pcre, JclResources; @@ -244,7 +259,18 @@ pcre.LibNotLoadedHandler := LibNotLoadedHandler; LoadPCRE; + + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + + + finalization + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + UnloadPCRE; end. Modified: trunk/jcl/source/common/JclQueues.pas =================================================================== --- trunk/jcl/source/common/JclQueues.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclQueues.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf; type @@ -85,8 +88,20 @@ constructor Create(ACapacity: Integer = DefaultContainerCapacity); end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclResources; @@ -340,4 +355,12 @@ Result := FTail - FHead; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclRTTI.pas =================================================================== --- trunk/jcl/source/common/JclRTTI.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclRTTI.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -42,6 +42,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} {$IFDEF HAS_UNIT_TYPES} Types, {$IFDEF CLR} @@ -375,8 +378,20 @@ function JclIsClass(const AnObj: TObject; const AClass: TClass): Boolean; function JclIsClassByName(const AnObj: TObject; const AClass: TClass): Boolean; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF HAS_UNIT_RTLCONSTS} RtlConsts, @@ -3009,9 +3024,31 @@ initialization TypeList := TThreadList.Create; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + + + finalization + + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + ClearInfoList; FreeAndNil(TypeList); + +{$ELSE} + +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + {$ENDIF ~CLR} end. Modified: trunk/jcl/source/common/JclResources.pas =================================================================== --- trunk/jcl/source/common/JclResources.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclResources.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -44,6 +44,11 @@ interface +{$IFDEF UNITVERSIONING} +Uses + JclUnitVersioning; +{$ENDIF UNITVERSIONING} + {$IFNDEF RTL140_UP} const sLineBreak = #13#10; @@ -1729,6 +1734,26 @@ RsMidiInUnknownError = 'Unknown MIDI-In error No. %d'; RsMidiOutUnknownError = 'Unknown MIDI-Out error No. %d'; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclSchedule.pas =================================================================== --- trunk/jcl/source/common/JclSchedule.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclSchedule.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -37,6 +37,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} SysUtils, JclBase; @@ -176,8 +179,20 @@ function EqualTimeStamps(const Stamp1, Stamp2: TTimeStamp): Boolean; function IsNullTimeStamp(const Stamp: TTimeStamp): Boolean; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclDateTime, JclResources; @@ -1569,4 +1584,12 @@ Result := TSchedule.Create; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclStacks.pas =================================================================== --- trunk/jcl/source/common/JclStacks.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclStacks.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} JclBase, JclAbstractContainers, JclContainerIntf; type @@ -85,8 +88,20 @@ constructor Create(ACapacity: Integer = DefaultContainerCapacity); end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + //=== { TJclIntfStack } ====================================================== constructor TJclIntfStack.Create(ACapacity: Integer = DefaultContainerCapacity); @@ -343,4 +358,12 @@ Result := FCount; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclStatistics.pas =================================================================== --- trunk/jcl/source/common/JclStatistics.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclStatistics.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -42,6 +42,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} JclBase, JclMath; type @@ -80,8 +83,20 @@ function SumSquareFloatArray(const B: TDynFloatArray): Float; function SumPairProductFloatArray(const X, Y: TDynFloatArray): Float; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclLogic, {$IFNDEF CLR} @@ -499,4 +514,12 @@ end; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclStrHashMap.pas =================================================================== --- trunk/jcl/source/common/JclStrHashMap.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclStrHashMap.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -34,6 +34,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} SysUtils, JclBase, JclResources; @@ -161,8 +164,20 @@ function Compare(const L, R: string): Integer; override; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + // Case Sensitive & Insensitive Traits function TCaseSensitiveTraits.Compare(const L, R: string): Integer; begin @@ -853,7 +868,17 @@ initialization + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + + finalization + + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + FreeAndNil(GlobalCaseInsensitiveTraits); FreeAndNil(GlobalCaseSensitiveTraits); Modified: trunk/jcl/source/common/JclStreams.pas =================================================================== --- trunk/jcl/source/common/JclStreams.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclStreams.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -31,6 +31,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -270,8 +273,20 @@ procedure WriteSizedString(const Value: string); end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclBase, JclResources; @@ -1209,4 +1224,12 @@ WriteBuffer(Pointer(Value)^, StrSize); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclStrings.pas =================================================================== --- trunk/jcl/source/common/JclStrings.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclStrings.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -55,6 +55,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -467,8 +470,20 @@ type EJclStringError = EJclError; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF CLR} System.Globalization, @@ -4978,6 +4993,24 @@ initialization LoadCharTypes; // this table first LoadCaseMap; // or this function does not work + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + +{$ELSE} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); +{$ENDIF UNITVERSIONING} {$ENDIF ~CLR} + + +{$IFDEF UNITVERSIONING} +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + + + end. Modified: trunk/jcl/source/common/JclSysInfo.pas =================================================================== --- trunk/jcl/source/common/JclSysInfo.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclSysInfo.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -62,6 +62,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF HAS_UNIT_TYPES} Types, {$ENDIF HAS_UNIT_TYPES} @@ -1124,8 +1127,20 @@ PageSize: Cardinal = 0; {$ENDIF ~CLR} + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, {$IFNDEF CLR} @@ -5431,7 +5446,18 @@ initialization InitSysInfo; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + + + finalization + + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + FinalizeSysInfo; {$ENDIF MSWINDOWS} Modified: trunk/jcl/source/common/JclSysUtils.pas =================================================================== --- trunk/jcl/source/common/JclSysUtils.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclSysUtils.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -49,6 +49,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} {$IFDEF CLR} Variants, {$ELSE} @@ -518,8 +521,20 @@ property LogOpen: Boolean read GetLogOpen; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF HAS_UNIT_TYPES} Types, @@ -3086,8 +3101,17 @@ GlobalMMFHandleListCS := TJclIntfCriticalSection.Create; {$ENDIF THREADSAFE} + + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + finalization + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + FinalizeMMFHandleList; {$IFDEF THREADSAFE} Modified: trunk/jcl/source/common/JclUnitConv.pas =================================================================== --- trunk/jcl/source/common/JclUnitConv.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclUnitConv.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -42,6 +42,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} SysUtils, JclBase; @@ -226,8 +229,20 @@ function WattToHpElectric(const W: Float): Float; function WattToHpMetric(const W: Float): Float; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclMath, JclResources; @@ -998,4 +1013,12 @@ Result := W / 735.4988; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclValidation.pas =================================================================== --- trunk/jcl/source/common/JclValidation.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclValidation.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -27,11 +27,28 @@ interface +{$IFDEF UNITVERSIONING} +uses + JclUnitVersioning; +{$ENDIF UNITVERSIONING} + // ISBN: International Standard Book Number function IsValidISBN(const ISBN: string): Boolean; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + { TODO -cDoc : Donator: Ivo Bauer } function IsValidISBN(const ISBN: string): Boolean; // @@ -126,4 +143,12 @@ Result := (Accumulator mod 11) = 0; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclVectors.pas =================================================================== --- trunk/jcl/source/common/JclVectors.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclVectors.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -36,6 +36,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Classes, JclBase, JclAbstractContainers, JclContainerIntf; @@ -178,8 +181,20 @@ property OwnsObjects: Boolean read FOwnsObjects; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclResources; @@ -1480,5 +1495,13 @@ end; {$ENDIF ~CLR} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/common/JclWideStrings.pas =================================================================== --- trunk/jcl/source/common/JclWideStrings.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/common/JclWideStrings.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -36,6 +36,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Classes, SysUtils; const @@ -281,8 +284,20 @@ function TrimLeftLengthW(const S: WideString): Integer; function TrimRightLengthW(const S: WideString): Integer; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF HAS_UNIT_RTLCONSTS} RTLConsts, @@ -1957,4 +1972,12 @@ CustomSort(DefaultSort); end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/jcl.inc =================================================================== --- trunk/jcl/source/jcl.inc 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/jcl.inc 2006-07-23 17:31:36 UTC (rev 1693) @@ -79,6 +79,10 @@ {$DEFINE KEEP_DEPRECATED} {$ENDIF} +//Support for JclUnitVersioning.pas) +{$DEFINE UNITVERSIONING} + + // debug sources // defining these symbols will the debug source to be automatically registered @@ -98,3 +102,4 @@ {$DEFINE PIC} {$DEFINE PUREPASCAL} {$ENDIF CLR} + Modified: trunk/jcl/source/prototypes/JclWin32.pas =================================================================== --- trunk/jcl/source/prototypes/JclWin32.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/prototypes/JclWin32.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -62,6 +62,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} Windows, SysUtils, {$IFNDEF FPC} {$IFDEF CLR} @@ -206,8 +209,20 @@ {$ENDIF ~CLR} {$ENDIF MSWINDOWS} + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses JclResources; @@ -248,6 +263,14 @@ {$I win32api\WinNLS.imp} {$I win32api\WinNT.imp} +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/vcl/JclPrint.pas =================================================================== --- trunk/jcl/source/vcl/JclPrint.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/vcl/JclPrint.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -35,6 +35,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Windows, Classes, StdCtrls, SysUtils, JclBase; @@ -161,8 +164,20 @@ function DPGetDefaultPrinter(out PrinterName: string): Boolean; function DPSetDefaultPrinter(const PrinterName: string): Boolean; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\vcl' + ); +{$ENDIF UNITVERSIONING} + implementation + uses Graphics, IniFiles, Messages, Printers, WinSpool, JclSysInfo, JclResources; @@ -1170,4 +1185,12 @@ end; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/JclAppInst.pas =================================================================== --- trunk/jcl/source/windows/JclAppInst.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclAppInst.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -41,6 +41,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Windows, Classes, Messages, JclFileUtils, JclSynch; @@ -109,8 +112,20 @@ procedure ReadMessageString(const Message: TMessage; var S: string); procedure ReadMessageStrings(const Message: TMessage; const Strings: TStrings); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses SysUtils, JclStrings; @@ -568,8 +583,14 @@ end; initialization + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} finalization FreeAndNil(AppInstances); + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} end. Modified: trunk/jcl/source/windows/JclCIL.pas =================================================================== --- trunk/jcl/source/windows/JclCIL.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclCIL.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -39,6 +39,9 @@ {$I jcl.inc} uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -196,8 +199,20 @@ EJclCliInstructionError = class(EJclError); EJclCliInstructionStreamInvalid = class(EJclCliInstructionError); + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF HAS_UNIT_VARIANTS} Variants, @@ -1003,4 +1018,12 @@ end; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/JclCLR.pas =================================================================== --- trunk/jcl/source/windows/JclCLR.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclCLR.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -38,6 +38,9 @@ {$I jcl.inc} uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -484,8 +487,20 @@ property VTableFixupCount: Integer read GetVTableFixupCount; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses Math, TypInfo, JclMetadata, JclResources, JclStrings, JclUnicode; @@ -1739,4 +1754,12 @@ end; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/JclCOM.pas =================================================================== --- trunk/jcl/source/windows/JclCOM.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclCOM.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -38,6 +38,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Windows, ActiveX, Classes, JclBase; @@ -114,8 +117,20 @@ procedure VariantArrayToStream(VarArray: OleVariant; var Stream: TStream); overload; procedure VariantArrayToStream(VarArray: OleVariant; var Stream: IStream); overload; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF FPC} Types, @@ -126,7 +141,7 @@ {$ENDIF HAS_UNIT_VARIANTS} JclFileUtils, JclRegistry, JclResources, JclSysInfo, JclWin32; -{ Implementation Constants - may be reused by more than one routine } +{implementation Constants - may be reused by more than one routine } const pcOLE32 = 'OLE32.dll'; @@ -648,4 +663,13 @@ end; end; + +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/JclConsole.pas =================================================================== --- trunk/jcl/source/windows/JclConsole.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclConsole.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -46,6 +46,9 @@ interface uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Windows, Classes, SysUtils, Contnrs, JclBase; @@ -388,8 +391,20 @@ property EventCount: DWORD read GetEventCount; end; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF FPC} WinSysUt, JwaWinNT, @@ -1544,4 +1559,12 @@ Result := PutEvents(Evts) = 1; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/JclDebug.pas =================================================================== --- trunk/jcl/source/windows/JclDebug.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclDebug.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -43,6 +43,9 @@ {$I jcl.inc} uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, {$ENDIF MSWINDOWS} @@ -729,8 +732,20 @@ EnvironmentVarNtSymbolPath = '_NT_SYMBOL_PATH'; // do not localize EnvironmentVarAlternateNtSymbolPath = '_NT_ALTERNATE_SYMBOL_PATH'; // do not localize + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses ImageHlp, {$IFDEF MSWINDOWS} @@ -4463,7 +4478,16 @@ GlobalModulesList := TJclGlobalModulesList.Create; GlobalStackList := TJclGlobalStackList.Create; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + finalization + + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + { TODO -oPV -cInvestigate : Calling JclStopExceptionTracking causes linking of various classes to the code without a real need. Although there doesn't seem to be a way to unhook exceptions safely because we need to be covered by JclHookExcept.Notifiers critical section } Modified: trunk/jcl/source/windows/JclDotNet.pas =================================================================== --- trunk/jcl/source/windows/JclDotNet.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclDotNet.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -48,6 +48,9 @@ {$I jcl.inc} uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} {$IFDEF MSWINDOWS} Windows, ActiveX, {$ENDIF MSWINDOWS} @@ -285,8 +288,20 @@ const mscoree_dll = 'mscoree.dll'; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses ComObj, {$IFDEF HAS_UNIT_VARIANTS} @@ -981,4 +996,12 @@ FDefaultInterface := Intf; end; +{$IFDEF UNITVERSIONING} +initialization + RegisterUnitVersion(HInstance, UnitVersioning); + +finalization + UnregisterUnitVersion(HInstance); +{$ENDIF UNITVERSIONING} + end. Modified: trunk/jcl/source/windows/JclHookExcept.pas =================================================================== --- trunk/jcl/source/windows/JclHookExcept.pas 2006-07-23 17:30:30 UTC (rev 1692) +++ trunk/jcl/source/windows/JclHookExcept.pas 2006-07-23 17:31:36 UTC (rev 1693) @@ -36,6 +36,9 @@ {$I jcl.inc} uses +{$IFDEF UNITVERSIONING} + JclUnitVersioning, +{$ENDIF UNITVERSIONING} Windows, SysUtils; type @@ -71,8 +74,20 @@ // Hooking routines location info helper function JclBelongsHookedCode(Addr: Pointer): Boolean; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JCL\source\windows' + ); +{$ENDIF UNITVERSIONING} + implementation + uses Classes, JclBase, JclPeImage, JclSysInfo, JclSysUtils; @@ -545,7 +560,16 @@ initialization Notifiers := TThreadList.Create; + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} + finalization + + {$IFDEF UNITVERSIONING} + UnregisterUnitVersion(HInstance); + {$ENDIF UNITVERSIONING} + {$IFDEF HOOK_DLL_EXCEPTIONS} FinalizeLibrariesHookExcept; {$ENDIF HOOK_DLL_EXCEPTIONS} Modified: trunk/jcl/source/windows/JclLANMan.pas ===... [truncated message content] |
|
From: <jfu...@us...> - 2006-07-23 17:30:38
|
Revision: 1692 Author: jfudickar Date: 2006-07-23 10:30:30 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1692&view=rev Log Message: ----------- Support for DEFINE UNITVERSIONING Modified Paths: -------------- trunk/jcl/install/JclInstall.pas trunk/jcl/install/JediInstall.pas Modified: trunk/jcl/install/JclInstall.pas =================================================================== --- trunk/jcl/install/JclInstall.pas 2006-07-23 16:39:52 UTC (rev 1691) +++ trunk/jcl/install/JclInstall.pas 2006-07-23 17:30:30 UTC (rev 1692) @@ -246,6 +246,8 @@ RsDefMathPrecSingle = 'Single float precision'; RsDefMathPrecDouble = 'Double float precision'; RsDefMathPrecExtended = 'Extended float precision'; + + RsUnitVersioning = 'Include Unit Versioning'; RsMapCreate = 'Create MAP files'; RsMapLink = 'Link MAP files'; @@ -296,6 +298,7 @@ RsHintJclDefMathPrecSingle = 'type Float = Single'; RsHintJclDefMathPrecDouble = 'type Float = Double'; RsHintJclDefMathPrecExtended = 'type Float = Extended'; + RsHintJclUnitVersioning = 'Includes JCL Unit Versioning informations into each jcl unit (see also JclUnitVersioning.pas)'; RsHintJclMapCreate = 'Create detailled MAP files for each libraries'; RsHintJclMapLink = 'Link MAP files as a resource in the output library or executable, the stack can be traced on exceptions'; RsHintJclMapDelete = 'Once linked in the binary, delete the original MAP file'; @@ -383,6 +386,9 @@ (Parent: ioJCL; // ioJclDefMathPrecExtended Caption: RsDefMathPrecExtended; Hint: RsHintJclDefMathPrecExtended), + (Parent: ioJCL; // ioJclUnitVersioning + Caption: RsUnitVersioning; + Hint: RsHintJclUnitVersioning), (Parent: ioJCL; // ioJclMapCreate Caption: RsMapCreate; Hint: RsHintJclMapCreate), @@ -1275,6 +1281,7 @@ AddNode(ProductNode, ioJclDefMathPrecSingle, [goRadioButton]); AddNode(ProductNode, ioJclDefMathPrecDouble, [goRadioButton]); AddNode(ProductNode, ioJclDefMathPrecExtended, [goRadioButton, goChecked]); + AddNode(ProductNode, ioJclUnitVersioning); EnvNode := AddNode(ProductNode, ioJclEnv); AddNode(EnvNode, ioJclEnvLibPath); @@ -1445,6 +1452,8 @@ Defines.Add('MATH_DOUBLE_PRECISION'); ioJclDefMathPrecExtended: Defines.Add('MATH_EXTENDED_PRECISION'); + ioJclUnitVersioning: + Defines.Add('UNITVERSIONING'); ioJclMapCreate: Target.MapCreate := True; ioJclMapLink: Modified: trunk/jcl/install/JediInstall.pas =================================================================== --- trunk/jcl/install/JediInstall.pas 2006-07-23 16:39:52 UTC (rev 1691) +++ trunk/jcl/install/JediInstall.pas 2006-07-23 17:30:30 UTC (rev 1692) @@ -39,6 +39,7 @@ ioJclDefMathPrecSingle, ioJclDefMathPrecDouble, ioJclDefMathPrecExtended, + ioJclUnitVersioning, ioJclMapCreate, ioJclMapLink, ioJclMapDelete, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <jfu...@us...> - 2006-07-23 16:39:58
|
Revision: 1691 Author: jfudickar Date: 2006-07-23 09:39:52 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1691&view=rev Log Message: ----------- Support for DEFINE UNITVERSIONING Modified Paths: -------------- trunk/jcl/source/common/JclFileUtils.pas Modified: trunk/jcl/source/common/JclFileUtils.pas =================================================================== --- trunk/jcl/source/common/JclFileUtils.pas 2006-07-23 05:35:54 UTC (rev 1690) +++ trunk/jcl/source/common/JclFileUtils.pas 2006-07-23 16:39:52 UTC (rev 1691) @@ -63,6 +63,9 @@ interface uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} {$IFDEF HAS_UNIT_TYPES} Types, {$ENDIF HAS_UNIT_TYPES} @@ -958,8 +961,20 @@ // return the index of an item function PathListItemIndex(const List, Item: string): Integer; + +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'jcl\source\common' + ); +{$ENDIF UNITVERSIONING} + implementation + uses {$IFDEF Win32API} ShellApi, @@ -3184,7 +3199,19 @@ {$IFDEF UNIX} // Warning: Between the time the pathname is constructed and the file is created // another process might have created a file with the same name using tmpnam, -// leading to a possible security hole. The implementation generates names which +// leading to a possible security hole. The +{$IFDEF UNITVERSIONING} +const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$URL$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'jcl\source\common' + ); +{$ENDIF UNITVERSIONING} + +implementation + generates names which // can hardly be predicted, but when opening the file you should use the O_EXCL // flag. Using tmpfile or mkstemp is a safe way to avoid this problem. var This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mar...@us...> - 2006-07-23 05:36:05
|
Revision: 1690 Author: marquardt Date: 2006-07-22 22:35:54 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1690&view=rev Log Message: ----------- minor style cleanups Modified Paths: -------------- trunk/jcl/source/common/JclAnsiStrings.pas trunk/jcl/source/common/JclArrayLists.pas Modified: trunk/jcl/source/common/JclAnsiStrings.pas =================================================================== --- trunk/jcl/source/common/JclAnsiStrings.pas 2006-07-16 15:14:39 UTC (rev 1689) +++ trunk/jcl/source/common/JclAnsiStrings.pas 2006-07-23 05:35:54 UTC (rev 1690) @@ -178,8 +178,8 @@ {$ENDIF ~CLR} procedure StrMove(var Dest: AnsiString; const Source: AnsiString; const ToIndex, FromIndex, Count: Integer); -function StrPadLeft(const S: AnsiString; Len: Integer; C: AnsiChar = AnsiSpace ): AnsiString; -function StrPadRight(const S: AnsiString; Len: Integer; C: AnsiChar = AnsiSpace ): AnsiString; +function StrPadLeft(const S: AnsiString; Len: Integer; C: AnsiChar = AnsiSpace): AnsiString; +function StrPadRight(const S: AnsiString; Len: Integer; C: AnsiChar = AnsiSpace): AnsiString; function StrProper(const S: AnsiString): AnsiString; {$IFNDEF CLR} procedure StrProperBuff(S: PAnsiChar); @@ -289,7 +289,7 @@ // Character Search and Replace function CharPos(const S: AnsiString; const C: AnsiChar; const Index: Integer = 1): Integer; function CharLastPos(const S: AnsiString; const C: AnsiChar; const Index: Integer = 1): Integer; -function CharIPos(const S: AnsiString; C: AnsiChar; const Index: Integer = 1 ): Integer; +function CharIPos(const S: AnsiString; C: AnsiChar; const Index: Integer = 1): Integer; function CharReplace(var S: AnsiString; const Search, Replace: AnsiChar): Integer; {$IFNDEF CLR} @@ -326,9 +326,9 @@ procedure StrIToStrings(S, Sep: AnsiString; const List: TStrings; const AllowEmptyString: Boolean = True); procedure StrToStrings(S, Sep: AnsiString; const List: TStrings; const AllowEmptyString: Boolean = True); function StringsToStr(const List: TStrings; const Sep: AnsiString; const AllowEmptyString: Boolean = True): AnsiString; -procedure TrimStrings(const List: TStrings; DeleteIfEmpty: Boolean = True ); +procedure TrimStrings(const List: TStrings; DeleteIfEmpty: Boolean = True); procedure TrimStringsRight(const List: TStrings; DeleteIfEmpty: Boolean = True); -procedure TrimStringsLeft(const List: TStrings; DeleteIfEmpty: Boolean = True ); +procedure TrimStringsLeft(const List: TStrings; DeleteIfEmpty: Boolean = True); function AddStringToStrings(const S: string; Strings: TStrings; const Unique: Boolean): Boolean; // Miscellaneous @@ -345,7 +345,7 @@ {$ENDIF ~CLR} function StrToFloatSafe(const S: AnsiString): Float; function StrToIntSafe(const S: AnsiString): Integer; -procedure StrNormIndex(const StrLen: integer; var Index: integer; var Count: integer); overload; +procedure StrNormIndex(const StrLen: Integer; var Index: Integer; var Count: Integer); overload; {$IFDEF CLR} function ArrayOf(List: TStrings): TDynStringArray; overload; @@ -884,7 +884,7 @@ function StrEnsureNoPrefix(const Prefix, Text: AnsiString): AnsiString; var - PrefixLen : Integer; + PrefixLen: Integer; begin PrefixLen := Length(Prefix); if Copy(Text, 1, PrefixLen) = Prefix then @@ -895,8 +895,8 @@ function StrEnsureNoSuffix(const Suffix, Text: AnsiString): AnsiString; var - SuffixLen : Integer; - StrLength : Integer; + SuffixLen: Integer; + StrLength: Integer; begin SuffixLen := Length(Suffix); StrLength := Length(Text); @@ -959,7 +959,7 @@ end; end; - if val > 255 then + if Val > 255 then {$IFDEF CLR} raise EJclStringError.Create(RsNumericConstantTooLarge); {$ELSE} @@ -1364,10 +1364,10 @@ SourceMatchPtr: PAnsiChar; { pointers into S and Search when first character has } SearchMatchPtr: PAnsiChar; { been matched and we're probing for a complete match } ResultPtr: PAnsiChar; { pointer into Result of character being written } - ResultIndex, - SearchLength, { length of search string } - ReplaceLength, { length of replace string } - BufferLength, { length of temporary result buffer } + ResultIndex: Integer; + SearchLength: Integer; { length of search string } + ReplaceLength: Integer; { length of replace string } + BufferLength: Integer; { length of temporary result buffer } ResultLength: Integer; { length of result string } C: AnsiChar; { first character of search string } IgnoreCase: Boolean; @@ -1565,13 +1565,13 @@ function StrSmartCase(const S: AnsiString; Delimiters: TSysCharSet): AnsiString; var -{$IFDEF CLR} + {$IFDEF CLR} Index: Integer; LenS: Integer; -{$ELSE} + {$ELSE} Source, Dest: PAnsiChar; Index, Len: Integer; -{$ENDIF CLR} + {$ENDIF CLR} begin Result := ''; if Delimiters = [] then @@ -1593,7 +1593,7 @@ UniqueString(Result); Len := Length(S); - Source := PAnsiChar(S); + Source := PAnsiChar(S); Dest := PAnsiChar(Result); Inc(Dest); @@ -1640,7 +1640,7 @@ else // Characters < ' ' are escaped with hex sequence if S[I] < #32 then - Result := Result + Format('\x%.2x',[Integer(S[I])]) + Result := Result + Format('\x%.2x', [Integer(S[I])]) else Result := Result + S[I]; end; @@ -1706,7 +1706,8 @@ begin I := 1; L := Length(S); - while (I <= L) and (S[I] = C) do Inc(I); + while (I <= L) and (S[I] = C) do + Inc(I); Result := Copy(S, I, L - I + 1); end; @@ -1716,7 +1717,8 @@ begin I := 1; L := Length(S); - while (I <= L) and (S[I] in Chars) do Inc(I); + while (I <= L) and (S[I] in Chars) do + Inc(I); Result := Copy(S, I, L - I + 1); end; @@ -1725,7 +1727,8 @@ I: Integer; begin I := Length(S); - while (I >= 1) and (S[I] in Chars) do Dec(I); + while (I >= 1) and (S[I] in Chars) do + Dec(I); Result := Copy(S, 1, I); end; @@ -1734,7 +1737,8 @@ I: Integer; begin I := Length(S); - while (I >= 1) and (S[I] = C) do Dec(I); + while (I >= 1) and (S[I] = C) do + Dec(I); Result := Copy(S, 1, I); end; @@ -1845,7 +1849,8 @@ Foo: AnsiString; begin case StrRefCount(S) of - -1, 0: { nothing } ; + -1, 0: + { nothing } ; 1: begin Finalize(S); @@ -2250,22 +2255,22 @@ {$IFDEF CLR} function StrFillChar(const C: Char; Count: Integer): string; var - sb: System.Text.StringBuilder; + SB: System.Text.StringBuilder; begin - sb := System.Text.StringBuilder.Create(Count); + SB := System.Text.StringBuilder.Create(Count); while Count > 0 do begin - sb.Append(C); + SB.Append(C); Dec(Count); end; - Result := sb.ToString(); + Result := SB.ToString; end; {$ENDIF CLR} {$IFDEF CLR} function StrFind(const Substr, S: AnsiString; const Index: Integer): Integer; begin - Result := System.String(S).ToLower().IndexOf(System.String(SubStr).ToLower(), Index - 1) + 1; + Result := System.String(S).ToLower().IndexOf(System.String(SubStr).ToLower, Index - 1) + 1; end; {$ELSE} function StrFind(const Substr, S: AnsiString; const Index: Integer): Integer; assembler; @@ -3057,7 +3062,7 @@ L: Integer; begin PosStart := Pos(Start, S); - PosEnd := StrSearch(Stop, S, PosStart+1); // PosEnd has to be after PosStart. + PosEnd := StrSearch(Stop, S, PosStart + 1); // PosEnd has to be after PosStart. if (PosStart > 0) and (PosEnd > PosStart) then begin @@ -3083,7 +3088,7 @@ Result := Copy(S, Start, Count); end; -function StrRestOf(const S: AnsiString; N: Integer ): AnsiString; +function StrRestOf(const S: AnsiString; N: Integer): AnsiString; begin Result := Copy(S, N, (Length(S) - N + 1)); end; @@ -3097,7 +3102,7 @@ function CharEqualNoCase(const C1, C2: AnsiChar): Boolean; begin - //if they are not equal chars, may be same letter different case + // if they are not equal chars, may be same letter different case Result := (C1 = C2) or (CharIsAlpha(C1) and CharIsAlpha(C2) and (CharLower(C1) = CharLower(C2))); end; @@ -3293,22 +3298,18 @@ function CharLastPos(const S: AnsiString; const C: AnsiChar; const Index: Integer): Integer; begin if (Index > 0) and (Index <= Length(S)) then - begin for Result := Length(S) downto Index do if S[Result] = C then Exit; - end; Result := 0; end; function CharPos(const S: AnsiString; const C: AnsiChar; const Index: Integer): Integer; begin if (Index > 0) and (Index <= Length(S)) then - begin for Result := Index to Length(S) do if S[Result] = C then Exit; - end; Result := 0; end; @@ -3475,7 +3476,7 @@ P := StrECopyW(P, PWideChar(Source[I])); Inc(P); end; - P^:= #0; + P^ := #0; Result := Dest; end; @@ -3607,7 +3608,8 @@ end; end; -function StringsToStr(const List: TStrings; const Sep: AnsiString; const AllowEmptyString: Boolean): AnsiString; +function StringsToStr(const List: TStrings; const Sep: AnsiString; + const AllowEmptyString: Boolean): AnsiString; var I, L: Integer; begin @@ -3692,6 +3694,7 @@ end; //=== Miscellaneous ========================================================== + {$IFDEF KEEP_DEPRECATED} function BooleanToStr(B: Boolean): AnsiString; const @@ -3703,47 +3706,47 @@ function FileToString(const FileName: AnsiString): AnsiString; var - fs: TFileStream; + FS: TFileStream; Len: Integer; {$IFDEF CLR} Buf: array of Byte; {$ENDIF CLR} begin - fs := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite); + FS := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite); try - Len := fs.Size; + Len := FS.Size; SetLength(Result, Len); if Len > 0 then {$IFDEF CLR} begin SetLength(Buf, Len); - fs.ReadBuffer(Buf, Len); + FS.ReadBuffer(Buf, Len); Result := Buf; end; {$ELSE} - fs.ReadBuffer(Result[1], Len); + FS.ReadBuffer(Result[1], Len); {$ENDIF CLR} finally - fs.Free; + FS.Free; end; end; procedure StringToFile(const FileName: AnsiString; const Contents: AnsiString); var - fs: TFileStream; + FS: TFileStream; Len: Integer; begin - fs := TFileStream.Create(FileName, fmCreate); + FS := TFileStream.Create(FileName, fmCreate); try Len := Length(Contents); if Len > 0 then {$IFDEF CLR} - fs.WriteBuffer(BytesOf(Contents), Len); + FS.WriteBuffer(BytesOf(Contents), Len); {$ELSE} - fs.WriteBuffer(Contents[1], Len); + FS.WriteBuffer(Contents[1], Len); {$ENDIF CLR} finally - fs.Free; + FS.Free; end; end; @@ -3765,6 +3768,7 @@ end; {$IFNDEF CLR} + procedure StrTokens(const S: AnsiString; const List: TStrings); var Start: PAnsiChar; @@ -3841,7 +3845,7 @@ Exit; end else - while (S^ in [AnsiSpace, AnsiLineFeed, AnsiCarriageReturn]) do + while S^ in [AnsiSpace, AnsiLineFeed, AnsiCarriageReturn] do Inc(S); end; else @@ -3851,6 +3855,7 @@ end; end; end; + {$ENDIF ~CLR} function StrToFloatSafe(const S: AnsiString): Float; @@ -3908,8 +3913,8 @@ if Temp[I] = DecSep then Temp[I] := ThouSep else - if Temp[I] = ThouSep then - Temp[I] := DecSep; + if Temp[I] = ThouSep then + Temp[I] := DecSep; end; Temp := StrKeepChars(Temp, AnsiDecDigits + [DecSep]); @@ -3918,7 +3923,7 @@ begin if Temp[1] = DecSep then Temp := '0' + Temp; - if Temp[length(Temp)] = DecSep then + if Temp[Length(Temp)] = DecSep then Temp := Temp + '0'; Result := StrToFloat(Temp); if IsNegative then @@ -3933,10 +3938,10 @@ Result := Trunc(StrToFloatSafe(S)); end; -procedure StrNormIndex(const StrLen: integer; var Index: integer; var Count: integer); overload; +procedure StrNormIndex(const StrLen: Integer; var Index: Integer; var Count: Integer); overload; begin - Index := Max(1, Min(Index, StrLen+1)); - Count := Max(0, Min(Count, StrLen+1 - Index)); + Index := Max(1, Min(Index, StrLen + 1)); + Count := Max(0, Min(Count, StrLen + 1 - Index)); end; {$IFDEF CLR} Modified: trunk/jcl/source/common/JclArrayLists.pas =================================================================== --- trunk/jcl/source/common/JclArrayLists.pas 2006-07-16 15:14:39 UTC (rev 1689) +++ trunk/jcl/source/common/JclArrayLists.pas 2006-07-23 05:35:54 UTC (rev 1690) @@ -221,9 +221,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} // inlined FOwnList.Add if FOwnList.FSize = FOwnList.Capacity then FOwnList.Grow; @@ -243,9 +243,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := FOwnList.FElementData[FCursor]; end; @@ -265,9 +265,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := FOwnList.FElementData[FCursor]; //FLastRet := FCursor; Inc(FCursor); @@ -284,9 +284,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Dec(FCursor); //FLastRet := FCursor; Result := FOwnList.FElementData[FCursor]; @@ -303,9 +303,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} with FOwnList do begin FElementData[FCursor] := nil; // Force Release @@ -326,9 +326,9 @@ if FLastRet = -1 then raise EJclIllegalState.Create(SIllegalState); } -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} FOwnList.FElementData[FCursor] := AInterface; end; @@ -386,9 +386,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} // inlined FOwnList.Add if FOwnList.FSize = FOwnList.Capacity then FOwnList.Grow; @@ -408,9 +408,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := FOwnList.FElementData[FCursor]; end; @@ -430,9 +430,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := FOwnList.FElementData[FCursor]; //FLastRet := FCursor; Inc(FCursor); @@ -449,9 +449,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Dec(FCursor); //FLastRet := FCursor; Result := FOwnList.FElementData[FCursor]; @@ -468,9 +468,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} with FOwnList do begin FElementData[FCursor] := ''; // Force Release @@ -491,9 +491,9 @@ if FLastRet = -1 then raise EJclIllegalState.Create(SIllegalState); } -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} FOwnList.FElementData[FCursor] := AString; end; @@ -551,9 +551,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} // inlined FOwnList.Add if FOwnList.FSize = FOwnList.Capacity then FOwnList.Grow; @@ -573,9 +573,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := FOwnList.FElementData[FCursor]; end; @@ -595,9 +595,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := FOwnList.FElementData[FCursor]; //FLastRet := FCursor; Inc(FCursor); @@ -614,9 +614,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Dec(FCursor); //FLastRet := FCursor; Result := FOwnList.FElementData[FCursor]; @@ -633,9 +633,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} with FOwnList do begin FreeObject(FElementData[FCursor]); @@ -652,9 +652,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} FOwnList.FElementData[FCursor] := AObject; end; @@ -697,9 +697,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index > FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -718,13 +718,13 @@ var It: IJclIntfIterator; Size: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} @@ -754,9 +754,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if FSize = Capacity then Grow; {$IFNDEF CLR} @@ -770,13 +770,13 @@ function TJclIntfArrayList.AddAll(ACollection: IJclIntfCollection): Boolean; var It: IJclIntfIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -798,13 +798,13 @@ procedure TJclIntfArrayList.Clear; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} for I := 0 to FSize - 1 do FElementData[I] := nil; FSize := 0; @@ -822,13 +822,13 @@ function TJclIntfArrayList.Contains(AInterface: IInterface): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if AInterface = nil then Exit; @@ -843,13 +843,13 @@ function TJclIntfArrayList.ContainsAll(ACollection: IJclIntfCollection): Boolean; var It: IJclIntfIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := True; if ACollection = nil then Exit; @@ -862,13 +862,13 @@ var I: Integer; It: IJclIntfIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -887,9 +887,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then Result := nil else @@ -915,7 +915,8 @@ begin if Capacity > 64 then Capacity := Capacity + Capacity div 4 - else if FCapacity = 0 then + else + if FCapacity = 0 then FCapacity := 64 else Capacity := Capacity * 4; @@ -924,13 +925,13 @@ function TJclIntfArrayList.IndexOf(AInterface: IInterface): Integer; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := -1; if AInterface = nil then Exit; @@ -965,13 +966,13 @@ function TJclIntfArrayList.LastIndexOf(AInterface: IInterface): Integer; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := -1; if AInterface = nil then Exit; @@ -986,13 +987,13 @@ function TJclIntfArrayList.Remove(AInterface: IInterface): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if AInterface = nil then Exit; @@ -1013,9 +1014,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1032,13 +1033,13 @@ function TJclIntfArrayList.RemoveAll(ACollection: IJclIntfCollection): Boolean; var It: IJclIntfIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := True; if ACollection = nil then Exit; @@ -1050,13 +1051,13 @@ function TJclIntfArrayList.RetainAll(ACollection: IJclIntfCollection): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1071,9 +1072,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1092,13 +1093,13 @@ var I: Integer; Last: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Last := First + Count - 1; if Last >= FSize then Last := FSize - 1; @@ -1146,9 +1147,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index > FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1167,13 +1168,13 @@ var It: IJclStrIterator; Size: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if (Index < 0) or (Index >= FSize) then @@ -1208,9 +1209,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if FSize = Capacity then Grow; {$IFNDEF CLR} @@ -1224,13 +1225,13 @@ function TJclStrArrayList.AddAll(ACollection: IJclStrCollection): Boolean; var It: IJclStrIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1253,13 +1254,13 @@ procedure TJclStrArrayList.Clear; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} for I := 0 to FSize - 1 do FElementData[I] := ''; FSize := 0; @@ -1277,13 +1278,13 @@ function TJclStrArrayList.Contains(const AString: string): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if AString = '' then Exit; @@ -1298,32 +1299,32 @@ function TJclStrArrayList.ContainsAll(ACollection: IJclStrCollection): Boolean; var It: IJclStrIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := True; if ACollection = nil then Exit; It := ACollection.First; while Result and It.HasNext do - Result := contains(It.Next); + Result := Contains(It.Next); end; function TJclStrArrayList.Equals(ACollection: IJclStrCollection): Boolean; var I: Integer; It: IJclStrIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1347,9 +1348,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then Result := '' else @@ -1375,7 +1376,8 @@ begin if Capacity > 64 then Capacity := Capacity + Capacity div 4 - else if FCapacity = 0 then + else + if FCapacity = 0 then FCapacity := 64 else Capacity := Capacity * 4; @@ -1384,13 +1386,13 @@ function TJclStrArrayList.IndexOf(const AString: string): Integer; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := -1; if AString = '' then Exit; @@ -1420,13 +1422,13 @@ function TJclStrArrayList.LastIndexOf(const AString: string): Integer; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := -1; if AString = '' then Exit; @@ -1441,13 +1443,13 @@ function TJclStrArrayList.Remove(const AString: string): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if AString = '' then Exit; @@ -1468,9 +1470,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1487,13 +1489,13 @@ function TJclStrArrayList.RemoveAll(ACollection: IJclStrCollection): Boolean; var It: IJclStrIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := True; if ACollection = nil then Exit; @@ -1505,13 +1507,13 @@ function TJclStrArrayList.RetainAll(ACollection: IJclStrCollection): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1526,9 +1528,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1547,13 +1549,13 @@ var I: Integer; Last: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Last := First + Count - 1; if Last >= FSize then Last := FSize - 1; @@ -1603,9 +1605,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index > FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1624,13 +1626,13 @@ var It: IJclIterator; Size: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} @@ -1660,9 +1662,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if FSize = Capacity then Grow; FElementData[FSize] := AObject; @@ -1673,13 +1675,13 @@ function TJclArrayList.AddAll(ACollection: IJclCollection): Boolean; var It: IJclIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1698,13 +1700,13 @@ procedure TJclArrayList.Clear; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} for I := 0 to FSize - 1 do FreeObject(FElementData[I]); FSize := 0; @@ -1722,13 +1724,13 @@ function TJclArrayList.Contains(AObject: TObject): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if AObject = nil then Exit; @@ -1743,13 +1745,13 @@ function TJclArrayList.ContainsAll(ACollection: IJclCollection): Boolean; var It: IJclIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := True; if ACollection = nil then Exit; @@ -1762,13 +1764,13 @@ var I: Integer; It: IJclIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1796,9 +1798,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then Result := nil else @@ -1824,7 +1826,8 @@ begin if Capacity > 64 then Capacity := Capacity + Capacity div 4 - else if FCapacity = 0 then + else + if FCapacity = 0 then FCapacity := 64 else Capacity := Capacity * 4; @@ -1833,13 +1836,13 @@ function TJclArrayList.IndexOf(AObject: TObject): Integer; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := -1; if AObject = nil then Exit; @@ -1874,13 +1877,13 @@ function TJclArrayList.LastIndexOf(AObject: TObject): Integer; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := -1; if AObject = nil then Exit; @@ -1895,13 +1898,13 @@ function TJclArrayList.Remove(AObject: TObject): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if AObject = nil then Exit; @@ -1922,9 +1925,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -1941,13 +1944,13 @@ function TJclArrayList.RemoveAll(ACollection: IJclCollection): Boolean; var It: IJclIterator; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := True; if ACollection = nil then Exit; @@ -1959,13 +1962,13 @@ function TJclArrayList.RetainAll(ACollection: IJclCollection): Boolean; var I: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Result := False; if ACollection = nil then Exit; @@ -1980,9 +1983,9 @@ CS: IInterface; {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} if (Index < 0) or (Index >= FSize) then {$IFDEF CLR} raise EJclOutOfBoundsError.Create(RsEOutOfBounds); @@ -2001,13 +2004,13 @@ var I: Integer; Last: Integer; -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS: IInterface; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} begin -{$IFDEF THREADSAFE} + {$IFDEF THREADSAFE} CS := EnterCriticalSection; -{$ENDIF THREADSAFE} + {$ENDIF THREADSAFE} Last := First + Count - 1; if Last >= FSize then Last := FSize - 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-16 15:14:51
|
Revision: 1689 Author: outchy Date: 2006-07-16 08:14:39 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1689&view=rev Log Message: ----------- Minor style cleaning Dialog box to inform the user when the compilation is aborted The compilation can continue when debug data are not inserted Modified Paths: -------------- trunk/jcl/experts/common/JclOtaResources.pas trunk/jcl/experts/debug/JclDebugIdeImpl.pas Modified: trunk/jcl/experts/common/JclOtaResources.pas =================================================================== --- trunk/jcl/experts/common/JclOtaResources.pas 2006-07-16 14:26:50 UTC (rev 1688) +++ trunk/jcl/experts/common/JclOtaResources.pas 2006-07-16 15:14:39 UTC (rev 1689) @@ -21,7 +21,7 @@ {**************************************************************************************************} { } { Unit owner: Florent Ouchet } -{ Last modified: $Date$ } +{ Last modified: $Date$ } { } {**************************************************************************************************} @@ -217,7 +217,8 @@ RsBuildActionName = 'ProjectJCLBuildCommand'; RsBuildAllActionName = 'ProjectJCLBuildAllCommand'; RsCantInsertToInstalledPackage = 'JCL Debug IDE Expert: Can not insert debug information to installed package' + - #13#10'%s'#13#10#10'Would you like to disable inserting JCL Debug data ?'; + AnsiLineBreak + '%s' + AnsiLineBreak + 'Would you like to disable inserting JCL Debug data ?'; + RsCompilationAborted = 'JCL Debug data cannot be inserted to installed package' + AnsiLineBreak + 'Compilation aborted'; RsInsertDataCaption = 'Insert JCL Debug data'; RsInsertDataActionName = 'ProjectJCLInsertDataCommand'; RsEExecutableNotFound = 'Executable file for project "%s" not found.' + @@ -250,7 +251,7 @@ RsLong = '64-bit Core'; RsTrademarks = - 'MMX is a trademark of Intel Corporation.' + #13#10 + + 'MMX is a trademark of Intel Corporation.' + AnsiLineBreak + '3DNow! is a registered trademark of Advanced Micro Devices.'; RsNoSIMD = 'No SIMD registers found'; Modified: trunk/jcl/experts/debug/JclDebugIdeImpl.pas =================================================================== --- trunk/jcl/experts/debug/JclDebugIdeImpl.pas 2006-07-16 14:26:50 UTC (rev 1688) +++ trunk/jcl/experts/debug/JclDebugIdeImpl.pas 2006-07-16 15:14:39 UTC (rev 1689) @@ -290,8 +290,12 @@ if IsInstalledPackage(Project) then begin if MessageDlg(Format(RsCantInsertToInstalledPackage, [Project.FileName]), mtError, [mbYes, mbNo], 0) = mrYes then - ExpertActive(False); - Cancel := True; + ExpertActive(False) + else + begin + Cancel := True; + MessageDlg(RsCompilationAborted, mtError, [mbOK], 0); + end; end else begin @@ -420,7 +424,8 @@ try try FSaveBuildAllProjectsExecute(Sender); - DisplayResults; + if FInsertDataAction.Checked then + DisplayResults; except on ExceptionObj: TObject do JclExpertShowExceptionDialog(ExceptionObj); @@ -437,7 +442,8 @@ try try FSaveBuildProjectExecute(Sender); - DisplayResults; + if FInsertDataAction.Checked then + DisplayResults; except on ExceptionObj: TObject do JclExpertShowExceptionDialog(ExceptionObj); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-16 14:26:58
|
Revision: 1688 Author: outchy Date: 2006-07-16 07:26:50 -0700 (Sun, 16 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1688&view=rev Log Message: ----------- Multiple DirDilimiter makes file name comparisons fail Modified Paths: -------------- trunk/jcl/experts/common/JclOtaUtils.pas Modified: trunk/jcl/experts/common/JclOtaUtils.pas =================================================================== --- trunk/jcl/experts/common/JclOtaUtils.pas 2006-07-07 20:07:37 UTC (rev 1687) +++ trunk/jcl/experts/common/JclOtaUtils.pas 2006-07-16 14:26:50 UTC (rev 1688) @@ -959,6 +959,8 @@ Result := StringReplace(Result, Format('$(%s)', [Name]), FEnvVariables.Values[Name], [rfReplaceAll, rfIgnoreCase]); end; + While Pos('\\', Result) > 0 do + Result := StringReplace(Result, '\\', DirDelimiter, [rfReplaceAll]); end; procedure TJclOTAExpertBase.RegisterAction(Action: TCustomAction); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-07 20:07:44
|
Revision: 1687 Author: outchy Date: 2006-07-07 13:07:37 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1687&view=rev Log Message: ----------- the label was truncated Modified Paths: -------------- trunk/jcl/experts/useswizard/JCLOptionsFrame.dfm Modified: trunk/jcl/experts/useswizard/JCLOptionsFrame.dfm =================================================================== --- trunk/jcl/experts/useswizard/JCLOptionsFrame.dfm 2006-07-07 19:51:49 UTC (rev 1686) +++ trunk/jcl/experts/useswizard/JCLOptionsFrame.dfm 2006-07-07 20:07:37 UTC (rev 1687) @@ -31,9 +31,9 @@ TabOrder = 3 end object EditIniFile: TEdit - Left = 111 + Left = 136 Top = 15 - Width = 253 + Width = 228 Height = 21 Anchors = [akLeft, akTop, akRight] TabOrder = 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ou...@us...> - 2006-07-07 19:51:56
|
Revision: 1686 Author: outchy Date: 2006-07-07 12:51:49 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1686&view=rev Log Message: ----------- subversion sandboxes names now fixed Modified Paths: -------------- trunk/jcl/experts/versioncontrol/JclVersionCtrlSVNImpl.pas Modified: trunk/jcl/experts/versioncontrol/JclVersionCtrlSVNImpl.pas =================================================================== --- trunk/jcl/experts/versioncontrol/JclVersionCtrlSVNImpl.pas 2006-07-06 16:43:10 UTC (rev 1685) +++ trunk/jcl/experts/versioncontrol/JclVersionCtrlSVNImpl.pas 2006-07-07 19:51:49 UTC (rev 1686) @@ -368,17 +368,17 @@ for IndexFileName := Length(FileName) downto 1 do if FileName[IndexFileName] = DirDelimiter then begin + DirectoryName := Copy(FileName, 1, IndexFileName); for IndexDir := Low(JclVersionCtrlSVNDirectories) to High(JclVersionCtrlSVNDirectories) do begin - DirectoryName := Copy(FileName, 1, IndexFileName) + JclVersionCtrlSVNDirectories[IndexDir]; - if DirectoryExists(DirectoryName) then + if DirectoryExists(DirectoryName + JclVersionCtrlSVNDirectories[IndexDir]) then SdBxNames.Add(DirectoryName); end; end; finally SdBxNames.EndUpdate; end; - + if SdBxNames.Count = 0 then Result := inherited GetSandboxNames(FileName, SdBxNames); end; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ah...@us...> - 2006-07-06 16:43:18
|
Revision: 1685 Author: ahuser Date: 2006-07-06 09:43:10 -0700 (Thu, 06 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1685&view=rev Log Message: ----------- Fixed JCL.NET bug: Wrong incrementor Modified Paths: -------------- trunk/jcl/source/common/JclMime.pas Modified: trunk/jcl/source/common/JclMime.pas =================================================================== --- trunk/jcl/source/common/JclMime.pas 2006-07-06 06:58:11 UTC (rev 1684) +++ trunk/jcl/source/common/JclMime.pas 2006-07-06 16:43:10 UTC (rev 1685) @@ -466,7 +466,7 @@ B := B or InputBuffer[InIndex + 1]; B := B shl 8; B := B or InputBuffer[InIndex + 2]; - Inc(InIndex); + Inc(InIndex, 3); { Write 4 bytes to OutputBuffer (in reverse order). } OutputBuffer[OutIndex + 3] := MIME_ENCODE_TABLE[B and $3F]; B := B shr 6; @@ -475,7 +475,7 @@ OutputBuffer[OutIndex + 1] := MIME_ENCODE_TABLE[B and $3F]; B := B shr 6; OutputBuffer[OutIndex + 0] := MIME_ENCODE_TABLE[B]; - Inc(OutIndex); + Inc(OutIndex, 3); until InIndex >= InnerLimit; { Write line break (CRLF). } @@ -566,7 +566,7 @@ B := B or InputBuffer[InIndex + 1]; B := B shl 8; B := B or InputBuffer[InIndex + 2]; - Inc(InIndex); + Inc(InIndex, 3); { Write 4 bytes to OutputBuffer (in reverse order). } OutputBuffer[OutIndex + 3] := MIME_ENCODE_TABLE[B and $3F]; B := B shr 6; @@ -575,7 +575,7 @@ OutputBuffer[OutIndex + 1] := MIME_ENCODE_TABLE[B and $3F]; B := B shr 6; OutputBuffer[OutIndex + 0] := MIME_ENCODE_TABLE[B]; - Inc(OutIndex); + Inc(OutIndex, 3); end; { End of data & padding. } @@ -632,7 +632,7 @@ B := B or InPtr^.B2; B := B shl 8; B := B or InPtr^.B3; - Inc(InPtr); + Inc(InPtr, 3); { Write 4 bytes to OutputBuffer (in reverse order). } OutPtr^.B4 := MIME_ENCODE_TABLE[B and $3F]; B := B shr 6; @@ -641,7 +641,7 @@ OutPtr^.B2 := MIME_ENCODE_TABLE[B and $3F]; B := B shr 6; OutPtr^.B1 := MIME_ENCODE_TABLE[B]; - Inc(OutPtr); + Inc(OutPtr, 3); end; { End of data & padding. } @@ -773,7 +773,7 @@ LByteBuffer := LByteBuffer shr 8; OutPtr^.B1 := Byte(LByteBuffer); LByteBuffer := 0; - Inc(OutPtr); + Inc(OutPtr, 3); LByteBufferSpace := 4; end; ByteBuffer := LByteBuffer; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ob...@us...> - 2006-07-06 06:58:17
|
Revision: 1684 Author: obones Date: 2006-07-05 23:58:11 -0700 (Wed, 05 Jul 2006) ViewCVS: http://svn.sourceforge.net/jcl/?rev=1684&view=rev Log Message: ----------- faVolumeID is deprecated and potentially dangerous and as such has been removed. Steps have been taken to ensure that reading back a TJclFileAttributeMask from a DFM will not trigger an error. Modified Paths: -------------- trunk/jcl/source/common/JclFileUtils.pas Modified: trunk/jcl/source/common/JclFileUtils.pas =================================================================== --- trunk/jcl/source/common/JclFileUtils.pas 2006-07-02 19:41:17 UTC (rev 1683) +++ trunk/jcl/source/common/JclFileUtils.pas 2006-07-06 06:58:11 UTC (rev 1684) @@ -138,12 +138,11 @@ faNotContentIndexed = $00002000 {$IFDEF SUPPORTS_PLATFORM} platform {$ENDIF}; faEncrypted = $00004000 {$IFDEF SUPPORTS_PLATFORM} platform {$ENDIF}; - // outchy: why were faVolumeID commented for JCL.NET support? - faRejectedByDefault = faHidden + faSysFile + - {$IFDEF KEEP_DEPRECATED} faVolumeID + {$ENDIF KEEP_DEPRECATED} - faDirectory; - faWindowsSpecific = {$IFDEF KEEP_DEPRECATED} faVolumeID + {$ENDIF KEEP_DEPRECATED} - faArchive + faTemporary + faSparseFile + faReparsePoint + + // Note: faVolumeID is potentially dangerous and its usage has been discontinued + // Please see QC report 6003 for details, available online at this URL: + // http://qc.borland.com/wc/qcmain.aspx?d=6003 + faRejectedByDefault = faHidden + faSysFile + faDirectory; + faWindowsSpecific = faArchive + faTemporary + faSparseFile + faReparsePoint + faCompressed + faOffline + faNotContentIndexed + faEncrypted; faUnixSpecific = faSymLink; @@ -342,11 +341,6 @@ read GetAttr write SetAttr stored False; property System: TAttributeInterest index faSysFile read GetAttr write SetAttr stored False; - // outchy: why were these lines commented for JCL.NET support? - {$IFDEF KEEP_DEPRECATED} - property VolumeID: TAttributeInterest index faVolumeID - read GetAttr write SetAttr stored False; - {$ENDIF KEEP_DEPRECATED} property Directory: TAttributeInterest index faDirectory read GetAttr write SetAttr stored False; property SymLink: TAttributeInterest index faSymLink @@ -381,6 +375,10 @@ end; TJclFileAttributeMask = class(TJclCustomFileAttrMask) + private + procedure ReadVolumeID(Reader: TReader); + public + procedure DefineProperties(Filer: TFiler); override; published property ReadOnly; property Hidden; @@ -391,9 +389,6 @@ property SymLink; {$ENDIF UNIX} {$IFDEF MSWINDOWS} - {$IFDEF KEEP_DEPRECATED} - property VolumeID; - {$ENDIF KEEP_DEPRECATED} property Archive; property Temporary; property SparseFile; @@ -3393,10 +3388,6 @@ Items.Add(RsAttrReadOnly); if Attr and faSysFile = faSysFile then Items.Add(RsAttrSystemFile); - {$IFDEF KEEP_DEPRECATED} - if Attr and faVolumeID = faVolumeID then - Items.Add(RsAttrVolumeID); - {$ENDIF KEEP_DEPRECATED} if Attr and faArchive = faArchive then Items.Add(RsAttrArchive); if Attr and faAnyFile = faAnyFile then @@ -5192,7 +5183,7 @@ Process(RootDir); end; -//=== { TJclFileAttributeMask } ============================================== +//=== { TJclCustomFileAttributeMask } ============================================== constructor TJclCustomFileAttrMask.Create; begin @@ -5305,6 +5296,22 @@ Writer.WriteInteger(FRequiredAttr); end; +//=== { TJclFileAttributeMask } ============================================== + +procedure TJclFileAttributeMask.ReadVolumeID(Reader: TReader); +begin + // Nothing, we are not interested in the value of the VolumeID property, + // this procedure and the associated DefineProperty call are here only + // to allow reading legacy DFMs that have this property defined. +end; + +procedure TJclFileAttributeMask.DefineProperties(Filer: TFiler); +begin + inherited DefineProperties(Filer); + + Filer.DefineProperty('VolumeID', ReadVolumeID, nil, False); +end; + //=== { TEnumFileThread } ==================================================== type This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
49 messages has been excluded from this view by a project administrator.
