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...> - 2008-09-22 23:14:45
|
Revision: 2491
http://jcl.svn.sourceforge.net/jcl/?rev=2491&view=rev
Author: outchy
Date: 2008-09-22 23:14:35 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
fixed wrong directory in unit versioning information.
Modified Paths:
--------------
trunk/jcl/source/common/JclStringConversions.pas
trunk/jcl/source/common/JclSynch.pas
trunk/jcl/source/common/JclUnicode.pas
trunk/jcl/source/windows/JclMetadata.pas
Modified: trunk/jcl/source/common/JclStringConversions.pas
===================================================================
--- trunk/jcl/source/common/JclStringConversions.pas 2008-09-22 23:01:34 UTC (rev 2490)
+++ trunk/jcl/source/common/JclStringConversions.pas 2008-09-22 23:14:35 UTC (rev 2491)
@@ -233,7 +233,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\source\windows'
+ LogPath: 'JCL\source\common'
);
{$ENDIF UNITVERSIONING}
Modified: trunk/jcl/source/common/JclSynch.pas
===================================================================
--- trunk/jcl/source/common/JclSynch.pas 2008-09-22 23:01:34 UTC (rev 2490)
+++ trunk/jcl/source/common/JclSynch.pas 2008-09-22 23:14:35 UTC (rev 2491)
@@ -31,7 +31,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -367,7 +367,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\source\windows'
+ LogPath: 'JCL\source\common'
);
{$ENDIF UNITVERSIONING}
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-22 23:01:34 UTC (rev 2490)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-22 23:14:35 UTC (rev 2491)
@@ -1264,7 +1264,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\source\windows'
+ LogPath: 'JCL\source\common'
);
{$ENDIF UNITVERSIONING}
Modified: trunk/jcl/source/windows/JclMetadata.pas
===================================================================
--- trunk/jcl/source/windows/JclMetadata.pas 2008-09-22 23:01:34 UTC (rev 2490)
+++ trunk/jcl/source/windows/JclMetadata.pas 2008-09-22 23:14:35 UTC (rev 2491)
@@ -1631,7 +1631,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\source\common'
+ LogPath: 'JCL\source\windows'
);
{$ENDIF UNITVERSIONING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-22 23:01:46
|
Revision: 2490
http://jcl.svn.sourceforge.net/jcl/?rev=2490&view=rev
Author: outchy
Date: 2008-09-22 23:01:34 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Added unit versioning information to experts.
Modified Paths:
--------------
trunk/jcl/experts/common/JclOtaActionConfigureSheet.pas
trunk/jcl/experts/common/JclOtaConfigurationForm.pas
trunk/jcl/experts/common/JclOtaConsts.pas
trunk/jcl/experts/common/JclOtaExceptionForm.pas
trunk/jcl/experts/common/JclOtaResources.pas
trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
trunk/jcl/experts/common/JclOtaUtils.pas
trunk/jcl/experts/common/JclOtaWizardForm.pas
trunk/jcl/experts/common/JclOtaWizardFrame.pas
trunk/jcl/experts/debug/JclDebugThread.pas
trunk/jcl/experts/debug/converter/JclDebugIdeConfigFrame.pas
trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas
trunk/jcl/experts/debug/converter/JclDebugIdeResult.pas
trunk/jcl/experts/debug/simdview/JclSIMDCpuInfo.pas
trunk/jcl/experts/debug/simdview/JclSIMDModifyForm.pas
trunk/jcl/experts/debug/simdview/JclSIMDUtils.pas
trunk/jcl/experts/debug/simdview/JclSIMDView.pas
trunk/jcl/experts/debug/simdview/JclSIMDViewForm.pas
trunk/jcl/experts/debug/threadnames/ThreadExpertSharedNames.pas
trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas
trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas
trunk/jcl/experts/favfolders/OpenDlgFavAdapter.pas
trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas
trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas
trunk/jcl/experts/repository/JclOtaExcDlgFileFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgFormFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgIgnoreFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas
trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgTraceFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgWizard.pas
trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas
trunk/jcl/experts/repository/JclOtaTemplates.pas
trunk/jcl/experts/useswizard/JCLOptionsFrame.pas
trunk/jcl/experts/useswizard/JCLUsesWizard.pas
trunk/jcl/experts/useswizard/JclParseUses.pas
trunk/jcl/experts/useswizard/JclUsesDialog.pas
trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas
trunk/jcl/experts/versioncontrol/JclVersionCtrlCommonOptions.pas
Property Changed:
----------------
trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas
Modified: trunk/jcl/experts/common/JclOtaActionConfigureSheet.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaActionConfigureSheet.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaActionConfigureSheet.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -28,10 +28,15 @@
unit JclOtaActionConfigureSheet;
+{$I jcl.inc}
+
interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
Dialogs, ComCtrls, StdCtrls;
type
@@ -51,6 +56,16 @@
procedure SaveChanges;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -143,4 +158,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/common/JclOtaConfigurationForm.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaConfigurationForm.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaConfigurationForm.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -28,11 +28,16 @@
unit JclOtaConfigurationForm;
+{$I jcl.inc}
+
interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ExtCtrls, ComCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils;
type
@@ -63,6 +68,16 @@
property Settings: TJclOTASettings read FSettings;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -231,4 +246,12 @@
PanelOptions.Controls[Index].Visible := PanelOptions.Controls[Index] = AControl;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
\ No newline at end of file
Modified: trunk/jcl/experts/common/JclOtaConsts.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaConsts.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaConsts.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -33,6 +33,9 @@
{$I jcl.inc}
uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
ToolsApi;
const
@@ -143,6 +146,24 @@
JclVersionCtrlIconTypeNoIconValue = 'noicon';
JclVersionCtrlIconTypeJclIconValue = 'jclicons';
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/common/JclOtaExceptionForm.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaExceptionForm.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaExceptionForm.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -33,6 +33,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils;
type
@@ -50,6 +53,16 @@
function Execute: Boolean;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -130,4 +143,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/common/JclOtaResources.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaResources.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaResources.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -32,7 +32,11 @@
{$I jcl.inc}
-uses JclBase;
+uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclBase;
//=== JclOtaUtils.pas ========================================================
resourcestring
@@ -354,6 +358,24 @@
RsActionCategory = 'JEDI Code Library';
RsVersionCtrlSystemName = 'System';
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -28,10 +28,13 @@
unit JclOtaUnitVersioningSheet;
+{$I jcl.inc}
+
interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ JclUnitVersioning,
Dialogs, ComCtrls, StdCtrls;
type
@@ -42,6 +45,16 @@
constructor Create(AOwner: TComponent); override;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -49,7 +62,7 @@
uses
ActnList, Menus,
ToolsApi,
- JclFileUtils, JclUnitVersioning, JclUnitVersioningProviders,
+ JclFileUtils, JclUnitVersioningProviders,
JclOtaConsts, JclOtaResources, JclOtaUtils;
constructor TJclOtaUnitVersioningFrame.Create(AOwner: TComponent);
@@ -87,4 +100,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/common/JclOtaUtils.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUtils.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaUtils.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -42,6 +42,9 @@
// as TControlAction defined in Controls.pas for newer versions of Delphi
{$ENDIF COMPILER8_UP}
JclBase,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
{$IFDEF MSWINDOWS}
JclDebug,
{$ENDIF MSWINDOWS}
@@ -239,6 +242,16 @@
var
JclDisablePostCompilationProcess: Boolean = False;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -1554,12 +1567,26 @@
initialization
-Classes.RegisterClass(TJclWizardForm);
-Classes.RegisterClass(TJclWizardFrame);
+try
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
+ Classes.RegisterClass(TJclWizardForm);
+ Classes.RegisterClass(TJclWizardFrame);
+except
+ on ExceptionObj: TObject do
+ begin
+ JclExpertShowExceptionDialog(ExceptionObj);
+ raise;
+ end;
+end;
finalization
try
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
{$IFDEF BDS}
UnregisterAboutBox;
{$ENDIF BDS}
Modified: trunk/jcl/experts/common/JclOtaWizardForm.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaWizardForm.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaWizardForm.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -34,6 +34,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ExtCtrls, ActnList,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaWizardFrame;
type
@@ -80,6 +83,16 @@
property Executing: Boolean read FExecuting;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -232,4 +245,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/common/JclOtaWizardFrame.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaWizardFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/common/JclOtaWizardFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -33,7 +33,10 @@
{$I jcl.inc}
uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
Dialogs;
type
@@ -54,6 +57,16 @@
TJclWizardFrameClass = class of TJclWizardFrame;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\common'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -88,5 +101,12 @@
// override to customize
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
-
Modified: trunk/jcl/experts/debug/JclDebugThread.pas
===================================================================
--- trunk/jcl/experts/debug/JclDebugThread.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/JclDebugThread.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -30,6 +30,9 @@
interface
uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
Windows, Classes, SysUtils;
procedure RegisterThread(ThreadID: DWORD; const ThreadName: string); overload;
@@ -43,6 +46,16 @@
function ThreadNamesAvailable: Boolean;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -179,11 +192,17 @@
end;
initialization
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
Init;
finalization
FreeAndNil(HookImports);
FreeAndNil(SharedThreadNames);
FreeAndNil(Notifier);
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
end.
Modified: trunk/jcl/experts/debug/converter/JclDebugIdeConfigFrame.pas
===================================================================
--- trunk/jcl/experts/debug/converter/JclDebugIdeConfigFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/converter/JclDebugIdeConfigFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -19,7 +19,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -30,7 +30,11 @@
interface
uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls;
+ Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ Dialogs, StdCtrls, ExtCtrls;
type
TDebugExpertState = (deAlwaysDisabled, deProjectDisabled, deProjectEnabled, deAlwaysEnabled);
@@ -61,6 +65,16 @@
function DisableDebugExpertState(Value: TDebugExpertState): TDebugExpertState;
function ApplyDebugExpertState(GlobalState: TDebugExpertState; LocalEnabled: Boolean): TDebugExpertState;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\converter'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -219,4 +233,12 @@
RadioGroupDeleteMapFile.ItemIndex := DebugExpertStateToInt(Value);
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas
===================================================================
--- trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -31,6 +31,9 @@
uses
Windows, Classes, Menus, ActnList, SysUtils, Graphics, Dialogs, Controls, Forms, ToolsAPI,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils, JclOtaConsts,
JclDebugIdeConfigFrame;
@@ -178,6 +181,16 @@
DebugActionValues: array [False..True] of AnsiString =
( 'OFF', 'ON' );
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\converter'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R JclDebugIdeIcon.res}
@@ -1698,4 +1711,12 @@
{$ENDIF BDS4_UP}
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/converter/JclDebugIdeResult.pas
===================================================================
--- trunk/jcl/experts/debug/converter/JclDebugIdeResult.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/converter/JclDebugIdeResult.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -25,10 +25,15 @@
unit JclDebugIdeResult;
+{$I jcl.inc}
+
interface
uses
Windows, SysUtils, Classes, Controls, Forms, ComCtrls, StdCtrls, ImgList,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils;
type
@@ -50,6 +55,16 @@
constructor Create(AOwner: TComponent; ASettings: TJclOTASettings); reintroduce;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\converter'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -200,4 +215,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/simdview/JclSIMDCpuInfo.pas
===================================================================
--- trunk/jcl/experts/debug/simdview/JclSIMDCpuInfo.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/simdview/JclSIMDCpuInfo.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -37,6 +37,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclSysInfo;
type
@@ -66,6 +69,16 @@
procedure Execute(const CpuInfo: TCPUInfo);
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\simdview'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -106,4 +119,12 @@
ShowModal;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/simdview/JclSIMDModifyForm.pas
===================================================================
--- trunk/jcl/experts/debug/simdview/JclSIMDModifyForm.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/simdview/JclSIMDModifyForm.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -37,6 +37,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ExtCtrls, ToolsApi, Contnrs,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils, JclSysInfo, JclSIMDUtils;
const
@@ -108,6 +111,16 @@
property Settings: TJclOTASettings read FSettings;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\simdview'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -532,4 +545,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/simdview/JclSIMDUtils.pas
===================================================================
--- trunk/jcl/experts/debug/simdview/JclSIMDUtils.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/simdview/JclSIMDUtils.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -37,6 +37,9 @@
uses
Windows,
ToolsAPI,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclSysInfo,
JclOtaResources;
@@ -203,6 +206,16 @@
// return the XMM registers for the specified thread, this thread must be suspended
function SetVectorContext(AThread: IOTAThread; const VectorContext: TJclVectorFrame): Boolean;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\simdview'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -889,5 +902,12 @@
end;
{$ENDIF COMPILER9_UP}
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
-
Modified: trunk/jcl/experts/debug/simdview/JclSIMDView.pas
===================================================================
--- trunk/jcl/experts/debug/simdview/JclSIMDView.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/simdview/JclSIMDView.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -37,7 +37,11 @@
uses
Windows, Classes, Menus, ActnList, ToolsAPI, SysUtils, Graphics, Dialogs,
Forms, ComCtrls,
- JclOtaUtils, JclSIMDViewForm, JclSysInfo;
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclSysInfo,
+ JclOtaUtils, JclSIMDViewForm;
{$R 'JclSIMDIcon.dcr'}
@@ -122,6 +126,16 @@
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\simdview'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -628,4 +642,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/simdview/JclSIMDViewForm.pas
===================================================================
--- trunk/jcl/experts/debug/simdview/JclSIMDViewForm.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/simdview/JclSIMDViewForm.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -38,6 +38,9 @@
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ToolsApi, Grids, ExtCtrls, Menus, ActnList,
DockForm,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils, JclSysInfo, JclSIMDUtils, JclSIMDModifyForm;
type
@@ -135,6 +138,16 @@
property Settings: TJclOtaSettings read FSettings;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\simdview'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -952,4 +965,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/threadnames/ThreadExpertSharedNames.pas
===================================================================
--- trunk/jcl/experts/debug/threadnames/ThreadExpertSharedNames.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/threadnames/ThreadExpertSharedNames.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -31,6 +31,9 @@
uses
Windows, SysUtils, Classes,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclBase, JclFileUtils, JclSynch;
type
@@ -61,6 +64,16 @@
property NotifyEvent: TJclEvent read FNotifyEvent;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\threadnames'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -335,4 +348,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas
===================================================================
--- trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -31,6 +31,9 @@
uses
Windows, Classes, SysUtils, ToolsAPI, ComCtrls, Dialogs,
ThreadExpertSharedNames,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils, JclSynch;
type
@@ -92,6 +95,16 @@
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\debug\threadnames'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -398,4 +411,12 @@
FExpert.UpdateContent;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas
===================================================================
--- trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -32,6 +32,9 @@
uses
SysUtils,
ToolsAPI, OpenDlgFavAdapter,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils;
type
@@ -54,6 +57,16 @@
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\favfolders'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -156,4 +169,12 @@
inherited UnregisterCommands;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/favfolders/OpenDlgFavAdapter.pas
===================================================================
--- trunk/jcl/experts/favfolders/OpenDlgFavAdapter.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/favfolders/OpenDlgFavAdapter.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -34,6 +34,9 @@
uses
Windows, Messages, Classes, SysUtils, Controls, StdCtrls, ExtCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclPeImage, JclWin32;
type
@@ -91,6 +94,16 @@
function InitializeFavOpenDialog: TFavOpenDialog;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\favfolders'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -514,9 +527,24 @@
initialization
+try
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
+except
+ on ExceptionObj: TObject do
+ begin
+ JclExpertShowExceptionDialog(ExceptionObj);
+ raise;
+ end;
+end;
+
finalization
try
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
FreeAndNil(FavOpenDialog);
except
on ExceptionObj: TObject do
Modified: trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas
===================================================================
--- trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -32,6 +32,9 @@
uses
Windows, SysUtils, Classes, Controls, Forms, Dialogs,
ComCtrls, ActnList, Menus, ClipBrd, ImgList, ToolWin,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclDebug,
JclOtaUtils;
@@ -131,6 +134,16 @@
var
ProjectAnalyzerForm: TProjectAnalyzerForm;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\projectanalyser'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -697,4 +710,12 @@
FPackageUnits := nil;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas
===================================================================
--- trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -31,6 +31,9 @@
uses
Classes, Menus, ActnList, ToolsAPI, SysUtils, Graphics, Dialogs, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils, ProjAnalyzerFrm;
type
@@ -74,6 +77,16 @@
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\projectanalyser'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R ProjAnalyzerIcon.res}
@@ -414,4 +427,12 @@
{$ENDIF BDS4_UP}
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgFileFrame.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgFileFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgFileFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -35,6 +35,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclBorlandTools, JclOtaWizardFrame, JclOtaExcDlgRepository;
type
@@ -68,6 +71,16 @@
property Params: TJclOtaExcDlgParams read FParams write FParams;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -202,4 +215,12 @@
Params.FormAncestor := EditFormAncestor.Text;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgFormFrame.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgFormFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgFormFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -35,6 +35,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaExcDlgRepository, JclOtaWizardFrame;
type
@@ -62,6 +65,16 @@
property Params: TJclOtaExcDlgParams read FParams write FParams;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -141,4 +154,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgIgnoreFrame.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgIgnoreFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgIgnoreFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -35,6 +35,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaExcDlgRepository, JclOtaWizardFrame;
type
@@ -56,6 +59,16 @@
property Params: TJclOtaExcDlgParams read FParams write FParams;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -121,4 +134,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -34,6 +34,9 @@
uses
Classes, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclBorlandTools,
JclOtaTemplates;
@@ -117,6 +120,16 @@
property VirtualAddress: Boolean read FVirtualAddress write FVirtualAddress;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R JclOtaExcDlgIcons.res}
@@ -171,4 +184,12 @@
Result := FIgnoredExceptions.Count;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -35,6 +35,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaExcDlgRepository, JclOtaWizardFrame;
type
@@ -63,6 +66,16 @@
property Params: TJclOtaExcDlgParams read FParams write FParams;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -144,4 +157,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgTraceFrame.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgTraceFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgTraceFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -35,6 +35,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, JclDebug,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaExcDlgRepository, JclOtaWizardFrame;
type
@@ -74,6 +77,16 @@
procedure Execute; override;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -217,4 +230,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaExcDlgWizard.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgWizard.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaExcDlgWizard.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -35,6 +35,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, ActnList, ExtCtrls, StdCtrls,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclBorlandTools, JclOtaExcDlgRepository, JclOtaWizardForm;
type
@@ -50,6 +53,16 @@
function ExcDlgWizard(var AParams: TJclOtaExcDlgParams): Boolean;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
{$R *.dfm}
@@ -106,4 +119,12 @@
AddPage(TJclOtaExcDlgTracePage.Create(Self, Params));
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -47,6 +47,9 @@
uses
SysUtils, Classes,
ToolsAPI,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclBorlandTools,
JclOtaUtils, JclOtaRepositoryUtils, JclOtaExcDlgRepository;
@@ -82,6 +85,16 @@
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -370,4 +383,12 @@
Result := Personality = bpBCBuilder32;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -36,6 +36,9 @@
Windows,
SysUtils,
ToolsAPI,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclBorlandTools,
JclOtaUtils;
@@ -176,6 +179,16 @@
function GetAge: TDateTime;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -583,4 +596,12 @@
Result := FContent;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/repository/JclOtaTemplates.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaTemplates.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/repository/JclOtaTemplates.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -33,7 +33,11 @@
{$I jcl.inc}
uses
- Classes, JclBorlandTools;
+ Classes,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ JclBorlandTools;
type
TJclOtaTemplateParams = class(TPersistent)
@@ -64,6 +68,16 @@
function ApplyTemplate(const Template: string;
const Params: TJclOtaTemplateParams): string;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\repository'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -318,4 +332,12 @@
Result := GetBoolValue(Name);
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/useswizard/JCLOptionsFrame.pas
===================================================================
--- trunk/jcl/experts/useswizard/JCLOptionsFrame.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/useswizard/JCLOptionsFrame.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -34,6 +34,9 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
StdCtrls, ExtCtrls, ComCtrls;
type
@@ -59,6 +62,16 @@
property ConfigFileName: TFileName read GetConfigFileName write SetConfigFileName;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\useswizard'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -127,4 +140,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/useswizard/JCLUsesWizard.pas
===================================================================
--- trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -19,7 +19,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -35,6 +35,9 @@
SysUtils, Windows, Classes, Messages, Forms, Controls, StdCtrls, ComCtrls,
ExtCtrls,
ToolsAPI,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils, JclOptionsFrame;
type
@@ -106,6 +109,16 @@
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\useswizard'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -984,4 +997,12 @@
SaveSettings;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/useswizard/JclParseUses.pas
===================================================================
--- trunk/jcl/experts/useswizard/JclParseUses.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/useswizard/JclParseUses.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -33,6 +33,9 @@
uses
Classes, SysUtils,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
JclOtaUtils;
type
@@ -104,6 +107,16 @@
function CreateGoal(Text: PChar): TCustomGoal;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\useswizard'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -883,4 +896,12 @@
inherited Destroy;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/useswizard/JclUsesDialog.pas
===================================================================
--- trunk/jcl/experts/useswizard/JclUsesDialog.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/useswizard/JclUsesDialog.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -27,10 +27,15 @@
unit JclUsesDialog;
+{$I jcl.inc}
+
interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
Dialogs, StdCtrls, ComCtrls, ImgList;
type
@@ -51,6 +56,16 @@
constructor Create(AOwner: TComponent; AChangeList: TStrings; Errors: TList); reintroduce;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\experts\useswizard'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -191,4 +206,12 @@
end;
end;
+{$IFDEF UNITVERSIONING}
+initialization
+ RegisterUnitVersion(HInstance, UnitVersioning);
+
+finalization
+ UnregisterUnitVersion(HInstance);
+{$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas
===================================================================
--- trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas 2008-09-22 22:10:19 UTC (rev 2489)
+++ trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas 2008-09-22 23:01:34 UTC (rev 2490)
@@ -1,1307 +1,1328 @@
-{**************************************************************************************************}
-{ }
-{ 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 VersionControlImpl.pas }
-{ }
-{ The Initial Developer of the Original Code is Elahn Ientile. }
-{ Portions created by Elahn Ientile are Copyright (C) of Elahn Ientile. }
-{ }
-{ Contributors: }
-{ Florent Ouchet (outchy) }
-{ Sandeep Chandra }
-{ }
-{**************************************************************************************************}
-{ }
-{ Last modified: $Date:: 2008-08-07 23:54:09 +0200 (jeu., 07 ao\xFBt 2008) $ }
-{ Revision: $Rev:: 2412 $ }
-{ Author: $Author:: outchy $ }
-{ }
-{**************************************************************************************************}
-
-unit JclVersionControlImpl;
-
-{$I jcl.inc}
-
-interface
-
-uses
- SysUtils, Classes, Graphics, Controls, Menus, ActnList, Dialogs,
- ToolsAPI,
- JclVersionControl,
- JclOtaUtils, JclVersionCtrlCommonOptions;
-
-type
- TJclVersionControlStandardAction = class(TCustomAction)
- private
- FControlAction: TJclVersionControlActionType;
- public
- property ControlAction: TJclVersionControlActionType read FControlAction write FControlAction;
- end;
-
- TJclVersionControlDropDownAction = class(TDropDownAction)
- private
- FControlAction: TJclVersionControlActionType;
- public
- property ControlAction: TJclVersionControlActionType read FControlAction write FControlAction;
- end;
-
- TJclVersionControlExpert = class (TJclOTAExpert)
- private
- FVersionCtrlMenu: TMenuItem;
- FActions: array [TJclVersionControlActionType] of TCustomAction;
- FLastPlugin: TJclVersionControlPlugin;
- FModuleServices: IOTAModuleServices;
- FHideActions: Boolean;
- FIconType: Integer;
- FActOnTopSandbox: Boolean;
- FSaveConfirmation: Boolean;
- FDisableActions: Boolean;
- FOptionsFrame: TJclVersionCtrlOptionsFrame;
- FMenuOrganization: TStringList;
- procedure RefreshIcon(const AAction: TCustomAction);
- procedure SetIconType(const Value: Integer);
-
- procedure ActionUpdate(Sender: TObject);
- procedure ActionExecute(Sender: TObject);
- procedure IDEActionMenuClick(Sender: TObject);
- procedure SubItemClick(Sender: TObject);
- procedure DropDownMenuPopup(Sender: TObject);
- procedure IDEVersionCtrlMenuClick(Sender: TObject);
- procedure RefreshIcons;
- procedure RefreshMenu;
- function GetCurrentCache: TJclVersionControlCache;
- function GetCurrentPlugin: TJclVersionControlPlugin;
- function GetCurrentFileName: string;
- public
- constructor Create; reintroduce;
- destructor Destroy; override;
- procedure RegisterCommands; override;
- procedure UnregisterCommands; override;
- procedure AddConfigurationPages(AddPageFunc: TJclOTAAddPageFunc); override;
- procedure ConfigurationClosed(AControl: TControl; SaveChanges: Boolean); override;
- function SaveModules(const FileName: string;
- const IncludeSubDirectories: Boolean): Boolean;
-
- property ModuleServices: IOTAModuleServices read FModuleServices;
- property ActOnTopSandbox: Boolean read FActOnTopSandbox write FActOnTopSandbox;
- property DisableActions: Boolean read FDisableActions write FDisableActions;
- property HideActions: Boolean read FHideActions write FHideActions;
- property SaveConfirmation: Boolean read FSaveConfirmation write FSaveConfirmation;
- property IconType: Integer read FIconType write SetIconType;
- property CurrentCache: TJclVersionControlCache read GetCurrentCache;
- property CurrentPlugin: TJclVersionControlPlugin read GetCurrentPlugin;
- property CurrentFileName: string read GetCurrentFileName;
- end;
-
-// design package entry point
-procedure Register;
-
-// expert DLL entry point
-function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
- RegisterProc: TWizardRegisterProc;
- var TerminateProc: TWizardTerminateProc): Boolean; stdcall;
-
-function GetItemIndexA(const Item: string): Integer;
-function GetItemIndexB(const Item: string): Integer;
-function GetItemName(const Item: string): string;
-
-function CharIsAmpersand(const C: Char): Boolean;
-
-implementation
-
-uses
- Windows, Forms, TypInfo,
- JclDebug, JclFileUtils, JclRegistry, JclShell, JclStrings,
- JclOtaConsts, JclOtaResources,
- JclVersionCtrlSVNImpl,
- JclVersionCtrlCVSImpl;
-
-function CharIsAmpersand(const C: Char): Boolean;
-begin
- Result := C = '&';
-end;
-
-procedure Register;
-begin
- try
- RegisterPackageWizard(TJclVersionControlExpert.Create);
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- raise;
- end;
- end;
-end;
-
-var
- JCLWizardIndex: Integer = -1;
-
-procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
-begin
- try
- if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- end;
- end;
-end;
-
-function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
- RegisterProc: TWizardRegisterProc;
- var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
-begin
- try
- TerminateProc := JclWizardTerminate;
-
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- JCLWizardIndex := OTAWizardServices.AddWizard(TJclVersionControlExpert.Create);
-
- Result := True;
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- Result := False;
- end;
- end;
-end;
-
-function GetItemIndexA(const Item: string): Integer;
-var
- Index: Integer;
-begin
- Result := 0;
- for Index := 1 to Length(Item) do
- if not CharIsDigit(Item[Index]) then
- begin
- Result := StrToInt(Copy(Item, 1, Index - 1));
- Exit;
- end;
- Abort;
-end;
-
-function GetItemIndexB(const Item: string): Integer;
-var
- Index: Integer;
-begin
- Result := -1;
- for Index := Length(Item) downto 1 do
- if not CharIsDigit(Item[Index]) then
- begin
- if Index < Length(Item) then
- Result := StrToInt(Copy(Item, Index + 1, Length(Item) - Index));
- Exit;
- end;
-end;
-
-function GetItemName(const Item: string): string;
-var
- Index1, Index2: Integer;
-begin
- for Index1 := 1 to Length(Item) do
- if not CharIsDigit(Item[Index1]) then
- begin
- if Index1 = 1 then
- Abort;
- Break;
- end;
-
- for Index2 := Length(Item) downto 1 do
- if not CharIsDigit(Item[Index2]) then
- Break;
-
- Result := Copy(Item, Index1, Index2 - Index1 + 1);
-end;
-
-function MenuOrganizationSort(List: TStringList; Index1, Index2: Integer): Integer;
-var
- Item1, Item2: string;
- Index1A, Index1B, Index2A, Index2B: Integer;
-begin
- Item1 := List.Strings[Index1];
- Item2 := List.Strings[Index2];
- Index1A := GetItemIndexA(Item1);
- Index1B := GetItemIndexB(Item1);
- Index2A := GetItemIndexA(Item2);
- Index2B := GetItemIndexB(Item2);
-
- if Index1A < Index2A then
- Result := -1
- else
- if Index1A > Index2A then
- Result := 1
- else
- if Index1B < Index2B then
- Result := -1
- else
- if Index1B > Index2B then
- Result := 1
- else
- Result := 0;
-end;
-
-function ActionToControlAction(AAction: TCustomAction): TJclVersionControlActionType;
-begin
- if AAction is TJclVersionControlDropDownAction then
- Result := TJclVersionControlDropDownAction(AAction).ControlAction
- else
- if AAction is TJclVersionControlStandardAction then
- Result := TJclVersionControlStandardAction(AAction).ControlAction
- else
- raise EJclExpertException.CreateTrace('Internal error: invalid action');
-end;
-
-//=== { TJclVersionControlExpert } ===================================================
-
-{function TJclVersionControlExpert.ActiveModuleFileName(ASave, IncludeFamily: Boolean): string;
-var
- ModuleServices: IOTAModuleServices;
- lModule: IOTAModule;
- lExt, lFileName: string;
-begin
- try
- Supports(BorlandIDEServices, IOTAModuleServices, ModuleServices);
- if not Assigned(ModuleServices) then
- raise EJclExpertException.CreateTrace(RsENoModuleServices);
- lModule := ModuleServices.CurrentModule;
- if (lModule = nil) or (lModule.FileSystem <> '') then
- Result := ''
- else
- begin
- Result := lModule.CurrentEditor.FileName;
- if ASave then
- lModule.Save(False, False);
- if IncludeFamily and (lModule.ModuleFileCount > 1) then
- begin
- lExt := ExtractFileExt(Result);
- if (lExt = '.pas') then
- begin
- lFileName := ChangeFileExt(Result, '.dfm');
- if FileExists(lFileName) then
- Result := Result + '*' + lFileName;
- end
- else
- if (lExt = '.dfm') then
- begin
- lFileName := ChangeFileExt(Result, '.pas');
- if FileExists(lFileName) then
- Result := Result + '*' + lFileName;
- end
- end;
- end;
- except
- on ExceptionObj: TObject do
- begin
- JclExpertShowExceptionDialog(ExceptionObj);
- raise;
- end;
- end;
-end; }
-
-procedure TJclVersionControlExpert.ActionExecute(Sender: TObject);
-var
- Index: Integer;
- AAction: TCustomAction;
- ControlAction: TJclVersionControlActionType;
- ControlActionInfo: TJclVersionControlActionInfo;
- APlugin: TJclVersionControlPlugin;
- AFileName: string;
- AFileCache: TJclVersionControlCache;
- PluginList: TJclVersionControlPluginList;
-begin
- try
- AAction := Sender as TCustomAction;
- ControlAction := ActionToControlAction(AAction);
- ControlActionInfo := VersionControlActionInfo(ControlAction);
-
- if ControlActionInfo.Sandbox then
- begin
- AFileCache...
[truncated message content] |
|
From: <ou...@us...> - 2008-09-22 22:10:29
|
Revision: 2489
http://jcl.svn.sourceforge.net/jcl/?rev=2489&view=rev
Author: outchy
Date: 2008-09-22 22:10:19 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Added frame to report unit versioning information.
Modified Paths:
--------------
trunk/jcl/experts/common/JclOtaResources.pas
trunk/jcl/experts/common/JclOtaUtils.pas
trunk/jcl/packages/c5/JclBaseExpertC50.bpk
trunk/jcl/packages/c5/JclBaseExpertC50.cpp
trunk/jcl/packages/c5/JclBaseExpertC50.dpk
trunk/jcl/packages/c6/JclBaseExpert.bpk
trunk/jcl/packages/c6/JclBaseExpert.cpp
trunk/jcl/packages/c6/JclBaseExpert.dpk
trunk/jcl/packages/cs1/JclBaseExpert.dpk
trunk/jcl/packages/d10/JclBaseExpert.dpk
trunk/jcl/packages/d11/JclBaseExpert.dpk
trunk/jcl/packages/d11/JclBaseExpert.dproj
trunk/jcl/packages/d12/JclBaseExpert.dpk
trunk/jcl/packages/d12/JclBaseExpert.dproj
trunk/jcl/packages/d5/JclBaseExpertD50.dpk
trunk/jcl/packages/d6/JclBaseExpert.dpk
trunk/jcl/packages/d7/JclBaseExpert.dpk
trunk/jcl/packages/d8/JclBaseExpert.dpk
trunk/jcl/packages/d9/JclBaseExpert.dpk
trunk/jcl/packages/xml/JclBaseExpert-D.xml
Added Paths:
-----------
trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm
trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
Modified: trunk/jcl/experts/common/JclOtaResources.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaResources.pas 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/experts/common/JclOtaResources.pas 2008-09-22 22:10:19 UTC (rev 2489)
@@ -63,6 +63,7 @@
RsAboutLicenceStatus = 'MPL 1.1';
RsJCLOptions = 'JCL Options...';
RsActionSheet = 'Common\Actions';
+ RsUnitVersioningSheet = 'Common\Unit versioning';
RsENoBitmapResources = 'Unable to load bitmap resource';
RsENoEnvironmentOptions = 'Environment options are not available';
RsELineTooLong = 'Line too long in project file';
Added: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm
===================================================================
--- trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm (rev 0)
+++ trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm 2008-09-22 22:10:19 UTC (rev 2489)
@@ -0,0 +1,19 @@
+object JclOtaUnitVersioningFrame: TJclOtaUnitVersioningFrame
+ Left = 0
+ Top = 0
+ Width = 369
+ Height = 375
+ Anchors = [akLeft, akTop, akRight, akBottom]
+ TabOrder = 0
+ TabStop = True
+ object MemoUnitVersioning: TMemo
+ Left = 8
+ Top = 8
+ Width = 353
+ Height = 361
+ Anchors = [akLeft, akTop, akRight, akBottom]
+ ParentColor = True
+ ReadOnly = True
+ TabOrder = 0
+ end
+end
Property changes on: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas (rev 0)
+++ trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas 2008-09-22 22:10:19 UTC (rev 2489)
@@ -0,0 +1,90 @@
+{**************************************************************************************************}
+{ }
+{ 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 JclOtaUnitVersioningSheet.pas. }
+{ }
+{ The Initial Developer of the Original Code is Florent Ouchet }
+{ <outchy att users dott sourceforge dott net> }
+{ Portions created by Florent Ouchet are Copyright (C) of Florent Ouchet. All rights reserved. }
+{ }
+{ Contributors: }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclOtaUnitVersioningSheet;
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ Dialogs, ComCtrls, StdCtrls;
+
+type
+ TJclOtaUnitVersioningFrame = class(TFrame)
+ MemoUnitVersioning: TMemo;
+ private
+ public
+ constructor Create(AOwner: TComponent); override;
+ end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+ ActnList, Menus,
+ ToolsApi,
+ JclFileUtils, JclUnitVersioning, JclUnitVersioningProviders,
+ JclOtaConsts, JclOtaResources, JclOtaUtils;
+
+constructor TJclOtaUnitVersioningFrame.Create(AOwner: TComponent);
+var
+ UnitVersioning: TUnitVersioning;
+ UnitVersioningModule: TUnitVersioningModule;
+ UnitVersion: TUnitVersion;
+ I, J: Integer;
+ LongFileName: string;
+begin
+ inherited Create(AOwner);
+ UnitVersioning := GetUnitVersioning;
+ UnitVersioning.RegisterProvider(TJclDefaultUnitVersioningProvider);
+ for I := 0 to Pred(UnitVersioning.ModuleCount) do
+ UnitVersioning.LoadModuleUnitVersioningInfo(UnitVersioning.Modules[I].Instance);
+ MemoUnitVersioning.Lines.BeginUpdate;
+ try
+ MemoUnitVersioning.Lines.Clear;
+ for I := 0 to Pred(UnitVersioning.ModuleCount) do
+ begin
+ UnitVersioningModule := UnitVersioning.Modules[I];
+ MemoUnitVersioning.Lines.Add(Format('%s [%d units]', [GetModulePath(UnitVersioningModule.Instance), UnitVersioningModule.Count]));
+ for J := 0 to Pred(UnitVersioningModule.Count) do
+ begin
+ UnitVersion := UnitVersioningModule.Items[J];
+ LongFileName := UnitVersion.LogPath;
+ if LongFileName <> '' then
+ LongFileName := PathAddSeparator(LongFileName);
+ LongFileName := LongFileName + UnitVersion.RCSfile;
+ MemoUnitVersioning.Lines.Add(Format('%s %s %s', [LongFileName, UnitVersion.Revision, UnitVersion.Date]));
+ end;
+ end;
+ finally
+ MemoUnitVersioning.Lines.EndUpdate;
+ end;
+end;
+
+end.
Property changes on: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
___________________________________________________________________
Added: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: svn:eol-style
+ native
Modified: trunk/jcl/experts/common/JclOtaUtils.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUtils.pas 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/experts/common/JclOtaUtils.pas 2008-09-22 22:10:19 UTC (rev 2489)
@@ -251,7 +251,8 @@
{$ENDIF MSWINDOWS}
JclFileUtils, JclStrings, JclSysInfo, JclSimpleXml,
JclOtaConsts, JclOtaResources, JclOtaExceptionForm, JclOtaConfigurationForm,
- JclOtaActionConfigureSheet, JclOtaWizardForm, JclOtaWizardFrame;
+ JclOtaActionConfigureSheet, JclOtaUnitVersioningSheet,
+ JclOtaWizardForm, JclOtaWizardFrame;
{$R 'JclImages.res'}
@@ -262,6 +263,7 @@
ConfigurationAction: TAction = nil;
ConfigurationMenuItem: TMenuItem = nil;
ActionConfigureSheet: TJclOtaActionConfigureFrame = nil;
+ UnitVersioningSheet: TJclOtaUnitVersioningFrame = nil;
{$IFNDEF COMPILER6_UP}
OldFindGlobalComponentProc: TFindGlobalComponent = nil;
{$ENDIF COMPILER6_UP}
@@ -837,6 +839,11 @@
ActionConfigureSheet := TJclOtaActionConfigureFrame.Create(Application);
AddPageFunc(ActionConfigureSheet, RsActionSheet, Self);
end;
+ if not Assigned(UnitVersioningSheet) then
+ begin
+ UnitVersioningSheet := TJclOtaUnitVersioningFrame.Create(Application);
+ AddPageFunc(UnitVersioningSheet, RsUnitVersioningSheet, Self);
+ end;
// override to customize
end;
@@ -850,6 +857,9 @@
FreeAndNil(ActionConfigureSheet);
end
else
+ if Assigned(AControl) and (AControl = UnitVersioningSheet) then
+ FreeAndNil(UnitVersioningSheet)
+ else
AControl.Free;
// override to customize
end;
Modified: trunk/jcl/packages/c5/JclBaseExpertC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclBaseExpertC50.bpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/c5/JclBaseExpertC50.bpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 16-08-2008 01:20:13 UTC
+ Last generated: 22-09-2008 21:28:22 UTC
*****************************************************************************
-->
<PROJECT>
@@ -20,6 +20,7 @@
..\..\lib\c5\JclOtaExceptionForm.obj
..\..\lib\c5\JclOtaConfigurationForm.obj
..\..\lib\c5\JclOtaActionConfigureSheet.obj
+ ..\..\lib\c5\JclOtaUnitVersioningSheet.obj
..\..\lib\c5\JclOtaWizardForm.obj
..\..\lib\c5\JclOtaWizardFrame.obj
"/>
@@ -31,6 +32,7 @@
..\..\experts\common\JclOtaExceptionForm.dfm
..\..\experts\common\JclOtaConfigurationForm.dfm
..\..\experts\common\JclOtaActionConfigureSheet.dfm
+ ..\..\experts\common\JclOtaUnitVersioningSheet.dfm
..\..\experts\common\JclOtaWizardForm.dfm
..\..\experts\common\JclOtaWizardFrame.dfm
"/>
Modified: trunk/jcl/packages/c5/JclBaseExpertC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclBaseExpertC50.cpp 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/c5/JclBaseExpertC50.cpp 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 15-05-2006 19:21:45 UTC
+ Last generated: 22-09-2008 21:28:22 UTC
-----------------------------------------------------------------------------
*/
@@ -17,6 +17,7 @@
USEUNIT("..\..\experts\common\JclOtaExceptionForm.pas");
USEUNIT("..\..\experts\common\JclOtaConfigurationForm.pas");
USEUNIT("..\..\experts\common\JclOtaActionConfigureSheet.pas");
+USEUNIT("..\..\experts\common\JclOtaUnitVersioningSheet.pas");
USEUNIT("..\..\experts\common\JclOtaWizardForm.pas");
USEUNIT("..\..\experts\common\JclOtaWizardFrame.pas");
USEPACKAGE("vcl50.bpi");
Modified: trunk/jcl/packages/c5/JclBaseExpertC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclBaseExpertC50.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/c5/JclBaseExpertC50.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:26 UTC
+ Last generated: 22-09-2008 21:28:22 UTC
-----------------------------------------------------------------------------
}
@@ -47,6 +47,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/c6/JclBaseExpert.bpk
===================================================================
--- trunk/jcl/packages/c6/JclBaseExpert.bpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/c6/JclBaseExpert.bpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 16-08-2008 01:20:13 UTC
+ Last generated: 22-09-2008 21:28:22 UTC
*****************************************************************************
-->
<PROJECT>
@@ -20,6 +20,7 @@
..\..\lib\c6\JclOtaExceptionForm.obj
..\..\lib\c6\JclOtaConfigurationForm.obj
..\..\lib\c6\JclOtaActionConfigureSheet.obj
+ ..\..\lib\c6\JclOtaUnitVersioningSheet.obj
..\..\lib\c6\JclOtaWizardForm.obj
..\..\lib\c6\JclOtaWizardFrame.obj
"/>
@@ -31,6 +32,7 @@
..\..\experts\common\JclOtaExceptionForm.dfm
..\..\experts\common\JclOtaConfigurationForm.dfm
..\..\experts\common\JclOtaActionConfigureSheet.dfm
+ ..\..\experts\common\JclOtaUnitVersioningSheet.dfm
..\..\experts\common\JclOtaWizardForm.dfm
..\..\experts\common\JclOtaWizardFrame.dfm
"/>
@@ -90,6 +92,7 @@
<FILE FILENAME="..\..\experts\common\JclOtaExceptionForm.pas" FORMNAME="JclExpertExceptionForm" UNITNAME="JclOtaExceptionForm" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\common\JclOtaConfigurationForm.pas" FORMNAME="JclOtaOptionsForm" UNITNAME="JclOtaConfigurationForm" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\common\JclOtaActionConfigureSheet.pas" FORMNAME="JclOtaActionConfigureFrame" UNITNAME="JclOtaActionConfigureSheet" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\experts\common\JclOtaUnitVersioningSheet.pas" FORMNAME="JclOtaUnitVersioningFrame" UNITNAME="JclOtaUnitVersioningSheet" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\common\JclOtaWizardForm.pas" FORMNAME="JclWizardForm" UNITNAME="JclOtaWizardForm" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\experts\common\JclOtaWizardFrame.pas" FORMNAME="JclWizardFrame" UNITNAME="JclOtaWizardFrame" CONTAINERID="PascalCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
</FILELIST>
Modified: trunk/jcl/packages/c6/JclBaseExpert.cpp
===================================================================
--- trunk/jcl/packages/c6/JclBaseExpert.cpp 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/c6/JclBaseExpert.cpp 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:26 UTC
+ Last generated: 22-09-2008 21:28:22 UTC
-----------------------------------------------------------------------------
*/
@@ -14,6 +14,7 @@
USEFORMNS("..\..\experts\common\JclOtaExceptionForm.pas", Jclotaexceptionform, JclExpertExceptionForm);
USEFORMNS("..\..\experts\common\JclOtaConfigurationForm.pas", Jclotaconfigurationform, JclOtaOptionsForm);
USEFORMNS("..\..\experts\common\JclOtaActionConfigureSheet.pas", Jclotaactionconfiguresheet, JclOtaActionConfigureFrame); /* TFrame: File Type */
+USEFORMNS("..\..\experts\common\JclOtaUnitVersioningSheet.pas", Jclotaunitversioningsheet, JclOtaUnitVersioningFrame); /* TFrame: File Type */
USEFORMNS("..\..\experts\common\JclOtaWizardForm.pas", Jclotawizardform, JclWizardForm);
USEFORMNS("..\..\experts\common\JclOtaWizardFrame.pas", Jclotawizardframe, JclWizardFrame); /* TFrame: File Type */
//---------------------------------------------------------------------------
Modified: trunk/jcl/packages/c6/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/c6/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/c6/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:26 UTC
+ Last generated: 22-09-2008 21:28:22 UTC
-----------------------------------------------------------------------------
}
@@ -48,6 +48,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/cs1/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/cs1/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d10/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d10/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d10/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d11/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d11/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 16-04-2007 07:23:45 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d11/JclBaseExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclBaseExpert.dproj 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d11/JclBaseExpert.dproj 2008-09-22 22:10:19 UTC (rev 2489)
@@ -95,6 +95,7 @@
<DCCReference Include="..\..\experts\common\JclOtaExceptionForm.pas" />
<DCCReference Include="..\..\experts\common\JclOtaConfigurationForm.pas" />
<DCCReference Include="..\..\experts\common\JclOtaActionConfigureSheet.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaUnitVersioningSheet.pas" />
<DCCReference Include="..\..\experts\common\JclOtaWizardForm.pas" />
<DCCReference Include="..\..\experts\common\JclOtaWizardFrame.pas" />
</ItemGroup>
Modified: trunk/jcl/packages/d12/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d12/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d12/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 06-04-2008 12:02:32 UTC
+ Last generated: 22-09-2008 21:28:24 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d12/JclBaseExpert.dproj
===================================================================
--- trunk/jcl/packages/d12/JclBaseExpert.dproj 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d12/JclBaseExpert.dproj 2008-09-22 22:10:19 UTC (rev 2489)
@@ -72,6 +72,7 @@
<DCCReference Include="..\..\experts\common\JclOtaExceptionForm.pas" />
<DCCReference Include="..\..\experts\common\JclOtaConfigurationForm.pas" />
<DCCReference Include="..\..\experts\common\JclOtaActionConfigureSheet.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaUnitVersioningSheet.pas" />
<DCCReference Include="..\..\experts\common\JclOtaWizardForm.pas" />
<DCCReference Include="..\..\experts\common\JclOtaWizardFrame.pas" />
<BuildConfiguration Include="Base">
Modified: trunk/jcl/packages/d5/JclBaseExpertD50.dpk
===================================================================
--- trunk/jcl/packages/d5/JclBaseExpertD50.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d5/JclBaseExpertD50.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -47,6 +47,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d6/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d6/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d6/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d7/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d7/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d7/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d8/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d8/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d8/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/d9/JclBaseExpert.dpk
===================================================================
--- trunk/jcl/packages/d9/JclBaseExpert.dpk 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/d9/JclBaseExpert.dpk 2008-09-22 22:10:19 UTC (rev 2489)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclBaseExpert-D.xml)
- Last generated: 30-10-2006 08:26:27 UTC
+ Last generated: 22-09-2008 21:28:23 UTC
-----------------------------------------------------------------------------
}
@@ -49,6 +49,7 @@
JclOtaExceptionForm in '..\..\experts\common\JclOtaExceptionForm.pas' {JclExpertExceptionForm},
JclOtaConfigurationForm in '..\..\experts\common\JclOtaConfigurationForm.pas' {JclOtaOptionsForm},
JclOtaActionConfigureSheet in '..\..\experts\common\JclOtaActionConfigureSheet.pas' {JclOtaActionConfigureFrame: TFrame},
+ JclOtaUnitVersioningSheet in '..\..\experts\common\JclOtaUnitVersioningSheet.pas' {JclOtaUnitVersioningFrame: TFrame},
JclOtaWizardForm in '..\..\experts\common\JclOtaWizardForm.pas' {JclWizardForm},
JclOtaWizardFrame in '..\..\experts\common\JclOtaWizardFrame.pas' {JclWizardFrame: TFrame}
;
Modified: trunk/jcl/packages/xml/JclBaseExpert-D.xml
===================================================================
--- trunk/jcl/packages/xml/JclBaseExpert-D.xml 2008-09-22 22:03:06 UTC (rev 2488)
+++ trunk/jcl/packages/xml/JclBaseExpert-D.xml 2008-09-22 22:10:19 UTC (rev 2489)
@@ -22,6 +22,7 @@
<File Name="..\..\experts\common\JclOtaExceptionForm.pas" Targets="WinDev" Formname="JclExpertExceptionForm" Condition=""/>
<File Name="..\..\experts\common\JclOtaConfigurationForm.pas" Targets="WinDev" Formname="JclOtaOptionsForm" Condition=""/>
<File Name="..\..\experts\common\JclOtaActionConfigureSheet.pas" Targets="WinDev" Formname="JclOtaActionConfigureFrame: TFrame" Condition=""/>
+ <File Name="..\..\experts\common\JclOtaUnitVersioningSheet.pas" Targets="WinDev" Formname="JclOtaUnitVersioningFrame: TFrame" Condition=""/>
<File Name="..\..\experts\common\JclOtaWizardForm.pas" Targets="WinDev" Formname="JclWizardForm" Condition=""/>
<File Name="..\..\experts\common\JclOtaWizardFrame.pas" Targets="WinDev" Formname="JclWizardFrame: TFrame" Condition=""/>
</Contains>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-22 22:03:11
|
Revision: 2488
http://jcl.svn.sourceforge.net/jcl/?rev=2488&view=rev
Author: outchy
Date: 2008-09-22 22:03:06 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
fixed wrong directory in unit versioning information.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnitVersioning.pas
trunk/jcl/source/common/JclUnitVersioningProviders.pas
Modified: trunk/jcl/source/common/JclUnitVersioning.pas
===================================================================
--- trunk/jcl/source/common/JclUnitVersioning.pas 2008-09-22 21:17:31 UTC (rev 2487)
+++ trunk/jcl/source/common/JclUnitVersioning.pas 2008-09-22 22:03:06 UTC (rev 2488)
@@ -799,7 +799,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\common';
+ LogPath: 'JCL\source\common';
);
initialization
Modified: trunk/jcl/source/common/JclUnitVersioningProviders.pas
===================================================================
--- trunk/jcl/source/common/JclUnitVersioningProviders.pas 2008-09-22 21:17:31 UTC (rev 2487)
+++ trunk/jcl/source/common/JclUnitVersioningProviders.pas 2008-09-22 22:03:06 UTC (rev 2488)
@@ -394,7 +394,7 @@
RCSfile: '$URL$';
Revision: '$Revision$';
Date: '$Date$';
- LogPath: 'JCL\common';
+ LogPath: 'JCL\source\common';
);
initialization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-22 21:17:39
|
Revision: 2487
http://jcl.svn.sourceforge.net/jcl/?rev=2487&view=rev
Author: outchy
Date: 2008-09-22 21:17:31 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Mantis 1221: Donnation of RegAutoExecEnabled.
Modified Paths:
--------------
trunk/jcl/source/windows/JclRegistry.pas
Modified: trunk/jcl/source/windows/JclRegistry.pas
===================================================================
--- trunk/jcl/source/windows/JclRegistry.pas 2008-09-22 21:09:32 UTC (rev 2486)
+++ trunk/jcl/source/windows/JclRegistry.pas 2008-09-22 21:17:31 UTC (rev 2487)
@@ -251,6 +251,9 @@
function RegHasSubKeys(const RootKey: DelphiHKEY; const Key: string): Boolean;
function AllowRegKeyForEveryone(const RootKey: DelphiHKEY; Path: string): Boolean;
+
+function RegAutoExecEnabled(const ExecKind: TExecKind; const Name: string; out CmdLine: string): Boolean;
+
{
From: Jean-Fabien Connault [cycocrew att worldnet dott fr]
Descr: Test whether a registry key exists as a subkey of RootKey
@@ -1940,6 +1943,27 @@
end;
end;
+function RegAutoExecEnabled(const ExecKind: TExecKind; const Name: string; out CmdLine: string): Boolean;
+var
+ Key: HKEY;
+ RegPath: string;
+begin
+ CmdLine := '';
+
+ Result := GetKeyAndPath(ExecKind, Key, RegPath);
+ if Result then
+ begin
+ try
+ CmdLine := RegReadString(Key, RegPath, Name);
+ except
+ Result := False;
+ CmdLine := '';
+ end;
+ end
+ else
+ CmdLine := '';
+end;
+
{$IFDEF UNITVERSIONING}
initialization
RegisterUnitVersion(HInstance, UnitVersioning);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-22 21:09:43
|
Revision: 2486
http://jcl.svn.sourceforge.net/jcl/?rev=2486&view=rev
Author: outchy
Date: 2008-09-22 21:09:32 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
DLL experts were not unregistered.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-09-22 20:26:16 UTC (rev 2485)
+++ trunk/jcl/install/JclInstall.pas 2008-09-22 21:09:32 UTC (rev 2486)
@@ -2427,10 +2427,10 @@
FileName := ATarget.IdePackages.PackageFileNames[Index];
ShortFileName := ChangeFileExt(ExtractFileName(FileName), '');
if StrMatches(Name, ShortFileName)
- or StrMatches(Format('%s%s', [Name, ATarget.VersionNumberStr]), ShortFileName)
- or StrMatches(Format('%s%d', [Name, ATarget.VersionNumber]), ShortFileName)
- or StrMatches(Format('%s%s0', [Name, ATarget.VersionNumberStr]), ShortFileName)
- or StrMatches(Format('%s%d0', [Name, ATarget.VersionNumber]), ShortFileName) then
+ or StrMatches(Format('%sDLL%s', [Name, StrUpper(ATarget.VersionNumberStr)]), ShortFileName)
+ or StrMatches(Format('%sDLL%d', [Name, ATarget.VersionNumber]), ShortFileName)
+ or StrMatches(Format('%sDLL%s0', [Name, StrUpper(ATarget.VersionNumberStr)]), ShortFileName)
+ or StrMatches(Format('%sDLL%d0', [Name, ATarget.VersionNumber]), ShortFileName) then
ATarget.UnregisterPackage(FileName);
end;
for Index := ATarget.IdePackages.ExpertCount - 1 downto 0 do
@@ -2438,10 +2438,10 @@
FileName := ATarget.IdePackages.ExpertFileNames[Index];
ShortFileName := ChangeFileExt(ExtractFileName(FileName), '');
if StrMatches(Name, ShortFileName)
- or StrMatches(Format('%s%s', [Name, ATarget.VersionNumberStr]), ShortFileName)
- or StrMatches(Format('%s%d', [Name, ATarget.VersionNumber]), ShortFileName)
- or StrMatches(Format('%s%s0', [Name, ATarget.VersionNumberStr]), ShortFileName)
- or StrMatches(Format('%s%d0', [Name, ATarget.VersionNumber]), ShortFileName) then
+ or StrMatches(Format('%sDLL%s', [Name, StrUpper(ATarget.VersionNumberStr)]), ShortFileName)
+ or StrMatches(Format('%sDLL%d', [Name, ATarget.VersionNumber]), ShortFileName)
+ or StrMatches(Format('%sDLL%s0', [Name, StrUpper(ATarget.VersionNumberStr)]), ShortFileName)
+ or StrMatches(Format('%sDLL%d0', [Name, ATarget.VersionNumber]), ShortFileName) then
ATarget.UnregisterExpert(FileName);
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-22 20:26:27
|
Revision: 2485
http://jcl.svn.sourceforge.net/jcl/?rev=2485&view=rev
Author: outchy
Date: 2008-09-22 20:26:16 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Mantis 443 StrPLCopyW just inserts zero's between original chars
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-21 21:16:28 UTC (rev 2484)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-22 20:26:16 UTC (rev 2485)
@@ -5871,6 +5871,16 @@
function StrPLCopyW(Dest: PWideChar; const Source: AnsiString; MaxLen: Cardinal): PWideChar;
// copies characters from a Pascal-style string into a null-terminated wide string
+{$IFDEF MSWINDOWS}
+begin
+ if (MaxLen = 0) or (MultiByteToWideChar(CP_ACP, MB_COMPOSITE or MB_USEGLYPHCHARS, PAnsiChar(Source), Length(Source), Dest, MaxLen) > 0) then
+ Result := Dest
+ else
+ Result := nil;
+end;
+{$ENDIF MSWINDOWS}
+{$IFDEF UNIX}
+// TODO: true conversion from Ansi to UTF-16
asm
PUSH EDI
PUSH ESI
@@ -5886,6 +5896,7 @@
POP ESI
POP EDI
end;
+{$ENDIF UNIX}
function StrCatW(Dest: PWideChar; const Source: PWideChar): PWideChar;
// appends a copy of Source to the end of Dest and returns the concatenated string
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2008-09-21 21:16:35
|
Revision: 2484
http://jcl.svn.sourceforge.net/jcl/?rev=2484&view=rev
Author: obones
Date: 2008-09-21 21:16:28 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 4460: Length and not SizeOf
Modified Paths:
--------------
trunk/jcl/source/windows/JclAppInst.pas
Modified: trunk/jcl/source/windows/JclAppInst.pas
===================================================================
--- trunk/jcl/source/windows/JclAppInst.pas 2008-09-21 19:22:23 UTC (rev 2483)
+++ trunk/jcl/source/windows/JclAppInst.pas 2008-09-21 21:16:28 UTC (rev 2484)
@@ -245,14 +245,15 @@
C: array [0..Length(ClassNameOfTApplication) + 1] of Char;
begin
GetWindowThreadProcessId(Wnd, @PID);
- if (PID = Param^.ProcessID) and (GetClassName(Wnd, C, SizeOf(C)) > 0) and
- (C = ClassNameOfTApplication) then
+ if (PID = Param^.ProcessID) and (GetClassName(Wnd, C, Length(C)) > 0) and (C = ClassNameOfTApplication) then
begin
Result := False;
Param^.Wnd := Wnd;
end
else
+ begin
Result := True;
+ end;
end;
begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 19:22:25
|
Revision: 2483
http://jcl.svn.sourceforge.net/jcl/?rev=2483&view=rev
Author: outchy
Date: 2008-09-21 19:22:23 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 476: TJclLocaleInfo.FontCharset property incorrectly returns DEFAULT_CHARSET for all Chinese locales
recoded as a wrapper to JclUnicode.CharSetFromLocale
Modified Paths:
--------------
trunk/jcl/source/windows/JclLocales.pas
Modified: trunk/jcl/source/windows/JclLocales.pas
===================================================================
--- trunk/jcl/source/windows/JclLocales.pas 2008-09-21 19:05:59 UTC (rev 2482)
+++ trunk/jcl/source/windows/JclLocales.pas 2008-09-21 19:22:23 UTC (rev 2483)
@@ -323,7 +323,7 @@
{$IFDEF FPC}
WinSysUt,
{$ENDIF FPC}
- SysConst, JclFileUtils, JclRegistry, JclStrings, JclSysInfo;
+ SysConst, JclFileUtils, JclRegistry, JclStrings, JclSysInfo, JclUnicode;
const
JclMaxKeyboardLayouts = 16;
@@ -528,36 +528,8 @@
end;
function TJclLocaleInfo.GetFontCharset: Byte;
-type
- TCharsetEntry = record
- CodePage: Word;
- Charset: Byte;
- end;
-const
- CharsetTable: array [1..10] of TCharsetEntry =
- (
- (CodePage: 1252; Charset: ANSI_CHARSET),
- (CodePage: 1250; Charset: EASTEUROPE_CHARSET),
- (CodePage: 1251; Charset: RUSSIAN_CHARSET),
- (CodePage: 1253; Charset: GREEK_CHARSET),
- (CodePage: 1254; Charset: TURKISH_CHARSET),
- (CodePage: 1255; Charset: HEBREW_CHARSET),
- (CodePage: 1256; Charset: ARABIC_CHARSET),
- (CodePage: 1257; Charset: BALTIC_CHARSET),
- (CodePage: 874; Charset: THAI_CHARSET),
- (CodePage: 932; Charset: SHIFTJIS_CHARSET)
- );
-var
- I, CpANSI: Integer;
begin
- Result := DEFAULT_CHARSET;
- CpANSI := CodePageANSI;
- for I := Low(CharsetTable) to High(CharsetTable) do
- if CharsetTable[I].CodePage = CpANSI then
- begin
- Result := CharsetTable[I].Charset;
- Break;
- end;
+ Result := CharSetFromLocale(FLocaleID);
end;
function TJclLocaleInfo.GetIntegerInfo(InfoType: Integer): Integer;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 19:06:02
|
Revision: 2482
http://jcl.svn.sourceforge.net/jcl/?rev=2482&view=rev
Author: outchy
Date: 2008-09-21 19:05:59 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 474: CharSetFromLocale function returns invalid results for locales not having an ANSI code page
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-21 18:06:20 UTC (rev 2481)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-21 19:05:59 UTC (rev 2482)
@@ -1302,7 +1302,7 @@
JclStreams,
JclCompression,
{$ENDIF ~UNICODE_RAW_DATA}
- JclResources, JclSynch, JclSysUtils, JclStringConversions;
+ JclResources, JclSynch, JclSysUtils, JclSysInfo, JclStringConversions;
const
{$IFDEF FPC} // declarations from unit [Rtl]Consts
@@ -7260,12 +7260,24 @@
external 'gdi32.dll' name 'TranslateCharsetInfo';
function GetCharSetFromLocale(Language: LCID; out FontCharSet: Byte): Boolean;
+const
+ TCI_SRCLOCALE = $1000;
var
CP: Cardinal;
CSI: TCharsetInfo;
begin
- CP:= CodePageFromLocale(Language);
- Result := TranslateCharsetInfoEx(Pointer(CP), CSI, TCI_SRCCODEPAGE);
+ if GetWindowsVersion in [wvUnknown, wvWin95, wvWin95OSR2, wvWin98, wvWin98SE,
+ wvWinME, wvWinNT31, wvWinNT35, wvWinNT351, wvWinNT4] then
+ begin
+ // these versions of Windows don't support TCI_SRCLOCALE
+ CP := CodePageFromLocale(Language);
+ if CP = 0 then
+ RaiseLastOSError;
+ Result := TranslateCharsetInfoEx(Pointer(CP), CSI, TCI_SRCCODEPAGE);
+ end
+ else
+ Result := TranslateCharsetInfoEx(Pointer(Language), CSI, TCI_SRCLOCALE);
+
if Result then
FontCharset := CSI.ciCharset;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 18:06:32
|
Revision: 2481
http://jcl.svn.sourceforge.net/jcl/?rev=2481&view=rev
Author: outchy
Date: 2008-09-21 18:06:20 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 614: JclUnicode case conversions partly broken
0) Reworked proposed code to handle UTF16 strings.
3) UnicodeToLower etc. are now just wrappers around a UnicodeCaseConvert function; similarly, WideLowerCase etc. are wrappers around overloaded WideCaseConvert functions.
4) WideCaseConvert uses CaseLookup directly. This is to avoid creating an unnecessary TUCS4Array on most character conversion (the ones which previously used SingletonMapping).
5) The string version of WideCaseConvert now pre-allocates the result string, using the length of the source string as an initial guess. It appears that most of the case mappings are 1 to 1 (and, of course, uncased characters are simply used unchanged), so this seems to me a sensible optimization (it should be faster than building up the result string using repeated concatenations as previously).
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-21 16:51:25 UTC (rev 2480)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-21 18:06:20 UTC (rev 2481)
@@ -27,6 +27,7 @@
{ Petr Vones (pvones) }
{ Peter Schraut (http://www.console-dev.de) }
{ Florent Ouchet (outchy) }
+{ glchapman }
{ }
{**************************************************************************************************}
{ }
@@ -1136,19 +1137,26 @@
function WideExtractQuotedStr(var Src: PWideChar; Quote: WideChar): WideString;
function WideQuotedStr(const S: WideString; Quote: WideChar): WideString;
function WideStringOfChar(C: WideChar; Count: Cardinal): WideString;
-function WideCaseFolding(C: WideChar): WideString; overload;
-function WideCaseFolding(const S: WideString): WideString; overload;
-function WideLowerCase(C: WideChar): WideString; overload;
-function WideLowerCase(const S: WideString): WideString; overload;
+
+// case conversion function
+type
+ TCaseType = (ctFold, ctLower, ctTitle, ctUpper);
+
+function WideCaseConvert(C: WideChar; CaseType: TCaseType): WideString; overload;
+function WideCaseConvert(const S: WideString; CaseType: TCaseType): WideString; overload;
+function WideCaseFolding(C: WideChar): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function WideCaseFolding(const S: WideString): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function WideLowerCase(C: WideChar): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function WideLowerCase(const S: WideString): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
function WideNormalize(const S: WideString; Form: TNormalizationForm): WideString;
function WideSameText(const Str1, Str2: WideString): Boolean;
-function WideTitleCase(C: WideChar): WideString; overload;
-function WideTitleCase(const S: WideString): WideString; overload;
+function WideTitleCase(C: WideChar): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function WideTitleCase(const S: WideString): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
function WideTrim(const S: WideString): WideString;
function WideTrimLeft(const S: WideString): WideString;
function WideTrimRight(const S: WideString): WideString;
-function WideUpperCase(C: WideChar): WideString; overload;
-function WideUpperCase(const S: WideString): WideString; overload;
+function WideUpperCase(C: WideChar): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function WideUpperCase(const S: WideString): WideString; overload; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
// Low level character routines
function UnicodeNumberLookup(Code: UCS4; var Number: TUcNumber): Boolean;
@@ -1469,7 +1477,6 @@
//----------------- support for case mapping -------------------------------------------------------
type
- TCaseType = (ctFold, ctLower, ctTitle, ctUpper);
TCase = array [TCaseType] of TUCS4Array; // mapping for case fold, lower, title and upper in this order
TCaseArray = array of array of TCase;
@@ -6760,6 +6767,78 @@
//----------------- general purpose case mapping ---------------------------------------------------
+function WideCaseConvert(C: WideChar; CaseType: TCaseType): WideString;
+var
+ I, RPos: integer;
+ Mapping: TUCS4Array;
+begin
+ if not CaseLookup(UCS4(C), CaseType, Mapping) then
+ Result := C
+ else
+ begin
+ SetLength(Result, 2 * Length(Mapping));
+ RPos := 1;
+ for I := Low(Mapping) to High(Mapping) do
+ UTF16SetNextChar(Result, RPos, Mapping[I]);
+ if RPos > 0 then
+ SetLength(Result, RPos - 1)
+ else
+ raise EJclUnexpectedEOSequenceError.Create;
+ end;
+end;
+
+function WideCaseConvert(const S: WideString; CaseType: TCaseType): WideString;
+var
+ SLen, RLen, SPos, RPos, K, MapLen: Integer;
+ Code: UCS4;
+ Mapping: TUCS4Array;
+begin
+ SLen := Length(S);
+ RLen := SLen;
+ SetLength(Result, RLen);
+ SPos := 1;
+ RPos := 1;
+ while (SPos > 0) and (SPos <= SLen) do
+ begin
+ Code := UTF16GetNextChar(S, SPos);
+ if SPos = -1 then
+ raise EJclUnexpectedEOSequenceError.Create;
+
+ if CaseLookup(Code, CaseType, Mapping) then
+ begin
+ MapLen:= Length(Mapping);
+ if MapLen = 1 then
+ Code := Mapping[0];
+ end
+ else
+ MapLen := 1;
+
+ if MapLen = 1 then
+ begin
+ if not UTF16SetNextChar(Result, RPos, Code) then
+ begin
+ Inc(RLen, SLen);
+ SetLength(Result, RLen);
+ UTF16SetNextChar(Result, RPos, Code);
+ end;
+ end
+ else
+ begin
+ for K := Low(Mapping) to High(Mapping) do
+ if not UTF16SetNextChar(Result, RPos, Code) then
+ begin
+ Inc(RLen, SLen);
+ SetLength(Result, RLen);
+ UTF16SetNextChar(Result, RPos, Code);
+ end;
+ end;
+ end;
+ if RPos > 0 then
+ SetLength(Result, RPos - 1)
+ else
+ raise EJclUnexpectedEOSequenceError.Create;
+end;
+
// Note that most of the assigned code points don't have a case mapping and are therefore
// returned as they are. Other code points, however, might be converted into several characters
// like the german (eszett) whose upper case mapping is SS.
@@ -6767,43 +6846,23 @@
function WideCaseFolding(C: WideChar): WideString;
// Special case folding function to map a string to either its lower case or
// to special cases. This can be used for case-insensitive comparation.
-var
- I: Integer;
- Mapping: TUCS4Array;
begin
- Mapping := UnicodeCaseFold(UCS4(C));
- SetLength(Result, Length(Mapping));
- for I := 0 to High(Mapping) do
- Result[I + 1] := WideChar(Mapping[I]);
+ Result:= WideCaseConvert(C, ctFold);
end;
function WideCaseFolding(const S: WideString): WideString;
-var
- I: Integer;
begin
- Result := '';
- for I := 1 to Length(S) do
- Result := Result + WideCaseFolding(S[I]);
+ Result:= WideCaseConvert(S, ctFold);
end;
function WideLowerCase(C: WideChar): WideString;
-var
- I: Integer;
- Mapping: TUCS4Array;
begin
- Mapping := UnicodeToLower(UCS4(C));
- SetLength(Result, Length(Mapping));
- for I := 0 to High(Mapping) do
- Result[I + 1] := WideChar(Mapping[I]);
+ Result:= WideCaseConvert(C, ctLower);
end;
function WideLowerCase(const S: WideString): WideString;
-var
- I: Integer;
begin
- Result := '';
- for I := 1 to Length(S) do
- Result := Result + WideLowerCase(S[I]);
+ Result:= WideCaseConvert(S, ctLower);
end;
function WideNormalize(const S: WideString; Form: TNormalizationForm): WideString;
@@ -6835,43 +6894,23 @@
end;
function WideTitleCase(C: WideChar): WideString;
-var
- I: Integer;
- Mapping: TUCS4Array;
begin
- Mapping := UnicodeToTitle(UCS4(C));
- SetLength(Result, Length(Mapping));
- for I := 0 to High(Mapping) do
- Result[I + 1] := WideChar(Mapping[I]);
+ Result:= WideCaseConvert(C, ctTitle);
end;
function WideTitleCase(const S: WideString): WideString;
-var
- I: Integer;
begin
- Result := '';
- for I := 1 to Length(S) do
- Result := Result + WideTitleCase(S[I]);
+ Result:= WideCaseConvert(S, ctTitle);
end;
function WideUpperCase(C: WideChar): WideString;
-var
- I: Integer;
- Mapping: TUCS4Array;
begin
- Mapping := UnicodeToUpper(UCS4(C));
- SetLength(Result, Length(Mapping));
- for I := 0 to High(Mapping) do
- Result[I + 1] := WideChar(Mapping[I]);
+ Result:= WideCaseConvert(C, ctUpper);
end;
function WideUpperCase(const S: WideString): WideString;
-var
- I: Integer;
begin
- Result := '';
- for I := 1 to Length(S) do
- Result := Result + WideUpperCase(S[I]);
+ Result:= WideCaseConvert(S, ctUpper);
end;
//----------------- character test routines --------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 16:51:27
|
Revision: 2480
http://jcl.svn.sourceforge.net/jcl/?rev=2480&view=rev
Author: outchy
Date: 2008-09-21 16:51:25 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 614: JclUnicode case conversions partly broken
6) I also changed TURESearch.ExecuteURE to use CaseLookup directly, rather than going through UnicodeToLower. As noted, many calls to UnicodeToLower will now require creating a new TUCS4Array; by using CaseLookup directly, the allocation is avoided. Similar changes could be made in the URE compile code, but it seemed like it wouldn't make very much difference there.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-21 16:44:44 UTC (rev 2479)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-21 16:51:25 UTC (rev 2480)
@@ -4333,6 +4333,7 @@
LastState: PDFAState;
Symbol: PUcSymbolTableEntry;
Rp: PUcRange;
+ LCMapping: TUCS4Array;
begin
Result := False;
if Text <> nil then
@@ -4378,7 +4379,9 @@
if (FDFA.Flags and _URE_DFA_CASEFOLD) <> 0 then
{ TODO : use the entire mapping, not only the first character }
- C := UnicodeToLower(C)[0];
+ // (CaseLookup used for a little extra speed: avoids dynamic array allocation)
+ if CaseLookup(C, ctLower, LCMapping) then
+ C := LCMapping[0];
// See if one of the transitions matches.
I := LastState.NumberTransitions - 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 16:44:47
|
Revision: 2479
http://jcl.svn.sourceforge.net/jcl/?rev=2479&view=rev
Author: outchy
Date: 2008-09-21 16:44:44 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 614: JclUnicode case conversions partly broken
0) defer to lower case if a fold case for a code doesn't exist.
1) CaseLookup is changed to a boolean function. It returns false if no mapping for a Code is found in the case data; otherwise true (with the mapping in a var-param). CaseLookup is not exposed in the interface of the unit, so this change only requires changes within JclUnicode.
2) To make use of CaseLookup a little easier, the CaseType
parameter has been changed from an integer to an enumerated type.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-21 11:34:00 UTC (rev 2478)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-21 16:44:44 UTC (rev 2479)
@@ -1469,7 +1469,8 @@
//----------------- support for case mapping -------------------------------------------------------
type
- TCase = array [0..3] of TUCS4Array; // mapping for case fold, lower, title and upper in this order
+ TCaseType = (ctFold, ctLower, ctTitle, ctUpper);
+ TCase = array [TCaseType] of TUCS4Array; // mapping for case fold, lower, title and upper in this order
TCaseArray = array of array of TCase;
var
@@ -1478,7 +1479,6 @@
// SingletonMapping is to quickly return a single default mapping.
CaseDataLoaded: Boolean;
CaseMapping: array [Byte] of TCaseArray;
- SingletonMapping: TUCS4Array;
procedure LoadCaseMappingData;
var
@@ -1493,7 +1493,6 @@
LoadInProgress.Enter;
try
- SetLength(SingletonMapping, 1);
CaseDataLoaded := True;
Stream := OpenResourceStream('CASE');
try
@@ -1519,29 +1518,29 @@
Stream.ReadBuffer(Size, 4);
if Size > 0 then
begin
- SetLength(CaseMapping[First, Second, Third, 0], Size);
- Stream.ReadBuffer(CaseMapping[First, Second, Third, 0, 0], Size * SizeOf(UCS4));
+ SetLength(CaseMapping[First, Second, Third, ctFold], Size);
+ Stream.ReadBuffer(CaseMapping[First, Second, Third, ctFold, 0], Size * SizeOf(UCS4));
end;
// c) read lower case array
Stream.ReadBuffer(Size, 4);
if Size > 0 then
begin
- SetLength(CaseMapping[First, Second, Third, 1], Size);
- Stream.ReadBuffer(CaseMapping[First, Second, Third, 1, 0], Size * SizeOf(UCS4));
+ SetLength(CaseMapping[First, Second, Third, ctLower], Size);
+ Stream.ReadBuffer(CaseMapping[First, Second, Third, ctLower, 0], Size * SizeOf(UCS4));
end;
// d) read title case array
Stream.ReadBuffer(Size, 4);
if Size > 0 then
begin
- SetLength(CaseMapping[First, Second, Third, 2], Size);
- Stream.ReadBuffer(CaseMapping[First, Second, Third, 2, 0], Size * SizeOf(UCS4));
+ SetLength(CaseMapping[First, Second, Third, ctTitle], Size);
+ Stream.ReadBuffer(CaseMapping[First, Second, Third, ctTitle, 0], Size * SizeOf(UCS4));
end;
// e) read upper case array
Stream.ReadBuffer(Size, 4);
if Size > 0 then
begin
- SetLength(CaseMapping[First, Second, Third, 3], Size);
- Stream.ReadBuffer(CaseMapping[First, Second, Third, 3, 0], Size * SizeOf(UCS4));
+ SetLength(CaseMapping[First, Second, Third, ctUpper], Size);
+ Stream.ReadBuffer(CaseMapping[First, Second, Third, ctUpper, 0], Size * SizeOf(UCS4));
end;
end;
@@ -1554,11 +1553,10 @@
end;
end;
-function CaseLookup(Code: Cardinal; CaseType: Cardinal): TUCS4Array;
-// Performs a lookup of the given code and returns its case mapping if found.
-// CaseType must be 0 for case folding, 1 for lower case, 2 for title case and 3 for upper case, respectively.
-// If Code could not be found (or there is no case mapping) then the result is a mapping of length 1 with the
-// code itself. Otherwise an array of code points is returned which represent the mapping.
+function CaseLookup(Code: Cardinal; CaseType: TCaseType; var Mapping: TUCS4Array): Boolean;
+// Performs a lookup of the given code; returns True if Found, with Mapping referring to the mapping.
+// ctFold is handled specially: if no mapping is found then result of looking up ctLower
+// is returned
var
First, Second, Third: Byte;
begin
@@ -1573,14 +1571,19 @@
Third := Code and $FF;
// Check first stage table whether there is a mapping for a particular block and
// (if so) then whether there is a mapping or not.
- if (CaseMapping[First] = nil) or (CaseMapping[First, Second] = nil)
- or (CaseMapping[First, Second, Third, CaseType] = nil) then
+ if (CaseMapping[First] <> nil) and (CaseMapping[First, Second] <> nil) and
+ (CaseMapping[First, Second, Third, CaseType] <> nil) then
+ Mapping := CaseMapping[First, Second, Third, CaseType]
+ else
+ Mapping := nil;
+ Result := Assigned(Mapping);
+ // defer to lower case if no fold case exists
+ if not Result and (CaseType = ctFold) and (CaseMapping[First] <> nil) and
+ (CaseMapping[First, Second] <> nil) and (CaseMapping[First, Second, Third, ctLower] <> nil) then
begin
- SingletonMapping[0] := Code;
- Result := SingletonMapping;
- end
- else
- Result := CaseMapping[First, Second, Third, CaseType];
+ Mapping := CaseMapping[First, Second, Third, ctLower];
+ Result := Assigned(Mapping);
+ end;
end;
function UnicodeCaseFold(Code: UCS4): TUCS4Array;
@@ -1588,22 +1591,38 @@
// code, otherwise the lower case will be returned. This all applies only to cased code points.
// Uncased code points are returned unchanged.
begin
- Result := CaseLookup(Code, 0);
+ if not CaseLookup(Code, ctFold, Result) then
+ begin
+ SetLength(Result, 1);
+ Result[0] := Code;
+ end;
end;
function UnicodeToUpper(Code: UCS4): TUCS4Array;
begin
- Result := CaseLookup(Code, 3);
+ if not CaseLookup(Code, ctUpper, Result) then
+ begin
+ SetLength(Result, 1);
+ Result[0] := Code;
+ end;
end;
function UnicodeToLower(Code: UCS4): TUCS4Array;
begin
- Result := CaseLookup(Code, 1);
+ if not CaseLookup(Code, ctLower, Result) then
+ begin
+ SetLength(Result, 1);
+ Result[0] := Code;
+ end;
end;
function UnicodeToTitle(Code: UCS4): TUCS4Array;
begin
- Result := CaseLookup(Code, 2);
+ if not CaseLookup(Code, ctTitle, Result) then
+ begin
+ SetLength(Result, 1);
+ Result[0] := Code;
+ end;
end;
//----------------- support for decomposition ------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 12:07:58
|
Revision: 2478
http://jcl.svn.sourceforge.net/jcl/?rev=2478&view=rev
Author: outchy
Date: 2008-09-21 11:34:00 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 2098: TJclAppInstances.SendString sends one extra character.
Modified Paths:
--------------
trunk/jcl/source/windows/JclAppInst.pas
Modified: trunk/jcl/source/windows/JclAppInst.pas
===================================================================
--- trunk/jcl/source/windows/JclAppInst.pas 2008-09-21 11:27:55 UTC (rev 2477)
+++ trunk/jcl/source/windows/JclAppInst.pas 2008-09-21 11:34:00 UTC (rev 2478)
@@ -476,8 +476,7 @@
const DataKind: TJclAppInstDataKind; const S: string;
OriginatorWnd: THandle): Boolean;
begin
- Result := SendData(WindowClassName, DataKind, PChar(S), Length(S) + 1,
- OriginatorWnd);
+ Result := SendData(WindowClassName, DataKind, PChar(S), Length(S), OriginatorWnd);
end;
function TJclAppInstances.SendStrings(const WindowClassName: string;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-21 11:28:01
|
Revision: 2477
http://jcl.svn.sourceforge.net/jcl/?rev=2477&view=rev
Author: outchy
Date: 2008-09-21 11:27:55 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Mantis 4459: Bug in function DateTimeToUnixTime (precision loss)
Modified Paths:
--------------
trunk/jcl/source/common/JclDateTime.pas
Modified: trunk/jcl/source/common/JclDateTime.pas
===================================================================
--- trunk/jcl/source/common/JclDateTime.pas 2008-09-20 09:52:00 UTC (rev 2476)
+++ trunk/jcl/source/common/JclDateTime.pas 2008-09-21 11:27:55 UTC (rev 2477)
@@ -1215,7 +1215,7 @@
function DateTimeToUnixTime(DateTime: TDateTime): TJclUnixTime32;
begin
- Result := Trunc((DateTime-UnixTimeStart) * SecondsPerDay);
+ Result := Round((DateTime-UnixTimeStart) * SecondsPerDay);
end;
function UnixTimeToDateTime(const UnixTime: TJclUnixTime32): TDateTime;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-20 09:52:22
|
Revision: 2476
http://jcl.svn.sourceforge.net/jcl/?rev=2476&view=rev
Author: outchy
Date: 2008-09-20 09:52:00 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
fixed possible overflow.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnitVersioning.pas
Modified: trunk/jcl/source/common/JclUnitVersioning.pas
===================================================================
--- trunk/jcl/source/common/JclUnitVersioning.pas 2008-09-18 23:19:57 UTC (rev 2475)
+++ trunk/jcl/source/common/JclUnitVersioning.pas 2008-09-20 09:52:00 UTC (rev 2476)
@@ -596,7 +596,7 @@
{$ENDIF LINUX}
Requested, Allocated: PNPARecord;
Pages: Integer;
- PageSize: Cardinal;
+ PageSize, PageMask: Cardinal;
MaximumApplicationAddress: Pointer;
begin
RefCount := 0;
@@ -614,9 +614,10 @@
Pages := 0;
repeat
Requested := MaximumApplicationAddress;
- Requested := Pointer((DWORD_PTR(Requested) div $10000) * $10000);
- Dec(Cardinal(Requested), Pages * $10000);
- Requested := Pointer((DWORD_PTR(Requested) div PageSize) * PageSize);
+ Requested := Pointer(DWORD_PTR(Requested) and $FFFF0000);
+ Dec(Cardinal(Requested), Pages shl 16);
+ PageMask := (not PageSize) + 1; // assuming a power of two allocation granularity
+ Requested := Pointer(DWORD_PTR(Requested) and PageMask);
{$IFDEF MSWINDOWS}
Allocated := VirtualAlloc(Requested, PageSize, MEM_RESERVE or MEM_COMMIT, PAGE_READWRITE);
if Assigned(Allocated) and (Requested <> Allocated) then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jfu...@us...> - 2008-09-18 16:19:59
|
Revision: 2475
http://jcl.svn.sourceforge.net/jcl/?rev=2475&view=rev
Author: jfudickar
Date: 2008-09-18 23:19:57 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Added UnitVersioning
Modified Paths:
--------------
trunk/jcl/source/vcl/JclVersionControl.pas
trunk/jcl/source/vcl/JclVersionCtrlCVSImpl.pas
trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas
Modified: trunk/jcl/source/vcl/JclVersionControl.pas
===================================================================
--- trunk/jcl/source/vcl/JclVersionControl.pas 2008-09-18 23:15:52 UTC (rev 2474)
+++ trunk/jcl/source/vcl/JclVersionControl.pas 2008-09-18 23:19:57 UTC (rev 2475)
@@ -229,6 +229,16 @@
function VersionControlActionInfo(ActionType : TJclVersionControlActionType):
TJclVersionControlActionInfo;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\source\vcl'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -969,7 +979,11 @@
end;
end;
+
initialization
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
RegisterVersionControlPluginClass(TJclVersionControlSystemPlugin);
@@ -978,4 +992,8 @@
UnregisterVersionControlPluginClass(TJclVersionControlSystemPlugin);
FreeAndNil(GlobalPluginList);
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
+
end.
Modified: trunk/jcl/source/vcl/JclVersionCtrlCVSImpl.pas
===================================================================
--- trunk/jcl/source/vcl/JclVersionCtrlCVSImpl.pas 2008-09-18 23:15:52 UTC (rev 2474)
+++ trunk/jcl/source/vcl/JclVersionCtrlCVSImpl.pas 2008-09-18 23:19:57 UTC (rev 2475)
@@ -55,6 +55,16 @@
const Action: TJclVersionControlActionType): Boolean; override;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\source\vcl'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -347,10 +357,16 @@
initialization
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
RegisterVersionControlPluginClass(TJclVersionControlCVS);
finalization
UnregisterVersionControlPluginClass(TJclVersionControlCVS);
+ {$IFDEF UNITVERSIONING}
+ UnregisterUnitVersion(HInstance);
+ {$ENDIF UNITVERSIONING}
end.
Modified: trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas
===================================================================
--- trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas 2008-09-18 23:15:52 UTC (rev 2474)
+++ trunk/jcl/source/vcl/JclVersionCtrlSVNImpl.pas 2008-09-18 23:19:57 UTC (rev 2475)
@@ -57,6 +57,16 @@
const Action: TJclVersionControlActionType): Boolean; override;
end;
+{$IFDEF UNITVERSIONING}
+const
+ UnitVersioning: TUnitVersionInfo = (
+ RCSfile: '$URL$';
+ Revision: '$Revision$';
+ Date: '$Date$';
+ LogPath: 'JCL\source\vcl'
+ );
+{$ENDIF UNITVERSIONING}
+
implementation
uses
@@ -406,10 +416,16 @@
initialization
+ {$IFDEF UNITVERSIONING}
+ RegisterUnitVersion(HInstance, UnitVersioning);
+ {$ENDIF UNITVERSIONING}
RegisterVersionControlPluginClass(TJclVersionControlSVN);
finalization
UnregisterVersionControlPluginClass(TJclVersionControlSVN);
+ {$IFDEF UNITVERSIONING}
+ 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...> - 2008-09-16 12:11:06
|
Revision: 2470
http://jcl.svn.sourceforge.net/jcl/?rev=2470&view=rev
Author: outchy
Date: 2008-09-16 19:11:02 +0000 (Tue, 16 Sep 2008)
Log Message:
-----------
Mantis 1174 GetIPAddress returns only first entry in a multihomed system
Adapted GetIPAddresses to return the list of IP addresses associated to a given host name.
Modified Paths:
--------------
trunk/jcl/source/common/JclSysInfo.pas
Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas 2008-09-13 22:36:40 UTC (rev 2469)
+++ trunk/jcl/source/common/JclSysInfo.pas 2008-09-16 19:11:02 UTC (rev 2470)
@@ -205,7 +205,10 @@
{$ENDIF MSWINDOWS}
function GetIPAddress(const HostName: string): string;
{$IFNDEF CLR}
-procedure GetIpAddresses(Results: TStrings);
+{$IFDEF MSWINDOWS}
+procedure GetIpAddresses(Results: TStrings; const HostName: AnsiString); overload;
+{$ENDIF MSWINDOWS}
+procedure GetIpAddresses(Results: TStrings); overload;
{$ENDIF ~CLR}
function GetLocalComputerName: string;
{$IFNDEF CLR}
@@ -2169,6 +2172,11 @@
{$IFDEF MSWINDOWS}
{$IFNDEF CLR}
procedure GetIpAddresses(Results: TAnsiStrings);
+begin
+ GetIpAddresses(Results, '');
+end;
+
+procedure GetIpAddresses(Results: TAnsiStrings; const HostName: AnsiString);
type
TaPInAddr = array[0..10] of PInAddr;
PaPInAddr = ^TaPInAddr;
@@ -2184,10 +2192,19 @@
R := WSAStartup(MakeWord(1, 1), WSAData);
if R = 0 then begin
try
- SetLength(Host, MAX_PATH);
- GetHostName(PAnsiChar(Host), MAX_PATH);
- HostEnt := GetHostByName(PAnsiChar(Host));
- if HostEnt <> nil then begin
+ if HostName = '' then
+ begin
+ SetLength(Host, MAX_PATH);
+ GetHostName(PAnsiChar(Host), MAX_PATH);
+ HostEnt := GetHostByName(PAnsiChar(Host));
+ if HostEnt = nil then
+ Host := '';
+ end
+ else
+ Host := HostName;
+
+ if Host <> '' then
+ begin
pPtr := PaPInAddr(HostEnt^.h_addr_list);
i := 0;
while pPtr^[I] <> nil do begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-13 22:36:44
|
Revision: 2469
http://jcl.svn.sourceforge.net/jcl/?rev=2469&view=rev
Author: outchy
Date: 2008-09-13 22:36:40 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
Updated feature detection for AMD processors.
Modified Paths:
--------------
trunk/jcl/source/common/JclSysInfo.pas
Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas 2008-09-13 21:50:01 UTC (rev 2468)
+++ trunk/jcl/source/common/JclSysInfo.pas 2008-09-13 22:36:40 UTC (rev 2469)
@@ -754,7 +754,7 @@
AMD2_BIT_6 = BIT_6; // Reserved, do not count on value
AMD2_BIT_7 = BIT_7; // Reserved, do not count on value
AMD2_BIT_8 = BIT_8; // Reserved, do not count on value
- AMD2_BIT_9 = BIT_9; // Reserved, do not count on value
+ AMD2_SSSE3 = BIT_9; // supplemental SSE3 extensions
AMD2_BIT_10 = BIT_10; // Reserved, do not count on value
AMD2_BIT_11 = BIT_11; // Reserved, do not count on value
AMD2_BIT_12 = BIT_12; // Reserved, do not count on value
@@ -764,7 +764,7 @@
AMD2_BIT_16 = BIT_16; // Reserved, do not count on value
AMD2_BIT_17 = BIT_17; // Reserved, do not count on value
AMD2_BIT_18 = BIT_18; // Reserved, do not count on value
- AMD2_BIT_19 = BIT_19; // Reserved, do not count on value
+ AMD2_SSE41 = BIT_19; // SSE4.1 instruction support
AMD2_BIT_20 = BIT_20; // Reserved, do not count on value
AMD2_BIT_21 = BIT_21; // Reserved, do not count on value
AMD2_BIT_22 = BIT_22; // Reserved, do not count on value
@@ -823,7 +823,7 @@
EAMD2_MISALIGNSSE = BIT_7; // Misaligned SSE mode.
EAMD2_3DNOWPREFETCH = BIT_8; // PREFETCH and PREFETCHW instruction support.
EAMD2_OSVW = BIT_9; // OS visible workaround.
- EAMD2_BIT_10 = BIT_10; // Reserved, do not count on value
+ EAMD2_IBS = BIT_10; // Instruction based sampling
EAMD2_SSE5 = BIT_11; // Streaming SIMD Extensions 5
EAMD2_SKINIT = BIT_12; // SKINIT, STGI, and DEV support.
EAMD2_WDT = BIT_13; // Watchdog timer support.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-13 21:50:06
|
Revision: 2468
http://jcl.svn.sourceforge.net/jcl/?rev=2468&view=rev
Author: outchy
Date: 2008-09-13 21:50:01 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
Updated feature detection for Intel processors.
Modified Paths:
--------------
trunk/jcl/source/common/JclResources.pas
trunk/jcl/source/common/JclSysInfo.pas
Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas 2008-09-12 06:23:34 UTC (rev 2467)
+++ trunk/jcl/source/common/JclResources.pas 2008-09-13 21:50:01 UTC (rev 2468)
@@ -1810,12 +1810,19 @@
RsIntelCacheDescr0A = '1st level data cache: 8 KBytes, 2-way set associative, 32 byte line size';
RsIntelCacheDescr0B = 'Instruction TLB: 4 MByte pages, 4-way set associative, 4 entries';
RsIntelCacheDescr0C = '1st level data cache: 16 KBytes, 4-way set associative, 32 byte line size';
+ RsIntelCacheDescr0E = '1st level data cache: 24 KBytes, 6-way set associative, 64 byte line size';
RsIntelCacheDescr22 = '3rd level cache: 512 KBytes, 4-way set associative, 64 byte line size, 2 lines per sector';
RsIntelCacheDescr23 = '3rd level cache: 1 MBytes, 8-way set associative, 64 byte line size, 2 lines per sector';
RsIntelCacheDescr25 = '3rd level cache: 2 MBytes, 8-way set associative, 64 byte line size, 2 lines per sector';
RsIntelCacheDescr29 = '3rd level cache: 4 MBytes, 8-way set associative, 64 byte line size, 2 lines per sector';
RsIntelCacheDescr2C = '1st level data cache: 32 KBytes, 8-way set associative, 64 byte line size';
RsIntelCacheDescr30 = '1st level instruction cache: 32 KBytes, 8-way set associative, 64 byte line size';
+ RsIntelCacheDescr39 = '2nd-level cache: 128 KBytes, 4-way set associative, sectored cache, 64-byte line size';
+ RsIntelCacheDescr3A = '2nd-level cache: 192 KBytes, 6-way set associative, sectored cache, 64-byte line size';
+ RsIntelCacheDescr3B = '2nd-level cache: 128 KBytes, 2-way set associative, sectored cache, 64-byte line size';
+ RsIntelCacheDescr3C = '2nd-level cache: 256 KBytes, 4-way set associative, sectored cache, 64-byte line size';
+ RsIntelCacheDescr3D = '2nd-level cache: 384 KBytes, 6-way set associative, sectored cache, 64-byte line size';
+ RsIntelCacheDescr3E = '2nd-level cache: 512 KBytes, 4-way set associative, sectored cache, 64-byte line size';
RsIntelCacheDescr40 = 'No 2nd-level cache or, if processor contains a valid 2nd-level cache, no 3rd-level cache';
RsIntelCacheDescr41 = '2nd-level cache: 128 KBytes, 4-way set associative, 32 byte line size';
RsIntelCacheDescr42 = '2nd-level cache: 256 KBytes, 4-way set associative, 32 byte line size';
@@ -1830,11 +1837,13 @@
RsIntelCacheDescr4B = '3rd-level cache: 8MByte, 16-way set associative, 64 byte line size';
RsIntelCacheDescr4D = '3rd-level cache: 16MByte, 16-way set associative, 64 byte line size';
RsIntelCacheDescr4E = '2nd-level cache: 6MByte, 24-way set associative, 64 byte line size';
+ RsIntelCacheDescr4F = 'Instruction TLB: 4 KByte pages, 32 Entries';
RsIntelCacheDescr50 = 'Instruction TLB: 4 KByte and 2 MByte or 4 MByte pages, 64 Entries';
RsIntelCacheDescr51 = 'Instruction TLB: 4 KByte and 2 MByte or 4 MByte pages, 128 Entries';
RsIntelCacheDescr52 = 'Instruction TLB: 4 KByte and 2 MByte or 4 MByte pages, 256 Entries';
RsIntelCacheDescr56 = 'Data TLB0: 4 MByte pages, 4-way set associative, 16 entries';
RsIntelCacheDescr57 = 'Data TLB0: 4 KByte pages, 4-way associative, 16 entries';
+ RsIntelCacheDescr59 = 'Data TLB0: 4 KByte pages, fully associative, 16 entries';
RsIntelCacheDescr5B = 'Data TLB: 4 KByte and 4 MByte pages, 64 Entries';
RsIntelCacheDescr5C = 'Data TLB: 4 KByte and 4 MByte pages, 128 Entries';
RsIntelCacheDescr5D = 'Data TLB: 4 KByte and 4 MByte pages, 256 Entries';
@@ -1845,6 +1854,7 @@
RsIntelCacheDescr70 = 'Trace cache: 12 K-Ops, 8-way set associative';
RsIntelCacheDescr71 = 'Trace cache: 16 K-Ops, 8-way set associative';
RsIntelCacheDescr72 = 'Trace cache: 32 K-Ops, 8-way set associative';
+ RsIntelCacheDescr73 = 'Trace cache: 64 K-Ops, 8-way set associative';
RsIntelCacheDescr78 = '2nd-level cache: 1 MBytes, 4-way set associative, 64 bytes line size';
RsIntelCacheDescr79 = '2nd-level cache: 128 KBytes, 8-way set associative, 64 bytes line size, 2 lines per sector';
RsIntelCacheDescr7A = '2nd-level cache: 256 KBytes, 8-way set associative, 64 bytes line size, 2 lines per sector';
@@ -1852,6 +1862,7 @@
RsIntelCacheDescr7C = '2nd-level cache: 1 MBytes, 8-way set associative, 64 bytes line size, 2 lines per sector';
RsIntelCacheDescr7D = '2nd-level cache: 2 MBytes, 8-way set associative, 64 byte line size';
RsIntelCacheDescr7F = '2nd-level cache: 512 KBytes, 2-way set associative, 64 byte line size';
+ RsIntelCacheDescr80 = '2nd-level cache: 512 KBytes, 8-way set associative, 64 byte line size';
RsIntelCacheDescr82 = '2nd-level cache: 256 KBytes, 8-way associative, 32 byte line size';
RsIntelCacheDescr83 = '2nd-level cache: 512 KBytes, 8-way associative, 32 byte line size';
RsIntelCacheDescr84 = '2nd-level cache: 1 MBytes, 8-way associative, 32 byte line size';
@@ -1862,6 +1873,8 @@
RsIntelCacheDescrB1 = 'Instruction TLB: 2 MByte pages, 4-way, 8 entries or 4 MByte pages, 4-way, 4 entries';
RsIntelCacheDescrB3 = 'Data TLB: 4 KByte pages, 4-way set associative, 128 entries';
RsIntelCacheDescrB4 = 'Data TLB1: 4 KByte pages, 4-way set associative, 256 entries';
+ RsIntelCacheDescrBA = 'Data TLB1: 4 KByte pages, 4-way set associative, 64 entries';
+ RsIntelCacheDescrC0 = 'Data TLB: 4 KByte and 4 MByte pages, 4-way set associative, 8 entries';
RsIntelCacheDescrF0 = '64-Byte Prefetching';
RsIntelCacheDescrF1 = '128-Byte Prefetching';
Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas 2008-09-12 06:23:34 UTC (rev 2467)
+++ trunk/jcl/source/common/JclSysInfo.pas 2008-09-13 21:50:01 UTC (rev 2468)
@@ -605,13 +605,13 @@
INTEL_SS = BIT_27; // Self snoop
INTEL_HTT = BIT_28; // Hyper-threading technology
INTEL_TM = BIT_29; // Thermal monitor
- INTEL_BIT_30 = BIT_30; // Reserved, do not count on value
+ INTEL_IA64 = BIT_30; // IA32 emulation mode on Itanium processors (IA64)
INTEL_PBE = BIT_31; // Pending Break Enable
{ Extended Intel Feature Flags }
EINTEL_SSE3 = BIT_0; // Streaming SIMD Extensions 3
EINTEL_BIT_1 = BIT_1; // Reserved, do not count on value
- EINTEL_BIT_2 = BIT_2; // Reserved, do not count on value
+ EINTEL_DTES64 = BIT_2; // write a history of the 64-bit branch to and from addresses into memory
EINTEL_MONITOR = BIT_3; // Monitor/MWAIT
EINTEL_DSCPL = BIT_4; // CPL Qualified debug Store
EINTEL_VMX = BIT_5; // Virtual Machine Technology
@@ -622,7 +622,7 @@
EINTEL_CNXTID = BIT_10; // L1 Context ID
EINTEL_BIT_11 = BIT_11; // Reserved, do not count on value
EINTEL_BIT_12 = BIT_12; // Reserved, do not count on value
- EINTEL_CMPXCHG16B = BIT_13; // CMPXCHG16B instruction
+ EINTEL_CX16 = BIT_13; // CMPXCHG16B instruction
EINTEL_XTPR = BIT_14; // Send Task Priority messages
EINTEL_PDCM = BIT_15; // Perf/Debug Capability MSR
EINTEL_BIT_16 = BIT_16; // Reserved, do not count on value
@@ -630,13 +630,13 @@
EINTEL_DCA = BIT_18; // Direct Cache Access
EINTEL_SSE4_1 = BIT_19; // Streaming SIMD Extensions 4.1
EINTEL_SSE4_2 = BIT_20; // Streaming SIMD Extensions 4.2
- EINTEL_BIT_21 = BIT_21; // Reserved, do not count on value
- EINTEL_BIT_22 = BIT_22; // Reserved, do not count on value
+ EINTEL_X2APIC = BIT_21; // x2APIC feature
+ EINTEL_MOVBE = BIT_22; // MOVBE instruction
EINTEL_POPCNT = BIT_23; // A value of 1 indicates the processor supports the POPCNT instruction.
EINTEL_BIT_24 = BIT_24; // Reserved, do not count on value
EINTEL_BIT_25 = BIT_25; // Reserved, do not count on value
- EINTEL_BIT_26 = BIT_26; // Reserved, do not count on value
- EINTEL_BIT_27 = BIT_27; // Reserved, do not count on value
+ EINTEL_XSAVE = BIT_26; // XSAVE/XRSTOR processor extended states feature, XSETBV/XGETBV instructions and XFEATURE_ENABLED_MASK (XCR0) register
+ EINTEL_OSXSAVE = BIT_27; // OS has enabled features present in EINTEL_XSAVE
EINTEL_BIT_28 = BIT_28; // Reserved, do not count on value
EINTEL_BIT_29 = BIT_29; // Reserved, do not count on value
EINTEL_BIT_30 = BIT_30; // Reserved, do not count on value
@@ -663,7 +663,7 @@
EINTEL64_BIT_17 = BIT_17; // Reserved, do not count on value
EINTEL64_BIT_18 = BIT_18; // Reserved, do not count on value
EINTEL64_BIT_19 = BIT_19; // Reserved, do not count on value
- EINTEL64_EDB = BIT_20; // Execute Disable Bit
+ EINTEL64_XD = BIT_20; // Execution Disable Bit
EINTEL64_BIT_21 = BIT_21; // Reserved, do not count on value
EINTEL64_BIT_22 = BIT_22; // Reserved, do not count on value
EINTEL64_BIT_23 = BIT_23; // Reserved, do not count on value
@@ -1153,7 +1153,7 @@
MXCSR_FZ = BIT_15; // Flush to Zero
const
- IntelCacheDescription: array [0..64] of TCacheInfo = (
+ IntelCacheDescription: array [0..77] of TCacheInfo = (
(D: $00; Family: cfOther; I: RsIntelCacheDescr00),
(D: $01; Family: cfInstructionTLB; Size: 4; WaysOfAssoc: 4; Entries: 32; I: RsIntelCacheDescr01),
(D: $02; Family: cfInstructionTLB; Size: 4096; WaysOfAssoc: 4; Entries: 2; I: RsIntelCacheDescr02),
@@ -1165,12 +1165,19 @@
(D: $0A; Family: cfL1DataCache; Size: 8; WaysOfAssoc: 2; LineSize: 32; I: RsIntelCacheDescr0A),
(D: $0B; Family: cfInstructionTLB; Size: 4; WaysOfAssoc: 4; Entries: 4; I: RsIntelCacheDescr0B),
(D: $0C; Family: cfL1DataCache; Size: 16; WaysOfAssoc: 4; LineSize: 32; I: RsIntelCacheDescr0C),
+ (D: $0E; Family: cfL1DataCache; Size: 24; WaysOfAssoc: 4; LineSize: 32; I: RsIntelCacheDescr0E),
(D: $22; Family: cfL3Cache; Size: 512; WaysOfAssoc: 4; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr22),
(D: $23; Family: cfL3Cache; Size: 1024; WaysOfAssoc: 8; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr23),
(D: $25; Family: cfL3Cache; Size: 2048; WaysOfAssoc: 8; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr25),
(D: $29; Family: cfL3Cache; Size: 4096; WaysOfAssoc: 8; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr29),
(D: $2C; Family: cfL1DataCache; Size: 32; WaysOfAssoc: 8; LineSize: 64; I: RsIntelCacheDescr2C),
(D: $30; Family: cfL1InstructionCache; Size: 32; WaysOfAssoc: 8; LineSize: 64; I: RsIntelCacheDescr30),
+ (D: $39; Family: cfL2Cache; Size: 128; WaysOfAssoc: 4; LineSize: 64; I: RsIntelCacheDescr39),
+ (D: $3A; Family: cfL2Cache; Size: 192; WaysOfAssoc: 6; LineSize: 64; I: RsIntelCacheDescr3A),
+ (D: $3B; Family: cfL2Cache; Size: 128; WaysOfAssoc: 2; LineSize: 64; I: RsIntelCacheDescr3B),
+ (D: $3C; Family: cfL2Cache; Size: 256; WaysOfAssoc: 4; LineSize: 64; I: RsIntelCacheDescr3C),
+ (D: $3D; Family: cfL2Cache; Size: 384; WaysOfAssoc: 6; LineSize: 64; I: RsIntelCacheDescr3D),
+ (D: $3E; Family: cfL2Cache; Size: 512; WaysOfAssoc: 4; LineSize: 64; I: RsIntelCacheDescr3E),
(D: $40; Family: cfOther; I: RsIntelCacheDescr40),
(D: $41; Family: cfL2Cache; Size: 128; WaysOfAssoc: 4; LineSize: 32; I: RsIntelCacheDescr41),
(D: $42; Family: cfL2Cache; Size: 256; WaysOfAssoc: 4; LineSize: 32; I: RsIntelCacheDescr42),
@@ -1185,11 +1192,13 @@
(D: $4B; Family: cfL3Cache; Size: 8192; WaysOfAssoc: 16; LineSize: 64; I: RsIntelCacheDescr4B),
(D: $4D; Family: cfL3Cache; Size: 16384; WaysOfAssoc: 16; LineSize: 64; I: RsIntelCacheDescr4D),
(D: $4E; Family: cfL3Cache; Size: 6144; WaysOfAssoc: 24; LineSize: 64; I: RsIntelCacheDescr4E),
+ (D: $4F; Family: cfInstructionTLB; Size: 4; Entries: 32; I: RsIntelCacheDescr4F),
(D: $50; Family: cfInstructionTLB; Size: 4; Entries: 64; I: RsIntelCacheDescr50),
(D: $51; Family: cfInstructionTLB; Size: 4; Entries: 128; I: RsIntelCacheDescr51),
(D: $52; Family: cfInstructionTLB; Size: 4; Entries: 256; I: RsIntelCacheDescr52),
(D: $56; Family: cfDataTLB; Size: 4096; WaysOfAssoc: 4; Entries: 16; I: RsIntelCacheDescr56),
(D: $57; Family: cfDataTLB; Size: 4; WaysOfAssoc: 4; Entries: 16; I: RsIntelCacheDescr57),
+ (D: $59; Family: cfDataTLB; Size: 4; Entries: 16; I: RsIntelCacheDescr59),
(D: $5B; Family: cfDataTLB; Size: 4096; Entries: 64; I: RsIntelCacheDescr5B),
(D: $5C; Family: cfDataTLB; Size: 4096; Entries: 128; I: RsIntelCacheDescr5C),
(D: $5D; Family: cfDataTLB; Size: 4096; Entries: 256; I: RsIntelCacheDescr5D),
@@ -1200,6 +1209,7 @@
(D: $70; Family: cfTrace; Size: 12; WaysOfAssoc: 8; I: RsIntelCacheDescr70),
(D: $71; Family: cfTrace; Size: 16; WaysOfAssoc: 8; I: RsIntelCacheDescr71),
(D: $72; Family: cfTrace; Size: 32; WaysOfAssoc: 8; I: RsIntelCacheDescr72),
+ (D: $73; Family: cfTrace; Size: 64; WaysOfAssoc: 8; I: RsIntelCacheDescr73),
(D: $78; Family: cfL2Cache; Size: 1024; WaysOfAssoc: 4; LineSize: 64; I: RsIntelCacheDescr78),
(D: $79; Family: cfL2Cache; Size: 128; WaysOfAssoc: 8; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr79),
(D: $7A; Family: cfL2Cache; Size: 256; WaysOfAssoc: 8; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr7A),
@@ -1207,6 +1217,7 @@
(D: $7C; Family: cfL2Cache; Size: 1024; WaysOfAssoc: 8; LineSize: 64; LinePerSector: 2; I: RsIntelCacheDescr7C),
(D: $7D; Family: cfL2Cache; Size: 2048; WaysOfAssoc: 8; LineSize: 64; I: RsIntelCacheDescr7D),
(D: $7F; Family: cfL2Cache; Size: 512; WaysOfAssoc: 2; LineSize: 64; I: RsIntelCacheDescr7F),
+ (D: $80; Family: cfL2Cache; Size: 512; WaysOfAssoc: 8; LineSize: 64; I: RsIntelCacheDescr80),
(D: $82; Family: cfL2Cache; Size: 256; WaysOfAssoc: 8; LineSize: 32; I: RsIntelCacheDescr82),
(D: $83; Family: cfL2Cache; Size: 512; WaysOfAssoc: 8; LineSize: 32; I: RsIntelCacheDescr83),
(D: $84; Family: cfL2Cache; Size: 1024; WaysOfAssoc: 8; LineSize: 32; I: RsIntelCacheDescr84),
@@ -1217,6 +1228,8 @@
(D: $B1; Family: cfInstructionTLB; Size: 2048; WaysOfAssoc: 4; Entries: 8; I: RsIntelCacheDescrB1),
(D: $B3; Family: cfDataTLB; Size: 4; WaysOfAssoc: 4; Entries: 128; I: RsIntelCacheDescrB3),
(D: $B4; Family: cfDataTLB; Size: 4; WaysOfAssoc: 4; Entries: 256; I: RsIntelCacheDescrB4),
+ (D: $BA; Family: cfDataTLB; Size: 4; WaysOfAssoc: 4; Entries: 64; I: RsIntelCacheDescrBA),
+ (D: $C0; Family: cfDataTLB; Size: 4; WaysOfAssoc: 4; Entries: 8; I: RsIntelCacheDescrC0),
(D: $F0; Family: cfOther; I: RsIntelCacheDescrF0),
(D: $F1; Family: cfOther; I: RsIntelCacheDescrF1)
);
@@ -3619,7 +3632,7 @@
function GetNativeSystemInfo(var SystemInfo: TSystemInfo): Boolean;
type
- TGetNativeSystemInfo = procedure (var SystemInfo: TSystemInfo) stdcall;
+ TGetNativeSystemInfo = procedure (var SystemInfo: TSystemInfo); stdcall;
var
LibraryHandle: HMODULE;
_GetNativeSystemInfo: TGetNativeSystemInfo;
@@ -4360,7 +4373,7 @@
if (CPUInfo.IntelSpecific.ExFeatures and EINTEL_SSE4_2) <> 0 then
Include(CPUInfo.SSE, sse4B);
CPUInfo.Is64Bits := CPUInfo.HasExtendedInfo and ((CPUInfo.IntelSpecific.Ex64Features and EINTEL64_EM64T)<>0);
- CPUInfo.DepCapable := CPUInfo.HasExtendedInfo and ((CPUInfo.IntelSpecific.Ex64Features and EINTEL64_EDB) <> 0);
+ CPUInfo.DepCapable := CPUInfo.HasExtendedInfo and ((CPUInfo.IntelSpecific.Ex64Features and EINTEL64_XD) <> 0);
end;
procedure ProcessAMD(var CPUInfo: TCpuInfo; HiVal: Cardinal);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-12 06:23:36
|
Revision: 2467
http://jcl.svn.sourceforge.net/jcl/?rev=2467&view=rev
Author: outchy
Date: 2008-09-12 06:23:34 +0000 (Fri, 12 Sep 2008)
Log Message:
-----------
Patch from Sean Farrow, compilation with Delphi 2009.
Modified Paths:
--------------
trunk/thirdparty/makedist/MakeDistActions.pas
Modified: trunk/thirdparty/makedist/MakeDistActions.pas
===================================================================
--- trunk/thirdparty/makedist/MakeDistActions.pas 2008-09-12 00:01:35 UTC (rev 2466)
+++ trunk/thirdparty/makedist/MakeDistActions.pas 2008-09-12 06:23:34 UTC (rev 2467)
@@ -324,7 +324,7 @@
var
FileList: TStrings;
Index: Integer;
- TextFile: TJclMappedTextReader;
+ TextFile: TJclAnsiMappedTextReader;
OutputStream: TFileStream;
EOL, Content: AnsiString;
NewEOL, Directory, Filter, FileName: string;
@@ -361,7 +361,7 @@
FileName := PathAddSeparator(Directory) + FileList.Strings[Index];
Content := '';
- TextFile := TJclMappedTextReader.Create(FileName);
+ TextFile := TJclAnsiMappedTextReader.Create(FileName);
try
while not TextFile.Eof do
begin
@@ -1011,7 +1011,7 @@
function TConstantParser.Execute(const AMessageHandler: TTextHandler): Boolean;
var
SourceFile, ConstantName, EnvironmentVariable, Line, Value: string;
- FileContent: TJclMappedTextReader;
+ FileContent: TJclAnsiMappedTextReader;
LinePos, ConstantStart: Integer;
begin
SourceFile := FSourceFile;
@@ -1021,7 +1021,7 @@
EnvironmentVariable := FEnvironmentVariable;
ExpandEnvironmentVar(EnvironmentVariable);
- FileContent := TJclMappedTextReader.Create(SourceFile);
+ FileContent := TJclAnsiMappedTextReader.Create(SourceFile);
try
Result := False;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-12 00:01:42
|
Revision: 2466
http://jcl.svn.sourceforge.net/jcl/?rev=2466&view=rev
Author: outchy
Date: 2008-09-12 00:01:35 +0000 (Fri, 12 Sep 2008)
Log Message:
-----------
Fixed wrong parameter declaration of function inflate.
Added compilation option to statically link, late bind or statically bind to ZLib code.
Moved zlibh.pas from jcl/source/windows and jcl/source/unix to jcl/source/common by eliminating few differences.
Removed zlibh.pas from unit prototypes.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/lib/d10.net/common.exc
trunk/jcl/lib/d10.net/windows.exc
trunk/jcl/lib/d11.net/common.exc
trunk/jcl/lib/d11.net/windows.exc
trunk/jcl/lib/d9.net/common.exc
trunk/jcl/lib/d9.net/windows.exc
trunk/jcl/packages/c5/JclC50.bpk
trunk/jcl/packages/c5/JclC50.cpp
trunk/jcl/packages/c5/JclC50.dpk
trunk/jcl/packages/c6/Jcl.bpk
trunk/jcl/packages/c6/Jcl.dpk
trunk/jcl/packages/cs1/Jcl.dpk
trunk/jcl/packages/d10/Jcl.dpk
trunk/jcl/packages/d11/Jcl.dpk
trunk/jcl/packages/d11/Jcl.dproj
trunk/jcl/packages/d11/Jcl.res
trunk/jcl/packages/d12/Jcl.dpk
trunk/jcl/packages/d12/Jcl.dproj
trunk/jcl/packages/d5/JclD50.dpk
trunk/jcl/packages/d6/Jcl.dpk
trunk/jcl/packages/d7/Jcl.dpk
trunk/jcl/packages/d8/Jcl.dpk
trunk/jcl/packages/d9/Jcl.dpk
trunk/jcl/packages/k3/Jcl.bpk
trunk/jcl/packages/k3/Jcl.dpk
trunk/jcl/packages/xml/Jcl-R.xml
trunk/jcl/source/common/JclCompression.pas
trunk/jcl/source/include/jcl.inc
trunk/jcl/source/include/jcl.template.inc
trunk/jcl/source/prototypes/Makefile.mak
Added Paths:
-----------
trunk/jcl/source/common/zlibh.pas
Removed Paths:
-------------
trunk/jcl/source/prototypes/zlibh.pas
trunk/jcl/source/unix/zlibh.pas
trunk/jcl/source/windows/zlibh.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/install/JclInstall.pas 2008-09-12 00:01:35 UTC (rev 2466)
@@ -49,6 +49,7 @@
joJCLDefEDI,
joJCLDefPCRE,
joJCLDefBZip2,
+ joJCLDefZLib,
joJCLDefUnicode,
joJCLDefContainer,
joJCLDef7z,
@@ -72,6 +73,9 @@
joJCLDefBZip2StaticLink,
joJCLDefBZip2LinkDLL,
joJCLDefBZip2LinkOnRequest,
+ joJCLDefZLibStaticLink,
+ joJCLDefZLibLinkDLL,
+ joJCLDefZLibLinkOnRequest,
joJCLDefUnicodeSilentFailure,
joJCLDefUnicodeRawData,
joJCLDefUnicodeZLibData,
@@ -370,6 +374,11 @@
RsCaptionDefBZip2StaticLink = 'Static link to BZip2 code';
RsCaptionDefBZip2LinkDLL = 'Static bind to bzip2.dll';
RsCaptionDefBZip2LinkOnRequest = 'Late bind to bzip2.dll';
+ // ZLib options
+ RsCaptionDefZLib = 'ZLib options';
+ RsCaptionDefZLibStaticLink = 'Static link to ZLib code';
+ RsCaptionDefZLibLinkDLL = 'Static bind to zlib1.dll';
+ RsCaptionDefZLibLinkOnRequest = 'Late bind to zlib1.dll';
// Unicode options
RsCaptionDefUnicode = 'Unicode options';
RsCaptionDefUnicodeSilentFailure = 'Silent failure';
@@ -481,7 +490,12 @@
RsHintDefBZip2 = 'BZip2 specific options (bzip2.pas)';
RsHintDefBZip2StaticLink = 'Code from BZip2 is linked into JCL binaries';
RsHintDefBZip2LinkDLL = 'JCL binaries require bzip2.dll to be present';
- RsHintDefBZip2LinkOnRequest = 'JCL binaries require bzip2.dll when calling PCRE functions';
+ RsHintDefBZip2LinkOnRequest = 'JCL binaries require bzip2.dll when calling BZip2 functions';
+ // ZLib options
+ RsHintDefZLib = 'ZLib specific options (zlibh.pas)';
+ RsHintDefZLibStaticLink = 'Code from ZLib is linked into JCL binaries';
+ RsHintDefZLibLinkDLL = 'JCL binaries require zlib1.dll to be present';
+ RsHintDefZLibLinkOnRequest = 'JCL binaries require zlib1.dll when calling ZLib functions';
// Unicode options
RsHintDefUnicode = 'Unicode specific option (JclUnicode.pas)';
RsHintDefUnicodeSilentFailure = 'Insert a replacement character if sequence is corrupted rather than raising an exception';
@@ -594,6 +608,7 @@
(Id: -1; Caption: RsCaptionDefEDI; Hint: RsHintDefEDI), // joDefEDI
(Id: -1; Caption: RsCaptionDefPCRE; Hint: RsHintDefPCRE), // joDefPCRE
(Id: -1; Caption: RsCaptionDefBZip2; Hint: RsHintDefBZip2), // joDefBZip2
+ (Id: -1; Caption: RsCaptionDefZLib; Hint: RsHintDefZLib), // joDefZLib
(Id: -1; Caption: RsCaptionDefUnicode; Hint: RsHintDefUnicode), // joDefUnicode
(Id: -1; Caption: RsCaptionDefContainer; Hint: RsHintDefContainer), // joDefContainer
(Id: -1; Caption: RsCaptionDef7z; Hint: RsHintDef7z), // joDef7z
@@ -617,6 +632,9 @@
(Id: -1; Caption: RsCaptionDefBZip2StaticLink; Hint: RsHintDefBZip2StaticLink), // joDefBZip2StaticLink
(Id: -1; Caption: RsCaptionDefBZip2LinkDLL; Hint: RsHintDefBZip2LinkDLL), // joDefBZip2LinkDLL
(Id: -1; Caption: RsCaptionDefBZip2LinkOnRequest; Hint: RsHintDefBZip2LinkOnRequest), // joDefBZip2LinkOnRequest
+ (Id: -1; Caption: RsCaptionDefZLibStaticLink; Hint: RsHintDefZLibStaticLink), // joDefZLibStaticLink
+ (Id: -1; Caption: RsCaptionDefZLibLinkDLL; Hint: RsHintDefZLibLinkDLL), // joDefZLibLinkDLL
+ (Id: -1; Caption: RsCaptionDefZLibLinkOnRequest; Hint: RsHintDefZLibLinkOnRequest), // joDefZLibLinkOnRequest
(Id: -1; Caption: RsCaptionDefUnicodeSilentFailure; Hint: RsHintDefUnicodeSilentFailure), // joDefUnicodeSilentFailure
(Id: -1; Caption: RsCaptionDefUnicodeRawData; Hint: RsHintDefUnicodeRawData), // joDefUnicodeRawData
(Id: -1; Caption: RsCaptionDefUnicodeZLibData; Hint: RsHintDefUnicodeZLibData), // joDefUnicodeZLibData
@@ -1080,12 +1098,18 @@
AddOption(joJCLDefBZip2StaticLink, [goRadioButton, goChecked], joJCLDefBZip2);
AddOption(joJCLDefBZip2LinkOnRequest, [goRadioButton], joJCLDefBZip2);
AddOption(joJCLDefBZip2LinkDLL, [goRadioButton], joJCLDefBZip2);
- {$IFDEF MSWINDOWS}
+ // ZLib options
+ AddOption(joJCLDefZLib, [goChecked], Parent);
+ AddOption(joJCLDefZLibStaticLink, [goRadioButton, goChecked], joJCLDefZLib);
+ AddOption(joJCLDefZLibLinkOnRequest, [goRadioButton], joJCLDefZLib);
+ AddOption(joJCLDefZLibLinkDLL, [goRadioButton], joJCLDefZLib);
+ // Unicode options
AddOption(joJCLDefUnicode, [goChecked], Parent);
AddOption(joJCLDefUnicodeSilentFailure, [goChecked], joJCLDefUnicode);
AddOption(joJCLDefUnicodeRawData, [goRadioButton, goChecked], joJCLDefUnicode);
AddOption(joJCLDefUnicodeZLibData, [goRadioButton], joJCLDefUnicode);
AddOption(joJCLDefUnicodeBZip2Data, [goRadioButton], joJCLDefUnicode);
+ {$IFDEF MSWINDOWS}
// Sevenzip options
AddOption(joJCLDef7z, [goChecked], Parent);
//AddOption(joJCLDef7zStaticLink, [goRadioButton], joDef7z);
@@ -1555,7 +1579,8 @@
'DEBUG_NO_BINARY', 'DEBUG_NO_TD32', 'DEBUG_NO_MAP', 'DEBUG_NO_EXPORTS',
'DEBUG_NO_SYMBOLS', 'EDI_WEAK_PACKAGE_UNITS', 'PCRE_STATICLINK',
'PCRE_LINKDLL', 'PCRE_LINKONREQUEST', 'BZIP2_STATICLINK',
- 'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'UNICODE_SILENT_FAILURE',
+ 'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'ZLIB_STATICLINK',
+ 'ZLIB_LINKDLL', 'ZLIB_LINKONREQUEST', 'UNICODE_SILENT_FAILURE',
'UNICODE_RAW_DATA', 'UNICODE_ZLIB_DATA', 'UNICODE_BZIP2_DATA',
'CONTAINER_ANSISTR', 'CONTAINER_WIDESTR', 'CONTAINER_UNICODESTR',
'CONTAINER_NOSTR', {'7ZIP_STATICLINK',} '7ZIP_LINKDLL',
Modified: trunk/jcl/lib/d10.net/common.exc
===================================================================
--- trunk/jcl/lib/d10.net/common.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d10.net/common.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -20,4 +20,5 @@
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
-pcre.pas
\ No newline at end of file
+pcre.pas
+zlibh.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d10.net/windows.exc
===================================================================
--- trunk/jcl/lib/d10.net/windows.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d10.net/windows.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -32,5 +32,4 @@
MSHelpServices_TLB.pas
MSTask.pas
Sevenzip.pas
-Snmp.pas
-zlibh.pas
\ No newline at end of file
+Snmp.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d11.net/common.exc
===================================================================
--- trunk/jcl/lib/d11.net/common.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d11.net/common.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -20,4 +20,5 @@
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
-pcre.pas
\ No newline at end of file
+pcre.pas
+zlibh.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d11.net/windows.exc
===================================================================
--- trunk/jcl/lib/d11.net/windows.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d11.net/windows.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -32,5 +32,4 @@
MSHelpServices_TLB.pas
MSTask.pas
Sevenzip.pas
-Snmp.pas
-zlibh.pas
\ No newline at end of file
+Snmp.pas
\ No newline at end of file
Modified: trunk/jcl/lib/d9.net/common.exc
===================================================================
--- trunk/jcl/lib/d9.net/common.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d9.net/common.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -21,3 +21,4 @@
JclUnitVersioningProviders.pas
JclWideStrings.pas
pcre.pas
+zlibh.pas
Modified: trunk/jcl/lib/d9.net/windows.exc
===================================================================
--- trunk/jcl/lib/d9.net/windows.exc 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/lib/d9.net/windows.exc 2008-09-12 00:01:35 UTC (rev 2466)
@@ -32,5 +32,4 @@
MSHelpServices_TLB.pas
MSTask.pas
Sevenzip.pas
-Snmp.pas
-zlibh.pas
\ No newline at end of file
+Snmp.pas
\ No newline at end of file
Modified: trunk/jcl/packages/c5/JclC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.bpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c5/JclC50.bpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:34 UTC
+ Last generated: 06-09-2008 16:39:07 UTC
*****************************************************************************
-->
<PROJECT>
@@ -59,6 +59,7 @@
..\..\lib\c5\JclValidation.obj
..\..\lib\c5\JclWideStrings.obj
..\..\lib\c5\pcre.obj
+ ..\..\lib\c5\zlibh.obj
..\..\lib\c5\Hardlinks.obj
..\..\lib\c5\JclAppInst.obj
..\..\lib\c5\JclCIL.obj
@@ -90,7 +91,6 @@
..\..\lib\c5\MSTask.obj
..\..\lib\c5\sevenzip.obj
..\..\lib\c5\Snmp.obj
- ..\..\lib\c5\zlibh.obj
"/>
<RESFILES value="JclC50.res"/>
<IDLFILES value=""/>
Modified: trunk/jcl/packages/c5/JclC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclC50.cpp 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c5/JclC50.cpp 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:35 UTC
+ Last generated: 06-09-2008 16:39:07 UTC
-----------------------------------------------------------------------------
*/
@@ -56,6 +56,7 @@
USEUNIT("..\..\source\common\JclValidation.pas");
USEUNIT("..\..\source\common\JclWideStrings.pas");
USEUNIT("..\..\source\common\pcre.pas");
+USEUNIT("..\..\source\common\zlibh.pas");
USEUNIT("..\..\source\windows\Hardlinks.pas");
USEUNIT("..\..\source\windows\JclAppInst.pas");
USEUNIT("..\..\source\windows\JclCIL.pas");
@@ -87,7 +88,6 @@
USEUNIT("..\..\source\windows\MSTask.pas");
USEUNIT("..\..\source\windows\sevenzip.pas");
USEUNIT("..\..\source\windows\Snmp.pas");
-USEUNIT("..\..\source\windows\zlibh.pas");
USEPACKAGE("vcl50.bpi");
//---------------------------------------------------------------------------
#pragma package(smart_init)
Modified: trunk/jcl/packages/c5/JclC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c5/JclC50.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:35 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
-----------------------------------------------------------------------------
}
@@ -84,6 +84,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -114,8 +115,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c6/Jcl.bpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -5,7 +5,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:23 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
*****************************************************************************
-->
<PROJECT>
@@ -59,6 +59,7 @@
..\..\lib\c6\JclValidation.obj
..\..\lib\c6\JclWideStrings.obj
..\..\lib\c6\pcre.obj
+ ..\..\lib\c6\zlibh.obj
..\..\lib\c6\Hardlinks.obj
..\..\lib\c6\JclAppInst.obj
..\..\lib\c6\JclCIL.obj
@@ -90,7 +91,6 @@
..\..\lib\c6\MSTask.obj
..\..\lib\c6\sevenzip.obj
..\..\lib\c6\Snmp.obj
- ..\..\lib\c6\zlibh.obj
"/>
<RESFILES value="Jcl.res"/>
<IDLFILES value=""/>
@@ -187,6 +187,7 @@
<FILE FILENAME="..\..\source\common\JclValidation.pas" FORMNAME="" UNITNAME="JclValidation" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclWideStrings.pas" FORMNAME="" UNITNAME="JclWideStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\pcre.pas" FORMNAME="" UNITNAME="pcre" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\Hardlinks.pas" FORMNAME="" UNITNAME="Hardlinks" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclAppInst.pas" FORMNAME="" UNITNAME="JclAppInst" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclCIL.pas" FORMNAME="" UNITNAME="JclCIL" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -218,7 +219,6 @@
<FILE FILENAME="..\..\source\windows\MSTask.pas" FORMNAME="" UNITNAME="MSTask" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\sevenzip.pas" FORMNAME="" UNITNAME="sevenzip" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\Snmp.pas" FORMNAME="" UNITNAME="Snmp" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\windows\zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/c6/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:25 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
-----------------------------------------------------------------------------
}
@@ -84,6 +84,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -114,7 +115,6 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/cs1/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:27 UTC
+ Last generated: 06-09-2008 16:39:10 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -115,8 +116,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d10/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d10/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:28 UTC
+ Last generated: 06-09-2008 16:39:11 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d11/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:29 UTC
+ Last generated: 11-09-2008 22:13:46 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d11/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11/Jcl.dproj 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d11/Jcl.dproj 2008-09-12 00:01:35 UTC (rev 2466)
@@ -131,6 +131,7 @@
<DCCReference Include="..\..\source\common\JclValidation.pas" />
<DCCReference Include="..\..\source\common\JclWideStrings.pas" />
<DCCReference Include="..\..\source\common\pcre.pas" />
+ <DCCReference Include="..\..\source\common\zlibh.pas" />
<DCCReference Include="..\..\source\windows\Hardlinks.pas" />
<DCCReference Include="..\..\source\windows\JclAppInst.pas" />
<DCCReference Include="..\..\source\windows\JclCIL.pas" />
@@ -166,6 +167,5 @@
<DCCReference Include="..\..\source\windows\MSTask.pas" />
<DCCReference Include="..\..\source\windows\sevenzip.pas" />
<DCCReference Include="..\..\source\windows\Snmp.pas" />
- <DCCReference Include="..\..\source\windows\zlibh.pas" />
</ItemGroup>
</Project>
Modified: trunk/jcl/packages/d12/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d12/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d12/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 14:25:18 UTC
+ Last generated: 11-09-2008 22:13:47 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d12/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d12/Jcl.dproj 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d12/Jcl.dproj 2008-09-12 00:01:35 UTC (rev 2466)
@@ -108,6 +108,7 @@
<DCCReference Include="..\..\source\common\JclValidation.pas" />
<DCCReference Include="..\..\source\common\JclWideStrings.pas" />
<DCCReference Include="..\..\source\common\pcre.pas" />
+ <DCCReference Include="..\..\source\common\zlibh.pas" />
<DCCReference Include="..\..\source\windows\Hardlinks.pas" />
<DCCReference Include="..\..\source\windows\JclAppInst.pas" />
<DCCReference Include="..\..\source\windows\JclCIL.pas" />
@@ -143,7 +144,6 @@
<DCCReference Include="..\..\source\windows\MSTask.pas" />
<DCCReference Include="..\..\source\windows\sevenzip.pas" />
<DCCReference Include="..\..\source\windows\Snmp.pas" />
- <DCCReference Include="..\..\source\windows\zlibh.pas" />
<BuildConfiguration Include="Base">
<Key>Base</Key>
</BuildConfiguration>
Modified: trunk/jcl/packages/d5/JclD50.dpk
===================================================================
--- trunk/jcl/packages/d5/JclD50.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d5/JclD50.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 06-09-2008 15:16:36 UTC
+ Last generated: 06-09-2008 16:39:08 UTC
-----------------------------------------------------------------------------
}
@@ -84,6 +84,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -118,8 +119,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d6/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d6/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:26 UTC
+ Last generated: 06-09-2008 16:39:09 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d7/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d7/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d7/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:26 UTC
+ Last generated: 06-09-2008 16:39:09 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d8/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d8/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d8/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:27 UTC
+ Last generated: 06-09-2008 16:39:09 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/d9/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d9/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/d9/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:28 UTC
+ Last generated: 06-09-2008 16:39:10 UTC
-----------------------------------------------------------------------------
}
@@ -85,6 +85,7 @@
JclValidation in '..\..\source\common\JclValidation.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
+ zlibh in '..\..\source\common\zlibh.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
JclCIL in '..\..\source\windows\JclCIL.pas' ,
@@ -119,8 +120,7 @@
MSHelpServices_TLB in '..\..\source\windows\MSHelpServices_TLB.pas' ,
MSTask in '..\..\source\windows\MSTask.pas' ,
sevenzip in '..\..\source\windows\sevenzip.pas' ,
- Snmp in '..\..\source\windows\Snmp.pas' ,
- zlibh in '..\..\source\windows\zlibh.pas'
+ Snmp in '..\..\source\windows\Snmp.pas'
;
end.
Modified: trunk/jcl/packages/k3/Jcl.bpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.bpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/k3/Jcl.bpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -142,7 +142,7 @@
<FILE FILENAME="../../source/common/JclValidation.pas" FORMNAME="" UNITNAME="JclValidation" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclWideStrings.pas" FORMNAME="" UNITNAME="JclWideStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/pcre.pas" FORMNAME="" UNITNAME="pcre" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="../../source/unix/zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="../../source/common/zlibh.pas" FORMNAME="" UNITNAME="zlibh" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
Modified: trunk/jcl/packages/k3/Jcl.dpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.dpk 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/k3/Jcl.dpk 2008-09-12 00:01:35 UTC (rev 2466)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
- Last generated: 18-08-2008 15:46:29 UTC
+ Last generated: 06-09-2008 16:39:11 UTC
-----------------------------------------------------------------------------
}
@@ -86,7 +86,7 @@
JclValidation in '../../source/common/JclValidation.pas' ,
JclWideStrings in '../../source/common/JclWideStrings.pas' ,
pcre in '../../source/common/pcre.pas' ,
- zlibh in '../../source/unix/zlibh.pas'
+ zlibh in '../../source/common/zlibh.pas'
;
end.
Modified: trunk/jcl/packages/xml/Jcl-R.xml
===================================================================
--- trunk/jcl/packages/xml/Jcl-R.xml 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/packages/xml/Jcl-R.xml 2008-09-12 00:01:35 UTC (rev 2466)
@@ -63,6 +63,7 @@
<File Name="..\..\source\common\JclValidation.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclWideStrings.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\common\pcre.pas" Targets="JclDev" Formname="" Condition=""/>
+ <File Name="..\..\source\common\zlibh.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\Hardlinks.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclAppInst.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclCIL.pas" Targets="WinDev" Formname="" Condition=""/>
@@ -98,7 +99,5 @@
<File Name="..\..\source\windows\MSTask.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\sevenzip.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\Snmp.pas" Targets="WinDev" Formname="" Condition=""/>
- <File Name="..\..\source\windows\zlibh.pas" Targets="WinDev" Formname="" Condition=""/>
- <File Name="..\..\source\unix\zlibh.pas" Targets="Kylix" Formname="" Condition=""/>
</Contains>
</Package>
Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas 2008-09-11 22:16:32 UTC (rev 2465)
+++ trunk/jcl/source/common/JclCompression.pas 2008-09-12 00:01:35 UTC (rev 2466)
@@ -1877,6 +1877,8 @@
begin
inherited Create(Destination);
+ LoadZLib;
+
Assert(FBuffer <> nil);
Assert(FBufferSize > 0);
@@ -2038,6 +2040,8 @@
begin
inherited Create(Source, AOwnsStream);
+ LoadZLib;
+
// Initialize ZLib StreamRecord
with ZLibRecord do
begin
@@ -2132,6 +2136,8 @@
begin
inherited Create(Destination);
+ LoadZLib;
+
FFlags := [gfHeaderCRC16, gfExtraField, gfOriginalFileName, gfComment];
FAutoSetTime := True;
FFatSystem := gfsUnknown;
@@ -2367,6 +2373,8 @@
begin
inherited Create(Source, AOwnsStream);
+ LoadZLib;
+
FAutoCheckDataCRC32 := True;
FComputedDataCRC32 := crc32(0, nil, 0);
HeaderCRC := crc32(0, nil, 0);
Copied: trunk/jcl/source/common/zlibh.pas (from rev 2456, trunk/jcl/source/prototypes/zlibh.pas)
===================================================================
--- trunk/jcl/source/common/zlibh.pas (rev 0)
+++ trunk/jcl/source/common/zlibh.pas 2008-09-12 00:01:35 UTC (rev 2466)
@@ -0,0 +1,2357 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ zlib.h -- interface of the 'zlib' general purpose compression library }
+{ version 1.2.1, November 17th, 2003 }
+{ }
+{ Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler }
+{ }
+{ This software is provided 'as-is', without any express or implied warranty. In no event will }
+{ the authors be held liable for any damages arising from the use of this software. }
+{ }
+{ Permission is granted to anyone to use this software for any purpose, including commercial }
+{ applications, and to alter it and redistribute it freely, subject to the following restrictions: }
+{ }
+{ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the }
+{ original software. If you use this software in a product, an acknowledgment in the product }
+{ documentation would be appreciated but is not required. }
+{ 2. Altered source versions must be plainly marked as such, and must not be misrepresented as }
+{ being the original software. }
+{ 3. This notice may not be removed or altered from any source distribution. }
+{ }
+{ Jean-loup Gailly Mark Adler }
+{ jl...@gz... ma...@al... }
+{ }
+{ The data format used by the zlib library is described by RFCs (Request for }
+{ Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt }
+{ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+{$IFDEF ZLIB_LINKDLL}
+{$HPPEMIT '#define ZLIB_DLL'}
+{$ELSE ~ZLIB_LINKDLL}
+{$HPPEMIT '#define ZEXPORT __fastcall'}
+{$ENDIF ~ZLIB_LINKDLL}
+
+{$IFDEF ZEXPORT_CDECL}
+{$HPPEMIT '#define ZEXPORT __cdecl'}
+{$ENDIF ZEXPORT_CDECL}
+
+{$HPPEMIT '#define ZEXPORTVA __cdecl'}
+
+{$HPPEMIT '#define __MACTYPES__'}
+{$HPPEMIT '#include <zutil.h>'}
+
+unit zlibh;
+
+{$I jcl.inc}
+
+interface
+
+{$IFDEF MSWINDOWS}
+uses
+ Windows;
+{$ENDIF MSWINDOWS}
+{$IFDEF HAS_UNIT_LIBC}
+uses
+ Libc;
+{$ELSE ~HAS_UNIT_LIBC}
+type
+{$IFDEF UNIX}
+ uLong = LongWord;
+ {$EXTERNALSYM uLong}
+ uInt = Cardinal;
+ {$EXTERNALSYM uInt}
+{$ENDIF UNIX}
+ uShort = Word;
+ {$EXTERNALSYM uShort}
+ size_t = Longint;
+ {$EXTERNALSYM size_t}
+{$ENDIF ~HAS_UNIT_LIBC}
+
+//-----------------------------------------------------------------------------
+// START of the contents of the converted ZCONF.H
+//-----------------------------------------------------------------------------
+{* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ *}
+
+type
+ {$EXTERNALSYM Bytef}
+ Bytef = Byte;
+ {$EXTERNALSYM PBytef}
+ PBytef = ^Bytef;
+ {$EXTERNALSYM UnsignedInt}
+ UnsignedInt = LongWord;
+ {$EXTERNALSYM uLongf}
+ uLongf = ULONG;
+ {$EXTERNALSYM PuLongf}
+ PuLongf = ^uLongf;
+
+{* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ *}
+
+const
+ {$EXTERNALSYM MAX_WBITS}
+ MAX_WBITS = 15; // 32K LZ77 window
+
+{* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*}
+
+ {* Type declarations *}
+
+{* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ *}
+
+{* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ *}
+
+{ $HPPEMIT '#define ZEXPORT __stdcall'} // OS: CHECKTHIS
+{ $HPPEMIT '#define ZEXPORTVA __cdecl'} // OS: CHECKTHIS
+
+// type
+// uInt = UINT; --> already defined in Windows.pas /* 16 bits or more
+// uLong = ULONG; --> already defined in Windows.pas /* 32 bits or more
+
+type
+ {$EXTERNALSYM voidpc}
+ voidpc = Pointer;
+ {$EXTERNALSYM voidpf}
+ voidpf = Pointer;
+ {$EXTERNALSYM voidp}
+ voidp = Pointer;
+ {$EXTERNALSYM z_off_t}
+ z_off_t = LongInt;
+
+const
+ {$EXTERNALSYM SEEK_SET}
+ SEEK_SET = 0; // Seek from beginning of file.
+ {$EXTERNALSYM SEEK_CUR}
+ SEEK_CUR = 1; // Seek from current position.
+ {$EXTERNALSYM SEEK_END}
+ SEEK_END = 2; // Set file pointer to EOF plus "offset"
+
+//-----------------------------------------------------------------------------
+// END of the contents of the converted ZCONF.H
+//-----------------------------------------------------------------------------
+
+const
+ {$EXTERNALSYM ZLIB_VERSION}
+ ZLIB_VERSION = '1.2.3';
+ {$EXTERNALSYM ZLIB_VERNUM}
+ ZLIB_VERNUM = $1230;
+
+{*
+ The 'zlib' compression library provides in-memory compression and
+ decompression functions, including integrity checks of the uncompressed
+ data. This version of the library supports only one compression method
+ (deflation) but other algorithms will be added later and will have the same
+ stream interface.
+
+ Compression can be done in a single step if the buffers are large
+ enough (for example if an input file is mmap'ed), or can be done by
+ repeated calls of the compression function. In the latter case, the
+ application must provide more input and/or consume the output
+ (providing more output space) before each call.
+
+ The compressed data format used by the in-memory functions is the zlib
+ format, which is a zlib wrapper documented in RFC 1950, wrapped around a
+ deflate stream, which is itself documented in RFC 1951.
+
+ The library also supports reading and writing files in gzip (.gz) format
+ with an interface similar to that of stdio using the functions that start
+ with "gz". The gzip format is different from the zlib format. gzip is a
+ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+ The zlib format was designed to be compact and fast for use in memory
+ and on communications channels. The gzip format was designed for single-
+ file compression on file systems, has a larger header than zlib to maintain
+ directory information, and uses a different, slower check method than zlib.
+
+ This library does not provide any functions to write gzip files in memory.
+ However such functions could be easily written using zlib's deflate function,
+ the documentation in the gzip RFC, and the examples in gzio.c.
+
+ The library does not install any signal handler. The decoder checks
+ the consistency of the compressed data, so the library should never
+ crash even in case of corrupted input.
+*}
+
+type
+ {$EXTERNALSYM alloc_func}
+ alloc_func = function(opaque:voidpf; items:uInt; size:uInt):voidpf;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+ {$EXTERNALSYM free_func}
+ free_func = procedure(opaque:voidpf; address:voidpf);
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+ TFNAllocFunc = alloc_func;
+ TFNFreeFunc = free_func;
+
+type
+ {$EXTERNALSYM internal_state}
+ internal_state = packed record end;
+ TInternalState = internal_state; // backward compatibility
+ PInternalState = ^internal_state; // backward compatibility
+
+type
+ {$EXTERNALSYM z_stream_s}
+ z_stream_s = packed record
+ next_in: PBytef; // next input byte
+ avail_in: uInt; // number of bytes available at next_in
+ total_in: uLong; // total nb of input bytes read so far
+
+ next_out: PBytef; // next output byte should be put there
+ avail_out:uInt; // remaining free space at next_out
+ total_out:uLong; // total nb of bytes output so far
+
+ msg: PAnsiChar; // last error message, NULL if no error
+ state:PInternalState; // not visible by applications
+
+ zalloc: TFNAllocFunc;// used to allocate the internal state
+ zfree: TFNFreeFunc; // used to free the internal state
+ opaque: voidpf; // private data object passed to zalloc and zfree
+
+ data_type: Integer; // best guess about the data type: ascii or binary
+ adler: uLong; // adler32 value of the uncompressed data
+ reserved: uLong; // reserved for future use
+ end;
+
+ {$EXTERNALSYM z_stream}
+ z_stream = z_stream_s;
+ {$EXTERNALSYM z_streamp}
+ z_streamp = ^z_stream_s;
+
+ TZStreamRec = z_stream_s;
+ PZStreamRec = ^z_stream_s;
+
+{*
+ The application must update next_in and avail_in when avail_in has
+ dropped to zero. It must update next_out and avail_out when avail_out
+ has dropped to zero. The application must initialize zalloc, zfree and
+ opaque before calling the init function. All other fields are set by the
+ compression library and must not be updated by the application.
+
+ The opaque value provided by the application will be passed as the first
+ parameter for calls of zalloc and zfree. This can be useful for custom
+ memory management. The compression library attaches no meaning to the
+ opaque value.
+
+ zalloc must return Z_NULL if there is not enough memory for the object.
+ If zlib is used in a multi-threaded application, zalloc and zfree must be
+ thread safe.
+
+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
+ exactly 65536 bytes, but will not be required to allocate more than this
+ if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+ pointers returned by zalloc for objects of exactly 65536 bytes *must*
+ have their offset normalized to zero. The default allocation function
+ provided by this library ensures this (see zutil.c). To reduce memory
+ requirements and avoid any allocation of 64K objects, at the expense of
+ compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+ The fields total_in and total_out can be used for statistics or
+ progress reports. After compression, total_in holds the total size of
+ the uncompressed data and may be saved for use in the decompressor
+ (particularly if the decompressor wants to decompress everything in
+ a single step).
+*}
+
+ {* constants *}
+
+const
+ {$EXTERNALSYM Z_NO_FLUSH}
+ Z_NO_FLUSH = 0;
+ {$EXTERNALSYM Z_PARTIAL_FLUSH}
+ Z_PARTIAL_FLUSH = 1; // will be removed, use Z_SYNC_FLUSH instead
+ {$EXTERNALSYM Z_SYNC_FLUSH}
+ Z_SYNC_FLUSH = 2;
+ {$EXTERNALSYM Z_FULL_FLUSH}
+ Z_FULL_FLUSH = 3;
+ {$EXTERNALSYM Z_FINISH}
+ Z_FINISH = 4;
+ {$EXTERNALSYM Z_BLOCK}
+ Z_BLOCK = 5;
+
+{* Allowed flush values; see deflate() and inflate() below for details *}
+
+ {$EXTERNALSYM Z_OK}
+ Z_OK = 0;
+ {$EXTERNALSYM Z_STREAM_END}
+ Z_STREAM_END = 1;
+ {$EXTERNALSYM Z_NEED_DICT}
+ Z_NEED_DICT = 2;
+ {$EXTERNALSYM Z_ERRNO}
+ Z_ERRNO = -1;
+ {$EXTERNALSYM Z_STREAM_ERROR}
+ Z_STREAM_ERROR = -2;
+ {$EXTERNALSYM Z_DATA_ERROR}
+ Z_DATA_ERROR = -3;
+ {$EXTERNALSYM Z_MEM_ERROR}
+ Z_MEM_ERROR = -4;
+ {$EXTERNALSYM Z_BUF_ERROR}
+ Z_BUF_ERROR = -5;
+ {$EXTERNALSYM Z_VERSION_ERROR}
+ Z_VERSION_ERROR = -6;
+{* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ *}
+
+ {$EXTERNALSYM Z_NO_COMPRESSION}
+ Z_NO_COMPRESSION = 0;
+ {$EXTERNALSYM Z_BEST_SPEED}
+ Z_BEST_SPEED = 1;
+ {$EXTERNALSYM Z_BEST_COMPRESSION}
+ Z_BEST_COMPRESSION = 9;
+ {$EXTERNALSYM Z_DEFAULT_COMPRESSION}
+ Z_DEFAULT_COMPRESSION = -1;
+
+{* compression levels *}
+
+ {$EXTERNALSYM Z_FILTERED}
+ Z_FILTERED = 1;
+ {$EXTERNALSYM Z_HUFFMAN_ONLY}
+ Z_HUFFMAN_ONLY = 2;
+ {$EXTERNALSYM Z_RLE}
+ Z_RLE = 3;
+ {$EXTERNALSYM Z_DEFAULT_STRATEGY}
+ Z_DEFAULT_STRATEGY = 0;
+{* compression strategy; see deflateInit2() below for details *}
+
+ {$EXTERNALSYM Z_BINARY}
+ Z_BINARY = 0;
+ {$EXTERNALSYM Z_ASCII}
+ Z_ASCII = 1;
+ {$EXTERNALSYM Z_UNKNOWN}
+ Z_UNKNOWN = 2;
+{* Possible values of the data_type field (though see inflate()) *}
+
+ {$EXTERNALSYM Z_DEFLATED}
+ Z_DEFLATED = 8;
+{* The deflate compression method (the only one supported in this version) *}
+
+ {$EXTERNALSYM Z_NULL}
+ Z_NULL = 0; {* for initializing zalloc, zfree, opaque *}
+
+{* for compatibility with versions < 1.0.2 *}
+
+ {* basic functions *}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM TzlibVersion}
+ TzlibVersion = function (): PAnsiChar;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM zlibVersion}
+ zlibVersion: TzlibVersion = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM zlibVersion}
+function zlibVersion(): PAnsiChar;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ If the first character differs, the library code actually used is
+ not compatible with the zlib.h header file used by the application.
+ This check is automatically made by deflateInit and inflateInit.
+ *}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM TdeflateInit_}
+ TdeflateInit_ = function (var strm:z_stream;
+ level: Integer;
+ {const} version: PAnsiChar;
+ stream_size: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM deflateInit_}
+ deflateInit_: TdeflateInit_ = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflateInit_}
+function deflateInit_(var strm:z_stream;
+ level: Integer;
+ {const} version: PAnsiChar;
+ stream_size: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflateInit}
+function deflateInit(var strm: TZStreamRec; level: Integer): Integer; // macro
+{*
+ Initializes the internal stream state for compression. The fields
+ zalloc, zfree and opaque must be initialized before by the caller.
+ If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+ use default allocation functions.
+
+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+ 1 gives best speed, 9 gives best compression, 0 gives no compression at
+ all (the input data is simply copied a block at a time).
+ Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+ compression (currently equivalent to level 6).
+
+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+ with the version assumed by the caller (ZLIB_VERSION).
+ msg is set to null if there is no error message. deflateInit does not
+ perform any compression: this will be done by deflate().
+*}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM Tdeflate}
+ Tdeflate = function (var strm: TZStreamRec; flush: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM deflate}
+ deflate: Tdeflate = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflate}
+function deflate(var strm: TZStreamRec; flush: Integer): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{*
+ deflate compresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce some
+ output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. deflate performs one or both of the
+ following actions:
+
+ - Compress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in and avail_in are updated and
+ processing will resume at this point for the next call of deflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. This action is forced if the parameter flush is non zero.
+ Forcing flush frequently degrades the compression ratio, so this parameter
+ should be set only when necessary (in interactive applications).
+ Some output may be provided even if flush is not set.
+
+ Before the call of deflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming
+ more output, and updating avail_in or avail_out accordingly; avail_out
+ should never be zero before the call. The application can consume the
+ compressed output when it wants, for example when the output buffer is full
+ (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+ and with zero avail_out, it must be called again after making room in the
+ output buffer because there might be more output pending.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+ flushed to the output buffer and the output is aligned on a byte boundary, so
+ that the decompressor can get all input data available so far. (In particular
+ avail_in is zero after the call if enough output space has been provided
+ before the call.) Flushing may degrade compression for some compression
+ algorithms and so it should be used only when necessary.
+
+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+ restart from this point if previous compressed data has been damaged or if
+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+ the compression.
+
+ If deflate returns with avail_out == 0, this function must be called again
+ with the same value of the flush parameter and more output space (updated
+ avail_out), until the flush is complete (deflate returns with non-zero
+ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+ avail_out is greater than six to avoid repeated flush markers due to
+ avail_out == 0 on return.
+
+ If the parameter flush is set to Z_FINISH, pending input is processed,
+ pending output is flushed and deflate returns with Z_STREAM_END if there
+ was enough output space; if deflate returns with Z_OK, this function must be
+ called again with Z_FINISH and more output space (updated avail_out) but no
+ more input data, until it returns with Z_STREAM_END or an error. After
+ deflate has returned Z_STREAM_END, the only possible operations on the
+ stream are deflateReset or deflateEnd.
+
+ Z_FINISH can be used immediately after deflateInit if all the compression
+ is to be done in a single step. In this case, avail_out must be at least
+ the value returned by deflateBound (see below). If deflate does not return
+ Z_STREAM_END, then it must be called again as described above.
+
+ deflate() sets strm->adler to the adler32 checksum of all input read
+ so far (that is, total_in bytes).
+
+ deflate() may update data_type if it can make a good guess about
+ the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+ binary. This field is only for information purposes and does not affect
+ the compression algorithm in any manner.
+
+ deflate() returns Z_OK if some progress has been made (more input
+ processed or more output produced), Z_STREAM_END if all input has been
+ consumed and all output has been produced (only when flush is set to
+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+ if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+ fatal, and deflate() can be called again with more input and more output
+ space to continue compressing.
+*}
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
+ {$EXTERNALSYM TdeflateEnd}
+ TdeflateEnd = function (var strm: TZStreamRec): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+ {$EXTERNALSYM deflateEnd}
+ deflateEnd: TdeflateEnd = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflateEnd}
+function deflateEnd(var strm: TZStreamRec): Integer;
+ {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+{*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any
+ pending output.
+
+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+ prematurely (some input or output was discarded). In the error case,
+ msg may be set but then points to ...
[truncated message content] |
|
From: <ou...@us...> - 2008-09-11 22:16:34
|
Revision: 2465
http://jcl.svn.sourceforge.net/jcl/?rev=2465&view=rev
Author: outchy
Date: 2008-09-11 22:16:32 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
style cleaning.
Modified Paths:
--------------
trunk/jcl/source/common/bzip2.pas
Modified: trunk/jcl/source/common/bzip2.pas
===================================================================
--- trunk/jcl/source/common/bzip2.pas 2008-09-09 21:07:53 UTC (rev 2464)
+++ trunk/jcl/source/common/bzip2.pas 2008-09-11 22:16:32 UTC (rev 2465)
@@ -26,7 +26,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -459,7 +459,7 @@
begin
Result := True;
end;
- {$ENDIF ~BZIP2_LINKONREQUEST}
+{$ENDIF ~BZIP2_LINKONREQUEST}
function IsBZip2Loaded: Boolean;
begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2008-09-09 21:07:56
|
Revision: 2464
http://jcl.svn.sourceforge.net/jcl/?rev=2464&view=rev
Author: ahuser
Date: 2008-09-09 21:07:53 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
Updated InnoSetup Installer to support Delphi/C++Builder 2009
Modified Paths:
--------------
trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss
trunk/thirdparty/InnoSetup/IdeComponents.iss
trunk/thirdparty/InnoSetup/Install.iss
Modified: trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss
===================================================================
--- trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss 2008-09-09 19:42:02 UTC (rev 2463)
+++ trunk/thirdparty/InnoSetup/ComponentInstallerScript.iss 2008-09-09 21:07:53 UTC (rev 2464)
@@ -434,7 +434,7 @@
// Check if there is any Delphi IDE installed
Result := False;
- for Version := 5 to 11 do
+ for Version := 5 to 12 do
if IsDelphiInstalled(Version) then
Result := True;
Modified: trunk/thirdparty/InnoSetup/IdeComponents.iss
===================================================================
--- trunk/thirdparty/InnoSetup/IdeComponents.iss 2008-09-09 19:42:02 UTC (rev 2463)
+++ trunk/thirdparty/InnoSetup/IdeComponents.iss 2008-09-09 21:07:53 UTC (rev 2464)
@@ -25,4 +25,6 @@
#ifdef Include_Delphi11
Name: "IDE\Delphi11"; Description: "Install for RAD Studio 2007"; Types: full prefered; Check: IsDelphiInstalled(11)
#endif
-
+#ifdef Include_Delphi12
+Name: "IDE\Delphi12"; Description: "Install for RAD Studio 2009"; Types: full prefered; Check: IsDelphiInstalled(12)
+#endif
Modified: trunk/thirdparty/InnoSetup/Install.iss
===================================================================
--- trunk/thirdparty/InnoSetup/Install.iss 2008-09-09 19:42:02 UTC (rev 2463)
+++ trunk/thirdparty/InnoSetup/Install.iss 2008-09-09 21:07:53 UTC (rev 2464)
@@ -4,7 +4,7 @@
; Include_Binaries Create an installer that can install a precompiled JCL
; Include_Examples Add the Examples directory to the installer (user can then select the component)
; DEBUGGING Development. Will only use Delphi 5 BPLs as files with a fast compression (script debugging)
-; Include_DelphiX Include the binaries for Delphi X (X in 5..11)
+; Include_DelphiX Include the binaries for Delphi X (X in 5..12)
; Include_BCBX Include the binaries for C++Builder X (X in 5..6)
#define JclVersionStr "1.102.0.2726"
@@ -35,6 +35,7 @@
#define Include_Delphi9
#define Include_Delphi10
#define Include_Delphi11
+ #define Include_Delphi12
#endif
#endif
@@ -63,6 +64,8 @@
#define Delphi10Bpl BorlandSudioProjects + "\Bpl"
#define Delphi11Root CodeGearRoot + "\RAD Studio\5.0"
#define Delphi11Bpl CommonDocs + "\RAD Studio\5.0\Bpl"
+#define Delphi12Root CodeGearRoot + "\RAD Studio\6.0"
+#define Delphi12Bpl CommonDocs + "\RAD Studio\6.0\Bpl"
[Setup]
@@ -125,6 +128,7 @@
Name: delphi9; Description: "Delphi 2005 binary files"; Source: "{#downloadurl}/jcldelphi9.isz"; Flags: localcopy;
Name: delphi10; Description: "Delphi/C++Builder 2006 binary files"; Source: "{#downloadurl}/jcldelphi10.isz"; Flags: localcopy;
Name: delphi11; Description: "Delphi/C++Builder 2007 binary files"; Source: "{#downloadurl}/jcldelphi11.isz"; Flags: localcopy;
+Name: delphi12; Description: "Delphi/C++Builder 2009 binary files"; Source: "{#downloadurl}/jcldelphi12.isz"; Flags: localcopy;
#include "IdeComponents.iss"
@@ -205,9 +209,15 @@
; SolidBreak;
Source: {#JclRoot}\lib\d11\*; DestDir: "{app}\lib\d11"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
Source: {#Delphi11Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|11}"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
-Source: {#Delphi11Root}\Include\Vcl\Jcl*.hpp; DestDir: "{code:GetDelphiDir|10}\Include\Vcl"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#Delphi11Root}\Include\Vcl\Jcl*.hpp; DestDir: "{code:GetDelphiDir|11}\Include\Vcl"; Components: "IDE\Delphi11"; Package: delphi11; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
+#ifdef Include_Delphi12
+; SolidBreak;
+Source: {#JclRoot}\lib\d12\*; DestDir: "{app}\lib\d12"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#Delphi12Bpl}\Jcl*.*; DestDir: "{code:GetDelphiBplDir|12}"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
+Source: {#Delphi12Root}\Include\Vcl\Jcl*.hpp; DestDir: "{code:GetDelphiDir|12}\Include\Vcl"; Components: "IDE\Delphi12"; Package: delphi12; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs
#endif
+#endif
; only source code => execute Jedi Installer
[Run]
@@ -256,8 +266,17 @@
Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Jedi\JCL"; ValueType: string; ValueName: "DcpDir"; ValueData: {app}\lib\d11; Components: "IDE\Delphi11"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(11)
Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Jedi\JCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi11"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(11)
Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Jedi\JCL"; ValueType: string; ValueName: "Version"; ValueData: {#JclVersionStr}; Components: "IDE\Delphi11"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(11)
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|11}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi11"; Check: IsDelphiInstalled(11)
#endif
+#ifdef Include_Delphi12
+; Delphi 2009
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|12}\Jedi\JCL"; ValueType: string; ValueName: "BplDir"; ValueData: {code:GetDelphiBplDir|12}; Components: "IDE\Delphi12"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(12)
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|12}\Jedi\JCL"; ValueType: string; ValueName: "DcpDir"; ValueData: {app}\lib\d12; Components: "IDE\Delphi12"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(12)
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|12}\Jedi\JCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi12"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(12)
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|12}\Jedi\JCL"; ValueType: string; ValueName: "Version"; ValueData: {#JclVersionStr}; Components: "IDE\Delphi12"; Flags: uninsdeletevalue; Check: IsDelphiInstalled(12)
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|12}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi12"; Check: IsDelphiInstalled(12)
#endif
+#endif
@@ -304,6 +323,11 @@
Type: files; Name: "{app}\lib\d11\debug\*"
Type: files; Name: "{code:GetDelphiBplDir|11}\Jcl*.*"
Type: files; Name: "{code:GetDelphiDir|11}\Include\Vcl\Jcl*.hpp"
+; lib\Delphi/C++Builder 2009
+Type: files; Name: "{app}\lib\d12\*"
+Type: files; Name: "{app}\lib\d12\debug\*"
+Type: files; Name: "{code:GetDelphiBplDir|12}\Jcl*.*"
+Type: files; Name: "{code:GetDelphiDir|12}\Include\Vcl\Jcl*.hpp"
[Icons]
@@ -330,7 +354,7 @@
Version: Integer;
begin
{ // Uninstall from all IDEs ?
- for Version := 5 to 11 do
+ for Version := 5 to 12 do
UninstallExpertsPrefixed(ikDelphi, Version, 'Jcl');
for Version := 5 to 6 do
UninstallExpertsPrefixed(ikBCB, Version, 'Jcl');}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-09 19:42:05
|
Revision: 2463
http://jcl.svn.sourceforge.net/jcl/?rev=2463&view=rev
Author: outchy
Date: 2008-09-09 19:42:02 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
tag for the version in Delphi 2009 and C++Builder 2009 partner DVD.
Added Paths:
-----------
tags/JCL-1.103-Build3110-Preview/
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.
