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-01-31 15:33:48
|
Revision: 2337
http://jcl.svn.sourceforge.net/jcl/?rev=2337&view=rev
Author: outchy
Date: 2008-01-31 07:33:45 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
updated documentation project file to reflect moves of JclUnicode.pas and JclSynch.pas
Modified Paths:
--------------
trunk/help/JCLHelp.dox
Modified: trunk/help/JCLHelp.dox
===================================================================
--- trunk/help/JCLHelp.dox 2008-01-31 11:15:05 UTC (rev 2336)
+++ trunk/help/JCLHelp.dox 2008-01-31 15:33:45 UTC (rev 2337)
@@ -51520,7 +51520,7 @@
AutoDocText3=The following table lists %CATEGORYL% in this documentation.
AutoSyntaxHighlightCodeBlock=1
ClassHierarchyCommonLayoutOptions=0
-ClassHierarchyLayoutOutputDir=C:\Users\Admin\Documents\Doc-O-Matic\createdgraphics
+ClassHierarchyLayoutOutputDir=..\..\..\Users\Admin\Documents\Doc-O-Matic\createdgraphics
ClassHierarchyTextLayoutFlatSeparator=' |'
ClassHierarchyTextLayoutHangingIndent=' '
ClassHierarchyTextLayoutOptions=2
@@ -135956,41 +135956,41 @@
File0=8087.dtx
File1=AppInst.dtx
File10=ExprEval.dtx
-File100=..\jcl\source\vcl\JclGraphics.pas
-File101=..\jcl\source\vcl\JclGraphUtils.pas
-File102=..\jcl\source\vcl\JclPrint.pas
-File103=..\jcl\source\visclx\JclQGraphics.pas
-File104=..\jcl\source\visclx\JclQGraphUtils.pas
-File105=..\jcl\source\windows\Hardlinks.pas
-File106=..\jcl\source\windows\JclAppInst.pas
-File107=..\jcl\source\windows\JclCIL.pas
-File108=..\jcl\source\windows\JclCLR.pas
-File109=..\jcl\source\windows\JclCOM.pas
+File100=..\jcl\source\common\pcre.pas
+File101=..\jcl\source\vcl\JclFont.pas
+File102=..\jcl\source\vcl\JclGraphics.pas
+File103=..\jcl\source\vcl\JclGraphUtils.pas
+File104=..\jcl\source\vcl\JclPrint.pas
+File105=..\jcl\source\visclx\JclQGraphics.pas
+File106=..\jcl\source\visclx\JclQGraphUtils.pas
+File107=..\jcl\source\windows\Hardlinks.pas
+File108=..\jcl\source\windows\JclAppInst.pas
+File109=..\jcl\source\windows\JclCIL.pas
File11=FileUtils.dtx
-File110=..\jcl\source\windows\JclConsole.pas
-File111=..\jcl\source\windows\JclDebug.pas
-File112=..\jcl\source\windows\JclDotNet.pas
-File113=..\jcl\source\windows\JclHookExcept.pas
-File114=..\jcl\source\windows\JclLANMan.pas
-File115=..\jcl\source\windows\JclLocales.pas
-File116=..\jcl\source\windows\JclMapi.pas
-File117=..\jcl\source\windows\JclMetadata.pas
-File118=..\jcl\source\windows\JclMiscel.pas
-File119=..\jcl\source\windows\JclMsdosSys.pas
+File110=..\jcl\source\windows\JclCLR.pas
+File111=..\jcl\source\windows\JclCOM.pas
+File112=..\jcl\source\windows\JclConsole.pas
+File113=..\jcl\source\windows\JclDebug.pas
+File114=..\jcl\source\windows\JclDotNet.pas
+File115=..\jcl\source\windows\JclHookExcept.pas
+File116=..\jcl\source\windows\JclLANMan.pas
+File117=..\jcl\source\windows\JclLocales.pas
+File118=..\jcl\source\windows\JclMapi.pas
+File119=..\jcl\source\windows\JclMetadata.pas
File12=Font.dtx
-File120=..\jcl\source\windows\JclMultimedia.pas
-File121=..\jcl\source\windows\JclNTFS.pas
-File122=..\jcl\source\windows\JclPeImage.pas
-File123=..\jcl\source\windows\JclRegistry.pas
-File124=..\jcl\source\windows\JclSecurity.pas
-File125=..\jcl\source\windows\JclShell.pas
-File126=..\jcl\source\windows\JclStructStorage.pas
-File127=..\jcl\source\windows\JclSvcCtrl.pas
-File128=..\jcl\source\windows\JclSynch.pas
-File129=..\jcl\source\windows\JclTask.pas
+File120=..\jcl\source\windows\JclMiscel.pas
+File121=..\jcl\source\windows\JclMsdosSys.pas
+File122=..\jcl\source\windows\JclMultimedia.pas
+File123=..\jcl\source\windows\JclNTFS.pas
+File124=..\jcl\source\windows\JclPeImage.pas
+File125=..\jcl\source\windows\JclRegistry.pas
+File126=..\jcl\source\windows\JclSecurity.pas
+File127=..\jcl\source\windows\JclShell.pas
+File128=..\jcl\source\windows\JclStructStorage.pas
+File129=..\jcl\source\windows\JclSvcCtrl.pas
File13=Graphics.dtx
-File130=..\jcl\source\windows\JclTD32.pas
-File131=..\jcl\source\windows\JclUnicode.pas
+File130=..\jcl\source\windows\JclTask.pas
+File131=..\jcl\source\windows\JclTD32.pas
File132=..\jcl\source\windows\JclWideFormat.pas
File133=..\jcl\source\windows\JclWin32.pas
File134=..\jcl\source\windows\JclWin32Ex.pas
@@ -136079,16 +136079,16 @@
File88=..\jcl\source\common\JclStrHashMap.pas
File89=..\jcl\source\common\JclStrings.pas
File9=Debug.dtx
-File90=..\jcl\source\common\JclSysInfo.pas
-File91=..\jcl\source\common\JclSysUtils.pas
-File92=..\jcl\source\common\JclUnitConv.pas
-File93=..\jcl\source\common\JclUnitVersioning.pas
-File94=..\jcl\source\common\JclUnitVersioningProviders.pas
-File95=..\jcl\source\common\JclValidation.pas
-File96=..\jcl\source\common\JclVectors.pas
-File97=..\jcl\source\common\JclWideStrings.pas
-File98=..\jcl\source\common\pcre.pas
-File99=..\jcl\source\vcl\JclFont.pas
+File90=..\jcl\source\common\JclSynch.pas
+File91=..\jcl\source\common\JclSysInfo.pas
+File92=..\jcl\source\common\JclSysUtils.pas
+File93=..\jcl\source\common\JclUnicode.pas
+File94=..\jcl\source\common\JclUnitConv.pas
+File95=..\jcl\source\common\JclUnitVersioning.pas
+File96=..\jcl\source\common\JclUnitVersioningProviders.pas
+File97=..\jcl\source\common\JclValidation.pas
+File98=..\jcl\source\common\JclVectors.pas
+File99=..\jcl\source\common\JclWideStrings.pas
[Source Include Directories]
Count=1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-31 11:15:47
|
Revision: 2336
http://jcl.svn.sourceforge.net/jcl/?rev=2336&view=rev
Author: outchy
Date: 2008-01-31 03:15:05 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
added missing header.
Modified Paths:
--------------
trunk/jcl/source/windows/sevenzip.pas
Modified: trunk/jcl/source/windows/sevenzip.pas
===================================================================
--- trunk/jcl/source/windows/sevenzip.pas 2008-01-31 10:46:56 UTC (rev 2335)
+++ trunk/jcl/source/windows/sevenzip.pas 2008-01-31 11:15:05 UTC (rev 2336)
@@ -1,3 +1,55 @@
+{**************************************************************************************************}
+{ }
+{ Project JEDI Code Library (JCL) }
+{ }
+{ interface of the 'sevenzip' (http://sourceforge.net/projects/sevenzip/) compression library }
+{ version 4.57, December 6th, 2007 }
+{ }
+{ Copyright (C) 1999-2007 Igor Pavlov }
+{ }
+{ GNU LGPL information }
+{ -------------------- }
+{ }
+{ This library is free software; you can redistribute it and/or modify it under the terms of }
+{ the GNU Lesser General Public License as published by the Free Software Foundation; either }
+{ version 2.1 of the License, or (at your option) any later version. }
+{ }
+{ This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; }
+{ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. }
+{ See the GNU Lesser General Public License for more details. }
+{ }
+{ You should have received a copy of the GNU Lesser General Public License along with this }
+{ library; if not, write to }
+{ the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA }
+{ }
+{ unRAR restriction }
+{ ----------------- }
+{ }
+{ The decompression engine for RAR archives was developed using source code of unRAR program. }
+{ All copyrights to original unRAR code are owned by Alexander Roshal. }
+{ }
+{ The license for original unRAR code has the following restriction: }
+{ }
+{ The unRAR sources cannot be used to re-create the RAR compression algorithm, }
+{ which is proprietary. Distribution of modified unRAR sources in separate form }
+{ or as a part of other software is permitted, provided that it is clearly }
+{ stated in the documentation and source comments that the code may }
+{ not be used to develop a RAR (WinRAR) compatible archiver. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Translation 2007-2008 Florent Ouchet for the Jedi Code Library }
+{ Contributors: }
+{ Uwe Schuster (uschuster) }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
unit sevenzip;
interface
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-31 10:47:15
|
Revision: 2335
http://jcl.svn.sourceforge.net/jcl/?rev=2335&view=rev
Author: outchy
Date: 2008-01-31 02:46:56 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
introducing singletons to maintain list of supported formats for compressed streams and archives.
updated archive and stream classes to describe their names and supported extensions.
added new formats of sevenzip 4.57: Wim and Compound.
updated compression example to retrieve archive class from the list of registered formats.
Modified Paths:
--------------
trunk/jcl/examples/windows/compression/archive/UMain.dfm
trunk/jcl/examples/windows/compression/archive/UMain.pas
trunk/jcl/source/common/JclCompression.pas
trunk/jcl/source/common/JclResources.pas
trunk/jcl/source/windows/sevenzip.pas
Modified: trunk/jcl/examples/windows/compression/archive/UMain.dfm
===================================================================
--- trunk/jcl/examples/windows/compression/archive/UMain.dfm 2008-01-31 09:21:45 UTC (rev 2334)
+++ trunk/jcl/examples/windows/compression/archive/UMain.dfm 2008-01-31 10:46:56 UTC (rev 2335)
@@ -11,6 +11,7 @@
Font.Name = 'Tahoma'
Font.Style = []
OldCreateOrder = False
+ OnCreate = FormCreate
OnDestroy = FormDestroy
PixelsPerInch = 96
TextHeight = 13
@@ -99,7 +100,7 @@
Top = 16
Width = 75
Height = 25
- Action = ActionOpen
+ Action = ActionOpenRO
TabOrder = 0
end
object ButtonExtractSelected: TButton
@@ -107,7 +108,7 @@
Top = 16
Width = 96
Height = 25
- Action = ActionExtractSelected
+ Action = ActionExtractSelectedRO
TabOrder = 1
end
object ButtonExtractAll: TButton
@@ -115,7 +116,7 @@
Top = 16
Width = 75
Height = 25
- Action = ActionExtractAll
+ Action = ActionExtractAllRO
TabOrder = 2
end
end
@@ -127,7 +128,7 @@
Top = 16
Width = 75
Height = 25
- Action = ActionNew
+ Action = ActionNewWO
TabOrder = 0
end
object ButtonAddFile: TButton
@@ -179,7 +180,7 @@
Top = 16
Width = 75
Height = 25
- Action = ActionDelete
+ Action = ActionDeleteRW
TabOrder = 2
end
object ButtonAddFileRW: TButton
@@ -203,7 +204,7 @@
Top = 16
Width = 92
Height = 25
- Action = ActionExtractSelected
+ Action = ActionExtractSelectedRO
TabOrder = 5
end
object ButtonExtractAllRW: TButton
@@ -211,7 +212,7 @@
Top = 16
Width = 75
Height = 25
- Action = ActionExtractAll
+ Action = ActionExtractAllRO
TabOrder = 6
end
object ButtonSaveRW: TButton
@@ -227,53 +228,53 @@
object ActionList1: TActionList
Left = 64
Top = 152
- object ActionOpen: TAction
+ object ActionOpenRO: TAction
Category = 'ReadOnly'
Caption = '&Open'
- OnExecute = ActionOpenExecute
+ OnExecute = ActionOpenROExecute
OnUpdate = ActionAlwaysEnabled
end
- object ActionExtractSelected: TAction
+ object ActionExtractSelectedRO: TAction
Category = 'ReadOnly'
Caption = '&Extract selected'
- OnExecute = ActionExtractSelectedExecute
- OnUpdate = ActionExtractSelectedUpdate
+ OnExecute = ActionExtractSelectedROExecute
+ OnUpdate = ActionExtractSelectedROUpdate
end
- object ActionExtractAll: TAction
+ object ActionExtractAllRO: TAction
Category = 'ReadOnly'
Caption = 'Extract &all'
- OnExecute = ActionExtractAllExecute
- OnUpdate = ActionExtractAllUpdate
+ OnExecute = ActionExtractAllROExecute
+ OnUpdate = ActionExtractAllROUpdate
end
- object ActionNew: TAction
+ object ActionNewWO: TAction
Category = 'WriteOnly'
Caption = '&New'
- OnExecute = ActionNewExecute
+ OnExecute = ActionNewWOExecute
OnUpdate = ActionAlwaysEnabled
end
object ActionAddFile: TAction
- Category = 'WriteOnly'
+ Category = 'Write'
Caption = 'Add &file'
OnExecute = ActionAddFileExecute
OnUpdate = ActionAddFileUpdate
end
object ActionAddDirectory: TAction
- Category = 'WriteOnly'
+ Category = 'Write'
Caption = 'Add &directory'
OnExecute = ActionAddDirectoryExecute
OnUpdate = ActionAddDirectoryUpdate
end
object ActionSave: TAction
- Category = 'WriteOnly'
+ Category = 'Write'
Caption = '&Save'
OnExecute = ActionSaveExecute
OnUpdate = ActionSaveUpdate
end
- object ActionDelete: TAction
+ object ActionDeleteRW: TAction
Category = 'ReadWrite'
Caption = '&Delete'
- OnExecute = ActionDeleteExecute
- OnUpdate = ActionDeleteUpdate
+ OnExecute = ActionDeleteRWExecute
+ OnUpdate = ActionDeleteRWUpdate
end
object ActionNewRW: TAction
Category = 'ReadWrite'
@@ -288,27 +289,15 @@
OnUpdate = ActionAlwaysEnabled
end
end
- object OpenDialogArchive: TOpenDialog
- Filter =
- 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
- 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
- '|*.gz|Rar archive (*.rar)|*.rar|Arj archive (*.arj)|*.arj|Z arch' +
- 'ive (*.z)|*.z|Lzh archive (*.lzh)|*.lzh|Nsis archive (*.nsis)|*.' +
- 'nsis|Iso image (*.iso)|*.iso|Cab archive (*.cab)|*.cab|Chm file ' +
- '(*.chm)|*.chm|Rpm archive (*.rpm)|*.rpm|Deb archive (*.deb)|*.de' +
- 'b|Cpio archive (*.cpio)|*.cpio|Split archive (*.001)|*.001'
+ object OpenDialogArchiveRO: TOpenDialog
FilterIndex = 0
Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
Title = 'Open an archive for extraction'
Left = 104
Top = 152
end
- object SaveDialogArchive: TSaveDialog
+ object SaveDialogArchiveWO: TSaveDialog
DefaultExt = '*.zip'
- Filter =
- 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
- 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
- '|*.gz|Splitted archive (*.001)|*.001'
FilterIndex = 0
Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofCreatePrompt, ofNoReadOnlyReturn, ofEnableSizing]
Title = 'Create a new archive'
@@ -319,18 +308,22 @@
Filter = 'All files (*.*)|*.*'
FilterIndex = 0
Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
- Left = 104
- Top = 216
+ Left = 184
+ Top = 152
end
object OpenDialogArchiveRW: TOpenDialog
- Filter =
- 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
- 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
- '|*.gz|Split archive (*.001)|*.001'
FilterIndex = 0
Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
Title = 'Open an archive for modification'
Left = 104
Top = 184
end
+ object SaveDialogArchiveRW: TSaveDialog
+ DefaultExt = '*.zip'
+ FilterIndex = 0
+ Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofCreatePrompt, ofNoReadOnlyReturn, ofEnableSizing]
+ Title = 'Create a new archive'
+ Left = 144
+ Top = 184
+ end
end
Modified: trunk/jcl/examples/windows/compression/archive/UMain.pas
===================================================================
--- trunk/jcl/examples/windows/compression/archive/UMain.pas 2008-01-31 09:21:45 UTC (rev 2334)
+++ trunk/jcl/examples/windows/compression/archive/UMain.pas 2008-01-31 10:46:56 UTC (rev 2335)
@@ -11,16 +11,16 @@
type
TForm1 = class(TForm)
ActionList1: TActionList;
- ActionOpen: TAction;
- ActionExtractSelected: TAction;
- ActionExtractAll: TAction;
- ActionNew: TAction;
+ ActionOpenRO: TAction;
+ ActionExtractSelectedRO: TAction;
+ ActionExtractAllRO: TAction;
+ ActionNewWO: TAction;
ActionAddFile: TAction;
ActionAddDirectory: TAction;
ActionSave: TAction;
ListView1: TListView;
- OpenDialogArchive: TOpenDialog;
- SaveDialogArchive: TSaveDialog;
+ OpenDialogArchiveRO: TOpenDialog;
+ SaveDialogArchiveWO: TSaveDialog;
OpenDialogFile: TOpenDialog;
ProgressBar1: TProgressBar;
PageControl1: TPageControl;
@@ -34,7 +34,7 @@
ButtonAddFile: TButton;
ButtonAddDirectory: TButton;
ButtonSave: TButton;
- ActionDelete: TAction;
+ ActionDeleteRW: TAction;
ActionNewRW: TAction;
ActionOpenRW: TAction;
ButtonNewRW: TButton;
@@ -46,25 +46,27 @@
ButtonExtractAllRW: TButton;
ButtonSaveRW: TButton;
OpenDialogArchiveRW: TOpenDialog;
+ SaveDialogArchiveRW: TSaveDialog;
procedure ActionAlwaysEnabled(Sender: TObject);
- procedure ActionExtractSelectedUpdate(Sender: TObject);
- procedure ActionExtractAllUpdate(Sender: TObject);
+ procedure ActionExtractSelectedROUpdate(Sender: TObject);
+ procedure ActionExtractAllROUpdate(Sender: TObject);
procedure ActionAddFileUpdate(Sender: TObject);
procedure ActionAddDirectoryUpdate(Sender: TObject);
procedure ActionSaveUpdate(Sender: TObject);
- procedure ActionNewExecute(Sender: TObject);
+ procedure ActionNewWOExecute(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure ActionAddFileExecute(Sender: TObject);
procedure ActionAddDirectoryExecute(Sender: TObject);
procedure ActionSaveExecute(Sender: TObject);
- procedure ActionOpenExecute(Sender: TObject);
+ procedure ActionOpenROExecute(Sender: TObject);
procedure ListView1Data(Sender: TObject; Item: TListItem);
- procedure ActionExtractAllExecute(Sender: TObject);
- procedure ActionExtractSelectedExecute(Sender: TObject);
- procedure ActionDeleteUpdate(Sender: TObject);
- procedure ActionDeleteExecute(Sender: TObject);
+ procedure ActionExtractAllROExecute(Sender: TObject);
+ procedure ActionExtractSelectedROExecute(Sender: TObject);
+ procedure ActionDeleteRWUpdate(Sender: TObject);
+ procedure ActionDeleteRWExecute(Sender: TObject);
procedure ActionNewRWExecute(Sender: TObject);
procedure ActionOpenRWExecute(Sender: TObject);
+ procedure FormCreate(Sender: TObject);
private
FArchive: TJclCompressionArchive;
procedure CloseArchive;
@@ -137,7 +139,7 @@
(Sender as TAction).Enabled := True;
end;
-procedure TForm1.ActionDeleteExecute(Sender: TObject);
+procedure TForm1.ActionDeleteRWExecute(Sender: TObject);
var
Index: Integer;
begin
@@ -151,12 +153,12 @@
ListView1.Items.Count := FArchive.ItemCount;
end;
-procedure TForm1.ActionDeleteUpdate(Sender: TObject);
+procedure TForm1.ActionDeleteRWUpdate(Sender: TObject);
begin
(Sender as TAction).Enabled := (FArchive is TJclUpdateArchive) and (ListView1.SelCount = 1);
end;
-procedure TForm1.ActionExtractAllExecute(Sender: TObject);
+procedure TForm1.ActionExtractAllROExecute(Sender: TObject);
var
Directory: string;
begin
@@ -170,12 +172,12 @@
end;
end;
-procedure TForm1.ActionExtractAllUpdate(Sender: TObject);
+procedure TForm1.ActionExtractAllROUpdate(Sender: TObject);
begin
(Sender as TAction).Enabled := (FArchive is TJclDecompressArchive) or (FArchive is TJclUpdateArchive);
end;
-procedure TForm1.ActionExtractSelectedExecute(Sender: TObject);
+procedure TForm1.ActionExtractSelectedROExecute(Sender: TObject);
var
Directory: string;
Index: Integer;
@@ -193,185 +195,121 @@
end;
end;
-procedure TForm1.ActionExtractSelectedUpdate(Sender: TObject);
+procedure TForm1.ActionExtractSelectedROUpdate(Sender: TObject);
begin
(Sender as TAction).Enabled := ((FArchive is TJclDecompressArchive) or (FArchive is TJclUpdateArchive))
and (ListView1.SelCount > 0);
end;
-procedure TForm1.ActionNewExecute(Sender: TObject);
+procedure TForm1.ActionNewWOExecute(Sender: TObject);
var
- ArchiveFileName, ArchiveExt, VolumeSizeStr, Password: string;
+ ArchiveFileName, VolumeSizeStr, Password: string;
+ AFormat: TJclCompressArchiveClass;
VolumeSize: Int64;
Code: Integer;
begin
- if SaveDialogArchive.Execute then
+ if SaveDialogArchiveWO.Execute then
begin
CloseArchive;
- ArchiveFileName := SaveDialogArchive.FileName;
- VolumeSizeStr := '0';
- repeat
- if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
- Val(VolumeSizeStr, VolumeSize, Code)
- else
- begin
- VolumeSize := 0;
- Code := 0;
- end;
- until Code = 0;
+ ArchiveFileName := SaveDialogArchiveWO.FileName;
- InputQuery('Archive password', 'Value', Password);
+ AFormat := GetArchiveFormats.FindCompressFormat(ArchiveFileName);
- ArchiveExt := ExtractFileExt(ArchiveFileName);
- if VolumeSize <> 0 then
- ArchiveFileName := ArchiveFileName + '.%d';
+ if AFormat <> nil then
+ begin
+ VolumeSizeStr := '0';
+ repeat
+ if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
+ Val(VolumeSizeStr, VolumeSize, Code)
+ else
+ begin
+ VolumeSize := 0;
+ Code := 0;
+ end;
+ until Code = 0;
- if AnsiSameText(ArchiveExt, '.zip') then
- FArchive := TJclZipCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.tar') then
- FArchive := TJclTarCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.7z') then
- FArchive := TJcl7zCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.bz2') then
- FArchive := TJclBZ2CompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.gz') then
- FArchive := TJclGZipCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
+ InputQuery('Archive password', 'Value', Password);
- if Assigned(FArchive) then
- begin
+ if VolumeSize <> 0 then
+ ArchiveFileName := ArchiveFileName + '.%d';
+
+ FArchive := AFormat.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
FArchive.Password := Password;
FArchive.OnProgress := ArchiveProgress;
- end;
+ end
+ else
+ ShowMessage('not a supported format');
end;
end;
procedure TForm1.ActionNewRWExecute(Sender: TObject);
var
- ArchiveFileName, ArchiveExt, VolumeSizeStr, Password: string;
+ ArchiveFileName, VolumeSizeStr, Password: string;
+ AFormat: TJclUpdateArchiveClass;
VolumeSize: Int64;
Code: Integer;
begin
- if SaveDialogArchive.Execute then
+ if SaveDialogArchiveRW.Execute then
begin
CloseArchive;
- ArchiveFileName := SaveDialogArchive.FileName;
- VolumeSizeStr := '0';
- repeat
- if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
- Val(VolumeSizeStr, VolumeSize, Code)
- else
- begin
- VolumeSize := 0;
- Code := 0;
- end;
- until Code = 0;
+ ArchiveFileName := SaveDialogArchiveRW.FileName;
- InputQuery('Archive password', 'Value', Password);
+ AFormat := GetArchiveFormats.FindUpdateFormat(ArchiveFileName);
- ArchiveExt := ExtractFileExt(ArchiveFileName);
- if VolumeSize <> 0 then
- ArchiveFileName := ArchiveFileName + '.%d';
+ if AFormat <> nil then
+ begin
+ VolumeSizeStr := '0';
+ repeat
+ if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
+ Val(VolumeSizeStr, VolumeSize, Code)
+ else
+ begin
+ VolumeSize := 0;
+ Code := 0;
+ end;
+ until Code = 0;
- if AnsiSameText(ArchiveExt, '.zip') then
- FArchive := TJclZipUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.tar') then
- FArchive := TJclTarUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.7z') then
- FArchive := TJcl7zUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.bz2') then
- FArchive := TJclBZ2UpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.gz') then
- FArchive := TJclGZipUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
+ InputQuery('Archive password', 'Value', Password);
- if Assigned(FArchive) then
- begin
+ if VolumeSize <> 0 then
+ ArchiveFileName := ArchiveFileName + '.%d';
+
+ FArchive := AFormat.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
FArchive.Password := Password;
FArchive.OnProgress := ArchiveProgress;
- end;
+ end
+ else
+ ShowMessage('not a supported format');
end;
end;
-procedure TForm1.ActionOpenExecute(Sender: TObject);
+procedure TForm1.ActionOpenROExecute(Sender: TObject);
var
- ArchiveFileName, ArchiveFileExt, Password: string;
+ ArchiveFileName, Password: string;
+ AFormat: TJclDecompressArchiveClass;
SplitArchive: Boolean;
begin
- if OpenDialogArchive.Execute then
+ if OpenDialogArchiveRO.Execute then
begin
CloseArchive;
- ArchiveFileName := OpenDialogArchive.FileName;
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- SplitArchive := AnsiSameText(ArchiveFileExt, '.001');
+ ArchiveFileName := OpenDialogArchiveRO.FileName;
+ SplitArchive := AnsiSameText(ExtractFileExt(ArchiveFileName), '.001');
if SplitArchive then
- begin
ArchiveFileName := ChangeFileExt(ArchiveFileName, '');
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- ArchiveFileName := ArchiveFileName + '.%d';
- end;
- InputQuery('Archive password', 'Value', Password);
+ AFormat := GetArchiveFormats.FindDecompressFormat(ArchiveFileName);
- if AnsiSameText(ArchiveFileExt, '.zip') then
- FArchive := TJclZipDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.bz2') then
- FArchive := TJclBZ2DecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.rar') then
- FArchive := TJclRarDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.arj') then
- FArchive := TJclArjDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.z') then
- FArchive := TJclZDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.lzh') then
- FArchive := TJclLzhDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.7z') then
- FArchive := TJcl7zDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.nsis') then
- FArchive := TJclNsisDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.iso') then
- FArchive := TJclIsoDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.cab') then
- FArchive := TJclCabDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.chm') then
- FArchive := TJclChmDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.rpm') then
- FArchive := TJclRpmDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.deb') then
- FArchive := TJclDebDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.cpio') then
- FArchive := TJclCpioDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.tar') then
- FArchive := TJclTarDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.gz') then
- FArchive := TJclGZipDecompressArchive.Create(ArchiveFileName, 0, SplitArchive);
-
- if Assigned(FArchive) then
+ if AFormat <> nil then
begin
+ if SplitArchive then
+ ArchiveFileName := ArchiveFileName + '.%d';
+
+ InputQuery('Archive password', 'Value', Password);
+
+ FArchive := AFormat.Create(ArchiveFileName, 0, SplitArchive);
FArchive.Password := Password;
FArchive.OnProgress := ArchiveProgress;
@@ -388,13 +326,16 @@
finally
ListView1.Items.EndUpdate;
end;
- end;
+ end
+ else
+ ShowMessage('not a supported format');
end;
end;
procedure TForm1.ActionOpenRWExecute(Sender: TObject);
var
- ArchiveFileName, ArchiveFileExt, Password: string;
+ ArchiveFileName, Password: string;
+ AFormat: TJclUpdateArchiveClass;
SplitArchive: Boolean;
begin
if OpenDialogArchiveRW.Execute then
@@ -402,34 +343,20 @@
CloseArchive;
ArchiveFileName := OpenDialogArchiveRW.FileName;
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- SplitArchive := AnsiSameText(ArchiveFileExt, '.001');
+ SplitArchive := AnsiSameText(ExtractFileExt(ArchiveFileName), '.001');
if SplitArchive then
- begin
ArchiveFileName := ChangeFileExt(ArchiveFileName, '');
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- ArchiveFileName := ArchiveFileName + '.%d';
- end;
- InputQuery('Archive password', 'Value', Password);
+ AFormat := GetArchiveFormats.FindUpdateFormat(ArchiveFileName);
- if AnsiSameText(ArchiveFileExt, '.zip') then
- FArchive := TJclZipUpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.bz2') then
- FArchive := TJclBZ2UpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.7z') then
- FArchive := TJcl7zUpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.tar') then
- FArchive := TJclTarUpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.gz') then
- FArchive := TJclGZipUpdateArchive.Create(ArchiveFileName, 0, SplitArchive);
-
- if Assigned(FArchive) then
+ if AFormat <> nil then
begin
+ if SplitArchive then
+ ArchiveFileName := ArchiveFileName + '.%d';
+
+ InputQuery('Archive password', 'Value', Password);
+
+ FArchive := AFormat.Create(ArchiveFileName, 0, SplitArchive);
FArchive.Password := Password;
FArchive.OnProgress := ArchiveProgress;
@@ -446,7 +373,9 @@
finally
ListView1.Items.EndUpdate;
end;
- end;
+ end
+ else
+ ShowMessage('not a supported format');
end;
end;
@@ -483,6 +412,61 @@
ListView1.Items.Clear;
end;
+procedure TForm1.FormCreate(Sender: TObject);
+ procedure MergeFilters(var AFilter, AllExtensions: string; AFormat: TJclCompressionArchiveClass);
+ var
+ AName, AExtensions: string;
+ begin
+ AName := AFormat.ArchiveName;
+ AExtensions := AFormat.ArchiveExtensions;
+ if AFilter = '' then
+ AFilter := Format('%0:s (%1:s)|%1:s', [AName, AExtensions])
+ else
+ AFilter := Format('%0:s|%1:s (%2:s)|%2:s', [AFilter, AName, AExtensions]);
+ if AllExtensions = '' then
+ AllExtensions := AExtensions
+ else
+ AllExtensions := Format('%s;%s', [AllExtensions, AExtensions]);
+ end;
+ function AddStandardFilters(const AFilter, AllExtensions: string): string;
+ begin
+ if AFilter = '' then
+ Result := ''
+ else
+ Result := Format('All supported formats|(%0:s)|%1:s', [AllExtensions, AFilter]);
+ end;
+var
+ AFilter, AllExtensions: string;
+ AFormats: TJclCompressionArchiveFormats;
+ Index: Integer;
+begin
+ AFormats := GetArchiveFormats;
+
+ AFilter := '';
+ AllExtensions := '';
+ for Index := 0 to AFormats.CompressFormatCount - 1 do
+ MergeFilters(AFilter, AllExtensions, AFormats.CompressFormats[Index]);
+ SaveDialogArchiveWO.Filter := AFilter;
+
+ AFilter := '';
+ AllExtensions := '';
+ for Index := 0 to AFormats.UpdateFormatCount - 1 do
+ MergeFilters(AFilter, AllExtensions, AFormats.UpdateFormats[Index]);
+ SaveDialogArchiveRW.Filter := AFilter;
+
+ AFilter := '';
+ AllExtensions := '';
+ for Index := 0 to AFormats.DecompressFormatCount - 1 do
+ MergeFilters(AFilter, AllExtensions, AFormats.DecompressFormats[Index]);
+ OpenDialogArchiveRO.Filter := AddStandardFilters(AFilter, AllExtensions);
+
+ AFilter := '';
+ AllExtensions := '';
+ for Index := 0 to AFormats.UpdateFormatCount - 1 do
+ MergeFilters(AFilter, AllExtensions, AFormats.UpdateFormats[Index]);
+ OpenDialogArchiveRW.Filter := AddStandardFilters(AFilter, AllExtensions);
+end;
+
procedure TForm1.FormDestroy(Sender: TObject);
begin
CloseArchive;
Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas 2008-01-31 09:21:45 UTC (rev 2334)
+++ trunk/jcl/source/common/JclCompression.pas 2008-01-31 10:46:56 UTC (rev 2335)
@@ -143,20 +143,28 @@
procedure Progress(Sender: TObject); dynamic;
property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
public
+ class function StreamName: string; virtual;
+ class function StreamExtensions: string; virtual;
+
constructor Create(Stream: TStream);
destructor Destroy; override;
+
function Read(var Buffer; Count: Longint): Longint; override;
function Write(const Buffer; Count: Longint): Longint; override;
function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
procedure Reset; virtual;
end;
+ TJclCompressionStreamClass = class of TJclCompressionStream;
+
TJclCompressStream = class(TJclCompressionStream)
public
function Flush: Integer; dynamic; abstract;
constructor Create(Destination: TStream);
end;
+ TJclCompressStreamClass = class of TJclCompressStream;
+
TJclDecompressStream = class(TJclCompressionStream)
private
FOwnsStream: Boolean;
@@ -165,7 +173,38 @@
destructor Destroy; override;
end;
- // ZIP Support
+ TJclDecompressStreamClass = class of TJclDecompressStream;
+
+ TJclCompressionStreamFormats = class
+ private
+ FCompressFormats: TList;
+ FDecompressFormats: TList;
+ protected
+ function GetCompressFormatCount: Integer;
+ function GetCompressFormat(Index: Integer): TJclCompressStreamClass;
+ function GetDecompressFormatCount: Integer;
+ function GetDecompressFormat(Index: Integer): TJclDecompressStreamClass;
+ public
+ constructor Create;
+ destructor Destroy; override;
+
+ procedure RegisterFormat(AClass: TJclCompressionStreamClass);
+ procedure UnregisterFormat(AClass: TJclCompressionStreamClass);
+
+ function FindCompressFormat(const AFileName: string): TJclCompressStreamClass;
+ function FindDecompressFormat(const AFileName: string): TJclDecompressStreamClass;
+
+ property CompressFormatCount: Integer read GetCompressFormatCount;
+ property CompressFormats[Index: Integer]: TJclCompressStreamClass read GetCompressFormat;
+ property DecompressFormatCount: Integer read GetDecompressFormatCount;
+ property DecompressFormats[Index: Integer]: TJclDecompressStreamClass read GetDecompressFormat;
+ end;
+
+// retreive a singleton list containing registered stream classes
+function GetStreamFormats: TJclCompressionStreamFormats;
+
+// ZIP Support
+type
TJclCompressionLevel = Integer;
TJclZLibCompressStream = class(TJclCompressStream)
@@ -184,12 +223,18 @@
procedure SetMethod(Value: Integer);
procedure SetWindowBits(Value: Integer);
public
+ // stream description
+ class function StreamName: string; override;
+ class function StreamExtensions: string; override;
+
constructor Create(Destination: TStream; CompressionLevel: TJclCompressionLevel = -1);
destructor Destroy; override;
+
function Flush: Integer; override;
procedure Reset; override;
function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
function Write(const Buffer; Count: Longint): Longint; override;
+
property WindowBits: Integer read FWindowBits write SetWindowBits;
property MemLevel: Integer read FMemLevel write SetMemLevel;
property Method: Integer read FMethod write SetMethod;
@@ -205,10 +250,16 @@
ZLibRecord: TZStreamRec;
procedure SetWindowBits(Value: Integer);
public
+ // stream description
+ class function StreamName: string; override;
+ class function StreamExtensions: string; override;
+
constructor Create(Source: TStream; WindowBits: Integer = DEF_WBITS; AOwnsStream: Boolean = False);
destructor Destroy; override;
+
function Read(var Buffer; Count: Longint): Longint; override;
function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
+
property WindowBits: Integer read FWindowBits write SetWindowBits;
end;
@@ -323,11 +374,15 @@
procedure SetUnixTime(Value: Cardinal);
procedure ZLibStreamProgress(Sender: TObject);
public
+ // stream description
+ class function StreamName: string; override;
+ class function StreamExtensions: string; override;
+
constructor Create(Destination: TStream; CompressionLevel: TJclCompressionLevel = -1);
destructor Destroy; override;
+
function Write(const Buffer; Count: Longint): Longint; override;
procedure Reset; override;
-
// IMPORTANT: In order to get a valid GZip file, Flush MUST be called after
// the last call to Write.
function Flush: Integer; override;
@@ -373,8 +428,13 @@
function ReadCompressedData(Sender: TObject; var Buffer; Count: Longint): Longint;
procedure ZLibStreamProgress(Sender: TObject);
public
+ // stream description
+ class function StreamName: string; override;
+ class function StreamExtensions: string; override;
+
constructor Create(Source: TStream; CheckHeaderCRC: Boolean = True; AOwnsStream: Boolean = False);
destructor Destroy; override;
+
function Read(var Buffer; Count: Longint): Longint; override;
property ComputedHeaderCRC16: Word read FComputedHeaderCRC16;
@@ -403,13 +463,17 @@
BZLibRecord: bz_stream;
procedure SetCompressionLevel(const Value: Integer);
public
+ // stream description
+ class function StreamName: string; override;
+ class function StreamExtensions: string; override;
+
+ constructor Create(Destination: TStream; CompressionLevel: TJclCompressionLevel = -1);
+ destructor Destroy; override;
+
function Flush: Integer; override;
function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
function Write(const Buffer; Count: Longint): Longint; override;
- constructor Create(Destination: TStream; CompressionLevel: TJclCompressionLevel = -1);
- destructor Destroy; override;
-
property CompressionLevel: Integer read FCompressionLevel write SetCompressionLevel;
end;
@@ -419,11 +483,15 @@
protected
BZLibRecord: bz_stream;
public
- function Read(var Buffer; Count: Longint): Longint; override;
- function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
+ // stream description
+ class function StreamName: string; override;
+ class function StreamExtensions: string; override;
constructor Create(Source: TStream; AOwnsStream: Boolean = False); overload;
destructor Destroy; override;
+
+ function Read(var Buffer; Count: Longint): Longint; override;
+ function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
end;
EJclCompressionError = class(EJclError);
@@ -630,6 +698,8 @@
class function MultipleItemContainer: Boolean; virtual;
class function VolumeAccess: TJclStreamAccess; virtual;
class function ItemAccess: TJclStreamAccess; virtual;
+ class function ArchiveExtensions: string; virtual;
+ class function ArchiveName: string; virtual;
constructor Create(Volume0: TStream; AVolumeMaxSize: Int64 = 0;
AOwnVolume: Boolean = False); overload;
@@ -671,6 +741,8 @@
property Password: WideString read FPassword write FPassword;
end;
+ TJclCompressionArchiveClass = class of TJclCompressionArchive;
+
TJclCompressItem = class(TJclCompressionItem)
protected
procedure CheckGetProperty(AProperty: TJclCompressionItemProperty); override;
@@ -701,6 +773,8 @@
procedure Compress; virtual; abstract;
end;
+ TJclCompressArchiveClass = class of TJclCompressArchive;
+
TJclDecompressItem = class(TJclCompressionItem)
protected
procedure CheckGetProperty(AProperty: TJclCompressionItemProperty); override;
@@ -742,6 +816,8 @@
property AutoCreateSubDir: Boolean read FAutoCreateSubDir;
end;
+ TJclDecompressArchiveClass = class of TJclDecompressArchive;
+
TJclUpdateItem = class(TJclCompressionItem)
protected
procedure CheckGetProperty(AProperty: TJclCompressionItemProperty); override;
@@ -780,6 +856,44 @@
property AutoCreateSubDir: Boolean read FAutoCreateSubDir;
end;
+ TJclUpdateArchiveClass = class of TJclUpdateArchive;
+
+// registered archive formats
+type
+ TJclCompressionArchiveFormats = class
+ private
+ FCompressFormats: TList;
+ FDecompressFormats: TList;
+ FUpdateFormats: TList;
+ protected
+ function GetCompressFormatCount: Integer;
+ function GetCompressFormat(Index: Integer): TJclCompressArchiveClass;
+ function GetDecompressFormatCount: Integer;
+ function GetDecompressFormat(Index: Integer): TJclDecompressArchiveClass;
+ function GetUpdateFormatCount: Integer;
+ function GetUpdateFormat(Index: Integer): TJclUpdateArchiveClass;
+ public
+ constructor Create;
+ destructor Destroy; override;
+
+ procedure RegisterFormat(AClass: TJclCompressionArchiveClass);
+ procedure UnregisterFormat(AClass: TJclCompressionArchiveClass);
+
+ function FindCompressFormat(const AFileName: string): TJclCompressArchiveClass;
+ function FindDecompressFormat(const AFileName: string): TJclDecompressArchiveClass;
+ function FindUpdateFormat(const AFileName: string): TJclUpdateArchiveClass;
+
+ property CompressFormatCount: Integer read GetCompressFormatCount;
+ property CompressFormats[Index: Integer]: TJclCompressArchiveClass read GetCompressFormat;
+ property DecompressFormatCount: Integer read GetDecompressFormatCount;
+ property DecompressFormats[Index: Integer]: TJclDecompressArchiveClass read GetDecompressFormat;
+ property UpdateFormatCount: Integer read GetUpdateFormatCount;
+ property UpdateFormats[Index: Integer]: TJclUpdateArchiveClass read GetUpdateFormat;
+ end;
+
+// retreive a singleton list containing archive formats
+function GetArchiveFormats: TJclCompressionArchiveFormats;
+
// sevenzip classes for compression
type
TJclSevenzipCompressArchive = class(TJclCompressArchive)
@@ -813,6 +927,9 @@
procedure SetCompressionProperties; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
+
property DefaultMethod: TJclZipMethod read FDefaultMethod write SetDefaultMethod;
end;
@@ -820,6 +937,9 @@
protected
procedure CreateCompressionObject; override;
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJcl7zCompressArchive = class(TJclSevenzipCompressArchive)
@@ -828,6 +948,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclTarCompressArchive = class(TJclSevenzipCompressArchive)
@@ -837,12 +959,17 @@
procedure SetCompressionProperties; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclGZipCompressArchive = class(TJclSevenzipCompressArchive)
protected
procedure CreateCompressionObject; override;
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
// sevenzip classes for decompression
@@ -872,11 +999,16 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclBZ2DecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclRarDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -884,6 +1016,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclArjDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -891,6 +1025,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclZDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -898,6 +1034,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclLzhDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -905,6 +1043,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJcl7zDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -912,39 +1052,88 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
+ TJclCabDecompressArchive = class(TJclSevenzipDecompressArchive)
+ protected
+ function GetCLSID: TGUID; override;
+ public
+ class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
+ end;
+
TJclNsisDecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
- TJclIsoDecompressArchive = class(TJclSevenzipDecompressArchive)
+ {TJclLzmaDecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
+ end;}
+
+ TJclCompoundDecompressArchive = class(TJclSevenzipDecompressArchive)
+ protected
+ function GetCLSID: TGUID; override;
+ public
+ class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
- TJclCabDecompressArchive = class(TJclSevenzipDecompressArchive)
+ TJclWimDecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
+ TJclIsoDecompressArchive = class(TJclSevenzipDecompressArchive)
+ protected
+ function GetCLSID: TGUID; override;
+ public
+ class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
+ end;
+
+ {TJclBkfDecompressArchive = class(TJclSevenzipDecompressArchive)
+ protected
+ function GetCLSID: TGUID; override;
+ public
+ class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
+ end;}
+
TJclChmDecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclSplitDecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclRpmDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -952,6 +1141,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclDebDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -959,6 +1150,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclCpioDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -966,6 +1159,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclTarDecompressArchive = class(TJclSevenzipDecompressArchive)
@@ -973,11 +1168,16 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclGZipDecompressArchive = class(TJclSevenzipDecompressArchive)
protected
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
//sevenzip classes for updates (read and write)
@@ -1019,6 +1219,9 @@
procedure SetCompressionProperties; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
+
property DefaultMethod: TJclZipMethod read FDefaultMethod write SetDefaultMethod;
end;
@@ -1026,6 +1229,9 @@
protected
procedure CreateCompressionObject; override;
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJcl7zUpdateArchive = class(TJclSevenzipUpdateArchive)
@@ -1034,6 +1240,8 @@
function GetCLSID: TGUID; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclTarUpdateArchive = class(TJclSevenzipUpdateArchive)
@@ -1043,12 +1251,17 @@
procedure SetCompressionProperties; override;
public
class function MultipleItemContainer: Boolean; override;
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
TJclGZipUpdateArchive = class(TJclSevenzipUpdateArchive)
protected
procedure CreateCompressionObject; override;
function GetCLSID: TGUID; override;
+ public
+ class function ArchiveExtensions: string; override;
+ class function ArchiveName: string; override;
end;
{$ENDIF MSWINDOWS}
@@ -1072,11 +1285,17 @@
ComObj, // GUIDToString
JclUnicode, // WideSameText // TODO: should we use WideSameText from JclUnicode also for D6 and higher?
{$ENDIF COMPILER5}
- JclDateTime, JclFileUtils, JclResources;
+ JclDateTime, JclFileUtils, JclResources, JclStrings, JclSysUtils;
const
JclDefaultBufferSize = 131072; // 128k
+var
+ // using TObject prevents default linking of TJclCompressionStreamFormats
+ // and TJclCompressionArchiveFormats and all classes
+ GlobalStreamFormats: TObject;
+ GlobalArchiveFormats: TObject;
+
//=== { TJclCompressionStream } ==============================================
constructor TJclCompressionStream.Create(Stream: TStream);
@@ -1127,6 +1346,16 @@
Result := FBufferSize;
end;
+class function TJclCompressionStream.StreamExtensions: string;
+begin
+ Result := '';
+end;
+
+class function TJclCompressionStream.StreamName: string;
+begin
+ Result := '';
+end;
+
procedure TJclCompressionStream.Progress(Sender: TObject);
begin
if Assigned(FOnProgress) then
@@ -1157,6 +1386,127 @@
inherited Destroy;
end;
+//=== { TJclCompressionStreamFormats } =======================================
+
+constructor TJclCompressionStreamFormats.Create;
+begin
+ inherited Create;
+ FCompressFormats := TList.Create;
+ FDecompressFormats := TList.Create;
+ RegisterFormat(TJclZLibCompressStream);
+ RegisterFormat(TJclZLibDecompressStream);
+ RegisterFormat(TJclGZIPCompressionStream);
+ RegisterFormat(TJclGZIPDecompressionStream);
+ RegisterFormat(TJclBZIP2CompressionStream);
+ RegisterFormat(TJclBZIP2DecompressionStream);
+end;
+
+destructor TJclCompressionStreamFormats.Destroy;
+begin
+ FCompressFormats.Free;
+ FDecompressFormats.Free;
+ inherited Destroy;
+end;
+
+function TJclCompressionStreamFormats.FindCompressFormat(const AFileName: string): TJclCompressStreamClass;
+var
+ IndexFormat, IndexFilter: Integer;
+ Filters: TStrings;
+ AFormat: TJclCompressStreamClass;
+begin
+ Result := nil;
+ Filters := TStringList.Create;
+ try
+ for IndexFormat := 0 to CompressFormatCount - 1 do
+ begin
+ AFormat := CompressFormats[IndexFormat];
+ StrTokenToStrings(AFormat.StreamExtensions, DirSeparator, Filters);
+ for IndexFilter := 0 to Filters.Count - 1 do
+ if StrMatches(Filters.Strings[IndexFilter], AFileName) then
+ begin
+ Result := AFormat;
+ Break;
+ end;
+ if Result <> nil then
+ Break;
+ end;
+ finally
+ Filters.Free;
+ end;
+end;
+
+function TJclCompressionStreamFormats.FindDecompressFormat(const AFileName: string): TJclDecompressStreamClass;
+var
+ IndexFormat, IndexFilter: Integer;
+ Filters: TStrings;
+ AFormat: TJclDecompressStreamClass;
+begin
+ Result := nil;
+ Filters := TStringList.Create;
+ try
+ for IndexFormat := 0 to DecompressFormatCount - 1 do
+ begin
+ AFormat := DecompressFormats[IndexFormat];
+ StrTokenToStrings(AFormat.StreamExtensions, DirSeparator, Filters);
+ for IndexFilter := 0 to Filters.Count - 1 do
+ if StrMatches(Filters.Strings[IndexFilter], AFileName) then
+ begin
+ Result := AFormat;
+ Break;
+ end;
+ if Result <> nil then
+ Break;
+ end;
+ finally
+ Filters.Free;
+ end;
+end;
+
+function TJclCompressionStreamFormats.GetCompressFormat(Index: Integer): TJclCompressStreamClass;
+begin
+ Result := TJclCompressStreamClass(FCompressFormats.Items[Index]);
+end;
+
+function TJclCompressionStreamFormats.GetCompressFormatCount: Integer;
+begin
+ Result := FCompressFormats.Count;
+end;
+
+function TJclCompressionStreamFormats.GetDecompressFormat(Index: Integer): TJclDecompressStreamClass;
+begin
+ Result := TJclDecompressStreamClass(FDecompressFormats.Items[Index]);
+end;
+
+function TJclCompressionStreamFormats.GetDecompressFormatCount: Integer;
+begin
+ Result := FDecompressFormats.Count;
+end;
+
+procedure TJclCompressionStreamFormats.RegisterFormat(AClass: TJclCompressionStreamClass);
+begin
+ if AClass.InheritsFrom(TJclCompressStream) then
+ FCompressFormats.Add(AClass)
+ else
+ if AClass.InheritsFrom(TJclDecompressStream) then
+ FDecompressFormats.Add(AClass);
+end;
+
+procedure TJclCompressionStreamFormats.UnregisterFormat(AClass: TJclCompressionStreamClass);
+begin
+ if AClass.InheritsFrom(TJclCompressStream) then
+ FCompressFormats.Remove(AClass)
+ else
+ if AClass.InheritsFrom(TJclDecompressStream) then
+ FDecompressFormats.Remove(AClass);
+end;
+
+function GetStreamFormats: TJclCompressionStreamFormats;
+begin
+ if not Assigned(GlobalStreamFormats) then
+ GlobalStreamFormats := TJclCompressionStreamFormats.Create;
+ Result := TJclCompressionStreamFormats(GlobalStreamFormats);
+end;
+
//=== { TJclZLibCompressionStream } ==========================================
{ Error checking helper }
@@ -1299,6 +1649,16 @@
FWindowBits := Value;
end;
+class function TJclZLibCompressStream.StreamExtensions: string;
+begin
+ Result := LoadResString(@RsCompressionZExtensions);
+end;
+
+class function TJclZLibCompressStream.StreamName: string;
+begin
+ Result := LoadResString(@RsCompressionZName);
+end;
+
procedure TJclZLibCompressStream.SetMethod(Value: Integer);
begin
FMethod := Value;
@@ -1416,6 +1776,16 @@
FWindowBits := Value;
end;
+class function TJclZLibDecompressStream.StreamExtensions: string;
+begin
+ Result := LoadResString(@RsCompressionZExtensions);
+end;
+
+class function TJclZLibDecompressStream.StreamName: string;
+begin
+ Result := LoadResString(@RsCompressionZName);
+end;
+
//=== { TJclGZIPCompressionStream } ==========================================
constructor TJclGZIPCompressionStream.Create(Destination: TStream; CompressionLevel: TJclCompressionLevel);
@@ -1496,6 +1866,16 @@
FUnixTime := Value;
end;
+class function TJclGZIPCompressionStream.StreamExtensions: string;
+begin
+ Result := LoadResString(@RsCompressionGZipExtensions);
+end;
+
+class function TJclGZIPCompressionStream.StreamName: string;
+begin
+ Result := LoadResString(@RsCompressionGZipName);
+end;
+
function TJclGZIPCompressionStream.Write(const Buffer; Count: Integer): Longint;
begin
if not FHeaderWritten then
@@ -1859,6 +2239,16 @@
Inc(FCompressedDataSize, Result);
end;
+class function TJclGZIPDecompressionStream.StreamExtensions: string;
+begin
+ Result := LoadResString(@RsCompressionGZipExtensions);
+end;
+
+class function TJclGZIPDecompressionStream.StreamName: string;
+begin
+ Result := LoadResString(@RsCompressionGZipName);
+end;
+
procedure TJclGZIPDecompressionStream.ZLibStreamProgress(Sender: TObject);
begin
Progress(Self);
@@ -1976,6 +2366,16 @@
raise EJclCompressionError.CreateRes(@RsCompressionBZIP2SequenceError);
end;
+class function TJclBZIP2CompressionStream.StreamExtensions: string;
+begin
+ Result := LoadResString(@RsCompressionBZip2Extensions);
+end;
+
+class function TJclBZIP2CompressionStream.StreamName: string;
+begin
+ Result := LoadResString(@RsCompressionBZip2Name);
+end;
+
function TJclBZIP2CompressionStream.Write(const Buffer; Count: Longint): Longint;
begin
if not FDeflateInitialized then
@@ -2077,6 +2477,16 @@
Result := inherited Seek(Offset, Origin);
end;
+class function TJclBZIP2DecompressionStream.StreamExtensions: string;
+begin
+ Result := LoadResString(@RsCompressionBZip2Extensions);
+end;
+
+class function TJclBZIP2DecompressionStream.StreamName: string;
+begin
+ Result := LoadResString(@RsCompressionBZip2Name);
+end;
+
procedure InternalCompress(SourceStream: TStream; CompressStream: TJclCompressStream;
ProgressCallback: TJclCompressStreamProgressCallback; UserData: Pointer);
var
@@ -2718,7 +3128,7 @@
ALastWriteTime);
finally
CloseHandle(FileHandle);
- end;
+ end;
end;
end;
@@ -2727,6 +3137,195 @@
Result := False;
end;
+//=== { TJclCompressionArchiveFormats } ======================================
+
+constructor TJclCompressionArchiveFormats.Create;
+begin
+ inherited Create;
+ FCompressFormats := TList.Create;
+ FDecompressFormats := TList.Create;
+ FUpdateFormats := TList.Create;
+ RegisterFormat(TJclZipCompressArchive);
+ RegisterFormat(TJclBZ2CompressArchive);
+ RegisterFormat(TJcl7zCompressArchive);
+ RegisterFormat(TJclTarCompressArchive);
+ RegisterFormat(TJclGZipCompressArchive);
+ RegisterFormat(TJclZipDecompressArchive);
+ RegisterFormat(TJclBZ2DecompressArchive);
+ RegisterFormat(TJclRarDecompressArchive);
+ RegisterFormat(TJclArjDecompressArchive);
+ RegisterFormat(TJclZDecompressArchive);
+ RegisterFormat(TJclLzhDecompressArchive);
+ RegisterFormat(TJcl7zDecompressArchive);
+ RegisterFormat(TJclCabDecompressArchive);
+ RegisterFormat(TJclNsisDecompressArchive);
+ RegisterFormat(TJclCompoundDecompressArchive);
+ RegisterFormat(TJclWimDecompressArchive);
+ RegisterFormat(TJclIsoDecompressArchive);
+ RegisterFormat(TJclChmDecompressArchive);
+ RegisterFormat(TJclSplitDecompressArchive);
+ RegisterFormat(TJclRpmDecompressArchive);
+ RegisterFormat(TJclDebDecompressArchive);
+ RegisterFormat(TJclCpioDecompressArchive);
+ RegisterFormat(TJclTarDecompressArchive);
+ RegisterFormat(TJclGZipDecompressArchive);
+ RegisterFormat(TJclZipUpdateArchive);
+ RegisterFormat(TJclBZ2UpdateArchive);
+ RegisterFormat(TJcl7zUpdateArchive);
+ RegisterFormat(TJclTarUpdateArchive);
+ RegisterFormat(TJclGZipUpdateArchive);
+end;
+
+destructor TJclCompressionArchiveFormats.Destroy;
+begin
+ FCompressFormats.Free;
+ FDecompressFormats.Free;
+ FUpdateFormats.Free;
+ inherited Destroy;
+end;
+
+function TJclCompressionArchiveFormats.FindCompressFormat(const AFileName: string): TJclCompressArchiveClass;
+var
+ IndexFormat, IndexFilter: Integer;
+ Filters: TStrings;
+ AFormat: TJclCompressArchiveClass;
+begin
+ Result := nil;
+ Filters := TStringList.Create;
+ try
+ for IndexFormat := 0 to CompressFormatCount - 1 do
+ begin
+ AFormat := CompressFormats[IndexFormat];
+ StrTokenToStrings(AFormat.ArchiveExtensions, DirSeparator, Filters);
+ for IndexFilter := 0 to Filters.Count - 1 do
+ if StrMatches(Filters.Strings[IndexFilter], AFileName) then
+ begin
+ Result := AFormat;
+ Break;
+ end;
+ if Result <> nil then
+ Break;
+ end;
+ finally
+ Filters.Free;
+ end;
+end;
+
+function TJclCompressionArchiveFormats.FindDecompressFormat(const AFileName: string): TJclDecompressArchiveClass;
+var
+ IndexFormat, IndexFilter: Integer;
+ Filters: TStrings;
+ AFormat: TJclDecompressArchiveClass;
+begin
+ Result := nil;
+ Filters := TStringList.Create;
+ try
+ for IndexFormat := 0 to DecompressFormatCount - 1 do
+ begin
+ AFormat := DecompressFormats[IndexFormat];
+ StrTokenToStrings(AFormat.ArchiveExtensions, DirSeparator, Filters);
+ for IndexFilter := 0 to Filters.Count - 1 do
+ if StrMatches(Filters.Strings[IndexFilter], AFileName) then
+ begin
+ Result := AFormat;
+ Break;
+ end;
+ if Result <> nil then
+ Break;
+ end;
+ finally
+ Filters.Free;
+ end;
+end;
+
+function TJclCompressionArchiveFormats.FindUpdateFormat(const AFileName: string): TJclUpdateArchiveClass;
+var
+ IndexFormat, IndexFilter: Integer;
+ Filters: TStrings;
+ AFormat: TJclUpdateArchiveClass;
+begin
+ Result := nil;
+ Filters := TStringList.Create;
+ try
+ for IndexFormat := 0 to UpdateFormatCount - 1 do
+ begin
+ AFormat := UpdateFormats[IndexFormat];
+ StrTokenToStrings(AFormat.ArchiveExtensions, DirSeparator, Filters);
+ for IndexFilter := 0 to Filters.Count - 1 do
+ if StrMatches(Filters.Strings[IndexFilter], AFileName) then
+ begin
+ Result := AFormat;
+ Break;
+ end;
+ if Result <> nil then
+ Break;
+ end;
+ finally
+ Filters.Free;
+ end;
+end;
+
+function TJclCompressionArchiveFormats.GetCompressFormat(Index: Integer): TJclCompressArchiveClass;
+begin
+ Result := TJclCompressArchiveClass(FCompressFormats.Items[Index]);
+end;
+
+function TJclCompressionArchiveFormats.GetCompressFormatCount: Integer;
+begin
+ Result := FCompressFormats.Count;
+end;
+
+function TJclCompressionArchiveFormats.GetDecompressFormat(Index: Integer): TJclDecompressArchiveClass;
+begin
+ Result := TJclDecompressArchiveClass(FDecompressFormats.Items[Index]);
+end;
+
+function TJclCompressionArchiveFormats.GetDecompressFormatCount: Integer;
+begin
+ Result := FDecompressFormats.Count;
+end;
+
+function TJclCompressionArchiveFormats.GetUpdateFormat(Index: Integer): TJclUpdateArchiveClass;
+begin
+ Result := TJclUpdateArchiveClass(FUpdateFormats.Items[Index]);
+end;
+
+function TJclCompressionArchiveFormats.GetUpdateFormatCount: Integer;
+begin
+ Result := FUpdateFormats.Count;
+end;
+
+procedure TJclCompressionArchiveFormats.RegisterFormat(AClass: TJclCompressionArchiveClass);
+begin
+ if AClass.InheritsFrom(TJclUpdateArchive) then
+ FUpdateFormats.Add(AClass)
+ else
+ if AClass.InheritsFrom(TJclDecompressArchive) then
+ FDecompressFormats.Add(AClass)
+ else
+ if AClass.InheritsFrom(TJclCompressArchive) then
+ FCompressFormats.Add(AClass);
+end;
+
+procedure TJclCompressionArchiveFormats.UnregisterFormat(AClass: TJclCompressionArchiveClass);
+begin
+ if AClass.InheritsFrom(TJclUpdateArchive) then
+ FUpdateFormats.Remove(AClass)
+ else
+ if AClass.InheritsFrom(TJclDecompressArchive) then
+ FDecompressFormats.Remove(AClass)
+ else
+ if AClass.InheritsFrom(TJclCompressArchive) then
+ FCompressFormats.Remove(AClass);
+end;
+
+function GetArchiveFormats: TJclCompressionArchiveFormats;
+begin
+ if not Assigned(GlobalArchiveFormats) then
+ GlobalArchiveFormats := TJclCompressionArchiveFormats.Create;
+ Result := TJclCompressionArchiveFormats(GlobalArchiveFormats);
+end;
+
//=== { TJclCompressionVolume } ==============================================
constructor TJclCompressionVolume.Create(AStream: TStream; AOwnsStream: Boolean;
@@ -2793,6 +3392,16 @@
Result := FVolumes.Add(TJclCompressionVolume.Create(VolumeStream, AOwnsStream, '', AVolumeMaxSize));
end;
+class function TJclCompressionArchive.ArchiveExtensions: string;
+begin
+ Result := '';
+end;
+
+class function TJclCompressionArchive.ArchiveName: string;
+begin
+ Result := '';
+end;
+
function TJclCompressionArchive.AddVolume(const VolumeName: string;
AVolumeMaxSize: Int64): Integer;
begin
@@ -3035,12 +3644,6 @@
//=== { TJclCompressArchive } ================================================
-procedure TJclCompressArchive.CheckNotCompressing;
-begin
- if FCompressing then
- raise EJclCompressionError.CreateRes(@RsCompressionCompressingError);
-end;
-
function TJclCompressArchive.AddDirectory(const PackedName: WideString;
const DirName: string; RecurseIntoDir: Boolean; AddFilesInDir: Boolean): Integer;
var
@@ -3117,6 +3720,12 @@
Result := FItems.Add(AItem);
end;
+procedure TJclCompressArchive.CheckNotCompressing;
+begin
+ if FCompressing then
+ raise EJclCompressionError.CreateRes(@RsCompressionCompressingError);
+end;
+
procedure TJclCompressArchive.InternalAddDirectory(const Directory: string);
begin
AddDirectory(TranslateItemPath(Directory, FBaseDirName, FBaseRelName), Directory, False, FAddFilesInDir);
@@ -3987,6 +4596,16 @@
//=== { TJcl7zCompressArchive } ==============================================
+class function TJcl7zCompressArchive.ArchiveExtensions: string;
+begin
+ Result := LoadResString(@RsCompression7zExtensions);
+end;
+
+class function TJcl7zCompressArchive.ArchiveName: string;
+begin
+ Result := LoadResString(@RsCompression7zName);
+end;
+
procedure TJcl7zCompressArchive.CreateCompressionObject;
begin
inherited CreateCompressionObject;
@@ ...
[truncated message content] |
|
From: <mar...@us...> - 2008-01-31 09:21:50
|
Revision: 2334
http://jcl.svn.sourceforge.net/jcl/?rev=2334&view=rev
Author: marcovtje
Date: 2008-01-31 01:21:45 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
* Fixed regression due to psid change with {IFDEF FPC}
Modified Paths:
--------------
trunk/jcl/source/windows/JclSecurity.pas
Modified: trunk/jcl/source/windows/JclSecurity.pas
===================================================================
--- trunk/jcl/source/windows/JclSecurity.pas 2008-01-30 18:32:20 UTC (rev 2333)
+++ trunk/jcl/source/windows/JclSecurity.pas 2008-01-31 09:21:45 UTC (rev 2334)
@@ -517,7 +517,7 @@
procedure StringToSID(const SIDString: String; SID: PSID; cbSID: DWORD);
var
- ASID: PSID;
+ {$ifdef FPC} ASID: PSID; {$else} ASID : ^_SID; {$ENDIF}
CurrentPos, TempPos: Integer;
AuthorityValue, RequiredSize: DWORD;
Authority: string;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-01-30 18:32:21
|
Revision: 2333
http://jcl.svn.sourceforge.net/jcl/?rev=2333&view=rev
Author: marcovtje
Date: 2008-01-30 10:32:20 -0800 (Wed, 30 Jan 2008)
Log Message:
-----------
* Several small FPC problems solved;
jcldatetime: import unit Unix not ifndef linux, since that includes windows
jclsysinfo : fpc2+ has shlobj + for FPC activex was twice included.
JclUnitVersioning: temporary workaround for Unix getmodulefilename substitute. Till I know more about this
JclSecurity : ^_sid was not compatible to psid. Corrected
Modified Paths:
--------------
trunk/jcl/source/common/JclDateTime.pas
trunk/jcl/source/common/JclSysInfo.pas
trunk/jcl/source/common/JclUnitVersioning.pas
trunk/jcl/source/windows/JclSecurity.pas
Modified: trunk/jcl/source/common/JclDateTime.pas
===================================================================
--- trunk/jcl/source/common/JclDateTime.pas 2008-01-30 17:39:14 UTC (rev 2332)
+++ trunk/jcl/source/common/JclDateTime.pas 2008-01-30 18:32:20 UTC (rev 2333)
@@ -77,10 +77,12 @@
Libc,
{$ENDIF HAS_UNIT_LIBC}
{$IFDEF FPC}
+ {$IFDEF UNIX}
{$IFNDEF LINUX}
Unix,
{$ENDIF ~LINUX}
{$ENDIF FPC}
+ {$ENDIF}
SysUtils,
JclBase, JclResources;
Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas 2008-01-30 17:39:14 UTC (rev 2332)
+++ trunk/jcl/source/common/JclSysInfo.pas 2008-01-30 18:32:20 UTC (rev 2333)
@@ -81,9 +81,7 @@
{$ELSE ~CLR}
{$IFDEF MSWINDOWS}
Windows, ActiveX,
- {$IFNDEF FPC}
ShlObj,
- {$ENDIF ~FPC}
{$ENDIF MSWINDOWS}
{$ENDIF ~CLR}
Classes,
@@ -1315,7 +1313,7 @@
{$IFDEF MSWINDOWS}
Messages, Winsock, Snmp,
{$IFDEF FPC}
- ActiveX, JwaTlHelp32, JwaPsApi,
+ JwaTlHelp32, JwaPsApi,
{$ELSE ~FPC}
TLHelp32, PsApi,
JclShell,
Modified: trunk/jcl/source/common/JclUnitVersioning.pas
===================================================================
--- trunk/jcl/source/common/JclUnitVersioning.pas 2008-01-30 17:39:14 UTC (rev 2332)
+++ trunk/jcl/source/common/JclUnitVersioning.pas 2008-01-30 18:32:20 UTC (rev 2333)
@@ -472,6 +472,13 @@
Result := TUnitVersioningModule(FModules[Index]);
end;
+{$UNDEF FPCUNIX} // Temporary, will move to .inc's in time.
+{$IFDEF FPC}
+ {$IFDEF UNIX}
+ {$DEFIN FPCUNIX}
+{$ENDIF}
+{$ENDIF}
+
procedure TUnitVersioning.ValidateModules;
var
I: Integer;
@@ -480,7 +487,7 @@
for I := FModules.Count - 1 downto 0 do
begin
SetLength(Buffer, 1024);
- {$IFDEF FPC}
+ {$IFDEF FPCUNIX}
if dlsym(Pointer(Modules[I].Instance), '_init') = nil then
{$ELSE}
if GetModuleFileName(Modules[I].Instance, PChar(Buffer), 1024) = 0 then
Modified: trunk/jcl/source/windows/JclSecurity.pas
===================================================================
--- trunk/jcl/source/windows/JclSecurity.pas 2008-01-30 17:39:14 UTC (rev 2332)
+++ trunk/jcl/source/windows/JclSecurity.pas 2008-01-30 18:32:20 UTC (rev 2333)
@@ -517,7 +517,7 @@
procedure StringToSID(const SIDString: String; SID: PSID; cbSID: DWORD);
var
- ASID: ^_SID;
+ ASID: PSID;
CurrentPos, TempPos: Integer;
AuthorityValue, RequiredSize: DWORD;
Authority: string;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-01-30 17:39:22
|
Revision: 2332
http://jcl.svn.sourceforge.net/jcl/?rev=2332&view=rev
Author: marcovtje
Date: 2008-01-30 09:39:14 -0800 (Wed, 30 Jan 2008)
Log Message:
-----------
* (FPC) typecast a literal to a string to avoid overloading selection problems.
Ref: http://bugs.freepascal.org/view.php?id=10727
Modified Paths:
--------------
trunk/jcl/source/common/JclStrings.pas
Modified: trunk/jcl/source/common/JclStrings.pas
===================================================================
--- trunk/jcl/source/common/JclStrings.pas 2008-01-30 17:34:47 UTC (rev 2331)
+++ trunk/jcl/source/common/JclStrings.pas 2008-01-30 17:39:14 UTC (rev 2332)
@@ -5766,7 +5766,7 @@
end;
// flag zero-based tabset by outputting a 0 (zero) as the first character.
if ZeroBased then
- sb.Insert(0, '0 ');
+ sb.Insert(0, string('0 '));
Result := StrTrimCharRight(sb.ToString, ' ');
finally
sb.Free;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-01-30 17:34:51
|
Revision: 2331
http://jcl.svn.sourceforge.net/jcl/?rev=2331&view=rev
Author: marcovtje
Date: 2008-01-30 09:34:47 -0800 (Wed, 30 Jan 2008)
Log Message:
-----------
* FPC now also included.
Modified Paths:
--------------
trunk/jcl/source/jcl.inc
Modified: trunk/jcl/source/jcl.inc
===================================================================
--- trunk/jcl/source/jcl.inc 2008-01-30 16:01:07 UTC (rev 2330)
+++ trunk/jcl/source/jcl.inc 2008-01-30 17:34:47 UTC (rev 2331)
@@ -139,6 +139,11 @@
{$DEFINE JCL_CONFIGURED}
{$ENDIF BDS5}
{----------------------------}
+ {$IFDEF FPC}
+ {$I jclfpc.inc}
+ {$DEFINE JCL_CONFIGURED}
+ {$ENDIF FPC}
+ {----------------------------}
{$ENDIF ~CLR}
// check configuration
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-30 16:01:18
|
Revision: 2330
http://jcl.svn.sourceforge.net/jcl/?rev=2330&view=rev
Author: outchy
Date: 2008-01-30 08:01:07 -0800 (Wed, 30 Jan 2008)
Log Message:
-----------
precision of expression evaluator is fixed by JCL global precision setting.
Modified Paths:
--------------
trunk/jcl/source/common/JclExprEval.pas
Modified: trunk/jcl/source/common/JclExprEval.pas
===================================================================
--- trunk/jcl/source/common/JclExprEval.pas 2008-01-29 20:25:00 UTC (rev 2329)
+++ trunk/jcl/source/common/JclExprEval.pas 2008-01-30 16:01:07 UTC (rev 2330)
@@ -73,8 +73,8 @@
ExprWhiteSpace = [#1..#32];
type
- TFloat = Double;
- PFloat = ^TFloat;
+ TFloat = JclBase.Float;
+ PFloat = JclBase.PFloat;
TFloat32 = Single;
PFloat32 = ^TFloat32;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-29 20:25:04
|
Revision: 2329
http://jcl.svn.sourceforge.net/jcl/?rev=2329&view=rev
Author: outchy
Date: 2008-01-29 12:25:00 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
some minor fixes to JclCompression and its example:
- creation file time should always be older (or equal) to last modification or last access file times.
- the example displays incorrect file times when the archive doesn't store them.
Modified Paths:
--------------
trunk/jcl/examples/windows/compression/archive/UMain.pas
trunk/jcl/source/common/JclCompression.pas
Modified: trunk/jcl/examples/windows/compression/archive/UMain.pas
===================================================================
--- trunk/jcl/examples/windows/compression/archive/UMain.pas 2008-01-29 16:21:28 UTC (rev 2328)
+++ trunk/jcl/examples/windows/compression/archive/UMain.pas 2008-01-29 20:25:00 UTC (rev 2329)
@@ -503,18 +503,54 @@
Item.Caption := CompressionItem.FileName;
Item.SubItems.Clear;
- Item.SubItems.Add(CompressionItem.PackedName);
- Item.SubItems.Add(IntToStr(CompressionItem.FileSize));
- Item.SubItems.Add(IntToStr(CompressionItem.PackedSize));
- Item.SubItems.Add(FileTimeToString(CompressionItem.CreationTime));
- Item.SubItems.Add(FileTimeToString(CompressionItem.LastAccessTime));
- Item.SubItems.Add(FileTimeToString(CompressionItem.LastWriteTime));
- Item.SubItems.Add(CompressionItem.Comment);
- Item.SubItems.Add(CompressionItem.HostOS);
- Item.SubItems.Add(CompressionItem.HostFS);
- Item.SubItems.Add(CompressionItem.User);
- Item.SubItems.Add(CompressionItem.Group);
- Item.SubItems.Add(IntToHex(CompressionItem.CRC, 8));
+ if ipPackedName in CompressionItem.ValidProperties then
+ Item.SubItems.Add(CompressionItem.PackedName)
+ else
+ Item.SubItems.Add('');
+ if ipFileSize in CompressionItem.ValidProperties then
+ Item.SubItems.Add(IntToStr(CompressionItem.FileSize))
+ else
+ Item.SubItems.Add('');
+ if ipPackedSize in CompressionItem.ValidProperties then
+ Item.SubItems.Add(IntToStr(CompressionItem.PackedSize))
+ else
+ Item.SubItems.Add('');
+ if ipCreationTime in CompressionItem.ValidProperties then
+ Item.SubItems.Add(FileTimeToString(CompressionItem.CreationTime))
+ else
+ Item.SubItems.Add('');
+ if ipLastAccessTime in CompressionItem.ValidProperties then
+ Item.SubItems.Add(FileTimeToString(CompressionItem.LastAccessTime))
+ else
+ Item.SubItems.Add('');
+ if ipLastWriteTime in CompressionItem.ValidProperties then
+ Item.SubItems.Add(FileTimeToString(CompressionItem.LastWriteTime))
+ else
+ Item.SubItems.Add('');
+ if ipComment in CompressionItem.ValidProperties then
+ Item.SubItems.Add(CompressionItem.Comment)
+ else
+ Item.SubItems.Add('');
+ if ipHostOS in CompressionItem.ValidProperties then
+ Item.SubItems.Add(CompressionItem.HostOS)
+ else
+ Item.SubItems.Add('');
+ if ipHostFS in CompressionItem.ValidProperties then
+ Item.SubItems.Add(CompressionItem.HostFS)
+ else
+ Item.SubItems.Add('');
+ if ipUser in CompressionItem.ValidProperties then
+ Item.SubItems.Add(CompressionItem.User)
+ else
+ Item.SubItems.Add('');
+ if ipGroup in CompressionItem.ValidProperties then
+ Item.SubItems.Add(CompressionItem.Group)
+ else
+ Item.SubItems.Add('');
+ if ipCRC in CompressionItem.ValidProperties then
+ Item.SubItems.Add(IntToHex(CompressionItem.CRC, 8))
+ else
+ Item.SubItems.Add('');
end;
initialization
Modified: trunk/jcl/source/common/JclCompression.pas
===================================================================
--- trunk/jcl/source/common/JclCompression.pas 2008-01-29 16:21:28 UTC (rev 2328)
+++ trunk/jcl/source/common/JclCompression.pas 2008-01-29 20:25:00 UTC (rev 2329)
@@ -525,9 +525,9 @@
function GetStream: TStream;
function GetUser: WideString;
// property setters
- procedure SetAttributes(const Value: Cardinal);
+ procedure SetAttributes(Value: Cardinal);
procedure SetComment(const Value: WideString);
- procedure SetCRC(const Value: Cardinal);
+ procedure SetCRC(Value: Cardinal);
procedure SetCreationTime(const Value: TFileTime);
procedure SetFileName(const Value: TFileName);
procedure SetFileSize(const Value: Int64);
@@ -2515,7 +2515,7 @@
FreeAndNil(FStream);
end;
-procedure TJclCompressionItem.SetAttributes(const Value: Cardinal);
+procedure TJclCompressionItem.SetAttributes(Value: Cardinal);
begin
CheckSetProperty(ipAttributes);
FAttributes := Value;
@@ -2531,7 +2531,7 @@
Include(FValidProperties, ipComment);
end;
-procedure TJclCompressionItem.SetCRC(const Value: Cardinal);
+procedure TJclCompressionItem.SetCRC(Value: Cardinal);
begin
CheckSetProperty(ipCRC);
FCRC := Value;
@@ -2553,8 +2553,16 @@
begin
CheckSetProperty(ipFileName);
FFileName := Value;
- Include(FModifiedProperties, ipFileName);
- Include(FValidProperties, ipFileName);
+ if Value <> '' then
+ begin
+ Include(FModifiedProperties, ipFileName);
+ Include(FValidProperties, ipFileName);
+ end
+ else
+ begin
+ Exclude(FModifiedProperties, ipFileName);
+ Exclude(FValidProperties, ipFileName);
+ end;
if (Value <> '') and (FArchive is TJclCompressionArchive)
and GetFileAttributesEx(PAnsiChar(Value), GetFileExInfoStandard, @AFindData) then
@@ -2676,18 +2684,36 @@
begin
FileHandle := CreateFile(PAnsiChar(FFileName), FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ, nil, OPEN_EXISTING, 0, 0);
try
+ // creation time should be the oldest
if ipCreationTime in FValidProperties then
ACreationTime := @FCreationTime
else
+ if ipLastWriteTime in FValidProperties then
+ ACreationTime := @FLastWriteTime
+ else
+ if ipLastAccessTime in FValidProperties then
+ ACreationTime := @FLastAccessTime
+ else
ACreationTime := nil;
+
+ // last access time may default to now if not set
if ipLastAccessTime in FValidProperties then
ALastAccessTime := @FLastAccessTime
else
ALastAccessTime := nil;
+
+ // last write time may, if not set, be the creation time or last access time
if ipLastWriteTime in FValidProperties then
ALastWriteTime := @FLastWriteTime
else
+ if ipCreationTime in FValidProperties then
+ ALastWriteTime := @FCreationTime
+ else
+ if ipLastAccessTime in FValidProperties then
+ ALastWriteTime := @FLastAccessTime
+ else
ALastWriteTime := nil;
+
Result := (FileHandle <> INVALID_HANDLE_VALUE) and SetFileTime(FileHandle, ACreationTime, ALastAccessTime,
ALastWriteTime);
finally
@@ -3478,8 +3504,14 @@
raise EJclCompressionError.CreateResFmt(@RsCompression7zReturnError, [Value, SysErrorMessage(Value)]);
end;
+type
+ TWideStringSetter = procedure (const Value: WideString) of object;
+ TCardinalSetter = procedure (Value: Cardinal) of object;
+ TInt64Setter = procedure (const Value: Int64) of object;
+ TFileTimeSetter = procedure (const Value: TFileTime) of object;
+
function Get7zWideStringProp(const AArchive: IInArchive; ItemIndex: Integer;
- PropID: Cardinal): WideString;
+ PropID: Cardinal; const Setter: TWideStringSetter): Boolean;
var
Value: TPropVariant;
begin
@@ -3487,14 +3519,21 @@
SevenzipCheck(AArchive.GetProperty(ItemIndex, PropID, Value));
case Value.vt of
VT_EMPTY, VT_NULL:
- Result := '';
+ Result := False;
VT_LPSTR:
- Result := Value.pszVal;
+ begin
+ Result := True;
+ Setter(Value.pszVal);
+ end;
VT_LPWSTR:
- Result := Value.pwszVal;
+ begin
+ Result := True;
+ Setter(Value.pwszVal);
+ end;
VT_BSTR:
begin
- Result := Value.bstrVal;
+ Result := True;
+ Setter(Value.bstrVal);
SysFreeString(Value.bstrVal);
end;
else
@@ -3503,7 +3542,7 @@
end;
function Get7zCardinalProp(const AArchive: IInArchive; ItemIndex: Integer;
- PropID: Cardinal): Cardinal;
+ PropID: Cardinal; const Setter: TCardinalSetter): Boolean;
var
Value: TPropVariant;
begin
@@ -3511,30 +3550,37 @@
SevenzipCheck(AArchive.GetProperty(ItemIndex, PropID, Value));
case Value.vt of
VT_EMPTY, VT_NULL:
- Result := 0;
- VT_I1:
- Result := Value.iVal;
- VT_I2:
- Result := Value.iVal;
- VT_INT, VT_I4:
- Result := Value.lVal;
- VT_I8:
- Result := Value.hVal.QuadPart;
- VT_UI1:
- Result := Value.bVal;
- VT_UI2:
- Result := Value.uiVal;
- VT_UINT, VT_UI4:
- Result := Value.ulVal;
- VT_UI8:
- Result := Value.uhVal.QuadPart;
+ Result := False;
+ VT_I1, VT_I2, VT_INT, VT_I4, VT_I8,
+ VT_UI1, VT_UI2, VT_UINT, VT_UI4, VT_UI8:
+ begin
+ Result := True;
+ case Value.vt of
+ VT_I1:
+ Setter(Value.iVal);
+ VT_I2:
+ Setter(Value.iVal);
+ VT_INT, VT_I4:
+ Setter(Value.lVal);
+ VT_I8:
+ Setter(Value.hVal.QuadPart);
+ VT_UI1:
+ Setter(Value.bVal);
+ VT_UI2:
+ Setter(Value.uiVal);
+ VT_UINT, VT_UI4:
+ Setter(Value.ulVal);
+ VT_UI8:
+ Setter(Value.uhVal.QuadPart);
+ end;
+ end;
else
raise EJclCompressionError.CreateResFmt(@RsCompression7zUnknownValueType, [Value.vt, PropID]);
end;
end;
function Get7zInt64Prop(const AArchive: IInArchive; ItemIndex: Integer;
- PropID: Cardinal): Int64;
+ PropID: Cardinal; const Setter: TInt64Setter): Boolean;
var
Value: TPropVariant;
begin
@@ -3542,30 +3588,37 @@
SevenzipCheck(AArchive.GetProperty(ItemIndex, PropID, Value));
case Value.vt of
VT_EMPTY, VT_NULL:
- Result := 0;
- VT_I1:
- Result := Value.iVal;
- VT_I2:
- Result := Value.iVal;
- VT_INT, VT_I4:
- Result := Value.lVal;
- VT_I8:
- Result := Value.hVal.QuadPart;
- VT_UI1:
- Result := Value.bVal;
- VT_UI2:
- Result := Value.uiVal;
- VT_UINT, VT_UI4:
- Result := Value.ulVal;
- VT_UI8:
- Result := Value.uhVal.QuadPart;
+ Result := False;
+ VT_I1, VT_I2, VT_INT, VT_I4, VT_I8,
+ VT_UI1, VT_UI2, VT_UINT, VT_UI4, VT_UI8:
+ begin
+ Result := True;
+ case Value.vt of
+ VT_I1:
+ Setter(Value.iVal);
+ VT_I2:
+ Setter(Value.iVal);
+ VT_INT, VT_I4:
+ Setter(Value.lVal);
+ VT_I8:
+ Setter(Value.hVal.QuadPart);
+ VT_UI1:
+ Setter(Value.bVal);
+ VT_UI2:
+ Setter(Value.uiVal);
+ VT_UINT, VT_UI4:
+ Setter(Value.ulVal);
+ VT_UI8:
+ Setter(Value.uhVal.QuadPart);
+ end;
+ end;
else
raise EJclCompressionError.CreateResFmt(@RsCompression7zUnknownValueType, [Value.vt, PropID]);
end;
end;
function Get7zFileTimeProp(const AArchive: IInArchive; ItemIndex: Integer;
- PropID: Cardinal): TFileTime;
+ PropID: Cardinal; const Setter: TFileTimeSetter): Boolean;
var
Value: TPropVariant;
begin
@@ -3573,12 +3626,12 @@
SevenzipCheck(AArchive.GetProperty(ItemIndex, PropID, Value));
case Value.vt of
VT_EMPTY, VT_NULL:
+ Result := False;
+ VT_FILETIME:
begin
- Result.dwLowDateTime := 0;
- Result.dwHighDateTime := 0;
+ Result := True;
+ Setter(Value.filetime);
end;
- VT_FILETIME:
- Result := Value.filetime;
else
raise EJclCompressionError.CreateResFmt(@RsCompression7zUnknownValueType, [Value.vt, PropID]);
end;
@@ -3587,27 +3640,30 @@
procedure Load7zFileAttribute(AInArchive: IInArchive; ItemIndex: Integer;
AItem: TJclCompressionItem);
begin
- AItem.PackedName := Get7zWideStringProp(AInArchive, ItemIndex, kpidPath);
- AItem.FPackedIndex := ItemIndex;
- AItem.FileName := '';
- AItem.Stream := nil;
- AItem.OwnsStream := False;
- AItem.Attributes := Get7zCardinalProp(AInArchive, ItemIndex, kpidAttributes);
- AItem.FileSize := Get7zInt64Prop(AInArchive, ItemIndex, kpidSize);
- AItem.PackedSize := Get7zInt64Prop(AInArchive, ItemIndex, kpidPackedSize);
- AItem.CreationTime := Get7zFileTimeProp(AInArchive, ItemIndex, kpidCreationTime);
- AItem.LastAccessTime := Get7zFileTimeProp(AInArchive, ItemIndex, kpidLastAccessTime);
- AItem.LastWriteTime := Get7zFileTimeProp(AInArchive, ItemIndex, kpidLastWriteTime);
- AItem.Comment := Get7zWideStringProp(AInArchive, ItemIndex, kpidComment);
- AItem.HostOS := Get7zWideStringProp(AInArchive, ItemIndex, kpidHostOS);
- AItem.HostFS := Get7zWideStringProp(AInArchive, ItemIndex, kpidFileSystem);
- AItem.User := Get7zWideStringProp(AInArchive, ItemIndex, kpidUser);
- AItem.Group := Get7zWideStringProp(AInArchive, ItemIndex, kpidGroup);
- AItem.CRC := Get7zCardinalProp(AInArchive, ItemIndex, kpidCRC);
- AItem.Method := Get7zWideStringProp(AInArchive, ItemIndex, kpidMethod);
+ AItem.FValidProperties := [];
+ if Get7zWideStringProp(AInArchive, ItemIndex, kpidPath, AItem.SetPackedName) then
+ begin
+ AItem.FPackedIndex := ItemIndex;
+ AItem.FileName := '';
+ AItem.Stream := nil;
+ AItem.OwnsStream := False;
+ Get7zCardinalProp(AInArchive, ItemIndex, kpidAttributes, AItem.SetAttributes);
+ Get7zInt64Prop(AInArchive, ItemIndex, kpidSize, AItem.SetFileSize);
+ Get7zInt64Prop(AInArchive, ItemIndex, kpidPackedSize, AItem.SetPackedSize);
+ Get7zFileTimeProp(AInArchive, ItemIndex, kpidCreationTime, AItem.SetCreationTime);
+ Get7zFileTimeProp(AInArchive, ItemIndex, kpidLastAccessTime, AItem.SetLastAccessTime);
+ Get7zFileTimeProp(AInArchive, ItemIndex, kpidLastWriteTime, AItem.SetLastWriteTime);
+ Get7zWideStringProp(AInArchive, ItemIndex, kpidComment, AItem.SetComment);
+ Get7zWideStringProp(AInArchive, ItemIndex, kpidHostOS, AItem.SetHostOS);
+ Get7zWideStringProp(AInArchive, ItemIndex, kpidFileSystem, AItem.SetHostFS);
+ Get7zWideStringProp(AInArchive, ItemIndex, kpidUser, AItem.SetUser);
+ Get7zWideStringProp(AInArchive, ItemIndex, kpidGroup, AItem.SetGroup);
+ Get7zCardinalProp(AInArchive, ItemIndex, kpidCRC, AItem.SetCRC);
+ Get7zWideStringProp(AInArchive, ItemIndex, kpidMethod, AItem.SetMethod);
- // reset modified flags
- AItem.ModifiedProperties := [];
+ // reset modified flags
+ AItem.ModifiedProperties := [];
+ end;
end;
//=== { TJclSevenzipOutputCallback } =========================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-29 16:21:30
|
Revision: 2328
http://jcl.svn.sourceforge.net/jcl/?rev=2328&view=rev
Author: outchy
Date: 2008-01-29 08:21:28 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
merge of compression branch into trunk of development. fixing some compatibility issues with C++Builder and Delphi.net.
log messages for the compression branch were:
Revision: 2327
Author: outchy
Date: 13:05:48, lundi 28 janvier 2008
Message:
Mantis 4325: [branch compression] TJclSevenzip*Archive.Extract* does not set the timestamp of the files
----
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Revision: 2326
Author: outchy
Date: 12:19:43, lundi 28 janvier 2008
Message:
removing manifest from resource, adding standard manifest.
----
Modified : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
Modified : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.res
Revision: 2287
Author: uschuster
Date: 14:17:56, dimanche 30 d?\195?\169cembre 2007
Message:
fixed extraction of some selected files of a solid archive (Mantis #4324)
(Mantis #4324)
----
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Revision: 2218
Author: uschuster
Date: 01:30:09, mercredi 14 novembre 2007
Message:
fixed example for older versions
----
Modified : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
Modified : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.res
Modified : /branches/compression/jcl/examples/windows/compression/archive/UMain.pas
Revision: 2217
Author: uschuster
Date: 00:54:57, mercredi 14 novembre 2007
Message:
- fixed compilation with D5
- added missing file size in stream version of TJclCompressArchive.AddFile
----
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Revision: 2140
Author: outchy
Date: 23:30:28, mercredi 22 ao?\195?\187t 2007
Message:
Some progression: archive update support
File deletion is not functional yet, still need to be heavily tested.
----
Modified : /branches/compression/jcl/examples/windows/compression/archive/UMain.dfm
Modified : /branches/compression/jcl/examples/windows/compression/archive/UMain.pas
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Revision: 2138
Author: outchy
Date: 19:44:13, dimanche 19 ao?\195?\187t 2007
Message:
Preparing structure for read-write operations on archives
New property to read compression method for file (read-only)
Moving some string constants about compression method to sevenzip.pas
fixed issue: properties marked as modified after a load
----
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Modified : /branches/compression/jcl/source/windows/sevenzip.pas
Revision: 2137
Author: outchy
Date: 14:12:36, dimanche 19 ao?\195?\187t 2007
Message:
fixing zip extraction error.
----
Modified : /branches/compression/jcl/source/common/JclStreams.pas
Revision: 2136
Author: outchy
Date: 13:44:35, dimanche 19 ao?\195?\187t 2007
Message:
reworking sevenzip support: using objects instead of records.
----
Modified : /branches/compression/jcl/examples/windows/compression/archive/UMain.dfm
Modified : /branches/compression/jcl/examples/windows/compression/archive/UMain.pas
Modified : /branches/compression/jcl/source/common/JclBase.pas
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Modified : /branches/compression/jcl/source/common/JclResources.pas
Modified : /branches/compression/jcl/source/windows/sevenzip.pas
Revision: 2019
Author: uschuster
Date: 00:14:52, mercredi 30 mai 2007
Message:
changed PUInt64 to PInt64 as workaround for QC 9411 and QC 46671
----
Modified : /branches/compression/jcl/source/common/JclBase.pas
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Modified : /branches/compression/jcl/source/windows/sevenzip.pas
Revision: 2018
Author: outchy
Date: 21:55:38, dimanche 27 mai 2007
Message:
Reworking one-line compression to/from gzip/bzip2: added function to compress/decompress streams using one function.
Adding a new stream class (TJclSplitStream) with 2 implementors: TJclStaticSplitStream and TJclDynamicSplitStream
Adding wrapper for Sevenzip code (http://sevenzip.sourceforge.net/): jcl/source/windows/sevenzip.pas This code requires 7z.dll which is part of the Sevenzip redistribution.
Reworking compression classes for archive:
- root class TJclCompressionArchive handling item storage and exposing common properties
- ancestor class for compression: TJclCompressArchive
- ancestor class for decompression: TJclDecompressArchive
- ancestor class for compression handled by Sevenzip: TJclSevenzipCompressArchive
- ancestor class for decompression handled by Sevenzip: TJclSevenzipDecompressArchive
- one child class per format and operation: TJclZipCompressArchive, TJcl7zCompressArchive ...
Adding an example about archives and JclCompression.pas: file manager to compress/decompress archive in few clicks based on new classes of JclCompression.pas.
Modifying packages, included files and installer to configure these new imports.
----
Added : /branches/compression/jcl/examples/windows/compression
Added : /branches/compression/jcl/examples/windows/compression/archive
Added : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dof
Added : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
Added : /branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.res
Added : /branches/compression/jcl/examples/windows/compression/archive/UMain.dfm
Added : /branches/compression/jcl/examples/windows/compression/archive/UMain.pas
Modified : /branches/compression/jcl/install/JclInstall.pas
Modified : /branches/compression/jcl/lib/d10.net/windows.exc
Modified : /branches/compression/jcl/lib/d9.net/windows.exc
Modified : /branches/compression/jcl/packages/c5/JclC50.bpk
Modified : /branches/compression/jcl/packages/c5/JclC50.cpp
Modified : /branches/compression/jcl/packages/c5/JclC50.dpk
Modified : /branches/compression/jcl/packages/c6/Jcl.bpk
Modified : /branches/compression/jcl/packages/c6/Jcl.dpk
Modified : /branches/compression/jcl/packages/cs1/Jcl.dpk
Modified : /branches/compression/jcl/packages/d10/Jcl.dpk
Modified : /branches/compression/jcl/packages/d11/Jcl.dpk
Modified : /branches/compression/jcl/packages/d5/JclD50.dpk
Modified : /branches/compression/jcl/packages/d6/Jcl.dpk
Modified : /branches/compression/jcl/packages/d7/Jcl.dpk
Modified : /branches/compression/jcl/packages/d8/Jcl.dpk
Modified : /branches/compression/jcl/packages/d9/Jcl.dpk
Modified : /branches/compression/jcl/packages/xml/Jcl-R.xml
Modified : /branches/compression/jcl/source/common/JclBase.pas
Modified : /branches/compression/jcl/source/common/JclCompression.pas
Modified : /branches/compression/jcl/source/common/JclResources.pas
Modified : /branches/compression/jcl/source/common/JclStreams.pas
Modified : /branches/compression/jcl/source/jcl.inc
Modified : /branches/compression/jcl/source/jcl.template.inc
Modified : /branches/compression/jcl/source/windows/obj/bzip2
Modified : /branches/compression/jcl/source/windows/obj/pcre
Added : /branches/compression/jcl/source/windows/obj/sevenzip
Added : /branches/compression/jcl/source/windows/obj/sevenzip/dirinfo.txt
Added : /branches/compression/jcl/source/windows/sevenzip.pas
Revision: 2017
Author: outchy
Date: 20:51:24, dimanche 27 mai 2007
Message:
New branch for archive compression
----
Added : /branches/compression(Copy from path: /trunk, Revision, 2016
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/lib/d10.net/windows.exc
trunk/jcl/lib/d11.net/windows.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/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/xml/Jcl-R.xml
trunk/jcl/source/common/JclBase.pas
trunk/jcl/source/common/JclCompression.pas
trunk/jcl/source/common/JclResources.pas
trunk/jcl/source/common/JclStreams.pas
trunk/jcl/source/jcl.inc
trunk/jcl/source/jcl.template.inc
Added Paths:
-----------
trunk/jcl/examples/windows/compression/
trunk/jcl/examples/windows/compression/archive/
trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof
trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
trunk/jcl/examples/windows/compression/archive/ArchiveDemo.res
trunk/jcl/examples/windows/compression/archive/UMain.dfm
trunk/jcl/examples/windows/compression/archive/UMain.pas
trunk/jcl/source/windows/sevenzip.pas
Removed Paths:
-------------
trunk/jcl/examples/windows/compression/archive/
trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof
trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
trunk/jcl/examples/windows/compression/archive/ArchiveDemo.res
trunk/jcl/examples/windows/compression/archive/UMain.dfm
trunk/jcl/examples/windows/compression/archive/UMain.pas
Copied: trunk/jcl/examples/windows/compression (from rev 2327, branches/compression/jcl/examples/windows/compression)
Property changes on: trunk/jcl/examples/windows/compression
___________________________________________________________________
Name: bugtraq:url
+ http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID%
Name: bugtraq:message
+ (Mantis #%BUGID%)
Name: svn:ignore
+ *.identcache
*.local
*.cfg
*.drc
*.dcu
Name: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Copied: trunk/jcl/examples/windows/compression/archive (from rev 2327, branches/compression/jcl/examples/windows/compression/archive)
Property changes on: trunk/jcl/examples/windows/compression/archive
___________________________________________________________________
Name: bugtraq:url
+ http://homepages.codegear.com/jedi/issuetracker/view.php?id=%BUGID%
Name: bugtraq:message
+ (Mantis #%BUGID%)
Name: svn:ignore
+ *.identcache
*.local
*.cfg
*.drc
*.dcu
Name: bugtraq:logregex
+ [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)
Deleted: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof
===================================================================
--- branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dof 2008-01-28 12:05:48 UTC (rev 2327)
+++ trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof 2008-01-29 16:21:28 UTC (rev 2328)
@@ -1,3 +0,0 @@
-[Directories]
-OutputDir=..\..\..\..\bin
-
Copied: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof (from rev 2327, branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dof)
===================================================================
--- trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof (rev 0)
+++ trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof 2008-01-29 16:21:28 UTC (rev 2328)
@@ -0,0 +1,3 @@
+[Directories]
+OutputDir=..\..\..\..\bin
+
Property changes on: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dof
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
===================================================================
--- branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr 2008-01-28 12:05:48 UTC (rev 2327)
+++ trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr 2008-01-29 16:21:28 UTC (rev 2328)
@@ -1,14 +0,0 @@
-program ArchiveDemo;
-
-uses
- Forms,
- UMain in 'UMain.pas' {Form1};
-
-{$R *.res}
-{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
-
-begin
- Application.Initialize;
- Application.CreateForm(TForm1, Form1);
- Application.Run;
-end.
Copied: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr (from rev 2327, branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr)
===================================================================
--- trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr (rev 0)
+++ trunk/jcl/examples/windows/compression/archive/ArchiveDemo.dpr 2008-01-29 16:21:28 UTC (rev 2328)
@@ -0,0 +1,14 @@
+program ArchiveDemo;
+
+uses
+ Forms,
+ UMain in 'UMain.pas' {Form1};
+
+{$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
+
+begin
+ Application.Initialize;
+ Application.CreateForm(TForm1, Form1);
+ Application.Run;
+end.
Deleted: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.res
===================================================================
(Binary files differ)
Copied: trunk/jcl/examples/windows/compression/archive/ArchiveDemo.res (from rev 2327, branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.res)
===================================================================
(Binary files differ)
Deleted: trunk/jcl/examples/windows/compression/archive/UMain.dfm
===================================================================
--- branches/compression/jcl/examples/windows/compression/archive/UMain.dfm 2008-01-28 12:05:48 UTC (rev 2327)
+++ trunk/jcl/examples/windows/compression/archive/UMain.dfm 2008-01-29 16:21:28 UTC (rev 2328)
@@ -1,336 +0,0 @@
-object Form1: TForm1
- Left = 0
- Top = 0
- Caption = 'Form1'
- ClientHeight = 301
- ClientWidth = 691
- Color = clBtnFace
- Font.Charset = DEFAULT_CHARSET
- Font.Color = clWindowText
- Font.Height = -11
- Font.Name = 'Tahoma'
- Font.Style = []
- OldCreateOrder = False
- OnDestroy = FormDestroy
- PixelsPerInch = 96
- TextHeight = 13
- object ListView1: TListView
- Left = 0
- Top = 81
- Width = 691
- Height = 204
- Align = alClient
- Columns = <
- item
- Caption = 'Local name'
- Width = 150
- end
- item
- Caption = 'Archive name'
- Width = 150
- end
- item
- Caption = 'Size'
- Width = 30
- end
- item
- Caption = 'Compressed'
- Width = 30
- end
- item
- Caption = 'Creation'
- end
- item
- Caption = 'Last access'
- end
- item
- Caption = 'Last write'
- end
- item
- Caption = 'Comment'
- Width = 30
- end
- item
- Caption = 'OS'
- Width = 20
- end
- item
- Caption = 'FS'
- Width = 20
- end
- item
- Caption = 'User'
- Width = 20
- end
- item
- Caption = 'Group'
- Width = 20
- end
- item
- Caption = 'CRC'
- end>
- MultiSelect = True
- OwnerData = True
- RowSelect = True
- TabOrder = 0
- ViewStyle = vsReport
- OnData = ListView1Data
- end
- object ProgressBar1: TProgressBar
- Left = 0
- Top = 285
- Width = 691
- Height = 16
- Align = alBottom
- TabOrder = 1
- end
- object PageControl1: TPageControl
- Left = 0
- Top = 0
- Width = 691
- Height = 81
- ActivePage = TabSheetReadOnly
- Align = alTop
- TabOrder = 2
- object TabSheetReadOnly: TTabSheet
- Caption = 'Read-only'
- object ButtonOpen: TButton
- Left = 16
- Top = 16
- Width = 75
- Height = 25
- Action = ActionOpen
- TabOrder = 0
- end
- object ButtonExtractSelected: TButton
- Left = 97
- Top = 16
- Width = 96
- Height = 25
- Action = ActionExtractSelected
- TabOrder = 1
- end
- object ButtonExtractAll: TButton
- Left = 199
- Top = 16
- Width = 75
- Height = 25
- Action = ActionExtractAll
- TabOrder = 2
- end
- end
- object TabSheetWriteOnly: TTabSheet
- Caption = 'Write-only'
- ImageIndex = 1
- object ButtonNew: TButton
- Left = 16
- Top = 16
- Width = 75
- Height = 25
- Action = ActionNew
- TabOrder = 0
- end
- object ButtonAddFile: TButton
- Left = 97
- Top = 16
- Width = 75
- Height = 25
- Action = ActionAddFile
- TabOrder = 1
- end
- object ButtonAddDirectory: TButton
- Left = 178
- Top = 16
- Width = 75
- Height = 25
- Action = ActionAddDirectory
- TabOrder = 2
- end
- object ButtonSave: TButton
- Left = 259
- Top = 16
- Width = 75
- Height = 25
- Action = ActionSave
- TabOrder = 3
- end
- end
- object TabSheetReadWrite: TTabSheet
- Caption = 'Read and write'
- ImageIndex = 2
- object ButtonNewRW: TButton
- Left = 16
- Top = 16
- Width = 75
- Height = 25
- Action = ActionNewRW
- TabOrder = 0
- end
- object ButtonOpenRW: TButton
- Left = 97
- Top = 16
- Width = 75
- Height = 25
- Action = ActionOpenRW
- TabOrder = 1
- end
- object ButtonDeleteRW: TButton
- Left = 178
- Top = 16
- Width = 75
- Height = 25
- Action = ActionDelete
- TabOrder = 2
- end
- object ButtonAddFileRW: TButton
- Left = 259
- Top = 16
- Width = 75
- Height = 25
- Action = ActionAddFile
- TabOrder = 3
- end
- object ButtonAddDirectoryRW: TButton
- Left = 340
- Top = 16
- Width = 75
- Height = 25
- Action = ActionAddDirectory
- TabOrder = 4
- end
- object ButtonExtractSelectedRW: TButton
- Left = 421
- Top = 16
- Width = 92
- Height = 25
- Action = ActionExtractSelected
- TabOrder = 5
- end
- object ButtonExtractAllRW: TButton
- Left = 519
- Top = 16
- Width = 75
- Height = 25
- Action = ActionExtractAll
- TabOrder = 6
- end
- object ButtonSaveRW: TButton
- Left = 600
- Top = 16
- Width = 75
- Height = 25
- Action = ActionSave
- TabOrder = 7
- end
- end
- end
- object ActionList1: TActionList
- Left = 64
- Top = 152
- object ActionOpen: TAction
- Category = 'ReadOnly'
- Caption = '&Open'
- OnExecute = ActionOpenExecute
- OnUpdate = ActionAlwaysEnabled
- end
- object ActionExtractSelected: TAction
- Category = 'ReadOnly'
- Caption = '&Extract selected'
- OnExecute = ActionExtractSelectedExecute
- OnUpdate = ActionExtractSelectedUpdate
- end
- object ActionExtractAll: TAction
- Category = 'ReadOnly'
- Caption = 'Extract &all'
- OnExecute = ActionExtractAllExecute
- OnUpdate = ActionExtractAllUpdate
- end
- object ActionNew: TAction
- Category = 'WriteOnly'
- Caption = '&New'
- OnExecute = ActionNewExecute
- OnUpdate = ActionAlwaysEnabled
- end
- object ActionAddFile: TAction
- Category = 'WriteOnly'
- Caption = 'Add &file'
- OnExecute = ActionAddFileExecute
- OnUpdate = ActionAddFileUpdate
- end
- object ActionAddDirectory: TAction
- Category = 'WriteOnly'
- Caption = 'Add &directory'
- OnExecute = ActionAddDirectoryExecute
- OnUpdate = ActionAddDirectoryUpdate
- end
- object ActionSave: TAction
- Category = 'WriteOnly'
- Caption = '&Save'
- OnExecute = ActionSaveExecute
- OnUpdate = ActionSaveUpdate
- end
- object ActionDelete: TAction
- Category = 'ReadWrite'
- Caption = '&Delete'
- OnExecute = ActionDeleteExecute
- OnUpdate = ActionDeleteUpdate
- end
- object ActionNewRW: TAction
- Category = 'ReadWrite'
- Caption = '&New'
- OnExecute = ActionNewRWExecute
- OnUpdate = ActionAlwaysEnabled
- end
- object ActionOpenRW: TAction
- Category = 'ReadWrite'
- Caption = '&Open'
- OnExecute = ActionOpenRWExecute
- OnUpdate = ActionAlwaysEnabled
- end
- end
- object OpenDialogArchive: TOpenDialog
- Filter =
- 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
- 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
- '|*.gz|Rar archive (*.rar)|*.rar|Arj archive (*.arj)|*.arj|Z arch' +
- 'ive (*.z)|*.z|Lzh archive (*.lzh)|*.lzh|Nsis archive (*.nsis)|*.' +
- 'nsis|Iso image (*.iso)|*.iso|Cab archive (*.cab)|*.cab|Chm file ' +
- '(*.chm)|*.chm|Rpm archive (*.rpm)|*.rpm|Deb archive (*.deb)|*.de' +
- 'b|Cpio archive (*.cpio)|*.cpio|Split archive (*.001)|*.001'
- FilterIndex = 0
- Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
- Title = 'Open an archive for extraction'
- Left = 104
- Top = 152
- end
- object SaveDialogArchive: TSaveDialog
- DefaultExt = '*.zip'
- Filter =
- 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
- 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
- '|*.gz|Splitted archive (*.001)|*.001'
- FilterIndex = 0
- Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofCreatePrompt, ofNoReadOnlyReturn, ofEnableSizing]
- Title = 'Create a new archive'
- Left = 144
- Top = 152
- end
- object OpenDialogFile: TOpenDialog
- Filter = 'All files (*.*)|*.*'
- FilterIndex = 0
- Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
- Left = 104
- Top = 216
- end
- object OpenDialogArchiveRW: TOpenDialog
- Filter =
- 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
- 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
- '|*.gz|Split archive (*.001)|*.001'
- FilterIndex = 0
- Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
- Title = 'Open an archive for modification'
- Left = 104
- Top = 184
- end
-end
Copied: trunk/jcl/examples/windows/compression/archive/UMain.dfm (from rev 2327, branches/compression/jcl/examples/windows/compression/archive/UMain.dfm)
===================================================================
--- trunk/jcl/examples/windows/compression/archive/UMain.dfm (rev 0)
+++ trunk/jcl/examples/windows/compression/archive/UMain.dfm 2008-01-29 16:21:28 UTC (rev 2328)
@@ -0,0 +1,336 @@
+object Form1: TForm1
+ Left = 0
+ Top = 0
+ Caption = 'Form1'
+ ClientHeight = 301
+ ClientWidth = 691
+ Color = clBtnFace
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'Tahoma'
+ Font.Style = []
+ OldCreateOrder = False
+ OnDestroy = FormDestroy
+ PixelsPerInch = 96
+ TextHeight = 13
+ object ListView1: TListView
+ Left = 0
+ Top = 81
+ Width = 691
+ Height = 204
+ Align = alClient
+ Columns = <
+ item
+ Caption = 'Local name'
+ Width = 150
+ end
+ item
+ Caption = 'Archive name'
+ Width = 150
+ end
+ item
+ Caption = 'Size'
+ Width = 30
+ end
+ item
+ Caption = 'Compressed'
+ Width = 30
+ end
+ item
+ Caption = 'Creation'
+ end
+ item
+ Caption = 'Last access'
+ end
+ item
+ Caption = 'Last write'
+ end
+ item
+ Caption = 'Comment'
+ Width = 30
+ end
+ item
+ Caption = 'OS'
+ Width = 20
+ end
+ item
+ Caption = 'FS'
+ Width = 20
+ end
+ item
+ Caption = 'User'
+ Width = 20
+ end
+ item
+ Caption = 'Group'
+ Width = 20
+ end
+ item
+ Caption = 'CRC'
+ end>
+ MultiSelect = True
+ OwnerData = True
+ RowSelect = True
+ TabOrder = 0
+ ViewStyle = vsReport
+ OnData = ListView1Data
+ end
+ object ProgressBar1: TProgressBar
+ Left = 0
+ Top = 285
+ Width = 691
+ Height = 16
+ Align = alBottom
+ TabOrder = 1
+ end
+ object PageControl1: TPageControl
+ Left = 0
+ Top = 0
+ Width = 691
+ Height = 81
+ ActivePage = TabSheetReadOnly
+ Align = alTop
+ TabOrder = 2
+ object TabSheetReadOnly: TTabSheet
+ Caption = 'Read-only'
+ object ButtonOpen: TButton
+ Left = 16
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionOpen
+ TabOrder = 0
+ end
+ object ButtonExtractSelected: TButton
+ Left = 97
+ Top = 16
+ Width = 96
+ Height = 25
+ Action = ActionExtractSelected
+ TabOrder = 1
+ end
+ object ButtonExtractAll: TButton
+ Left = 199
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionExtractAll
+ TabOrder = 2
+ end
+ end
+ object TabSheetWriteOnly: TTabSheet
+ Caption = 'Write-only'
+ ImageIndex = 1
+ object ButtonNew: TButton
+ Left = 16
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionNew
+ TabOrder = 0
+ end
+ object ButtonAddFile: TButton
+ Left = 97
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionAddFile
+ TabOrder = 1
+ end
+ object ButtonAddDirectory: TButton
+ Left = 178
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionAddDirectory
+ TabOrder = 2
+ end
+ object ButtonSave: TButton
+ Left = 259
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionSave
+ TabOrder = 3
+ end
+ end
+ object TabSheetReadWrite: TTabSheet
+ Caption = 'Read and write'
+ ImageIndex = 2
+ object ButtonNewRW: TButton
+ Left = 16
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionNewRW
+ TabOrder = 0
+ end
+ object ButtonOpenRW: TButton
+ Left = 97
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionOpenRW
+ TabOrder = 1
+ end
+ object ButtonDeleteRW: TButton
+ Left = 178
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionDelete
+ TabOrder = 2
+ end
+ object ButtonAddFileRW: TButton
+ Left = 259
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionAddFile
+ TabOrder = 3
+ end
+ object ButtonAddDirectoryRW: TButton
+ Left = 340
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionAddDirectory
+ TabOrder = 4
+ end
+ object ButtonExtractSelectedRW: TButton
+ Left = 421
+ Top = 16
+ Width = 92
+ Height = 25
+ Action = ActionExtractSelected
+ TabOrder = 5
+ end
+ object ButtonExtractAllRW: TButton
+ Left = 519
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionExtractAll
+ TabOrder = 6
+ end
+ object ButtonSaveRW: TButton
+ Left = 600
+ Top = 16
+ Width = 75
+ Height = 25
+ Action = ActionSave
+ TabOrder = 7
+ end
+ end
+ end
+ object ActionList1: TActionList
+ Left = 64
+ Top = 152
+ object ActionOpen: TAction
+ Category = 'ReadOnly'
+ Caption = '&Open'
+ OnExecute = ActionOpenExecute
+ OnUpdate = ActionAlwaysEnabled
+ end
+ object ActionExtractSelected: TAction
+ Category = 'ReadOnly'
+ Caption = '&Extract selected'
+ OnExecute = ActionExtractSelectedExecute
+ OnUpdate = ActionExtractSelectedUpdate
+ end
+ object ActionExtractAll: TAction
+ Category = 'ReadOnly'
+ Caption = 'Extract &all'
+ OnExecute = ActionExtractAllExecute
+ OnUpdate = ActionExtractAllUpdate
+ end
+ object ActionNew: TAction
+ Category = 'WriteOnly'
+ Caption = '&New'
+ OnExecute = ActionNewExecute
+ OnUpdate = ActionAlwaysEnabled
+ end
+ object ActionAddFile: TAction
+ Category = 'WriteOnly'
+ Caption = 'Add &file'
+ OnExecute = ActionAddFileExecute
+ OnUpdate = ActionAddFileUpdate
+ end
+ object ActionAddDirectory: TAction
+ Category = 'WriteOnly'
+ Caption = 'Add &directory'
+ OnExecute = ActionAddDirectoryExecute
+ OnUpdate = ActionAddDirectoryUpdate
+ end
+ object ActionSave: TAction
+ Category = 'WriteOnly'
+ Caption = '&Save'
+ OnExecute = ActionSaveExecute
+ OnUpdate = ActionSaveUpdate
+ end
+ object ActionDelete: TAction
+ Category = 'ReadWrite'
+ Caption = '&Delete'
+ OnExecute = ActionDeleteExecute
+ OnUpdate = ActionDeleteUpdate
+ end
+ object ActionNewRW: TAction
+ Category = 'ReadWrite'
+ Caption = '&New'
+ OnExecute = ActionNewRWExecute
+ OnUpdate = ActionAlwaysEnabled
+ end
+ object ActionOpenRW: TAction
+ Category = 'ReadWrite'
+ Caption = '&Open'
+ OnExecute = ActionOpenRWExecute
+ OnUpdate = ActionAlwaysEnabled
+ end
+ end
+ object OpenDialogArchive: TOpenDialog
+ Filter =
+ 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
+ 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
+ '|*.gz|Rar archive (*.rar)|*.rar|Arj archive (*.arj)|*.arj|Z arch' +
+ 'ive (*.z)|*.z|Lzh archive (*.lzh)|*.lzh|Nsis archive (*.nsis)|*.' +
+ 'nsis|Iso image (*.iso)|*.iso|Cab archive (*.cab)|*.cab|Chm file ' +
+ '(*.chm)|*.chm|Rpm archive (*.rpm)|*.rpm|Deb archive (*.deb)|*.de' +
+ 'b|Cpio archive (*.cpio)|*.cpio|Split archive (*.001)|*.001'
+ FilterIndex = 0
+ Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
+ Title = 'Open an archive for extraction'
+ Left = 104
+ Top = 152
+ end
+ object SaveDialogArchive: TSaveDialog
+ DefaultExt = '*.zip'
+ Filter =
+ 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
+ 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
+ '|*.gz|Splitted archive (*.001)|*.001'
+ FilterIndex = 0
+ Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofCreatePrompt, ofNoReadOnlyReturn, ofEnableSizing]
+ Title = 'Create a new archive'
+ Left = 144
+ Top = 152
+ end
+ object OpenDialogFile: TOpenDialog
+ Filter = 'All files (*.*)|*.*'
+ FilterIndex = 0
+ Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
+ Left = 104
+ Top = 216
+ end
+ object OpenDialogArchiveRW: TOpenDialog
+ Filter =
+ 'Zip archive (*.zip)|*.zip|BZip2 archive (*.bz2)|*.bz2|Sevenzip a' +
+ 'rchive (*.7z)|*.7z|Tar archive (*.tar)|*.tar|GZip archive (*.gz)' +
+ '|*.gz|Split archive (*.001)|*.001'
+ FilterIndex = 0
+ Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
+ Title = 'Open an archive for modification'
+ Left = 104
+ Top = 184
+ end
+end
Property changes on: trunk/jcl/examples/windows/compression/archive/UMain.dfm
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/jcl/examples/windows/compression/archive/UMain.pas
===================================================================
--- branches/compression/jcl/examples/windows/compression/archive/UMain.pas 2008-01-28 12:05:48 UTC (rev 2327)
+++ trunk/jcl/examples/windows/compression/archive/UMain.pas 2008-01-29 16:21:28 UTC (rev 2328)
@@ -1,525 +0,0 @@
-unit UMain;
-
-{$I jcl.inc}
-
-interface
-
-uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls, ExtCtrls, ActnList, ComCtrls, ImgList, JclCompression;
-
-type
- TForm1 = class(TForm)
- ActionList1: TActionList;
- ActionOpen: TAction;
- ActionExtractSelected: TAction;
- ActionExtractAll: TAction;
- ActionNew: TAction;
- ActionAddFile: TAction;
- ActionAddDirectory: TAction;
- ActionSave: TAction;
- ListView1: TListView;
- OpenDialogArchive: TOpenDialog;
- SaveDialogArchive: TSaveDialog;
- OpenDialogFile: TOpenDialog;
- ProgressBar1: TProgressBar;
- PageControl1: TPageControl;
- TabSheetReadOnly: TTabSheet;
- TabSheetWriteOnly: TTabSheet;
- TabSheetReadWrite: TTabSheet;
- ButtonOpen: TButton;
- ButtonExtractSelected: TButton;
- ButtonExtractAll: TButton;
- ButtonNew: TButton;
- ButtonAddFile: TButton;
- ButtonAddDirectory: TButton;
- ButtonSave: TButton;
- ActionDelete: TAction;
- ActionNewRW: TAction;
- ActionOpenRW: TAction;
- ButtonNewRW: TButton;
- ButtonOpenRW: TButton;
- ButtonDeleteRW: TButton;
- ButtonAddFileRW: TButton;
- ButtonAddDirectoryRW: TButton;
- ButtonExtractSelectedRW: TButton;
- ButtonExtractAllRW: TButton;
- ButtonSaveRW: TButton;
- OpenDialogArchiveRW: TOpenDialog;
- procedure ActionAlwaysEnabled(Sender: TObject);
- procedure ActionExtractSelectedUpdate(Sender: TObject);
- procedure ActionExtractAllUpdate(Sender: TObject);
- procedure ActionAddFileUpdate(Sender: TObject);
- procedure ActionAddDirectoryUpdate(Sender: TObject);
- procedure ActionSaveUpdate(Sender: TObject);
- procedure ActionNewExecute(Sender: TObject);
- procedure FormDestroy(Sender: TObject);
- procedure ActionAddFileExecute(Sender: TObject);
- procedure ActionAddDirectoryExecute(Sender: TObject);
- procedure ActionSaveExecute(Sender: TObject);
- procedure ActionOpenExecute(Sender: TObject);
- procedure ListView1Data(Sender: TObject; Item: TListItem);
- procedure ActionExtractAllExecute(Sender: TObject);
- procedure ActionExtractSelectedExecute(Sender: TObject);
- procedure ActionDeleteUpdate(Sender: TObject);
- procedure ActionDeleteExecute(Sender: TObject);
- procedure ActionNewRWExecute(Sender: TObject);
- procedure ActionOpenRWExecute(Sender: TObject);
- private
- FArchive: TJclCompressionArchive;
- procedure CloseArchive;
- procedure ArchiveProgress(Sender: TObject; const Value, MaxValue: Int64);
- public
- end;
-
-var
- Form1: TForm1;
-
-implementation
-
-{$R *.dfm}
-
-uses
- JclAnsiStrings, Sevenzip, FileCtrl;
-
-function FileTimeToString(const FileTime: TFileTime): string;
-var
- LocalFileTime: TFileTime;
- SystemTime: TSystemTime;
-begin
- if FileTimeToLocalFileTime(FileTime, LocalFileTime)
- and FileTimeToSystemTime(LocalFileTime, SystemTime) then
- Result := DateTimeToStr(EncodeDate(SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay)
- + EncodeTime(SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond, SystemTime.wMilliseconds))
- else
- Result := '';
-end;
-
-procedure TForm1.ActionAddDirectoryExecute(Sender: TObject);
-var
- Directory: string;
-begin
- if FileCtrl.SelectDirectory('Select directory', '', Directory {$IFDEF COMPILER9_UP} , [sdNewUI], Self {$ENDIF}) then
- begin
- (FArchive as TJclCompressArchive).AddDirectory(ExtractFileName(Directory), Directory, True, True);
- ListView1.Items.BeginUpdate;
- try
- while ListView1.Items.Count < FArchive.ItemCount do
- ListView1.Items.Add;
- finally
- ListView1.Items.EndUpdate;
- end;
- end;
-end;
-
-procedure TForm1.ActionAddDirectoryUpdate(Sender: TObject);
-begin
- (Sender as TAction).Enabled := (FArchive is TJclCompressArchive) and FArchive.MultipleItemContainer;
-end;
-
-procedure TForm1.ActionAddFileExecute(Sender: TObject);
-begin
- if OpenDialogFile.Execute then
- begin
- (FArchive as TJclCompressArchive).AddFile(ExtractFileName(OpenDialogFile.FileName), OpenDialogFile.FileName);
- ListView1.Items.Add;
- end;
-end;
-
-procedure TForm1.ActionAddFileUpdate(Sender: TObject);
-begin
- (Sender as TAction).Enabled := (FArchive is TJclCompressArchive)
- and (FArchive.MultipleItemContainer or (ListView1.Items.Count = 0));
-end;
-
-procedure TForm1.ActionAlwaysEnabled(Sender: TObject);
-begin
- (Sender as TAction).Enabled := True;
-end;
-
-procedure TForm1.ActionDeleteExecute(Sender: TObject);
-var
- Index: Integer;
-begin
- for Index := ListView1.Items.Count - 1 downto 0 do
- if ListView1.Items[Index].Selected then
- begin
- (FArchive as TJclUpdateArchive).DeleteItem(Index);
- Break;
- end;
-
- ListView1.Items.Count := FArchive.ItemCount;
-end;
-
-procedure TForm1.ActionDeleteUpdate(Sender: TObject);
-begin
- (Sender as TAction).Enabled := (FArchive is TJclUpdateArchive) and (ListView1.SelCount = 1);
-end;
-
-procedure TForm1.ActionExtractAllExecute(Sender: TObject);
-var
- Directory: string;
-begin
- if FileCtrl.SelectDirectory('Target directory', '', Directory {$IFDEF COMPILER9_UP} , [sdNewUI], Self {$ENDIF}) then
- begin
- if FArchive is TJclDecompressArchive then
- TJclDecompressArchive(FArchive).ExtractAll(Directory, True)
- else
- if FArchive is TJclUpdateArchive then
- TJclUpdateArchive(FArchive).ExtractAll(Directory, True);
- end;
-end;
-
-procedure TForm1.ActionExtractAllUpdate(Sender: TObject);
-begin
- (Sender as TAction).Enabled := (FArchive is TJclDecompressArchive) or (FArchive is TJclUpdateArchive);
-end;
-
-procedure TForm1.ActionExtractSelectedExecute(Sender: TObject);
-var
- Directory: string;
- Index: Integer;
-begin
- if FileCtrl.SelectDirectory('Target directory', '', Directory {$IFDEF COMPILER9_UP} , [sdNewUI], Self {$ENDIF}) then
- begin
- for Index := 0 to ListView1.Items.Count - 1 do
- FArchive.Items[Index].Selected := ListView1.Items.Item[Index].Selected;
-
- if FArchive is TJclDecompressArchive then
- TJclDecompressArchive(FArchive).ExtractSelected(Directory, True)
- else
- if FArchive is TJclUpdateArchive then
- TJclUpdateArchive(FArchive).ExtractSelected(Directory, True);
- end;
-end;
-
-procedure TForm1.ActionExtractSelectedUpdate(Sender: TObject);
-begin
- (Sender as TAction).Enabled := ((FArchive is TJclDecompressArchive) or (FArchive is TJclUpdateArchive))
- and (ListView1.SelCount > 0);
-end;
-
-procedure TForm1.ActionNewExecute(Sender: TObject);
-var
- ArchiveFileName, ArchiveExt, VolumeSizeStr, Password: string;
- VolumeSize: Int64;
- Code: Integer;
-begin
- if SaveDialogArchive.Execute then
- begin
- CloseArchive;
-
- ArchiveFileName := SaveDialogArchive.FileName;
- VolumeSizeStr := '0';
- repeat
- if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
- Val(VolumeSizeStr, VolumeSize, Code)
- else
- begin
- VolumeSize := 0;
- Code := 0;
- end;
- until Code = 0;
-
- InputQuery('Archive password', 'Value', Password);
-
- ArchiveExt := ExtractFileExt(ArchiveFileName);
- if VolumeSize <> 0 then
- ArchiveFileName := ArchiveFileName + '.%d';
-
- if AnsiSameText(ArchiveExt, '.zip') then
- FArchive := TJclZipCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.tar') then
- FArchive := TJclTarCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.7z') then
- FArchive := TJcl7zCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.bz2') then
- FArchive := TJclBZ2CompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.gz') then
- FArchive := TJclGZipCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
-
- if Assigned(FArchive) then
- begin
- FArchive.Password := Password;
- FArchive.OnProgress := ArchiveProgress;
- end;
- end;
-end;
-
-procedure TForm1.ActionNewRWExecute(Sender: TObject);
-var
- ArchiveFileName, ArchiveExt, VolumeSizeStr, Password: string;
- VolumeSize: Int64;
- Code: Integer;
-begin
- if SaveDialogArchive.Execute then
- begin
- CloseArchive;
-
- ArchiveFileName := SaveDialogArchive.FileName;
- VolumeSizeStr := '0';
- repeat
- if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
- Val(VolumeSizeStr, VolumeSize, Code)
- else
- begin
- VolumeSize := 0;
- Code := 0;
- end;
- until Code = 0;
-
- InputQuery('Archive password', 'Value', Password);
-
- ArchiveExt := ExtractFileExt(ArchiveFileName);
- if VolumeSize <> 0 then
- ArchiveFileName := ArchiveFileName + '.%d';
-
- if AnsiSameText(ArchiveExt, '.zip') then
- FArchive := TJclZipUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.tar') then
- FArchive := TJclTarUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.7z') then
- FArchive := TJcl7zUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.bz2') then
- FArchive := TJclBZ2UpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
- else
- if AnsiSameText(ArchiveExt, '.gz') then
- FArchive := TJclGZipUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
-
- if Assigned(FArchive) then
- begin
- FArchive.Password := Password;
- FArchive.OnProgress := ArchiveProgress;
- end;
- end;
-end;
-
-procedure TForm1.ActionOpenExecute(Sender: TObject);
-var
- ArchiveFileName, ArchiveFileExt, Password: string;
- SplitArchive: Boolean;
-begin
- if OpenDialogArchive.Execute then
- begin
- CloseArchive;
-
- ArchiveFileName := OpenDialogArchive.FileName;
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- SplitArchive := AnsiSameText(ArchiveFileExt, '.001');
- if SplitArchive then
- begin
- ArchiveFileName := ChangeFileExt(ArchiveFileName, '');
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- ArchiveFileName := ArchiveFileName + '.%d';
- end;
-
- InputQuery('Archive password', 'Value', Password);
-
- if AnsiSameText(ArchiveFileExt, '.zip') then
- FArchive := TJclZipDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.bz2') then
- FArchive := TJclBZ2DecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.rar') then
- FArchive := TJclRarDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.arj') then
- FArchive := TJclArjDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.z') then
- FArchive := TJclZDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.lzh') then
- FArchive := TJclLzhDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.7z') then
- FArchive := TJcl7zDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.nsis') then
- FArchive := TJclNsisDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.iso') then
- FArchive := TJclIsoDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.cab') then
- FArchive := TJclCabDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.chm') then
- FArchive := TJclChmDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.rpm') then
- FArchive := TJclRpmDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.deb') then
- FArchive := TJclDebDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.cpio') then
- FArchive := TJclCpioDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.tar') then
- FArchive := TJclTarDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.gz') then
- FArchive := TJclGZipDecompressArchive.Create(ArchiveFileName, 0, SplitArchive);
-
- if Assigned(FArchive) then
- begin
- FArchive.Password := Password;
- FArchive.OnProgress := ArchiveProgress;
-
- if FArchive is TJclDecompressArchive then
- TJclDecompressArchive(FArchive).ListFiles
- else
- if FArchive is TJclUpdateArchive then
- TJclUpdateArchive(FArchive).ListFiles;
-
- ListView1.Items.BeginUpdate;
- try
- while ListView1.Items.Count < FArchive.ItemCount do
- ListView1.Items.Add;
- finally
- ListView1.Items.EndUpdate;
- end;
- end;
- end;
-end;
-
-procedure TForm1.ActionOpenRWExecute(Sender: TObject);
-var
- ArchiveFileName, ArchiveFileExt, Password: string;
- SplitArchive: Boolean;
-begin
- if OpenDialogArchiveRW.Execute then
- begin
- CloseArchive;
-
- ArchiveFileName := OpenDialogArchiveRW.FileName;
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- SplitArchive := AnsiSameText(ArchiveFileExt, '.001');
- if SplitArchive then
- begin
- ArchiveFileName := ChangeFileExt(ArchiveFileName, '');
- ArchiveFileExt := ExtractFileExt(ArchiveFileName);
- ArchiveFileName := ArchiveFileName + '.%d';
- end;
-
- InputQuery('Archive password', 'Value', Password);
-
- if AnsiSameText(ArchiveFileExt, '.zip') then
- FArchive := TJclZipUpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.bz2') then
- FArchive := TJclBZ2UpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.7z') then
- FArchive := TJcl7zUpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.tar') then
- FArchive := TJclTarUpdateArchive.Create(ArchiveFileName, 0, SplitArchive)
- else
- if AnsiSameText(ArchiveFileExt, '.gz') then
- FArchive := TJclGZipUpdateArchive.Create(ArchiveFileName, 0, SplitArchive);
-
- if Assigned(FArchive) then
- begin
- FArchive.Password := Password;
- FArchive.OnProgress := ArchiveProgress;
-
- if FArchive is TJclDecompressArchive then
- TJclDecompressArchive(FArchive).ListFiles
- else
- if FArchive is TJclUpdateArchive then
- TJclUpdateArchive(FArchive).ListFiles;
-
- ListView1.Items.BeginUpdate;
- try
- while ListView1.Items.Count < FArchive.ItemCount do
- ListView1.Items.Add;
- finally
- ListView1.Items.EndUpdate;
- end;
- end;
- end;
-end;
-
-procedure TForm1.ActionSaveExecute(Sender: TObject);
-begin
- (FArchive as TJclCompressArchive).Compress;
- CloseArchive;
-end;
-
-procedure TForm1.ActionSaveUpdate(Sender: TObject);
-begin
- (Sender as TAction).Enabled := (FArchive is TJclCompressArchive) and (ListView1.Items.Count > 0);
-end;
-
-procedure TForm1.ArchiveProgress(Sender: TObject; const Value, MaxValue: Int64);
-var
- MyValue, MyMaxValue: Int64;
-begin
- MyValue := Value;
- MyMaxValue := MaxValue;
-
- while MyMaxValue > High(Word) do
- begin
- MyMaxValue := MyMaxValue shr 8;
- MyValue := MyValue shr 8;
- end;
- ProgressBar1.Max := MyMaxValue;
- ProgressBar1.Position := MyValue;
-end;
-
-procedure TForm1.CloseArchive;
-begin
- FreeAndNil(FArchive);
- ListView1.Items.Clear;
-end;
-
-procedure TForm1.FormDestroy(Sender: TObject);
-begin
- CloseArchive;
-end;
-
-procedure TForm1.ListView1Data(Sender: TObject; Item: TListItem);
-var
- CompressionItem: TJclCompressionItem;
-begin
- if not Assigned(FArchive) then
- begin
- Item.Caption := '';
- Item.SubItems.Clear;
- Exit;
- end;
-
- CompressionItem := FArchive.Items[Item.Index];
-
- Item.Caption := CompressionItem.FileName;
- Item.SubItems.Clear;
- Item.SubItems.Add(CompressionItem.PackedName);
- Item.SubItems.Add(IntToStr(CompressionItem.FileSize));
- Item.SubItems.Add(IntToStr(CompressionItem.PackedSize));
- Item.SubItems.Add(FileTimeToString(CompressionItem.CreationTime));
- Item.SubItems.Add(FileTimeToString(CompressionItem.LastAccessTime));
- Item.SubItems.Add(FileTimeToString(CompressionItem.LastWriteTime));
- Item.SubItems.Add(CompressionItem.Comment);
- Item.SubItems.Add(CompressionItem.HostOS);
- Item.SubItems.Add(CompressionItem.HostFS);
- Item.SubItems.Add(CompressionItem.User);
- Item.SubItems.Add(CompressionItem.Group);
- Item.SubItems.Add(IntToHex(CompressionItem.CRC, 8));
-end;
-
-initialization
-
- if not Load7Zip then
- raise EJclCompressionError.Create('Cannot load sevenzip library');
-
-end.
Copied: trunk/jcl/examples/windows/compression/archive/UMain.pas (from rev 2327, branches/compression/jcl/examples/windows/compression/archive/UMain.pas)
===================================================================
--- trunk/jcl/examples/windows/compression/archive/UMain.pas (rev 0)
+++ trunk/jcl/examples/windows/compression/archive/UMain.pas 2008-01-29 16:21:28 UTC (rev 2328)
@@ -0,0 +1,525 @@
+unit UMain;
+
+{$I jcl.inc}
+
+interface
+
+uses
+ Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+ Dialogs, StdCtrls, ExtCtrls, ActnList, ComCtrls, ImgList, JclCompression;
+
+type
+ TForm1 = class(TForm)
+ ActionList1: TActionList;
+ ActionOpen: TAction;
+ ActionExtractSelected: TAction;
+ ActionExtractAll: TAction;
+ ActionNew: TAction;
+ ActionAddFile: TAction;
+ ActionAddDirectory: TAction;
+ ActionSave: TAction;
+ ListView1: TListView;
+ OpenDialogArchive: TOpenDialog;
+ SaveDialogArchive: TSaveDialog;
+ OpenDialogFile: TOpenDialog;
+ ProgressBar1: TProgressBar;
+ PageControl1: TPageControl;
+ TabSheetReadOnly: TTabSheet;
+ TabSheetWriteOnly: TTabSheet;
+ TabSheetReadWrite: TTabSheet;
+ ButtonOpen: TButton;
+ ButtonExtractSelected: TButton;
+ ButtonExtractAll: TButton;
+ ButtonNew: TButton;
+ ButtonAddFile: TButton;
+ ButtonAddDirectory: TButton;
+ ButtonSave: TButton;
+ ActionDelete: TAction;
+ ActionNewRW: TAction;
+ ActionOpenRW: TAction;
+ ButtonNewRW: TButton;
+ ButtonOpenRW: TButton;
+ ButtonDeleteRW: TButton;
+ ButtonAddFileRW: TButton;
+ ButtonAddDirectoryRW: TButton;
+ ButtonExtractSelectedRW: TButton;
+ ButtonExtractAllRW: TButton;
+ ButtonSaveRW: TButton;
+ OpenDialogArchiveRW: TOpenDialog;
+ procedure ActionAlwaysEnabled(Sender: TObject);
+ procedure ActionExtractSelectedUpdate(Sender: TObject);
+ procedure ActionExtractAllUpdate(Sender: TObject);
+ procedure ActionAddFileUpdate(Sender: TObject);
+ procedure ActionAddDirectoryUpdate(Sender: TObject);
+ procedure ActionSaveUpdate(Sender: TObject);
+ procedure ActionNewExecute(Sender: TObject);
+ procedure FormDestroy(Sender: TObject);
+ procedure ActionAddFileExecute(Sender: TObject);
+ procedure ActionAddDirectoryExecute(Sender: TObject);
+ procedure ActionSaveExecute(Sender: TObject);
+ procedure ActionOpenExecute(Sender: TObject);
+ procedure ListView1Data(Sender: TObject; Item: TListItem);
+ procedure ActionExtractAllExecute(Sender: TObject);
+ procedure ActionExtractSelectedExecute(Sender: TObject);
+ procedure ActionDeleteUpdate(Sender: TObject);
+ procedure ActionDeleteExecute(Sender: TObject);
+ procedure ActionNewRWExecute(Sender: TObject);
+ procedure ActionOpenRWExecute(Sender: TObject);
+ private
+ FArchive: TJclCompressionArchive;
+ procedure CloseArchive;
+ procedure ArchiveProgress(Sender: TObject; const Value, MaxValue: Int64);
+ public
+ end;
+
+var
+ Form1: TForm1;
+
+implementation
+
+{$R *.dfm}
+
+uses
+ JclAnsiStrings, Sevenzip, FileCtrl;
+
+function FileTimeToString(const FileTime: TFileTime): string;
+var
+ LocalFileTime: TFileTime;
+ SystemTime: TSystemTime;
+begin
+ if FileTimeToLocalFileTime(FileTime, LocalFileTime)
+ and FileTimeToSystemTime(LocalFileTime, SystemTime) then
+ Result := DateTimeToStr(EncodeDate(SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay)
+ + EncodeTime(SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond, SystemTime.wMilliseconds))
+ else
+ Result := '';
+end;
+
+procedure TForm1.ActionAddDirectoryExecute(Sender: TObject);
+var
+ Directory: string;
+begin
+ if FileCtrl.SelectDirectory('Select directory', '', Directory {$IFDEF COMPILER9_UP} , [sdNewUI], Self {$ENDIF}) then
+ begin
+ (FArchive as TJclCompressArchive).AddDirectory(ExtractFileName(Directory), Directory, True, True);
+ ListView1.Items.BeginUpdate;
+ try
+ while ListView1.Items.Count < FArchive.ItemCount do
+ ListView1.Items.Add;
+ finally
+ ListView1.Items.EndUpdate;
+ end;
+ end;
+end;
+
+procedure TForm1.ActionAddDirectoryUpdate(Sender: TObject);
+begin
+ (Sender as TAction).Enabled := (FArchive is TJclCompressArchive) and FArchive.MultipleItemContainer;
+end;
+
+procedure TForm1.ActionAddFileExecute(Sender: TObject);
+begin
+ if OpenDialogFile.Execute then
+ begin
+ (FArchive as TJclCompressArchive).AddFile(ExtractFileName(OpenDialogFile.FileName), OpenDialogFile.FileName);
+ ListView1.Items.Add;
+ end;
+end;
+
+procedure TForm1.ActionAddFileUpdate(Sender: TObject);
+begin
+ (Sender as TAction).Enabled := (FArchive is TJclCompressArchive)
+ and (FArchive.MultipleItemContainer or (ListView1.Items.Count = 0));
+end;
+
+procedure TForm1.ActionAlwaysEnabled(Sender: TObject);
+begin
+ (Sender as TAction).Enabled := True;
+end;
+
+procedure TForm1.ActionDeleteExecute(Sender: TObject);
+var
+ Index: Integer;
+begin
+ for Index := ListView1.Items.Count - 1 downto 0 do
+ if ListView1.Items[Index].Selected then
+ begin
+ (FArchive as TJclUpdateArchive).DeleteItem(Index);
+ Break;
+ end;
+
+ ListView1.Items.Count := FArchive.ItemCount;
+end;
+
+procedure TForm1.ActionDeleteUpdate(Sender: TObject);
+begin
+ (Sender as TAction).Enabled := (FArchive is TJclUpdateArchive) and (ListView1.SelCount = 1);
+end;
+
+procedure TForm1.ActionExtractAllExecute(Sender: TObject);
+var
+ Directory: string;
+begin
+ if FileCtrl.SelectDirectory('Target directory', '', Directory {$IFDEF COMPILER9_UP} , [sdNewUI], Self {$ENDIF}) then
+ begin
+ if FArchive is TJclDecompressArchive then
+ TJclDecompressArchive(FArchive).ExtractAll(Directory, True)
+ else
+ if FArchive is TJclUpdateArchive then
+ TJclUpdateArchive(FArchive).ExtractAll(Directory, True);
+ end;
+end;
+
+procedure TForm1.ActionExtractAllUpdate(Sender: TObject);
+begin
+ (Sender as TAction).Enabled := (FArchive is TJclDecompressArchive) or (FArchive is TJclUpdateArchive);
+end;
+
+procedure TForm1.ActionExtractSelectedExecute(Sender: TObject);
+var
+ Directory: string;
+ Index: Integer;
+begin
+ if FileCtrl.SelectDirectory('Target directory', '', Directory {$IFDEF COMPILER9_UP} , [sdNewUI], Self {$ENDIF}) then
+ begin
+ for Index := 0 to ListView1.Items.Count - 1 do
+ FArchive.Items[Index].Selected := ListView1.Items.Item[Index].Selected;
+
+ if FArchive is TJclDecompressArchive then
+ TJclDecompressArchive(FArchive).ExtractSelected(Directory, True)
+ else
+ if FArchive is TJclUpdateArchive then
+ TJclUpdateArchive(FArchive).ExtractSelected(Directory, True);
+ end;
+end;
+
+procedure TForm1.ActionExtractSelectedUpdate(Sender: TObject);
+begin
+ (Sender as TAction).Enabled := ((FArchive is TJclDecompressArchive) or (FArchive is TJclUpdateArchive))
+ and (ListView1.SelCount > 0);
+end;
+
+procedure TForm1.ActionNewExecute(Sender: TObject);
+var
+ ArchiveFileName, ArchiveExt, VolumeSizeStr, Password: string;
+ VolumeSize: Int64;
+ Code: Integer;
+begin
+ if SaveDialogArchive.Execute then
+ begin
+ CloseArchive;
+
+ ArchiveFileName := SaveDialogArchive.FileName;
+ VolumeSizeStr := '0';
+ repeat
+ if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
+ Val(VolumeSizeStr, VolumeSize, Code)
+ else
+ begin
+ VolumeSize := 0;
+ Code := 0;
+ end;
+ until Code = 0;
+
+ InputQuery('Archive password', 'Value', Password);
+
+ ArchiveExt := ExtractFileExt(ArchiveFileName);
+ if VolumeSize <> 0 then
+ ArchiveFileName := ArchiveFileName + '.%d';
+
+ if AnsiSameText(ArchiveExt, '.zip') then
+ FArchive := TJclZipCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.tar') then
+ FArchive := TJclTarCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.7z') then
+ FArchive := TJcl7zCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.bz2') then
+ FArchive := TJclBZ2CompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.gz') then
+ FArchive := TJclGZipCompressArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
+
+ if Assigned(FArchive) then
+ begin
+ FArchive.Password := Password;
+ FArchive.OnProgress := ArchiveProgress;
+ end;
+ end;
+end;
+
+procedure TForm1.ActionNewRWExecute(Sender: TObject);
+var
+ ArchiveFileName, ArchiveExt, VolumeSizeStr, Password: string;
+ VolumeSize: Int64;
+ Code: Integer;
+begin
+ if SaveDialogArchive.Execute then
+ begin
+ CloseArchive;
+
+ ArchiveFileName := SaveDialogArchive.FileName;
+ VolumeSizeStr := '0';
+ repeat
+ if InputQuery('Split archive?', 'Volume size in byte:', VolumeSizeStr) then
+ Val(VolumeSizeStr, VolumeSize, Code)
+ else
+ begin
+ VolumeSize := 0;
+ Code := 0;
+ end;
+ until Code = 0;
+
+ InputQuery('Archive password', 'Value', Password);
+
+ ArchiveExt := ExtractFileExt(ArchiveFileName);
+ if VolumeSize <> 0 then
+ ArchiveFileName := ArchiveFileName + '.%d';
+
+ if AnsiSameText(ArchiveExt, '.zip') then
+ FArchive := TJclZipUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.tar') then
+ FArchive := TJclTarUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.7z') then
+ FArchive := TJcl7zUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.bz2') then
+ FArchive := TJclBZ2UpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0)
+ else
+ if AnsiSameText(ArchiveExt, '.gz') then
+ FArchive := TJclGZipUpdateArchive.Create(ArchiveFileName, VolumeSize, VolumeSize <> 0);
+
+ if Assigned(FArchive) then
+ begin
+ FArchive.Password := Password;
+ FArchive.OnProgress := ArchiveProgress;
+ end;
+ end;
+end;
+
+procedure TForm1.ActionOpenExecute(Sender: TObject);
+var
+ ArchiveFileName, ArchiveFileExt, Password: string;
+ SplitArchive: Boolean;
+begin
+ if OpenDialogArchive.Execute then
+ begin
+ CloseArchive;
+
+ ArchiveFileName := OpenDialogArchive.FileName;
+ ArchiveFileExt := ExtractFileExt(ArchiveFileName);
+ SplitArchive := AnsiSameText(ArchiveFileExt, '.001');
+ if SplitArchive then
+ begin
+ ArchiveFileName := ChangeFileExt(ArchiveFileName, '');
+ ArchiveFileExt := ExtractFileExt(ArchiveFileName);
+ ArchiveFileName := ArchiveFileName + '.%d';
+ end;
+
+ InputQuery('Archive password', 'Value', Password);
+
+ if AnsiSameText(ArchiveFileExt, '.zip') then
+ FArchive := TJclZipDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
+ else
+ if AnsiSameText(ArchiveFileExt, '.bz2') then
+ FArchive := TJclBZ2DecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
+ else
+ if AnsiSameText(ArchiveFileExt, '.rar') then
+ FArchive := TJclRarDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
+ else
+ if AnsiSameText(ArchiveFileExt, '.arj') then
+ FArchive := TJclArjDecompressArchive.Create(ArchiveFileName, 0, SplitArchive)
+ else
+ if AnsiSameText(ArchiveFileExt, '.z') then
+ FArchive := TJclZDecompressArchive.Create(ArchiveF...
[truncated message content] |
|
From: <ou...@us...> - 2008-01-28 12:05:54
|
Revision: 2327
http://jcl.svn.sourceforge.net/jcl/?rev=2327&view=rev
Author: outchy
Date: 2008-01-28 04:05:48 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
Mantis 4325: [branch compression] TJclSevenzip*Archive.Extract* does not set the timestamp of the files
Modified Paths:
--------------
branches/compression/jcl/source/common/JclCompression.pas
Modified: branches/compression/jcl/source/common/JclCompression.pas
===================================================================
--- branches/compression/jcl/source/common/JclCompression.pas 2008-01-28 11:19:43 UTC (rev 2326)
+++ branches/compression/jcl/source/common/JclCompression.pas 2008-01-28 12:05:48 UTC (rev 2327)
@@ -497,6 +497,8 @@
procedure CheckGetProperty(AProperty: TJclCompressionItemProperty); virtual; abstract;
procedure CheckSetProperty(AProperty: TJclCompressionItemProperty); virtual; abstract;
function ValidateExtraction(Index: Integer): Boolean; virtual;
+ function DeleteOutputFile: Boolean;
+ function UpdateFileTimes: Boolean;
// property getters
function GetAttributes: Cardinal;
function GetComment: WideString;
@@ -2374,6 +2376,11 @@
FPackedIndex := $FFFFFFFF;
end;
+function TJclCompressionItem.DeleteOutputFile: Boolean;
+begin
+ Result := (FFileName <> '') and FileExists(FFileName) and FileDelete(FFileName);
+end;
+
destructor TJclCompressionItem.Destroy;
begin
ReleaseStream;
@@ -2641,6 +2648,39 @@
Include(FValidProperties, ipUser);
end;
+function TJclCompressionItem.UpdateFileTimes: Boolean;
+const
+ FILE_WRITE_ATTRIBUTES = $00000100;
+var
+ FileHandle: HFILE;
+ ACreationTime, ALastAccessTime, ALastWriteTime: PFileTime;
+begin
+ ReleaseStream;
+ Result := FFileName <> '';
+ if Result then
+ begin
+ FileHandle := CreateFile(PAnsiChar(FFileName), FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ, nil, OPEN_EXISTING, 0, 0);
+ try
+ if ipCreationTime in FValidProperties then
+ ACreationTime := @FCreationTime
+ else
+ ACreationTime := nil;
+ if ipLastAccessTime in FValidProperties then
+ ALastAccessTime := @FLastAccessTime
+ else
+ ALastAccessTime := nil;
+ if ipLastWriteTime in FValidProperties then
+ ALastWriteTime := @FLastWriteTime
+ else
+ ALastWriteTime := nil;
+ Result := (FileHandle <> INVALID_HANDLE_VALUE) and SetFileTime(FileHandle, ACreationTime, ALastAccessTime,
+ ALastWriteTime);
+ finally
+ CloseHandle(FileHandle);
+ end;
+ end;
+end;
+
function TJclCompressionItem.ValidateExtraction(Index: Integer): Boolean;
begin
Result := False;
@@ -4084,18 +4124,34 @@
function TJclSevenzipExtractCallback.SetOperationResult(
resultEOperationResult: Integer): HRESULT;
+var
+ LastItem: TJclCompressionItem;
begin
+ LastItem := FArchive.Items[FLastStream];
case resultEOperationResult of
kOK:
- FArchive.Items[FLastStream].OperationSuccess := osOK;
+ begin
+ LastItem.OperationSuccess := osOK;
+ LastItem.UpdateFileTimes;
+ end;
kUnSupportedMethod:
- FArchive.Items[FLastStream].OperationSuccess := osUnsupportedMethod;
+ begin
+ LastItem.OperationSuccess := osUnsupportedMethod;
+ LastItem.DeleteOutputFile;
+ end;
kDataError:
- FArchive.Items[FLastStream].OperationSuccess := osDataError;
+ begin
+ LastItem.OperationSuccess := osDataError;
+ LastItem.DeleteOutputFile;
+ end;
kCRCError:
- FArchive.Items[FLastStream].OperationSuccess := osCRCError;
+ begin
+ LastItem.OperationSuccess := osCRCError;
+ LastItem.DeleteOutputFile;
+ end
else
- FArchive.Items[FLastStream].OperationSuccess := osUnknownError;
+ LastItem.OperationSuccess := osUnknownError;
+ LastItem.DeleteOutputFile;
end;
Result := S_OK;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-28 11:19:45
|
Revision: 2326
http://jcl.svn.sourceforge.net/jcl/?rev=2326&view=rev
Author: outchy
Date: 2008-01-28 03:19:43 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
removing manifest from resource, adding standard manifest.
Modified Paths:
--------------
branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.res
Modified: branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr
===================================================================
--- branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr 2008-01-26 20:23:27 UTC (rev 2325)
+++ branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.dpr 2008-01-28 11:19:43 UTC (rev 2326)
@@ -5,6 +5,7 @@
UMain in 'UMain.pas' {Form1};
{$R *.res}
+{$R ..\..\..\..\source\windows\JclCommCtrlAsInvoker.res}
begin
Application.Initialize;
Modified: branches/compression/jcl/examples/windows/compression/archive/ArchiveDemo.res
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 20:23:29
|
Revision: 2325
http://jcl.svn.sourceforge.net/jcl/?rev=2325&view=rev
Author: outchy
Date: 2008-01-26 12:23:27 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
JclUnicode was moved from source/windows to source/common.
Modified Paths:
--------------
trunk/thirdparty/unicode_data_extractor/make_jclunicode.bat
Modified: trunk/thirdparty/unicode_data_extractor/make_jclunicode.bat
===================================================================
--- trunk/thirdparty/unicode_data_extractor/make_jclunicode.bat 2008-01-26 19:27:06 UTC (rev 2324)
+++ trunk/thirdparty/unicode_data_extractor/make_jclunicode.bat 2008-01-26 20:23:27 UTC (rev 2325)
@@ -4,16 +4,16 @@
dcc32 UDExtract.dpr -U..\..\jcl\source\windows;..\..\jcl\source\common -I..\..\jcl\source -N0. -E.
rem execute UDExtract.dpr no compression
-UDExtract.exe UnicodeData.txt ..\..\jcl\source\windows\JclUnicode.rc /c=SpecialCasing.txt /f=CaseFolding.txt /d=DerivedNormalizationProps.txt
+UDExtract.exe UnicodeData.txt ..\..\jcl\source\common\JclUnicode.rc /c=SpecialCasing.txt /f=CaseFolding.txt /d=DerivedNormalizationProps.txt
rem execute UDExtract.dpr zlib compression
-UDExtract.exe UnicodeData.txt ..\..\jcl\source\windows\JclUnicodeZLib.rc /z /c=SpecialCasing.txt /f=CaseFolding.txt /d=DerivedNormalizationProps.txt
+UDExtract.exe UnicodeData.txt ..\..\jcl\source\common\JclUnicodeZLib.rc /z /c=SpecialCasing.txt /f=CaseFolding.txt /d=DerivedNormalizationProps.txt
rem execute UDExtract.dpr bzip2 compression
-UDExtract.exe UnicodeData.txt ..\..\jcl\source\windows\JclUnicodeBzip2.rc /bz /c=SpecialCasing.txt /f=CaseFolding.txt /d=DerivedNormalizationProps.txt
+UDExtract.exe UnicodeData.txt ..\..\jcl\source\common\JclUnicodeBzip2.rc /bz /c=SpecialCasing.txt /f=CaseFolding.txt /d=DerivedNormalizationProps.txt
rem compiling JclUnicode.rc
-cd ..\..\jcl\source\windows
+cd ..\..\jcl\source\common
brcc32 JclUnicode.rc -foJclUnicode.res
brcc32 JclUnicodeZLib.rc -foJclUnicodeZLib.res
brcc32 JclUnicodeBZip2.rc -foJclUnicodeBZip2.res
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 19:27:09
|
Revision: 2324
http://jcl.svn.sourceforge.net/jcl/?rev=2324&view=rev
Author: outchy
Date: 2008-01-26 11:27:06 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
Moving JclUnicode.pas and its associated resources from windows source directory to common source directory.
Modified Paths:
--------------
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/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
Added Paths:
-----------
trunk/jcl/source/common/JclUnicode.pas
trunk/jcl/source/common/JclUnicode.rc
trunk/jcl/source/common/JclUnicode.res
trunk/jcl/source/common/JclUnicodeBZip2.res
trunk/jcl/source/common/JclUnicodeBzip2.rc
trunk/jcl/source/common/JclUnicodeZLib.rc
trunk/jcl/source/common/JclUnicodeZLib.res
Removed Paths:
-------------
trunk/jcl/source/windows/JclUnicode.pas
trunk/jcl/source/windows/JclUnicode.rc
trunk/jcl/source/windows/JclUnicode.res
trunk/jcl/source/windows/JclUnicodeBZip2.res
trunk/jcl/source/windows/JclUnicodeBzip2.rc
trunk/jcl/source/windows/JclUnicodeZLib.rc
trunk/jcl/source/windows/JclUnicodeZLib.res
Modified: trunk/jcl/lib/d10.net/common.exc
===================================================================
--- trunk/jcl/lib/d10.net/common.exc 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/lib/d10.net/common.exc 2008-01-26 19:27:06 UTC (rev 2324)
@@ -8,6 +8,7 @@
JclSchedule.pas
JclStrHashMap.pas
JclStringLists.pas
+JclUnicode.pas
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
Modified: trunk/jcl/lib/d10.net/windows.exc
===================================================================
--- trunk/jcl/lib/d10.net/windows.exc 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/lib/d10.net/windows.exc 2008-01-26 19:27:06 UTC (rev 2324)
@@ -23,7 +23,6 @@
JclSvcCtrl.pas
JclTask.pas
JclTD32.pas
-JclUnicode.pas
JclWideFormat.pas
JclWin32.pas
JclWin32Ex.pas
Modified: trunk/jcl/lib/d11.net/common.exc
===================================================================
--- trunk/jcl/lib/d11.net/common.exc 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/lib/d11.net/common.exc 2008-01-26 19:27:06 UTC (rev 2324)
@@ -8,6 +8,7 @@
JclSchedule.pas
JclStrHashMap.pas
JclStringLists.pas
+JclUnicode.pas
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
Modified: trunk/jcl/lib/d11.net/windows.exc
===================================================================
--- trunk/jcl/lib/d11.net/windows.exc 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/lib/d11.net/windows.exc 2008-01-26 19:27:06 UTC (rev 2324)
@@ -23,7 +23,6 @@
JclSvcCtrl.pas
JclTask.pas
JclTD32.pas
-JclUnicode.pas
JclWideFormat.pas
JclWin32.pas
JclWin32Ex.pas
Modified: trunk/jcl/lib/d9.net/common.exc
===================================================================
--- trunk/jcl/lib/d9.net/common.exc 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/lib/d9.net/common.exc 2008-01-26 19:27:06 UTC (rev 2324)
@@ -8,6 +8,7 @@
JclSchedule.pas
JclStrHashMap.pas
JclStringLists.pas
+JclUnicode.pas
JclUnitVersioning.pas
JclUnitVersioningProviders.pas
JclWideStrings.pas
Modified: trunk/jcl/lib/d9.net/windows.exc
===================================================================
--- trunk/jcl/lib/d9.net/windows.exc 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/lib/d9.net/windows.exc 2008-01-26 19:27:06 UTC (rev 2324)
@@ -23,7 +23,6 @@
JclSvcCtrl.pas
JclTask.pas
JclTD32.pas
-JclUnicode.pas
JclWideFormat.pas
JclWin32.pas
JclWin32Ex.pas
Modified: trunk/jcl/packages/c5/JclC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.bpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/c5/JclC50.bpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:41 UTC
+ Last generated: 26-01-2008 19:07:12 UTC
*****************************************************************************
-->
<PROJECT>
@@ -50,6 +50,7 @@
..\..\lib\c5\JclSynch.obj
..\..\lib\c5\JclSysInfo.obj
..\..\lib\c5\JclSysUtils.obj
+ ..\..\lib\c5\JclUnicode.obj
..\..\lib\c5\JclUnitConv.obj
..\..\lib\c5\JclUnitVersioning.obj
..\..\lib\c5\JclUnitVersioningProviders.obj
@@ -80,7 +81,6 @@
..\..\lib\c5\JclSvcCtrl.obj
..\..\lib\c5\JclTask.obj
..\..\lib\c5\JclTD32.obj
- ..\..\lib\c5\JclUnicode.obj
..\..\lib\c5\JclWin32.obj
..\..\lib\c5\JclWin32Ex.obj
..\..\lib\c5\JclWinMIDI.obj
Modified: trunk/jcl/packages/c5/JclC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclC50.cpp 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/c5/JclC50.cpp 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:41 UTC
+ Last generated: 26-01-2008 19:07:13 UTC
-----------------------------------------------------------------------------
*/
@@ -47,6 +47,7 @@
USEUNIT("..\..\source\Common\JclSynch.pas");
USEUNIT("..\..\source\common\JclSysInfo.pas");
USEUNIT("..\..\source\common\JclSysUtils.pas");
+USEUNIT("..\..\source\Common\JclUnicode.pas");
USEUNIT("..\..\source\common\JclUnitConv.pas");
USEUNIT("..\..\source\common\JclUnitVersioning.pas");
USEUNIT("..\..\source\common\JclUnitVersioningProviders.pas");
@@ -77,7 +78,6 @@
USEUNIT("..\..\source\windows\JclSvcCtrl.pas");
USEUNIT("..\..\source\windows\JclTask.pas");
USEUNIT("..\..\source\windows\JclTD32.pas");
-USEUNIT("..\..\source\windows\JclUnicode.pas");
USEUNIT("..\..\source\windows\JclWin32.pas");
USEUNIT("..\..\source\windows\JclWin32Ex.pas");
USEUNIT("..\..\source\windows\JclWinMIDI.pas");
Modified: trunk/jcl/packages/c5/JclC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/c5/JclC50.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:42 UTC
+ Last generated: 26-01-2008 19:07:13 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -106,7 +107,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
JclWinMIDI in '..\..\source\windows\JclWinMIDI.pas' ,
Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/c6/Jcl.bpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:43 UTC
+ Last generated: 26-01-2008 19:07:14 UTC
*****************************************************************************
-->
<PROJECT>
@@ -50,6 +50,7 @@
..\..\lib\c6\JclSynch.obj
..\..\lib\c6\JclSysInfo.obj
..\..\lib\c6\JclSysUtils.obj
+ ..\..\lib\c6\JclUnicode.obj
..\..\lib\c6\JclUnitConv.obj
..\..\lib\c6\JclUnitVersioning.obj
..\..\lib\c6\JclUnitVersioningProviders.obj
@@ -80,7 +81,6 @@
..\..\lib\c6\JclSvcCtrl.obj
..\..\lib\c6\JclTask.obj
..\..\lib\c6\JclTD32.obj
- ..\..\lib\c6\JclUnicode.obj
..\..\lib\c6\JclWin32.obj
..\..\lib\c6\JclWin32Ex.obj
..\..\lib\c6\JclWinMIDI.obj
@@ -175,6 +175,7 @@
<FILE FILENAME="..\..\source\Common\JclSynch.pas" FORMNAME="" UNITNAME="JclSynch" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSysInfo.pas" FORMNAME="" UNITNAME="JclSysInfo" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSysUtils.pas" FORMNAME="" UNITNAME="JclSysUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\Common\JclUnicode.pas" FORMNAME="" UNITNAME="JclUnicode" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitConv.pas" FORMNAME="" UNITNAME="JclUnitConv" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitVersioning.pas" FORMNAME="" UNITNAME="JclUnitVersioning" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitVersioningProviders.pas" FORMNAME="" UNITNAME="JclUnitVersioningProviders" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -205,7 +206,6 @@
<FILE FILENAME="..\..\source\windows\JclSvcCtrl.pas" FORMNAME="" UNITNAME="JclSvcCtrl" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclTask.pas" FORMNAME="" UNITNAME="JclTask" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclTD32.pas" FORMNAME="" UNITNAME="JclTD32" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\windows\JclUnicode.pas" FORMNAME="" UNITNAME="JclUnicode" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclWin32.pas" FORMNAME="" UNITNAME="JclWin32" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclWin32Ex.pas" FORMNAME="" UNITNAME="JclWin32Ex" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclWinMIDI.pas" FORMNAME="" UNITNAME="JclWinMIDI" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/c6/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:43 UTC
+ Last generated: 26-01-2008 19:07:15 UTC
-----------------------------------------------------------------------------
}
@@ -75,6 +75,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -105,7 +106,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
JclWinMIDI in '..\..\source\windows\JclWinMIDI.pas' ,
Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/cs1/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:47 UTC
+ Last generated: 26-01-2008 19:07:17 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -106,7 +107,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
JclWinMIDI in '..\..\source\windows\JclWinMIDI.pas' ,
Modified: trunk/jcl/packages/d10/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d10/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:48 UTC
+ Last generated: 26-01-2008 19:07:19 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d11/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:50 UTC
+ Last generated: 26-01-2008 19:07:19 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/d11/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11/Jcl.dproj 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d11/Jcl.dproj 2008-01-26 19:27:06 UTC (rev 2324)
@@ -121,6 +121,7 @@
<DCCReference Include="..\..\source\Common\JclSynch.pas" />
<DCCReference Include="..\..\source\common\JclSysInfo.pas" />
<DCCReference Include="..\..\source\common\JclSysUtils.pas" />
+ <DCCReference Include="..\..\source\Common\JclUnicode.pas" />
<DCCReference Include="..\..\source\common\JclUnitConv.pas" />
<DCCReference Include="..\..\source\common\JclUnitVersioning.pas" />
<DCCReference Include="..\..\source\common\JclUnitVersioningProviders.pas" />
@@ -152,7 +153,6 @@
<DCCReference Include="..\..\source\windows\JclSvcCtrl.pas" />
<DCCReference Include="..\..\source\windows\JclTask.pas" />
<DCCReference Include="..\..\source\windows\JclTD32.pas" />
- <DCCReference Include="..\..\source\windows\JclUnicode.pas" />
<DCCReference Include="..\..\source\windows\JclWideFormat.pas" />
<DCCReference Include="..\..\source\windows\JclWin32.pas" />
<DCCReference Include="..\..\source\windows\JclWin32Ex.pas" />
Modified: trunk/jcl/packages/d5/JclD50.dpk
===================================================================
--- trunk/jcl/packages/d5/JclD50.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d5/JclD50.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:44 UTC
+ Last generated: 26-01-2008 19:07:15 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/d6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d6/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d6/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:45 UTC
+ Last generated: 26-01-2008 19:07:16 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/d7/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d7/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d7/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:45 UTC
+ Last generated: 26-01-2008 19:07:16 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/d8/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d8/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d8/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:46 UTC
+ Last generated: 26-01-2008 19:07:17 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/d9/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d9/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/d9/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:47 UTC
+ Last generated: 26-01-2008 19:07:18 UTC
-----------------------------------------------------------------------------
}
@@ -76,6 +76,7 @@
JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnicode in '..\..\source\Common\JclUnicode.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
@@ -107,7 +108,6 @@
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
- JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
JclWideFormat in '..\..\source\windows\JclWideFormat.pas' ,
JclWin32 in '..\..\source\windows\JclWin32.pas' ,
JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
Modified: trunk/jcl/packages/k3/Jcl.bpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.bpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/k3/Jcl.bpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -41,6 +41,7 @@
..\..\lib\k3\JclSynch.obj
..\..\lib\k3\JclSysInfo.obj
..\..\lib\k3\JclSysUtils.obj
+ ..\..\lib\k3\JclUnicode.obj
..\..\lib\k3\JclUnitConv.obj
..\..\lib\k3\JclUnitVersioning.obj
..\..\lib\k3\JclUnitVersioningProviders.obj
@@ -130,6 +131,7 @@
<FILE FILENAME="../../source/Common/JclSynch.pas" FORMNAME="" UNITNAME="JclSynch" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclSysInfo.pas" FORMNAME="" UNITNAME="JclSysInfo" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclSysUtils.pas" FORMNAME="" UNITNAME="JclSysUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="../../source/Common/JclUnicode.pas" FORMNAME="" UNITNAME="JclUnicode" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclUnitConv.pas" FORMNAME="" UNITNAME="JclUnitConv" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclUnitVersioning.pas" FORMNAME="" UNITNAME="JclUnitVersioning" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclUnitVersioningProviders.pas" FORMNAME="" UNITNAME="JclUnitVersioningProviders" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/k3/Jcl.dpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/k3/Jcl.dpk 2008-01-26 19:27:06 UTC (rev 2324)
@@ -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: 26-01-2008 11:41:49 UTC
+ Last generated: 26-01-2008 19:07:19 UTC
-----------------------------------------------------------------------------
}
@@ -77,6 +77,7 @@
JclSynch in '../../source/Common/JclSynch.pas' ,
JclSysInfo in '../../source/common/JclSysInfo.pas' ,
JclSysUtils in '../../source/common/JclSysUtils.pas' ,
+ JclUnicode in '../../source/Common/JclUnicode.pas' ,
JclUnitConv in '../../source/common/JclUnitConv.pas' ,
JclUnitVersioning in '../../source/common/JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '../../source/common/JclUnitVersioningProviders.pas' ,
Modified: trunk/jcl/packages/xml/Jcl-R.xml
===================================================================
--- trunk/jcl/packages/xml/Jcl-R.xml 2008-01-26 19:05:52 UTC (rev 2323)
+++ trunk/jcl/packages/xml/Jcl-R.xml 2008-01-26 19:27:06 UTC (rev 2324)
@@ -55,6 +55,7 @@
<File Name="..\..\source\Common\JclSynch.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclSysInfo.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclSysUtils.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
+ <File Name="..\..\source\Common\JclUnicode.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\common\JclUnitConv.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclUnitVersioning.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\common\JclUnitVersioningProviders.pas" Targets="JclDev" Formname="" Condition=""/>
@@ -86,7 +87,6 @@
<File Name="..\..\source\windows\JclSvcCtrl.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclTask.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclTD32.pas" Targets="WinDev" Formname="" Condition=""/>
- <File Name="..\..\source\windows\JclUnicode.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclWideFormat.pas" Targets="DelphiDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclWin32.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclWin32Ex.pas" Targets="WinDev" Formname="" Condition=""/>
Copied: trunk/jcl/source/common/JclUnicode.pas (from rev 2320, trunk/jcl/source/windows/JclUnicode.pas)
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas (rev 0)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-01-26 19:27:06 UTC (rev 2324)
@@ -0,0 +1,8564 @@
+{**************************************************************************************************}
+{ }
+{ 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 JclUnicode.pas. }
+{ }
+{ The Initial Developer of the Original Code is Mike Lischke (public att lischke-online dott de). }
+{ Portions created by Mike Lischke are Copyright (C) 1999-2000 Mike Lischke. All Rights Reserved. }
+{ }
+{ Contributor(s): }
+{ Marcel van Brakel }
+{ Andreas Hausladen (ahuser) }
+{ Mike Lischke }
+{ Flier Lu (flier) }
+{ Robert Marquardt (marquardt) }
+{ Robert Rossmair (rrossmair) }
+{ Olivier Sannier (obones) }
+{ Matthias Thoma (mthoma) }
+{ Petr Vones (pvones) }
+{ Peter Schraut (http://www.console-dev.de) }
+{ Florent Ouchet (outchy) }
+{ }
+{**************************************************************************************************}
+{ }
+{ Various Unicode related routines }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclUnicode;
+
+{$I jcl.inc}
+
+// Copyright (c) 1999-2000 Mike Lischke (public att lischke-online dott de)
+//
+
+// 10-JUL-2005: (changes by Peter Schraut)
+// - added CodeBlockName, returns the blockname as string
+// - added CodeBlockRange, returns the range of the specified codeblock
+// - updated TUnicodeBlock to reflect changes in unicode 4.1
+// - updated CodeBlockFromChar to reflect changes in unicode 4.1
+// - Notes:
+// Here are a few suggestions to reflect latest namechanges in unicode 4.1,
+// but they were not done due to compatibility with old code:
+// ubGreek should be renamed to ubGreekandCoptic
+// ubCombiningMarksforSymbols should be renamed to ubCombiningDiacriticalMarksforSymbols
+// ubPrivateUse should be renamed to ubPrivateUseArea
+//
+//
+// 19-SEP-2003: (changes by Andreas Hausladen)
+// - added OWN_WIDESTRING_MEMMGR for faster memory managment in TWideStringList
+// under Windows
+// - fixed: TWideStringList.Destroy does not set OnChange and OnChanging to nil before calling Clear
+//
+//
+// 29-MAR-2002: MT
+// - WideNormalize now returns strings with normalization mode nfNone unchanged.
+// - Bug fix in WideCompose: Raised exception when Result of WideComposeHangul was an
+// empty string. (#0000044)
+// - Bug fix in WideAdjustLineBreaks
+// - Added Asserts were needed.
+// - TWideStrings.IndexOfName now takes care of NormalizeForm as well.
+// - TWideStrings.IndexOf now takes care of NormalizeForm as well.
+// - TWideString.List Find now uses the same NormalizationForm for the search string as it uses
+// within the list itself.
+//
+// 29-NOV-2001:
+// - bug fix
+// 06-JUN-2001:
+// - small changes
+// 28-APR-2001:
+// - bug fixes
+// 05-APR-2001:
+// - bug fixes
+// 23-MAR-2001:
+// - WideSameText
+// - small changes
+// 10-FEB-2001:
+// - bug fix in StringToWideStringEx and WideStringToStringEx
+// 05-FEB-2001:
+// - TWideStrings.GetSeparatedText changed (no separator anymore after the last line)
+// 29-JAN-2001:
+// - PrepareUnicodeData
+// - LoadInProgress critical section is now created at init time to avoid critical thread races
+// - bug fixes
+// 26-JAN-2001:
+// - ExpandANSIString
+// - TWideStrings.SaveUnicode is by default True now
+// 20..21-JAN-2001:
+// - StrUpperW, StrLowerW and StrTitleW removed because they potentially would need
+// a reallocation to work correctly (use the WideString versions instead)
+// - further improvements related to internal data
+// - introduced TUnicodeBlock
+// - CodeBlockFromChar improved
+// 07-JAN-2001:
+// optimized access to character properties, combining class etc.
+// 06-JAN-2001:
+// TWideStrings and TWideStringList improved
+// APR-DEC 2000: versions 2.1 - 2.6
+// - preparation for public rlease
+// - additional conversion routines
+// - JCL compliance
+// - character properties unified
+// - character properties data and lookup improvements
+// - reworked Unicode data resource file
+// - improved simple string comparation routines (StrCompW, StrLCompW etc., include surrogate fix)
+// - special case folding data for language neutral case insensitive comparations included
+// - optimized decomposition
+// - composition and normalization support
+// - normalization conformance tests applied
+// - bug fixes
+// FEB-MAR 2000: version 2.0
+// - Unicode regular expressions (URE) search class (TURESearch)
+// - generic search engine base class for both the Boyer-Moore and the RE search class
+// - whole word only search in UTBM, bug fixes in UTBM
+// - string decompositon (including hangul)
+// OCT/99 - JAN/2000: version 1.0
+// - basic Unicode implementation, more than 100 WideString/UCS2 and UCS4 core functions
+// - TWideStrings and TWideStringList classes
+// - Unicode Tuned Boyer-Moore search class (TUTBMSearch)
+// - low and high level Unicode/Wide* functions
+// - low level Unicode UCS4 data import and functions
+// - helper functions
+//
+// Version 2.9
+// This unit contains routines and classes to manage and work with Unicode/WideString strings.
+// You need Delphi 4 or higher to compile this code.
+//
+// Publicly available low level functions are all preceded by "Unicode..." (e.g.
+// in UnicodeToUpper) while the high level functions use the Str... or Wide...
+// naming scheme (e.g. StrLICompW and WideUpperCase).
+//
+// The normalization implementation in this unit has successfully and completely passed the
+// official normative conformance testing as of Annex 9 in Technical Report #15
+// (Unicode Standard Annex #15, http://www.unicode.org/unicode/reports/tr15, from 2000-08-31).
+//
+// Open issues:
+// - Yet to do things in the URE class are:
+// - check all character classes if they match correctly
+// - optimize rebuild of DFA (build only when pattern changes)
+// - set flag parameter of ExecuteURE
+// - add \d any decimal digit
+// \D any character that is not a decimal digit
+// \s any whitespace character
+// \S any character that is not a whitespace character
+// \w any "word" character
+// \W any "non-word" character
+// - The wide string classes still compare text with functions provided by the
+// particular system. This works usually fine under WinNT/W2K (although also
+// there are limitations like maximum text lengths). Under Win9x conversions
+// from and to MBCS are necessary which are bound to a particular locale and
+// so very limited in general use. These comparisons should be changed so that
+// the code in this unit is used.
+
+interface
+
+uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ {$IFDEF MSWINDOWS}
+ Windows,
+ {$ENDIF MSWINDOWS}
+ Classes,
+ JclBase;
+
+{$IFNDEF FPC}
+ {$IFDEF MSWINDOWS}
+ {$DEFINE OWN_WIDESTRING_MEMMGR}
+ {$ENDIF MSWINDOWS}
+{$ENDIF ~FPC}
+
+const
+ // definitions of often used characters:
+ // Note: Use them only for tests of a certain character not to determine character
+ // classes (like white spaces) as in Unicode are often many code points defined
+ // being in a certain class. Hence your best option is to use the various
+ // UnicodeIs* functions.
+ WideNull = WideChar(#0);
+ WideTabulator = WideChar(#9);
+ WideSpace = WideChar(#32);
+
+ // logical line breaks
+ WideLF = WideChar(#10);
+ WideLineFeed = WideChar(#10);
+ WideVerticalTab = WideChar(#11);
+ WideFormFeed = WideChar(#12);
+ WideCR = WideChar(#13);
+ WideCarriageReturn = WideChar(#13);
+ WideCRLF: WideString = #13#10;
+ WideLineSeparator = WideChar($2028);
+ WideParagraphSeparator = WideChar($2029);
+
+ // byte order marks for Unicode files
+ // Unicode text files (in UTF-16 format) should contain $FFFE as first character to
+ // identify such a file clearly. Depending on the system where the file was created
+ // on this appears either in big endian or little endian style.
+ BOM_LSB_FIRST = WideChar($FEFF);
+ BOM_MSB_FIRST = WideChar($FFFE);
+
+type
+ TSaveFormat = ( sfUTF16LSB, sfUTF16MSB, sfUTF8, sfAnsi );
+
+const
+ sfUnicodeLSB = sfUTF16LSB;
+ sfUnicodeMSB = sfUTF16MSB;
+
+ BOM_UTF16_LSB: array [0..1] of Byte = ($FF,$FE);
+ BOM_UTF16_MSB: array [0..1] of Byte = ($FE,$FF);
+ BOM_UTF8: array [0..2] of Byte = ($EF,$BB,$BF);
+ BOM_UTF32_LSB: array [0..3] of Byte = ($FF,$FE,$00,$00);
+ BOM_UTF32_MSB: array [0..3] of Byte = ($00,$00,$FE,$FF);
+// BOM_UTF7_1: array [0..3] of Byte = ($2B,$2F,$76,$38);
+// BOM_UTF7_2: array [0..3] of Byte = ($2B,$2F,$76,$39);
+// BOM_UTF7_3: array [0..3] of Byte = ($2B,$2F,$76,$2B);
+// BOM_UTF7_4: array [0..3] of Byte = ($2B,$2F,$76,$2F);
+// BOM_UTF7_5: array [0..3] of Byte = ($2B,$2F,$76,$38,$2D);
+
+type
+ // Unicode transformation formats (UTF) data types
+ PUTF7 = ^UTF7;
+ UTF7 = Char;
+ PUTF8 = ^UTF8;
+ UTF8 = Char;
+ PUTF16 = ^UTF16;
+ UTF16 = WideChar;
+ PUTF32 = ^UTF32;
+ UTF32 = Cardinal;
+
+ // UTF conversion schemes (UCS) data types
+ PUCS4 = ^UCS4;
+ UCS4 = Cardinal;
+ PUCS2 = PWideChar;
+ UCS2 = WideChar;
+
+ TUCS2Array = array of UCS2;
+ TUCS4Array = array of UCS4;
+
+ // various predefined or otherwise useful character property categories
+ TCharacterCategory = (
+ // normative categories
+ ccLetterUppercase,
+ ccLetterLowercase,
+ ccLetterTitlecase,
+ ccMarkNonSpacing,
+ ccMarkSpacingCombining,
+ ccMarkEnclosing,
+ ccNumberDecimalDigit,
+ ccNumberLetter,
+ ccNumberOther,
+ ccSeparatorSpace,
+ ccSeparatorLine,
+ ccSeparatorParagraph,
+ ccOtherControl,
+ ccOtherFormat,
+ ccOtherSurrogate,
+ ccOtherPrivate,
+ ccOtherUnassigned,
+ // informative categories
+ ccLetterModifier,
+ ccLetterOther,
+ ccPunctuationConnector,
+ ccPunctuationDash,
+ ccPunctuationOpen,
+ ccPunctuationClose,
+ ccPunctuationInitialQuote,
+ ccPunctuationFinalQuote,
+ ccPunctuationOther,
+ ccSymbolMath,
+ ccSymbolCurrency,
+ ccSymbolModifier,
+ ccSymbolOther,
+ // bidirectional categories
+ ccLeftToRight,
+ ccLeftToRightEmbedding,
+ ccLeftToRightOverride,
+ ccRightToLeft,
+ ccRightToLeftArabic,
+ ccRightToLeftEmbedding,
+ ccRightToLeftoverride,
+ ccPopDirectionalFormat,
+ ccEuropeanNumber,
+ ccEuropeanNumberSeparator,
+ ccEuropeanNumberTerminator,
+ ccArabicNumber,
+ ccCommonNumberSeparator,
+ ccBoundaryNeutral,
+ ccSegmentSeparator, // this includes tab and vertical tab
+ ccWhiteSpace,
+ ccOtherNeutrals,
+ // self defined categories, they do not appear in the Unicode data file
+ ccComposed, // can be decomposed
+ ccNonBreaking,
+ ccSymmetric, // has left and right forms
+ ccHexDigit,
+ ccQuotationMark,
+ ccMirroring,
+ ccSpaceOther,
+ ccAssigned // means there is a definition in the Unicode standard
+ );
+ TCharacterCategories = set of TCharacterCategory;
+
+ // four forms of normalization are defined:
+ TNormalizationForm = (
+ nfNone, // do not normalize
+ nfC, // canonical decomposition followed by canonical composition (this is most often used)
+ nfD, // canonical decomposition
+ nfKC, // compatibility decomposition followed by a canonical composition
+ nfKD // compatibility decomposition
+ );
+
+ // used to hold information about the start and end
+ // position of a unicodeblock.
+ TUnicodeBlockRange = record
+ RangeStart,
+ RangeEnd: Cardinal;
+ end;
+
+ // An Unicode block usually corresponds to a particular language script but
+ // can also represent special characters, musical symbols and the like.
+ // http://www.unicode.org/Public/5.0.0/ucd/Blocks.txt
+ TUnicodeBlock = (
+ ubUndefined,
+ ubBasicLatin,
+ ubLatin1Supplement,
+ ubLatinExtendedA,
+ ubLatinExtendedB,
+ ubIPAExtensions,
+ ubSpacingModifierLetters,
+ ubCombiningDiacriticalMarks,
+ ubGreekandCoptic,
+ ubCyrillic,
+ ubCyrillicSupplement,
+ ubArmenian,
+ ubHebrew,
+ ubArabic,
+ ubSyriac,
+ ubArabicSupplement,
+ ubThaana,
+ ubNKo,
+ ubDevanagari,
+ ubBengali,
+ ubGurmukhi,
+ ubGujarati,
+ ubOriya,
+ ubTamil,
+ ubTelugu,
+ ubKannada,
+ ubMalayalam,
+ ubSinhala,
+ ubThai,
+ ubLao,
+ ubTibetan,
+ ubMyanmar,
+ ubGeorgian,
+ ubHangulJamo,
+ ubEthiopic,
+ ubEthiopicSupplement,
+ ubCherokee,
+ ubUnifiedCanadianAboriginalSyllabics,
+ ubOgham,
+ ubRunic,
+ ubTagalog,
+ ubHanunoo,
+ ubBuhid,
+ ubTagbanwa,
+ ubKhmer,
+ ubMongolian,
+ ubLimbu,
+ ubTaiLe,
+ ubNewTaiLue,
+ ubKhmerSymbols,
+ ubBuginese,
+ ubBalinese,
+ ubPhoneticExtensions,
+ ubPhoneticExtensionsSupplement,
+ ubCombiningDiacriticalMarksSupplement,
+ ubLatinExtendedAdditional,
+ ubGreekExtended,
+ ubGeneralPunctuation,
+ ubSuperscriptsandSubscripts,
+ ubCurrencySymbols,
+ ubCombiningDiacriticalMarksforSymbols,
+ ubLetterlikeSymbols,
+ ubNumberForms,
+ ubArrows,
+ ubMathematicalOperators,
+ ubMiscellaneousTechnical,
+ ubControlPictures,
+ ubOpticalCharacterRecognition,
+ ubEnclosedAlphanumerics,
+ ubBoxDrawing,
+ ubBlockElements,
+ ubGeometricShapes,
+ ubMiscellaneousSymbols,
+ ubDingbats,
+ ubMiscellaneousMathematicalSymbolsA,
+ ubSupplementalArrowsA,
+ ubBraillePatterns,
+ ubSupplementalArrowsB,
+ ubMiscellaneousMathematicalSymbolsB,
+ ubSupplementalMathematicalOperators,
+ ubMiscellaneousSymbolsandArrows,
+ ubGlagolitic,
+ ubLatinExtendedC,
+ ubCoptic,
+ ubGeorgianSupplement,
+ ubTifinagh,
+ ubEthiopicExtended,
+ ubSupplementalPunctuation,
+ ubCJKRadicalsSupplement,
+ ubKangxiRadicals,
+ ubIdeographicDescriptionCharacters,
+ ubCJKSymbolsandPunctuation,
+ ubHiragana,
+ ubKatakana,
+ ubBopomofo,
+ ubHangulCompatibilityJamo,
+ ubKanbun,
+ ubBopomofoExtended,
+ ubCJKStrokes,
+ ubKatakanaPhoneticExtensions,
+ ubEnclosedCJKLettersandMonths,
+ ubCJKCompatibility,
+ ubCJKUnifiedIdeographsExtensionA,
+ ubYijingHexagramSymbols,
+ ubCJKUnifiedIdeographs,
+ ubYiSyllables,
+ ubYiRadicals,
+ ubModifierToneLetters,
+ ubLatinExtendedD,
+ ubSylotiNagri,
+ ubPhagsPa,
+ ubHangulSyllables,
+ ubHighSurrogates,
+ ubHighPrivateUseSurrogates,
+ ubLowSurrogates,
+ ubPrivateUseArea,
+ ubCJKCompatibilityIdeographs,
+ ubAlphabeticPresentationForms,
+ ubArabicPresentationFormsA,
+ ubVariationSelectors,
+ ubVerticalForms,
+ ubCombiningHalfMarks,
+ ubCJKCompatibilityForms,
+ ubSmallFormVariants,
+ ubArabicPresentationFormsB,
+ ubHalfwidthandFullwidthForms,
+ ubSpecials,
+ ubLinearBSyllabary,
+ ubLinearBIdeograms,
+ ubAegeanNumbers,
+ ubAncientGreekNumbers,
+ ubOldItalic,
+ ubGothic,
+ ubUgaritic,
+ ubOldPersian,
+ ubDeseret,
+ ubShavian,
+ ubOsmanya,
+ ubCypriotSyllabary,
+ ubPhoenician,
+ ubKharoshthi,
+ ubCuneiform,
+ ubCuneiformNumbersAndPunctuation,
+ ubByzantineMusicalSymbols,
+ ubMusicalSymbols,
+ ubAncientGreekMusicalNotation,
+ ubTaiXuanJingSymbols,
+ ubCountingRodNumerals,
+ ubMathematicalAlphanumericSymbols,
+ ubCJKUnifiedIdeographsExtensionB,
+ ubCJKCompatibilityIdeographsSupplement,
+ ubTags,
+ ubVariationSelectorsSupplement,
+ ubSupplementaryPrivateUseAreaA,
+ ubSupplementaryPrivateUseAreaB
+ );
+
+ TUnicodeBlockData = record
+ Range: TUnicodeBlockRange;
+ Name: string;
+ end;
+ PUnicodeBlockData = ^TUnicodeBlockData;
+
+const
+ UnicodeBlockData: array [TUnicodeBlock] of TUnicodeBlockData =
+ ((Range:(RangeStart: $FFFFFFFF; RangeEnd: $0000); Name: 'No-block'),
+ (Range:(RangeStart: $0000; RangeEnd: $007F); Name: 'Basic Latin'),
+ (Range:(RangeStart: $0080; RangeEnd: $00FF); Name: 'Latin-1 Supplement'),
+ (Range:(RangeStart: $0100; RangeEnd: $017F); Name: 'Latin Extended-A'),
+ (Range:(RangeStart: $0180; RangeEnd: $024F); Name: 'Latin Extended-B'),
+ (Range:(RangeStart: $0250; RangeEnd: $02AF); Name: 'IPA Extensions'),
+ (Range:(RangeStart: $02B0; RangeEnd: $02FF); Name: 'Spacing Modifier Letters'),
+ (Range:(RangeStart: $0300; RangeEnd: $036F); Name: 'Combining Diacritical Marks'),
+ (Range:(RangeStart: $0370; RangeEnd: $03FF); Name: 'Greek and Coptic'),
+ (Range:(RangeStart: $0400; RangeEnd: $04FF); Name: 'Cyrillic'),
+ (Range:(RangeStart: $0500; RangeEnd: $052F); Name: 'Cyrillic Supplement'),
+ (Range:(RangeStart: $0530; RangeEnd: $058F); Name: 'Armenian'),
+ (Range:(RangeStart: $0590; RangeEnd: $05FF); Name: 'Hebrew'),
+ (Range:(RangeStart: $0600; RangeEnd: $06FF); Name: 'Arabic'),
+ (Range:(RangeStart: $0700; RangeEnd: $074F); Name: 'Syriac'),
+ (Range:(RangeStart: $0750; RangeEnd: $077F); Name: 'Arabic Supplement'),
+ (Range:(RangeStart: $0780; RangeEnd: $07BF); Name: 'Thaana'),
+ (Range:(RangeStart: $07C0; RangeEnd: $07FF); Name: 'NKo'),
+ (Range:(RangeStart: $0900; RangeEnd: $097F); Name: 'Devanagari'),
+ (Range:(RangeStart: $0980; RangeEnd: $09FF); Name: 'Bengali'),
+ (Range:(RangeStart: $0A00; RangeEnd: $0A7F); Name: 'Gurmukhi'),
+ (Range:(RangeStart: $0A80; RangeEnd: $0AFF); Name: 'Gujarati'),
+ (Range:(RangeStart: $0B00; RangeEnd: $0B7F); Name: 'Oriya'),
+ (Range:(RangeStart: $0B80; RangeEnd: $0BFF); Name: 'Tamil'),
+ (Range:(RangeStart: $0C00; RangeEnd: $0C7F); Name: 'Telugu'),
+ (Range:(RangeStart: $0C80; RangeEnd: $0CFF); Name: 'Kannada'),
+ (Range:(RangeStart: $0D00; RangeEnd: $0D7F); Name: 'Malayalam'),
+ (Range:(RangeStart: $0D80; RangeEnd: $0DFF); Name: 'Sinhala'),
+ (Range:(RangeStart: $0E00; RangeEnd: $0E7F); Name: 'Thai'),
+ (Range:(RangeStart: $0E80; RangeEnd: $0EFF); Name: 'Lao'),
+ (Range:(RangeStart: $0F00; RangeEnd: $0FFF); Name: 'Tibetan'),
+ (Range:(RangeStart: $1000; RangeEnd: $109F); Name: 'Myanmar'),
+ (Range:(RangeStart: $10A0; RangeEnd: $10FF); Name: 'Georgian'),
+ (Range:(RangeStart: $1100; RangeEnd: $11FF); Name: 'Hangul Jamo'),
+ (Range:(RangeStart: $1200; RangeEnd: $137F); Name: 'Ethiopic'),
+ (Range:(RangeStart: $1380; RangeEnd: $139F); Name: 'Ethiopic Supplement'),
+ (Range:(RangeStart: $13A0; RangeEnd: $13FF); Name: 'Cherokee'),
+ (Range:(RangeStart: $1400; RangeEnd: $167F); Name: 'Unified Canadian Aboriginal Syllabics'),
+ (Range:(RangeStart: $1680; RangeEnd: $169F); Name: 'Ogham'),
+ (Range:(RangeStart: $16A0; RangeEnd: $16FF); Name: 'Runic'),
+ (Range:(RangeStart: $1700; RangeEnd: $171F); Name: 'Tagalog'),
+ (Range:(RangeStart: $1720; RangeEnd: $173F); Name: 'Hanunoo'),
+ (Range:(RangeStart: $1740; RangeEnd: $175F); Name: 'Buhid'),
+ (Range:(RangeStart: $1760; RangeEnd: $177F); Name: 'Tagbanwa'),
+ (Range:(RangeStart: $1780; RangeEnd: $17FF); Name: 'Khmer'),
+ (Range:(RangeStart: $1800; RangeEnd: $18AF); Name: 'Mongolian'),
+ (Range:(RangeStart: $1900; RangeEnd: $194F); Name: 'Limbu'),
+ (Range:(RangeStart: $1950; RangeEnd: $197F); Name: 'Tai Le'),
+ (Range:(RangeStart: $1980; RangeEnd: $19DF); Name: 'New Tai Lue'),
+ (Range:(RangeStart: $19E0; RangeEnd: $19FF); Name: 'Khmer Symbols'),
+ (Range:(RangeStart: $1A00; RangeEnd: $1A1F); Name: 'Buginese'),
+ (Range:(RangeStart: $1B00; RangeEnd: $1B7F); Name: 'Balinese'),
+ (Range:(RangeStart: $1D00; RangeEnd: $1D7F); Name: 'Phonetic Extensions'),
+ (Range:(RangeStart: $1D80; RangeEnd: $1DBF); Name: 'Phonetic Extensions Supplement'),
+ (Range:(RangeStart: $1DC0; RangeEnd: $1DFF); Name: 'Combining Diacritical Marks Supplement'),
+ (Range:(RangeStart: $1E00; RangeEnd: $1EFF); Name: 'Latin Extended Additional'),
+ (Range:(RangeStart: $1F00; RangeEnd: $1FFF); Name: 'Greek Extended'),
+ (Range:(RangeStart: $2000; RangeEnd: $206F); Name: 'General Punctuation'),
+ (Range:(RangeStart: $2070; RangeEnd: $209F); Name: 'Superscripts and Subscripts'),
+ (Range:(RangeStart: $20A0; RangeEnd: $20CF); Name: 'Currency Symbols'),
+ (Range:(RangeStart: $20D0; RangeEnd: $20FF); Name: 'Combining Diacritical Marks for Symbols'),
+ (Range:(RangeStart: $2100; RangeEnd: $214F); Name: 'Letterlike Symbols'),
+ (Range:(RangeStart: $2150; RangeEnd: $218F); Name: 'Number Forms'),
+ (Range:(RangeStart: $2190; RangeEnd: $21FF); Name: 'Arrows'),
+ (Range:(RangeStart: $2200; RangeEnd: $22FF); Name: 'Mathematical Operators'),
+ (Range:(RangeStart: $2300; RangeEnd: $23FF); Name: 'Miscellaneous Technical'),
+ (Range:(RangeStart: $2400; RangeEnd: $243F); Name: 'Control Pictures'),
+ (Range:(RangeStart: $2440; RangeEnd: $245F); Name: 'Optical Character Recognition'),
+ (Range:(RangeStart: $2460; RangeEnd: $24FF); Name: 'Enclosed Alphanumerics'),
+ (Range:(RangeStart: $2500; RangeEnd: $257F); Name: 'Box Drawing'),
+ (Range:(RangeStart: $2580; RangeEnd: $259F); Name: 'Block Elements'),
+ (Range:(RangeStart: $25A0; RangeEnd: $25FF); Name: 'Geometric Shapes'),
+ (Range:(RangeStart: $2600; RangeEnd: $26FF); Name: 'Miscellaneous Symbols'),
+ (Range:(RangeStart: $2700; RangeEnd: $27BF); Name: 'Dingbats'),
+ (Range:(RangeStart: $27C0; RangeEnd: $27EF); Name: 'Miscellaneous Mathematical Symbols-A'),
+ (Range:(RangeStart: $27F0; RangeEnd: $27FF); Name: 'Supplemental Arrows-A'),
+ (Range:(RangeStart: $2800; RangeEnd: $28FF); Name: 'Braille Patterns'),
+ (Range:(RangeStart: $2900; RangeEnd: $297F); Name: 'Supplemental Arrows-B'),
+ (Range:(RangeStart: $2980; RangeEnd: $29FF); Name: 'Miscellaneous Mathematical Symbols-B'),
+ (Range:(RangeStart: $2A00; RangeEnd: $2AFF); Name: 'Supplemental Mathematical Operators'),
+ (Range:(RangeStart: $2B00; RangeEnd: $2BFF); Name: 'Miscellaneous Symbols and Arrows'),
+ (Range:(RangeStart: $2C00; RangeEnd: $2C5F); Name: 'Glagolitic'),
+ (Range:(RangeStart: $2C60; RangeEnd: $2C7F); Name: 'Latin Extended-C'),
+ (Range:(RangeStart: $2C80; RangeEnd: $2CFF); Name: 'Coptic'),
+ (Range:(RangeStart: $2D00; RangeEnd: $2D2F); Name: 'Georgian Supplement'),
+ (Range:(RangeStart: $2D30; RangeEnd: $2D7F); Name: 'Tifinagh'),
+ (Range:(RangeStart: $2D80; RangeEnd: $2DDF); Name: 'Ethiopic Extended'),
+ (Range:(RangeStart: $2E00; RangeEnd: $2E7F); Name: 'Supplemental Punctuation'),
+ (Range:(RangeStart: $2E80; RangeEnd: $2EFF); Name: 'CJK Radicals Supplement'),
+ (Range:(RangeStart: $2F00; RangeEnd: $2FDF); Name: 'Kangxi Radicals'),
+ (Range:(RangeStart: $2FF0; RangeEnd: $2FFF); Name: 'Ideographic Description Characters'),
+ (Range:(RangeStart: $3000; RangeEnd: $303F); Name: 'CJK Symbols and Punctuation'),
+ (Range:(RangeStart: $3040; RangeEnd: $309F); Name: 'Hiragana'),
+ (Range:(RangeStart: $30A0; RangeEnd: $30FF); Name: 'Katakana'),
+ (Range:(RangeStart: $3100; RangeEnd: $312F); Name: 'Bopomofo'),
+ (Range:(RangeStart: $3130; RangeEnd: $318F); Name: 'Hangul Compatibility Jamo'),
+ (Range:(RangeStart: $3190; RangeEnd: $319F); Name: 'Kanbun'),
+ (Range:(RangeStart: $31A0; RangeEnd: $31BF); Name: 'Bopomofo Extended'),
+ (Range:(RangeStart: $31C0; RangeEnd: $31EF); Name: 'CJK Strokes'),
+ (Range:(RangeStart: $31F0; RangeEnd: $31FF); Name: 'Katakana Phonetic Extensions'),
+ (Range:(RangeStart: $3200; RangeEnd: $32FF); Name: 'Enclosed CJK Letters and Months'),
+ (Range:(RangeStart: $3300; RangeEnd: $33FF); Name: 'CJK Compatibility'),
+ (Range:(RangeStart: $3400; RangeEnd: $4DBF); Name: 'CJK Unified Ideographs Extension A'),
+ (Range:(RangeStart: $4DC0; RangeEnd: $4DFF); Name: 'Yijing Hexagram Symbols'),
+ (Range:(RangeStart: $4E00; RangeEnd: $9FFF); Name: 'CJK Unified Ideographs'),
+ (Range:(RangeStart: $A000; RangeEnd: $A48F); Name: 'Yi Syllables'),
+ (Range:(RangeStart: $A490; RangeEnd: $A4CF); Name: 'Yi Radicals'),
+ (Range:(RangeStart: $A700; RangeEnd: $A71F); Name: 'Modifier Tone Letters'),
+ (Range:(RangeStart: $A720; RangeEnd: $A7FF); Name: 'Latin Extended-D'),
+ (Range:(RangeStart: $A800; RangeEnd: $A82F); Name: 'Syloti Nagri'),
+ (Range:(RangeStart: $A840; RangeEnd: $A87F); Name: 'Phags-pa'),
+ (Range:(RangeStart: $AC00; RangeEnd: $D7AF); Name: 'Hangul Syllables'),
+ (Range:(RangeStart: $D800; RangeEnd: $DB7F); Name: 'High Surrogates'),
+ (Range:(RangeStart: $DB80; RangeEnd: $DBFF); Name: 'High Private Use Surrogates'),
+ (Range:(RangeStart: $DC00; RangeEnd: $DFFF); Name: 'Low Surrogates'),
+ (Range:(RangeStart: $E000; RangeEnd: $F8FF); Name: 'Private Use Area'),
+ (Range:(RangeStart: $F900; RangeEnd: $FAFF); Name: 'CJK Compatibility Ideographs'),
+ (Range:(RangeStart: $FB00; RangeEnd: $FB4F); Name: 'Alphabetic Presentation Forms'),
+ (Range:(RangeStart: $FB50; RangeEnd: $FDFF); Name: 'Arabic Presentation Forms-A'),
+ (Range:(RangeStart: $FE00; RangeEnd: $FE0F); Name: 'Variation Selectors'),
+ (Range:(RangeStart: $FE10; RangeEnd: $FE1F); Name: 'Vertical Forms'),
+ (Range:(RangeStart: $FE20; RangeEnd: $FE2F); Name: 'Combining Half Marks'),
+ (Range:(RangeStart: $FE30; RangeEnd: $FE4F); Name: 'CJK Compatibility Forms'),
+ (Range:(RangeStart: $FE50; RangeEnd: $FE6F); Name: 'Small Form Variants'),
+ (Range:(RangeStart: $FE70; RangeEnd: $FEFF); Name: 'Arabic Presentation Forms-B'),
+ (Range:(RangeStart: $FF00; RangeEnd: $FFEF); Name: 'Halfwidth and Fullwidth Forms'),
+ (Range:(RangeStart: $FFF0; RangeEnd: $FFFF); Name: 'Specials'),
+ (Range:(RangeStart: $10000; RangeEnd: $1007F); Name: 'Linear B Syllabary'),
+ (Range:(RangeStart: $10080; RangeEnd: $100FF); Name: 'Linear B Ideograms'),
+ (Range:(RangeStart: $10100; RangeEnd: $1013F); Name: 'Aegean Numbers'),
+ (Range:(RangeStart: $10140; RangeEnd: $1018F); Name: 'Ancient Greek Numbers'),
+ (Range:(RangeStart: $10300; RangeEnd: $1032F); Name: 'Old Italic'),
+ (Range:(RangeStart: $10330; RangeEnd: $1034F); Name: 'Gothic'),
+ (Range:(RangeStart: $10380; RangeEnd: $1039F); Name: 'Ugaritic'),
+ (Range:(RangeStart: $103A0; RangeEnd: $103DF); Name: 'Old Persian'),
+ (Range:(RangeStart: $10400; RangeEnd: $1044F); Name: 'Deseret'),
+ (Range:(RangeStart: $10450; RangeEnd: $1047F); Name: 'Shavian'),
+ (Range:(RangeStart: $10480; RangeEnd: $104AF); Name: 'Osmanya'),
+ (Range:(RangeStart: $10800; RangeEnd: $1083F); Name: 'Cypriot Syllabary'),
+ (Range:(RangeStart: $10900; RangeEnd: $1091F); Name: 'Phoenician'),
+ (Range:(RangeStart: $10A00; RangeEnd: $10A5F); Name: 'Kharoshthi'),
+ (Range:(RangeStart: $12000; RangeEnd: $123FF); Name: 'Cuneiform'),
+ (Range:(RangeStart: $12400; RangeEnd: $1247F); Name: 'Cuneiform Numbers and Punctuation'),
+ (Range:(RangeStart: $1D000; RangeEnd: $1D0FF); Name: 'Byzantine Musical Symbols'),
+ (Range:(RangeStart: $1D100; RangeEnd: $1D1FF); Name: 'Musical Symbols'),
+ (Range:(RangeStart: $1D200; RangeEnd: $1D24F); Name: 'Ancient Greek Musical Notation'),
+ (Range:(RangeStart: $1...
[truncated message content] |
|
From: <ou...@us...> - 2008-01-26 19:05:55
|
Revision: 2323
http://jcl.svn.sourceforge.net/jcl/?rev=2323&view=rev
Author: outchy
Date: 2008-01-26 11:05:52 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
fixed copyright year.
converted Delphi.net 2005 libraries to packages.
added RELEASE conditional.
fixed compiler switches mismatches between project file (.dpk) and option file (.bdsproj).
Modified Paths:
--------------
trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d10.net/Jedi.Jcl.dpk
trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
trunk/jcl/packages/d10.net/template.bdsproj
trunk/jcl/packages/d10.net/template.dpk
trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d9.net/template.bdsproj
Added Paths:
-----------
trunk/jcl/packages/d9.net/Jedi.Jcl.dpk
trunk/jcl/packages/d9.net/Jedi.JclContainers.dpk
trunk/jcl/packages/d9.net/template.dpk
Removed Paths:
-------------
trunk/jcl/packages/d9.net/Jedi.Jcl.dpr
trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr
trunk/jcl/packages/d9.net/template.dpr
Modified: trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj 2008-01-26 19:05:52 UTC (rev 2323)
@@ -18,16 +18,16 @@
<Compiler>
<Compiler Name="A">0</Compiler>
<Compiler Name="B">0</Compiler>
- <Compiler Name="C">1</Compiler>
- <Compiler Name="D">1</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
<Compiler Name="E">0</Compiler>
<Compiler Name="F">0</Compiler>
<Compiler Name="G">1</Compiler>
<Compiler Name="H">1</Compiler>
- <Compiler Name="I">1</Compiler>
- <Compiler Name="J">0</Compiler>
+ <Compiler Name="I">0</Compiler>
+ <Compiler Name="J">1</Compiler>
<Compiler Name="K">0</Compiler>
- <Compiler Name="L">1</Compiler>
+ <Compiler Name="L">0</Compiler>
<Compiler Name="M">0</Compiler>
<Compiler Name="N">1</Compiler>
<Compiler Name="O">1</Compiler>
@@ -40,7 +40,7 @@
<Compiler Name="V">1</Compiler>
<Compiler Name="W">0</Compiler>
<Compiler Name="X">1</Compiler>
- <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
<Compiler Name="Z">1</Compiler>
<Compiler Name="ShowHints">True</Compiler>
<Compiler Name="ShowWarnings">True</Compiler>
@@ -125,7 +125,7 @@
<Directories Name="PackageDCPOutputDir">..\..\lib\d10.net</Directories>
<Directories Name="SearchPath">..\..\lib\d10.net;..\..\source</Directories>
<Directories Name="Packages"></Directories>
- <Directories Name="Conditionals"></Directories>
+ <Directories Name="Conditionals">RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
</Directories>
@@ -150,7 +150,7 @@
<Language Name="RootDir"></Language>
</Language>
<VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">102</VersionInfo>
Modified: trunk/jcl/packages/d10.net/Jedi.Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.Jcl.dpk 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d10.net/Jedi.Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
@@ -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: 26-01-2008 11:41:50 UTC
+ Last generated: 26-01-2008 18:54:27 UTC
-----------------------------------------------------------------------------
}
@@ -29,6 +29,7 @@
{$WRITEABLECONST ON}
{$MINENUMSIZE 1}
{$IMAGEBASE $48000000}
+{$LIBSUFFIX '100'}
{$RUNONLY}
{$IMPLICITBUILD OFF}
{$DEFINE RELEASE}
@@ -75,7 +76,7 @@
[assembly: AssemblyConfiguration('')]
[assembly: AssemblyCompany('Project JEDI')]
[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
[assembly: AssemblyTrademark('')]
[assembly: AssemblyCulture('')]
Modified: trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 19:05:52 UTC (rev 2323)
@@ -18,16 +18,16 @@
<Compiler>
<Compiler Name="A">0</Compiler>
<Compiler Name="B">0</Compiler>
- <Compiler Name="C">1</Compiler>
- <Compiler Name="D">1</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
<Compiler Name="E">0</Compiler>
<Compiler Name="F">0</Compiler>
<Compiler Name="G">1</Compiler>
<Compiler Name="H">1</Compiler>
- <Compiler Name="I">1</Compiler>
- <Compiler Name="J">0</Compiler>
+ <Compiler Name="I">0</Compiler>
+ <Compiler Name="J">1</Compiler>
<Compiler Name="K">0</Compiler>
- <Compiler Name="L">1</Compiler>
+ <Compiler Name="L">0</Compiler>
<Compiler Name="M">0</Compiler>
<Compiler Name="N">1</Compiler>
<Compiler Name="O">1</Compiler>
@@ -40,7 +40,7 @@
<Compiler Name="V">1</Compiler>
<Compiler Name="W">0</Compiler>
<Compiler Name="X">1</Compiler>
- <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
<Compiler Name="Z">1</Compiler>
<Compiler Name="ShowHints">True</Compiler>
<Compiler Name="ShowWarnings">True</Compiler>
@@ -125,7 +125,7 @@
<Directories Name="PackageDCPOutputDir">..\..\lib\d10.net</Directories>
<Directories Name="SearchPath">..\..\lib\d10.net;..\..\source</Directories>
<Directories Name="Packages"></Directories>
- <Directories Name="Conditionals"></Directories>
+ <Directories Name="Conditionals">RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
</Directories>
@@ -150,7 +150,7 @@
<Language Name="RootDir"></Language>
</Language>
<VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">102</VersionInfo>
Modified: trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk 2008-01-26 19:05:52 UTC (rev 2323)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
- Last generated: 26-01-2008 15:05:38 UTC
+ Last generated: 26-01-2008 18:54:27 UTC
-----------------------------------------------------------------------------
}
@@ -29,6 +29,7 @@
{$WRITEABLECONST ON}
{$MINENUMSIZE 1}
{$IMAGEBASE $48500000}
+{$LIBSUFFIX '100'}
{$RUNONLY}
{$IMPLICITBUILD OFF}
{$DEFINE RELEASE}
@@ -61,7 +62,7 @@
[assembly: AssemblyConfiguration('')]
[assembly: AssemblyCompany('Project JEDI')]
[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
[assembly: AssemblyTrademark('')]
[assembly: AssemblyCulture('')]
Modified: trunk/jcl/packages/d10.net/template.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/template.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d10.net/template.bdsproj 2008-01-26 19:05:52 UTC (rev 2323)
@@ -18,16 +18,16 @@
<Compiler>
<Compiler Name="A">0</Compiler>
<Compiler Name="B">0</Compiler>
- <Compiler Name="C">1</Compiler>
- <Compiler Name="D">1</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
<Compiler Name="E">0</Compiler>
<Compiler Name="F">0</Compiler>
<Compiler Name="G">1</Compiler>
<Compiler Name="H">1</Compiler>
- <Compiler Name="I">1</Compiler>
- <Compiler Name="J">0</Compiler>
+ <Compiler Name="I">0</Compiler>
+ <Compiler Name="J">1</Compiler>
<Compiler Name="K">0</Compiler>
- <Compiler Name="L">1</Compiler>
+ <Compiler Name="L">0</Compiler>
<Compiler Name="M">0</Compiler>
<Compiler Name="N">1</Compiler>
<Compiler Name="O">1</Compiler>
@@ -40,7 +40,7 @@
<Compiler Name="V">1</Compiler>
<Compiler Name="W">0</Compiler>
<Compiler Name="X">1</Compiler>
- <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
<Compiler Name="Z">1</Compiler>
<Compiler Name="ShowHints">True</Compiler>
<Compiler Name="ShowWarnings">True</Compiler>
@@ -125,7 +125,7 @@
<Directories Name="PackageDCPOutputDir">..\..\lib\d10.net</Directories>
<Directories Name="SearchPath">..\..\lib\d10.net;..\..\source</Directories>
<Directories Name="Packages"></Directories>
- <Directories Name="Conditionals"></Directories>
+ <Directories Name="Conditionals">RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
</Directories>
@@ -150,7 +150,7 @@
<Language Name="RootDir"></Language>
</Language>
<VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">%VERSION_MAJOR_NUMBER%</VersionInfo>
<VersionInfo Name="MinorVer">%VERSION_MINOR_NUMBER%</VersionInfo>
Modified: trunk/jcl/packages/d10.net/template.dpk
===================================================================
--- trunk/jcl/packages/d10.net/template.dpk 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d10.net/template.dpk 2008-01-26 19:05:52 UTC (rev 2323)
@@ -35,6 +35,7 @@
{$WRITEABLECONST ON}
{$MINENUMSIZE 1}
{$IMAGEBASE $%IMAGE_BASE%}
+{$LIBSUFFIX '100'}
{$%TYPE%ONLY}
{$IMPLICITBUILD OFF}
{$DEFINE RELEASE}
@@ -56,7 +57,7 @@
[assembly: AssemblyConfiguration('')]
[assembly: AssemblyCompany('Project JEDI')]
[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
[assembly: AssemblyTrademark('')]
[assembly: AssemblyCulture('')]
Modified: trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj 2008-01-26 19:05:52 UTC (rev 2323)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<PersonalityInfo>
<Option>
<Option Name="Personality">DelphiDotNet.Personality</Option>
- <Option Name="ProjectType">Library</Option>
+ <Option Name="ProjectType"></Option>
<Option Name="Version">2.0</Option>
<Option Name="GUID">{44DB645B-C167-410D-9334-38AF9F0C7913}</Option>
</Option>
@@ -18,16 +18,16 @@
<Compiler>
<Compiler Name="A">0</Compiler>
<Compiler Name="B">0</Compiler>
- <Compiler Name="C">1</Compiler>
- <Compiler Name="D">1</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
<Compiler Name="E">0</Compiler>
<Compiler Name="F">0</Compiler>
<Compiler Name="G">1</Compiler>
<Compiler Name="H">1</Compiler>
- <Compiler Name="I">1</Compiler>
- <Compiler Name="J">0</Compiler>
+ <Compiler Name="I">0</Compiler>
+ <Compiler Name="J">1</Compiler>
<Compiler Name="K">0</Compiler>
- <Compiler Name="L">1</Compiler>
+ <Compiler Name="L">0</Compiler>
<Compiler Name="M">0</Compiler>
<Compiler Name="N">1</Compiler>
<Compiler Name="O">1</Compiler>
@@ -40,7 +40,7 @@
<Compiler Name="V">1</Compiler>
<Compiler Name="W">0</Compiler>
<Compiler Name="X">1</Compiler>
- <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
<Compiler Name="Z">1</Compiler>
<Compiler Name="ShowHints">True</Compiler>
<Compiler Name="ShowWarnings">True</Compiler>
@@ -125,7 +125,7 @@
<Directories Name="PackageDCPOutputDir">..\..\lib\d9.net</Directories>
<Directories Name="SearchPath">..\..\lib\d9.net;..\..\source</Directories>
<Directories Name="Packages"></Directories>
- <Directories Name="Conditionals"></Directories>
+ <Directories Name="Conditionals">RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
</Directories>
@@ -150,7 +150,7 @@
<Language Name="RootDir"></Language>
</Language>
<VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">102</VersionInfo>
@@ -171,7 +171,7 @@
<VersionInfoKeys Name="InternalName">Jedi.Jcl</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">Jedi.Jcl9.bpl</VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename">Jedi.Jcl90.bpl</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">1.102 Build 2726</VersionInfoKeys>
<VersionInfoKeys Name="Comments"></VersionInfoKeys>
Added: trunk/jcl/packages/d9.net/Jedi.Jcl.dpk
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.Jcl.dpk (rev 0)
+++ trunk/jcl/packages/d9.net/Jedi.Jcl.dpk 2008-01-26 19:05:52 UTC (rev 2323)
@@ -0,0 +1,96 @@
+package Jedi.Jcl;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
+
+ Last generated: 26-01-2008 18:54:27 UTC
+-----------------------------------------------------------------------------
+}
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48000000}
+{$LIBSUFFIX '90'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+ Borland.Delphi,
+ Borland.VclRtl
+ ;
+
+contains
+ JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
+ JclBase in '..\..\source\common\JclBase.pas' ,
+ JclComplex in '..\..\source\common\JclComplex.pas' ,
+ JclCounter in '..\..\source\common\JclCounter.pas' ,
+ JclDateTime in '..\..\source\common\JclDateTime.pas' ,
+ JclEDI in '..\..\source\common\JclEDI.pas' ,
+ JclEDISEF in '..\..\source\common\JclEDISEF.pas' ,
+ JclEDITranslators in '..\..\source\common\JclEDITranslators.pas' ,
+ JclEDIXML in '..\..\source\common\JclEDIXML.pas' ,
+ JclEDI_ANSIX12 in '..\..\source\common\JclEDI_ANSIX12.pas' ,
+ JclEDI_ANSIX12_Ext in '..\..\source\common\JclEDI_ANSIX12_Ext.pas' ,
+ JclEDI_UNEDIFACT in '..\..\source\common\JclEDI_UNEDIFACT.pas' ,
+ JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
+ JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
+ JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
+ JclLogic in '..\..\source\common\JclLogic.pas' ,
+ JclMath in '..\..\source\common\JclMath.pas' ,
+ JclMime in '..\..\source\common\JclMime.pas' ,
+ JclResources in '..\..\source\common\JclResources.pas' ,
+ JclRTTI in '..\..\source\common\JclRTTI.pas' ,
+ JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
+ JclStatistics in '..\..\source\common\JclStatistics.pas' ,
+ JclStreams in '..\..\source\common\JclStreams.pas' ,
+ JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
+ JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
+ JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
+ JclValidation in '..\..\source\common\JclValidation.pas'
+ ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('JEDI Code Library RTL package')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('1.102.0.2726')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.
Property changes on: trunk/jcl/packages/d9.net/Jedi.Jcl.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Deleted: trunk/jcl/packages/d9.net/Jedi.Jcl.dpr
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.Jcl.dpr 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d9.net/Jedi.Jcl.dpr 2008-01-26 19:05:52 UTC (rev 2323)
@@ -1,64 +0,0 @@
-Package Jedi.Jcl;
-
-uses
- Borland.Delphi,
- Borland.VclRtl
- ,
- JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
- JclBase in '..\..\source\common\JclBase.pas' ,
- JclComplex in '..\..\source\common\JclComplex.pas' ,
- JclCounter in '..\..\source\common\JclCounter.pas' ,
- JclDateTime in '..\..\source\common\JclDateTime.pas' ,
- JclEDI in '..\..\source\common\JclEDI.pas' ,
- JclEDISEF in '..\..\source\common\JclEDISEF.pas' ,
- JclEDITranslators in '..\..\source\common\JclEDITranslators.pas' ,
- JclEDIXML in '..\..\source\common\JclEDIXML.pas' ,
- JclEDI_ANSIX12 in '..\..\source\common\JclEDI_ANSIX12.pas' ,
- JclEDI_ANSIX12_Ext in '..\..\source\common\JclEDI_ANSIX12_Ext.pas' ,
- JclEDI_UNEDIFACT in '..\..\source\common\JclEDI_UNEDIFACT.pas' ,
- JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
- JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
- JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
- JclLogic in '..\..\source\common\JclLogic.pas' ,
- JclMath in '..\..\source\common\JclMath.pas' ,
- JclMime in '..\..\source\common\JclMime.pas' ,
- JclResources in '..\..\source\common\JclResources.pas' ,
- JclRTTI in '..\..\source\common\JclRTTI.pas' ,
- JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
- JclStatistics in '..\..\source\common\JclStatistics.pas' ,
- JclStreams in '..\..\source\common\JclStreams.pas' ,
- JclStrings in '..\..\source\common\JclStrings.pas' ,
- JclSynch in '..\..\source\Common\JclSynch.pas' ,
- JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
- JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
- JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
- JclValidation in '..\..\source\common\JclValidation.pas'
- ;
-
-{$LIBSUFFIX '9'}
-
-[assembly: AssemblyTitle('JEDI Code Library')]
-[assembly: AssemblyDescription('JEDI Code Library RTL package')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('1.102.0.2726')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-
-begin
-end.
Modified: trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj 2008-01-26 19:05:52 UTC (rev 2323)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<PersonalityInfo>
<Option>
<Option Name="Personality">DelphiDotNet.Personality</Option>
- <Option Name="ProjectType">Library</Option>
+ <Option Name="ProjectType"></Option>
<Option Name="Version">2.0</Option>
<Option Name="GUID">{71D14CDC-6386-44FD-B861-4C4213CFFF08}</Option>
</Option>
@@ -18,16 +18,16 @@
<Compiler>
<Compiler Name="A">0</Compiler>
<Compiler Name="B">0</Compiler>
- <Compiler Name="C">1</Compiler>
- <Compiler Name="D">1</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
<Compiler Name="E">0</Compiler>
<Compiler Name="F">0</Compiler>
<Compiler Name="G">1</Compiler>
<Compiler Name="H">1</Compiler>
- <Compiler Name="I">1</Compiler>
- <Compiler Name="J">0</Compiler>
+ <Compiler Name="I">0</Compiler>
+ <Compiler Name="J">1</Compiler>
<Compiler Name="K">0</Compiler>
- <Compiler Name="L">1</Compiler>
+ <Compiler Name="L">0</Compiler>
<Compiler Name="M">0</Compiler>
<Compiler Name="N">1</Compiler>
<Compiler Name="O">1</Compiler>
@@ -40,7 +40,7 @@
<Compiler Name="V">1</Compiler>
<Compiler Name="W">0</Compiler>
<Compiler Name="X">1</Compiler>
- <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
<Compiler Name="Z">1</Compiler>
<Compiler Name="ShowHints">True</Compiler>
<Compiler Name="ShowWarnings">True</Compiler>
@@ -125,7 +125,7 @@
<Directories Name="PackageDCPOutputDir">..\..\lib\d9.net</Directories>
<Directories Name="SearchPath">..\..\lib\d9.net;..\..\source</Directories>
<Directories Name="Packages"></Directories>
- <Directories Name="Conditionals"></Directories>
+ <Directories Name="Conditionals">RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
</Directories>
@@ -150,7 +150,7 @@
<Language Name="RootDir"></Language>
</Language>
<VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">1</VersionInfo>
<VersionInfo Name="MinorVer">102</VersionInfo>
@@ -171,7 +171,7 @@
<VersionInfoKeys Name="InternalName">Jedi.JclContainers</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">Jedi.JclContainers9.bpl</VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename">Jedi.JclContainers90.bpl</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">1.102 Build 2726</VersionInfoKeys>
<VersionInfoKeys Name="Comments"></VersionInfoKeys>
Added: trunk/jcl/packages/d9.net/Jedi.JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.JclContainers.dpk (rev 0)
+++ trunk/jcl/packages/d9.net/Jedi.JclContainers.dpk 2008-01-26 19:05:52 UTC (rev 2323)
@@ -0,0 +1,82 @@
+package Jedi.JclContainers;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 26-01-2008 18:54:27 UTC
+-----------------------------------------------------------------------------
+}
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48500000}
+{$LIBSUFFIX '90'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+ Borland.Delphi,
+ Borland.VclRtl,
+ Jedi.Jcl
+ ;
+
+contains
+ JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
+ JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
+ JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
+ JclArraySets in '..\..\source\common\JclArraySets.pas' ,
+ JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
+ JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
+ JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
+ JclHashSets in '..\..\source\common\JclHashSets.pas' ,
+ JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
+ JclQueues in '..\..\source\common\JclQueues.pas' ,
+ JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
+ JclStacks in '..\..\source\common\JclStacks.pas' ,
+ JclTrees in '..\..\source\common\JclTrees.pas' ,
+ JclVectors in '..\..\source\common\JclVectors.pas'
+ ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('JEDI Code Library Containers package')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('1.102.0.2726')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.
Property changes on: trunk/jcl/packages/d9.net/Jedi.JclContainers.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Deleted: trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr 2008-01-26 19:05:52 UTC (rev 2323)
@@ -1,50 +0,0 @@
-Package Jedi.JclContainers;
-
-uses
- Borland.Delphi,
- Borland.VclRtl,
- Jedi.Jcl
- ,
- JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
- JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
- JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
- JclArraySets in '..\..\source\common\JclArraySets.pas' ,
- JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
- JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
- JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
- JclHashSets in '..\..\source\common\JclHashSets.pas' ,
- JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
- JclQueues in '..\..\source\common\JclQueues.pas' ,
- JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
- JclStacks in '..\..\source\common\JclStacks.pas' ,
- JclTrees in '..\..\source\common\JclTrees.pas' ,
- JclVectors in '..\..\source\common\JclVectors.pas'
- ;
-
-{$LIBSUFFIX '9'}
-
-[assembly: AssemblyTitle('JEDI Code Library')]
-[assembly: AssemblyDescription('JEDI Code Library Containers package')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('1.102.0.2726')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-
-begin
-end.
Modified: trunk/jcl/packages/d9.net/template.bdsproj
===================================================================
--- trunk/jcl/packages/d9.net/template.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d9.net/template.bdsproj 2008-01-26 19:05:52 UTC (rev 2323)
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<PersonalityInfo>
<Option>
<Option Name="Personality">DelphiDotNet.Personality</Option>
- <Option Name="ProjectType">Library</Option>
+ <Option Name="ProjectType"></Option>
<Option Name="Version">2.0</Option>
<Option Name="GUID">%GUID%</Option>
</Option>
@@ -18,16 +18,16 @@
<Compiler>
<Compiler Name="A">0</Compiler>
<Compiler Name="B">0</Compiler>
- <Compiler Name="C">1</Compiler>
- <Compiler Name="D">1</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
<Compiler Name="E">0</Compiler>
<Compiler Name="F">0</Compiler>
<Compiler Name="G">1</Compiler>
<Compiler Name="H">1</Compiler>
- <Compiler Name="I">1</Compiler>
- <Compiler Name="J">0</Compiler>
+ <Compiler Name="I">0</Compiler>
+ <Compiler Name="J">1</Compiler>
<Compiler Name="K">0</Compiler>
- <Compiler Name="L">1</Compiler>
+ <Compiler Name="L">0</Compiler>
<Compiler Name="M">0</Compiler>
<Compiler Name="N">1</Compiler>
<Compiler Name="O">1</Compiler>
@@ -40,7 +40,7 @@
<Compiler Name="V">1</Compiler>
<Compiler Name="W">0</Compiler>
<Compiler Name="X">1</Compiler>
- <Compiler Name="Y">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
<Compiler Name="Z">1</Compiler>
<Compiler Name="ShowHints">True</Compiler>
<Compiler Name="ShowWarnings">True</Compiler>
@@ -125,7 +125,7 @@
<Directories Name="PackageDCPOutputDir">..\..\lib\d9.net</Directories>
<Directories Name="SearchPath">..\..\lib\d9.net;..\..\source</Directories>
<Directories Name="Packages"></Directories>
- <Directories Name="Conditionals"></Directories>
+ <Directories Name="Conditionals">RELEASE</Directories>
<Directories Name="DebugSourceDirs"></Directories>
<Directories Name="UsePackages">True</Directories>
</Directories>
@@ -150,7 +150,7 @@
<Language Name="RootDir"></Language>
</Language>
<VersionInfo>
- <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+ <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">%VERSION_MAJOR_NUMBER%</VersionInfo>
<VersionInfo Name="MinorVer">%VERSION_MINOR_NUMBER%</VersionInfo>
@@ -171,7 +171,7 @@
<VersionInfoKeys Name="InternalName">%NAME%</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">%NAME%9%BINEXTENSION%</VersionInfoKeys>
+ <VersionInfoKeys Name="OriginalFilename">%NAME%90%BINEXTENSION%</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER% Build %BUILD_NUMBER%</VersionInfoKeys>
<VersionInfoKeys Name="Comments"></VersionInfoKeys>
Copied: trunk/jcl/packages/d9.net/template.dpk (from rev 2320, trunk/jcl/packages/d10.net/template.dpk)
===================================================================
--- trunk/jcl/packages/d9.net/template.dpk (rev 0)
+++ trunk/jcl/packages/d9.net/template.dpk 2008-01-26 19:05:52 UTC (rev 2323)
@@ -0,0 +1,77 @@
+package %NAME%;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (%XMLNAME%)
+
+ Last generated: %DATETIME%
+-----------------------------------------------------------------------------
+}
+<%%% BEGIN PROGRAMONLY %%%>
+<%%% DO NOT GENERATE %%%>
+<%%% END PROGRAMONLY %%%>
+<%%% BEGIN LIBRARYONLY %%%>
+<%%% DO NOT GENERATE %%%>
+<%%% END LIBRARYONLY %%%>
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $%IMAGE_BASE%}
+{$LIBSUFFIX '90'}
+{$%TYPE%ONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+<%%% START REQUIRES %%%>
+ %NAME%,
+<%%% END REQUIRES %%%>
+ ;
+
+contains
+<%%% START FILES %%%>
+ %UNITNAME% in '%FILENAME%' {%FORMNAMEANDTYPE%},
+<%%% END FILES %%%>
+ ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('%DESCRIPTION%')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.
\ No newline at end of file
Deleted: trunk/jcl/packages/d9.net/template.dpr
===================================================================
--- trunk/jcl/packages/d9.net/template.dpr 2008-01-26 18:44:42 UTC (rev 2322)
+++ trunk/jcl/packages/d9.net/template.dpr 2008-01-26 19:05:52 UTC (rev 2323)
@@ -1,39 +0,0 @@
-%PROJECT% %NAME%;
-
-uses
-<%%% START REQUIRES %%%>
- %NAME%,
-<%%% END REQUIRES %%%>
- ,
-<%%% START FILES %%%>
- %UNITNAME% in '%FILENAME%' {%FORMNAMEANDTYPE%},
-<%%% END FILES %%%>
- ;
-
-{$LIBSUFFIX '9'}
-
-[assembly: AssemblyTitle('JEDI Code Library')]
-[assembly: AssemblyDescription('%DESCRIPTION%')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-
-begin
-end.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 18:44:44
|
Revision: 2322
http://jcl.svn.sourceforge.net/jcl/?rev=2322&view=rev
Author: outchy
Date: 2008-01-26 10:44:42 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
fixed image base
Modified Paths:
--------------
trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d10.net/template.bdsproj
Modified: trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj 2008-01-26 18:35:40 UTC (rev 2321)
+++ trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
@@ -114,7 +114,7 @@
<Linker Name="GenerateDRC">False</Linker>
<Linker Name="MinStackSize">4096</Linker>
<Linker Name="MaxStackSize">1048576</Linker>
- <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ImageBase">$48000000</Linker>
<Linker Name="ExeDescription"></Linker>
<Linker Name="GenerateHpps">False</Linker>
</Linker>
Modified: trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 18:35:40 UTC (rev 2321)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
@@ -114,7 +114,7 @@
<Linker Name="GenerateDRC">False</Linker>
<Linker Name="MinStackSize">4096</Linker>
<Linker Name="MaxStackSize">1048576</Linker>
- <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ImageBase">$48500000</Linker>
<Linker Name="ExeDescription"></Linker>
<Linker Name="GenerateHpps">False</Linker>
</Linker>
Modified: trunk/jcl/packages/d10.net/template.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/template.bdsproj 2008-01-26 18:35:40 UTC (rev 2321)
+++ trunk/jcl/packages/d10.net/template.bdsproj 2008-01-26 18:44:42 UTC (rev 2322)
@@ -114,7 +114,7 @@
<Linker Name="GenerateDRC">False</Linker>
<Linker Name="MinStackSize">4096</Linker>
<Linker Name="MaxStackSize">1048576</Linker>
- <Linker Name="ImageBase">4194304</Linker>
+ <Linker Name="ImageBase">$%IMAGE_BASE%</Linker>
<Linker Name="ExeDescription"></Linker>
<Linker Name="GenerateHpps">False</Linker>
</Linker>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 18:35:44
|
Revision: 2321
http://jcl.svn.sourceforge.net/jcl/?rev=2321&view=rev
Author: outchy
Date: 2008-01-26 10:35:40 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
style cleaning of project files:
- added unit dependency
- Release is the default configuration
Modified Paths:
--------------
trunk/jcl/packages/d11/Jcl.dproj
trunk/jcl/packages/d11/JclBaseExpert.dproj
trunk/jcl/packages/d11/JclContainers.dproj
trunk/jcl/packages/d11/JclDebugExpert.dproj
trunk/jcl/packages/d11/JclDebugExpertDLL.dproj
trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
trunk/jcl/packages/d11/JclRepositoryExpert.dproj
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
trunk/jcl/packages/d11/JclSIMDViewExpert.dproj
trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj
trunk/jcl/packages/d11/JclThreadNameExpert.dproj
trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj
trunk/jcl/packages/d11/JclVcl.dproj
trunk/jcl/packages/d11/JclVersionControlExpert.dproj
trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj
trunk/jcl/packages/d11/template.dproj
trunk/jcl/packages/d11.net/Jedi.Jcl.dproj
trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj
trunk/jcl/packages/d11.net/template.dproj
Modified: trunk/jcl/packages/d11/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11/Jcl.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/Jcl.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{44DB645B-C167-410D-9334-38AF9F0C7913}</ProjectGuid>
<MainSource>Jcl.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,89 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="Jcl.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\source\common\bzip2.pas" />
+ <DCCReference Include="..\..\source\common\Jcl8087.pas" />
+ <DCCReference Include="..\..\source\common\JclAnsiStrings.pas" />
+ <DCCReference Include="..\..\source\common\JclBase.pas" />
+ <DCCReference Include="..\..\source\common\JclBorlandTools.pas" />
+ <DCCReference Include="..\..\source\common\JclComplex.pas" />
+ <DCCReference Include="..\..\source\common\JclCompression.pas" />
+ <DCCReference Include="..\..\source\common\JclCounter.pas" />
+ <DCCReference Include="..\..\source\common\JclDateTime.pas" />
+ <DCCReference Include="..\..\source\common\JclEDI.pas" />
+ <DCCReference Include="..\..\source\common\JclEDISEF.pas" />
+ <DCCReference Include="..\..\source\common\JclEDITranslators.pas" />
+ <DCCReference Include="..\..\source\common\JclEDIXML.pas" />
+ <DCCReference Include="..\..\source\common\JclEDI_ANSIX12.pas" />
+ <DCCReference Include="..\..\source\common\JclEDI_ANSIX12_Ext.pas" />
+ <DCCReference Include="..\..\source\common\JclEDI_UNEDIFACT.pas" />
+ <DCCReference Include="..\..\source\common\JclEDI_UNEDIFACT_Ext.pas" />
+ <DCCReference Include="..\..\source\common\JclExprEval.pas" />
+ <DCCReference Include="..\..\source\common\JclFileUtils.pas" />
+ <DCCReference Include="..\..\source\common\JclIniFiles.pas" />
+ <DCCReference Include="..\..\source\common\JclLogic.pas" />
+ <DCCReference Include="..\..\source\common\JclMath.pas" />
+ <DCCReference Include="..\..\source\common\JclMIDI.pas" />
+ <DCCReference Include="..\..\source\common\JclMime.pas" />
+ <DCCReference Include="..\..\source\common\JclPCRE.pas" />
+ <DCCReference Include="..\..\source\common\JclResources.pas" />
+ <DCCReference Include="..\..\source\common\JclRTTI.pas" />
+ <DCCReference Include="..\..\source\common\JclSimpleXml.pas" />
+ <DCCReference Include="..\..\source\common\JclSchedule.pas" />
+ <DCCReference Include="..\..\source\common\JclStatistics.pas" />
+ <DCCReference Include="..\..\source\common\JclStreams.pas" />
+ <DCCReference Include="..\..\source\common\JclStrHashMap.pas" />
+ <DCCReference Include="..\..\source\common\JclStrings.pas" />
+ <DCCReference Include="..\..\source\Common\JclSynch.pas" />
+ <DCCReference Include="..\..\source\common\JclSysInfo.pas" />
+ <DCCReference Include="..\..\source\common\JclSysUtils.pas" />
+ <DCCReference Include="..\..\source\common\JclUnitConv.pas" />
+ <DCCReference Include="..\..\source\common\JclUnitVersioning.pas" />
+ <DCCReference Include="..\..\source\common\JclUnitVersioningProviders.pas" />
+ <DCCReference Include="..\..\source\common\JclValidation.pas" />
+ <DCCReference Include="..\..\source\common\JclWideStrings.pas" />
+ <DCCReference Include="..\..\source\common\pcre.pas" />
+ <DCCReference Include="..\..\source\windows\Hardlinks.pas" />
+ <DCCReference Include="..\..\source\windows\JclAppInst.pas" />
+ <DCCReference Include="..\..\source\windows\JclCIL.pas" />
+ <DCCReference Include="..\..\source\windows\JclCLR.pas" />
+ <DCCReference Include="..\..\source\windows\JclCOM.pas" />
+ <DCCReference Include="..\..\source\windows\JclConsole.pas" />
+ <DCCReference Include="..\..\source\windows\JclDebug.pas" />
+ <DCCReference Include="..\..\source\windows\JclDotNet.pas" />
+ <DCCReference Include="..\..\source\windows\JclHookExcept.pas" />
+ <DCCReference Include="..\..\source\windows\JclLANMan.pas" />
+ <DCCReference Include="..\..\source\windows\JclLocales.pas" />
+ <DCCReference Include="..\..\source\windows\JclMapi.pas" />
+ <DCCReference Include="..\..\source\windows\JclMetadata.pas" />
+ <DCCReference Include="..\..\source\windows\JclMiscel.pas" />
+ <DCCReference Include="..\..\source\windows\JclMsdosSys.pas" />
+ <DCCReference Include="..\..\source\windows\JclMultimedia.pas" />
+ <DCCReference Include="..\..\source\windows\JclNTFS.pas" />
+ <DCCReference Include="..\..\source\windows\JclPeImage.pas" />
+ <DCCReference Include="..\..\source\windows\JclRegistry.pas" />
+ <DCCReference Include="..\..\source\windows\JclSecurity.pas" />
+ <DCCReference Include="..\..\source\windows\JclShell.pas" />
+ <DCCReference Include="..\..\source\windows\JclStructStorage.pas" />
+ <DCCReference Include="..\..\source\windows\JclSvcCtrl.pas" />
+ <DCCReference Include="..\..\source\windows\JclTask.pas" />
+ <DCCReference Include="..\..\source\windows\JclTD32.pas" />
+ <DCCReference Include="..\..\source\windows\JclUnicode.pas" />
+ <DCCReference Include="..\..\source\windows\JclWideFormat.pas" />
+ <DCCReference Include="..\..\source\windows\JclWin32.pas" />
+ <DCCReference Include="..\..\source\windows\JclWin32Ex.pas" />
+ <DCCReference Include="..\..\source\windows\JclWinMIDI.pas" />
+ <DCCReference Include="..\..\source\windows\mscoree_TLB.pas" />
+ <DCCReference Include="..\..\source\windows\mscorlib_TLB.pas" />
+ <DCCReference Include="..\..\source\windows\MSHelpServices_TLB.pas" />
+ <DCCReference Include="..\..\source\windows\MSTask.pas" />
+ <DCCReference Include="..\..\source\windows\Snmp.pas" />
+ <DCCReference Include="..\..\source\windows\zlibh.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclBaseExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclBaseExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclBaseExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclBaseExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,19 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclBaseExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\common\JclOtaUtils.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaResources.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaConsts.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaExceptionForm.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaConfigurationForm.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaActionConfigureSheet.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaWizardForm.pas" />
+ <DCCReference Include="..\..\experts\common\JclOtaWizardFrame.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d11/JclContainers.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclContainers.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{71D14CDC-6386-44FD-B861-4C4213CFFF08}</ProjectGuid>
<MainSource>JclContainers.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,25 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclContainers.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\source\common\JclAbstractContainers.pas" />
+ <DCCReference Include="..\..\source\common\JclAlgorithms.pas" />
+ <DCCReference Include="..\..\source\common\JclArrayLists.pas" />
+ <DCCReference Include="..\..\source\common\JclArraySets.pas" />
+ <DCCReference Include="..\..\source\common\JclBinaryTrees.pas" />
+ <DCCReference Include="..\..\source\common\JclContainerIntf.pas" />
+ <DCCReference Include="..\..\source\common\JclHashMaps.pas" />
+ <DCCReference Include="..\..\source\common\JclHashSets.pas" />
+ <DCCReference Include="..\..\source\common\JclLinkedLists.pas" />
+ <DCCReference Include="..\..\source\common\JclQueues.pas" />
+ <DCCReference Include="..\..\source\common\JclSortedMaps.pas" />
+ <DCCReference Include="..\..\source\common\JclStacks.pas" />
+ <DCCReference Include="..\..\source\common\JclTrees.pas" />
+ <DCCReference Include="..\..\source\common\JclVectors.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclDebugExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDebugExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclDebugExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclDebugExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,14 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclDebugExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeResult.pas" />
+ <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeImpl.pas" />
+ <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeConfigFrame.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclDebugExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDebugExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclDebugExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclDebugExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,14 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclDebugExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeResult.pas" />
+ <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeImpl.pas" />
+ <DCCReference Include="..\..\experts\debug\converter\JclDebugIdeConfigFrame.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclFavoriteFoldersExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,13 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclFavoriteFoldersExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" />
+ <DCCReference Include="..\..\experts\favfolders\OpenDlgFavAdapter.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclFavoriteFoldersExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,13 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclFavoriteFoldersExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\favfolders\IdeOpenDlgFavoriteUnit.pas" />
+ <DCCReference Include="..\..\experts\favfolders\OpenDlgFavAdapter.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclProjectAnalysisExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,13 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclProjectAnalysisExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\projectanalyzer\ProjAnalyzerFrm.pas" />
+ <DCCReference Include="..\..\experts\projectanalyzer\ProjAnalyzerImpl.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclProjectAnalysisExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,13 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclProjectAnalysisExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\projectanalyzer\ProjAnalyzerFrm.pas" />
+ <DCCReference Include="..\..\experts\projectanalyzer\ProjAnalyzerImpl.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclRepositoryExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclRepositoryExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclRepositoryExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,21 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclRepositoryExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgRepository.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgWizard.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgFileFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgFormFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgSystemFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgTraceFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgIgnoreFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclRepositoryExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,21 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclRepositoryExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\repository\JclOtaTemplates.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryUtils.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgRepository.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgWizard.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgFileFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgFormFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgSystemFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgTraceFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaExcDlgIgnoreFrame.pas" />
+ <DCCReference Include="..\..\experts\repository\JclOtaRepositoryReg.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclSIMDViewExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclSIMDViewExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclSIMDViewExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclSIMDViewExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,16 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclSIMDViewExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDViewForm.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDView.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDUtils.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDModifyForm.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDCpuInfo.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclSIMDViewExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,16 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclSIMDViewExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDViewForm.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDView.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDUtils.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDModifyForm.pas" />
+ <DCCReference Include="..\..\experts\debug\simdview\JclSIMDCpuInfo.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclThreadNameExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclThreadNameExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclThreadNameExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,13 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclThreadNameExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas" />
+ <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertUnit.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclThreadNameExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,13 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclThreadNameExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas" />
+ <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertUnit.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclVcl.dproj
===================================================================
--- trunk/jcl/packages/d11/JclVcl.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclVcl.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclVcl.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,15 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclVcl.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\source\vcl\JclPrint.pas" />
+ <DCCReference Include="..\..\source\vcl\JclGraphUtils.pas" />
+ <DCCReference Include="..\..\source\vcl\JclGraphics.pas" />
+ <DCCReference Include="..\..\source\vcl\JclFont.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclVersionControlExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclVersionControlExpert.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclVersionControlExpert.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclVersionControlExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,15 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclVersionControlExpert.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\versioncontrol\VersionControlImpl.pas" />
+ <DCCReference Include="..\..\experts\versioncontrol\JclVersionCtrlCommonOptions.pas" />
+ <DCCReference Include="..\..\experts\versioncontrol\JclVersionCtrlCVSImpl.pas" />
+ <DCCReference Include="..\..\experts\versioncontrol\JclVersionCtrlSVNImpl.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid></ProjectGuid>
<MainSource>JclVersionControlExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,15 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="JclVersionControlExpertDLL.dpr">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+ <DCCReference Include="..\..\experts\versioncontrol\VersionControlImpl.pas" />
+ <DCCReference Include="..\..\experts\versioncontrol\JclVersionCtrlCommonOptions.pas" />
+ <DCCReference Include="..\..\experts\versioncontrol\JclVersionCtrlCVSImpl.pas" />
+ <DCCReference Include="..\..\experts\versioncontrol\JclVersionCtrlSVNImpl.pas" />
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11/template.dproj
===================================================================
--- trunk/jcl/packages/d11/template.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11/template.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>%GUID%</ProjectGuid>
<MainSource>%NAME%%SOURCEEXTENSION%</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
</PropertyGroup>
@@ -79,12 +79,14 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
- <ItemGroup />
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="%NAME%%SOURCEEXTENSION%">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="rtl.dcp" />
+<%%% START FILES %%%>
+ <DCCReference Include="%FILENAME%" />
+<%%% END FILES %%%>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11.net/Jedi.Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.Jcl.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11.net/Jedi.Jcl.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -3,7 +3,7 @@
<PropertyGroup>
<ProjectGuid>{44DB645B-C167-410D-9334-38AF9F0C7913}</ProjectGuid>
<MainSource>Jedi.Jcl.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCCIL</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>Jedi.Jcl.bpl</DCC_DependencyCheckOutputName>
@@ -91,6 +91,7 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="Jedi.Jcl.dpk">
<MainSource>MainSource</MainSource>
@@ -125,5 +126,4 @@
<DCCReference Include="..\..\source\common\JclUnitConv.pas"/>
<DCCReference Include="..\..\source\common\JclValidation.pas"/>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -3,7 +3,7 @@
<PropertyGroup>
<ProjectGuid>{71D14CDC-6386-44FD-B861-4C4213CFFF08}</ProjectGuid>
<MainSource>Jedi.JclContainers.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCCIL</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>Jedi.JclContainers.bpl</DCC_DependencyCheckOutputName>
@@ -91,6 +91,7 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="Jedi.JclContainers.dpk">
<MainSource>MainSource</MainSource>
@@ -110,5 +111,4 @@
<DCCReference Include="..\..\source\common\JclTrees.pas"/>
<DCCReference Include="..\..\source\common\JclVectors.pas"/>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d11.net/template.dproj
===================================================================
--- trunk/jcl/packages/d11.net/template.dproj 2008-01-26 18:03:00 UTC (rev 2320)
+++ trunk/jcl/packages/d11.net/template.dproj 2008-01-26 18:35:40 UTC (rev 2321)
@@ -3,7 +3,7 @@
<PropertyGroup>
<ProjectGuid>%GUID%</ProjectGuid>
<MainSource>%NAME%%SOURCEEXTENSION%</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<DCC_DCCCompiler>DCCIL</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>%NAME%%BINEXTENSION%</DCC_DependencyCheckOutputName>
@@ -107,6 +107,7 @@
</BorlandProject>
</BorlandProject>
</ProjectExtensions>
+ <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>
<DelphiCompile Include="%NAME%%SOURCEEXTENSION%">
<MainSource>MainSource</MainSource>
@@ -115,5 +116,4 @@
<DCCReference Include="%FILENAME%"/>
<%%% END FILES %%%>
</ItemGroup>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 18:03:02
|
Revision: 2320
http://jcl.svn.sourceforge.net/jcl/?rev=2320&view=rev
Author: outchy
Date: 2008-01-26 10:03:00 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
fix compilation errors with Delphi.net 2007.
Modified Paths:
--------------
trunk/jcl/source/common/JclSynch.pas
Modified: trunk/jcl/source/common/JclSynch.pas
===================================================================
--- trunk/jcl/source/common/JclSynch.pas 2008-01-26 16:21:31 UTC (rev 2319)
+++ trunk/jcl/source/common/JclSynch.pas 2008-01-26 18:03:00 UTC (rev 2320)
@@ -178,15 +178,15 @@
end;
{$ENDIF ~CLR}
- {$IFNDEF CLR11}
+ {$IFNDEF CLR}
TJclSemaphore = class(TJclDispatcherObject)
public
- constructor Create({$IFNDEF CLR}SecAttr: PSecurityAttributes;{$ENDIF} Initial, Maximum: Longint; const Name: string);
+ constructor Create(SecAttr: PSecurityAttributes; Initial, Maximum: Longint; const Name: string);
constructor Open(Access: Cardinal; Inheritable: Boolean; const Name: string);
function Release(ReleaseCount: Longint): Boolean;
function ReleasePrev(ReleaseCount: Longint; var PrevCount: Longint): Boolean;
end;
- {$ENDIF ~CLR11}
+ {$ENDIF ~CLR}
{$IFNDEF CLR11}
TJclMutex = class(TJclDispatcherObject)
@@ -712,7 +712,7 @@
//== { TJclCriticalSectionEx } ===============================================
-{$IFNDEF CLR11}
+{$IFNDEF CLR}
const
DefaultCritSectSpinCount = 4000;
@@ -770,7 +770,7 @@
Result := TryEnterCriticalSection(FCriticalSection);
end;
-{$ENDIF ~CLR11}
+{$ENDIF ~CLR}
//== { TJclEvent } ===========================================================
@@ -900,7 +900,7 @@
//== { TJclSemaphore } =======================================================
-{$IFNDEF CLR11}
+{$IFNDEF CLR}
constructor TJclSemaphore.Create(SecAttr: PSecurityAttributes;
Initial, Maximum: Integer; const Name: string);
begin
@@ -932,7 +932,7 @@
begin
Result := Windows.ReleaseSemaphore(FHandle, ReleaseCount, nil);
end;
-{$ENDIF ~CLR11}
+{$ENDIF ~CLR}
//=== { TJclMutex } ==========================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 16:21:33
|
Revision: 2319
http://jcl.svn.sourceforge.net/jcl/?rev=2319&view=rev
Author: outchy
Date: 2008-01-26 08:21:31 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
inlining ReadLock/ReadUnlock/WriteLock/WriteUnlock calls.
Modified Paths:
--------------
trunk/jcl/source/common/JclAbstractContainers.pas
trunk/jcl/source/common/JclArrayLists.pas
trunk/jcl/source/common/JclArraySets.pas
trunk/jcl/source/common/JclBinaryTrees.pas
trunk/jcl/source/common/JclHashMaps.pas
trunk/jcl/source/common/JclHashSets.pas
trunk/jcl/source/common/JclLinkedLists.pas
trunk/jcl/source/common/JclQueues.pas
trunk/jcl/source/common/JclSortedMaps.pas
trunk/jcl/source/common/JclStacks.pas
trunk/jcl/source/common/JclTrees.pas
trunk/jcl/source/common/JclVectors.pas
trunk/jcl/source/prototypes/JclArrayLists.pas
trunk/jcl/source/prototypes/JclArraySets.pas
trunk/jcl/source/prototypes/JclBinaryTrees.pas
trunk/jcl/source/prototypes/JclHashMaps.pas
trunk/jcl/source/prototypes/JclHashSets.pas
trunk/jcl/source/prototypes/JclLinkedLists.pas
trunk/jcl/source/prototypes/JclQueues.pas
trunk/jcl/source/prototypes/JclSortedMaps.pas
trunk/jcl/source/prototypes/JclStacks.pas
trunk/jcl/source/prototypes/JclTrees.pas
trunk/jcl/source/prototypes/JclVectors.pas
trunk/jcl/source/prototypes/containers/JclContainerCommon.imp
Modified: trunk/jcl/source/common/JclAbstractContainers.pas
===================================================================
--- trunk/jcl/source/common/JclAbstractContainers.pas 2008-01-26 15:53:37 UTC (rev 2318)
+++ trunk/jcl/source/common/JclAbstractContainers.pas 2008-01-26 16:21:31 UTC (rev 2319)
@@ -55,10 +55,9 @@
TJclAbstractLockable = class(TInterfacedObject {$IFDEF THREADSAFE}, IJclLockable {$ENDIF THREADSAFE})
{$IFDEF THREADSAFE}
- private
+ protected
FThreadSafe: Boolean;
- SyncReaderWriter: TJclMultiReadExclusiveWrite;
- protected
+ FSyncReaderWriter: TJclMultiReadExclusiveWrite;
procedure ReadLock;
procedure ReadUnlock;
procedure WriteLock;
@@ -66,6 +65,8 @@
public
constructor Create;
destructor Destroy; override;
+
+ property SyncReaderWriter: TJclMultiReadExclusiveWrite read FSyncReaderWriter;
{$ENDIF THREADSAFE}
end;
@@ -650,12 +651,12 @@
begin
inherited Create;
FThreadSafe := True;
- SyncReaderWriter := TJclMultiReadExclusiveWrite.Create{$IFNDEF CLR}(mpReaders){$ENDIF ~CLR};
+ FSyncReaderWriter := TJclMultiReadExclusiveWrite.Create{$IFNDEF CLR}(mpReaders){$ENDIF ~CLR};
end;
destructor TJclAbstractLockable.Destroy;
begin
- SyncReaderWriter.Free;
+ FSyncReaderWriter.Free;
inherited Destroy;
end;
Modified: trunk/jcl/source/common/JclArrayLists.pas
===================================================================
--- trunk/jcl/source/common/JclArrayLists.pas 2008-01-26 15:53:37 UTC (rev 2318)
+++ trunk/jcl/source/common/JclArrayLists.pas 2008-01-26 16:21:31 UTC (rev 2319)
@@ -52,7 +52,7 @@
{$ENDIF CLR}
JclAlgorithms,
{$ENDIF SUPPORTS_GENERICS}
- JclBase, JclAbstractContainers, JclContainerIntf;
+ JclBase, JclAbstractContainers, JclContainerIntf, JclSynch;
type
TJclIntfArrayList = class(TJclIntfAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntfEqualityComparer,
@@ -2881,7 +2881,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AInterface, nil);
@@ -2909,7 +2910,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -2924,7 +2926,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -2962,7 +2965,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -2994,7 +2998,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -3003,7 +3008,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3013,7 +3019,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3025,7 +3032,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3035,7 +3043,8 @@
It: IJclIntfIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3047,7 +3056,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3063,7 +3073,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -3081,7 +3092,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3092,7 +3104,8 @@
It: IJclIntfIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3107,7 +3120,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3127,7 +3141,8 @@
function TJclIntfArrayList.GetObject(Index: Integer): IInterface;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := nil;
@@ -3138,7 +3153,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3148,7 +3164,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -3160,7 +3177,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3170,7 +3188,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AInterface, nil);
@@ -3204,7 +3223,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3216,7 +3236,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3231,7 +3252,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3251,7 +3273,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -3263,7 +3286,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3275,7 +3299,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3293,7 +3318,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3305,7 +3331,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3317,7 +3344,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3329,7 +3357,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3341,7 +3370,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3351,7 +3381,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -3363,7 +3394,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3376,7 +3408,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -3401,7 +3434,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3417,7 +3451,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -3428,7 +3463,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3473,7 +3509,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AString, '');
@@ -3501,7 +3538,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3516,7 +3554,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3554,7 +3593,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3586,7 +3626,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -3595,7 +3636,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3605,7 +3647,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3617,7 +3660,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3627,7 +3671,8 @@
It: IJclAnsiStrIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3639,7 +3684,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3655,7 +3701,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -3673,7 +3720,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3684,7 +3732,8 @@
It: IJclAnsiStrIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3699,7 +3748,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3719,7 +3769,8 @@
function TJclAnsiStrArrayList.GetString(Index: Integer): AnsiString;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := '';
@@ -3730,7 +3781,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3740,7 +3792,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -3752,7 +3805,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3762,7 +3816,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AString, '');
@@ -3796,7 +3851,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3808,7 +3864,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3823,7 +3880,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3843,7 +3901,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -3855,7 +3914,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -3867,7 +3927,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3885,7 +3946,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3897,7 +3959,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3909,7 +3972,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3921,7 +3985,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -3933,7 +3998,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3943,7 +4009,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -3955,7 +4022,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -3968,7 +4036,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -3993,7 +4062,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4009,7 +4079,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -4020,7 +4091,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4065,7 +4137,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AString, '');
@@ -4093,7 +4166,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4108,7 +4182,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4146,7 +4221,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4178,7 +4254,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -4187,7 +4264,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4197,7 +4275,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4209,7 +4288,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4219,7 +4299,8 @@
It: IJclWideStrIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4231,7 +4312,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4247,7 +4329,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -4265,7 +4348,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4276,7 +4360,8 @@
It: IJclWideStrIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4291,7 +4376,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4311,7 +4397,8 @@
function TJclWideStrArrayList.GetString(Index: Integer): WideString;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := '';
@@ -4322,7 +4409,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4332,7 +4420,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -4344,7 +4433,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4354,7 +4444,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AString, '');
@@ -4388,7 +4479,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4400,7 +4492,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4415,7 +4508,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4435,7 +4529,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -4447,7 +4542,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4459,7 +4555,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4477,7 +4574,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4489,7 +4587,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4501,7 +4600,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4513,7 +4613,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4525,7 +4626,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4535,7 +4637,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -4547,7 +4650,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4560,7 +4664,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -4585,7 +4690,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4601,7 +4707,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -4612,7 +4719,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4657,7 +4765,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0.0);
@@ -4685,7 +4794,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4700,7 +4810,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4738,7 +4849,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4770,7 +4882,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -4779,7 +4892,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4789,7 +4903,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4801,7 +4916,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4811,7 +4927,8 @@
It: IJclSingleIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4823,7 +4940,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4839,7 +4957,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -4857,7 +4976,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4868,7 +4988,8 @@
It: IJclSingleIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -4883,7 +5004,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4903,7 +5025,8 @@
function TJclSingleArrayList.GetValue(Index: Integer): Single;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := 0.0;
@@ -4914,7 +5037,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4924,7 +5048,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -4936,7 +5061,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -4946,7 +5072,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0.0);
@@ -4980,7 +5107,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -4992,7 +5120,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5007,7 +5136,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5027,7 +5157,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -5039,7 +5170,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5051,7 +5183,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5069,7 +5202,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5081,7 +5215,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5093,7 +5228,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5105,7 +5241,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5117,7 +5254,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5127,7 +5265,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -5139,7 +5278,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5152,7 +5292,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -5177,7 +5318,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5193,7 +5335,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -5204,7 +5347,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5249,7 +5393,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0.0);
@@ -5277,7 +5422,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5292,7 +5438,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5330,7 +5477,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5362,7 +5510,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -5371,7 +5520,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5381,7 +5531,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5393,7 +5544,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5403,7 +5555,8 @@
It: IJclDoubleIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5415,7 +5568,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5431,7 +5585,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -5449,7 +5604,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5460,7 +5616,8 @@
It: IJclDoubleIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5475,7 +5632,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5495,7 +5653,8 @@
function TJclDoubleArrayList.GetValue(Index: Integer): Double;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := 0.0;
@@ -5506,7 +5665,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5516,7 +5676,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -5528,7 +5689,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5538,7 +5700,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0.0);
@@ -5572,7 +5735,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5584,7 +5748,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5599,7 +5764,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5619,7 +5785,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -5631,7 +5798,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5643,7 +5811,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5661,7 +5830,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5673,7 +5843,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5685,7 +5856,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5697,7 +5869,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5709,7 +5882,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5719,7 +5893,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -5731,7 +5906,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5744,7 +5920,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -5769,7 +5946,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5785,7 +5963,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -5796,7 +5975,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5841,7 +6021,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0.0);
@@ -5869,7 +6050,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5884,7 +6066,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5922,7 +6105,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5954,7 +6138,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -5963,7 +6148,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -5973,7 +6159,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -5985,7 +6172,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -5995,7 +6183,8 @@
It: IJclExtendedIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6007,7 +6196,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6023,7 +6213,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -6041,7 +6232,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6052,7 +6244,8 @@
It: IJclExtendedIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6067,7 +6260,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6087,7 +6281,8 @@
function TJclExtendedArrayList.GetValue(Index: Integer): Extended;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := 0.0;
@@ -6098,7 +6293,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6108,7 +6304,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -6120,7 +6317,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6130,7 +6328,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0.0);
@@ -6164,7 +6363,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6176,7 +6376,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6191,7 +6392,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6211,7 +6413,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -6223,7 +6426,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6235,7 +6439,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6253,7 +6458,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6265,7 +6471,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6277,7 +6484,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6289,7 +6497,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6301,7 +6510,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6311,7 +6521,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -6323,7 +6534,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6336,7 +6548,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -6361,7 +6574,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6377,7 +6591,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -6388,7 +6603,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6433,7 +6649,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0);
@@ -6461,7 +6678,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6476,7 +6694,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6514,7 +6733,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6546,7 +6766,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -6555,7 +6776,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6565,7 +6787,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6577,7 +6800,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6587,7 +6811,8 @@
It: IJclIntegerIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6599,7 +6824,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6615,7 +6841,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -6633,7 +6860,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6644,7 +6872,8 @@
It: IJclIntegerIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6659,7 +6888,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6679,7 +6909,8 @@
function TJclIntegerArrayList.GetValue(Index: Integer): Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := 0;
@@ -6690,7 +6921,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6700,7 +6932,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -6712,7 +6945,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6722,7 +6956,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0);
@@ -6756,7 +6991,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6768,7 +7004,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6783,7 +7020,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6803,7 +7041,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -6815,7 +7054,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -6827,7 +7067,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6845,7 +7086,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6857,7 +7099,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6869,7 +7112,8 @@
Result := Remove(It.Next) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6881,7 +7125,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -6893,7 +7138,8 @@
Delete(I);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6903,7 +7149,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if Value >= FSize then
@@ -6915,7 +7162,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6928,7 +7176,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
if (Index < 0) or (Index >= FSize) then
@@ -6953,7 +7202,8 @@
Delete(Index);
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -6969,7 +7219,8 @@
Last: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Last := First + Count - 1;
@@ -6980,7 +7231,8 @@
Result.Add(FElementData[I]);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -7025,7 +7277,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0);
@@ -7053,7 +7306,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -7068,7 +7322,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -7106,7 +7361,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -7138,7 +7394,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
for I := 0 to FSize - 1 do
@@ -7147,7 +7404,8 @@
AutoPack;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -7157,7 +7415,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -7169,7 +7428,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -7179,7 +7439,8 @@
It: IJclCardinalIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -7191,7 +7452,8 @@
Result := Contains(It.Next);
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -7207,7 +7469,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
{$IFDEF CLR}
@@ -7225,7 +7488,8 @@
raise EJclOutOfBoundsError.Create;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -7236,7 +7500,8 @@
It: IJclCardinalIterator;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -7251,7 +7516,8 @@
Result := True;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -7271,7 +7537,8 @@
function TJclCardinalArrayList.GetValue(Index: Integer): Cardinal;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := 0;
@@ -7282,7 +7549,8 @@
raise EJclNoSuchElementError.Create(IntToStr(Index));
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -7292,7 +7560,8 @@
I: Integer;
begin
{$IFDEF THREADSAFE}
- ReadLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginRead;
try
{$ENDIF THREADSAFE}
Result := -1;
@@ -7304,7 +7573,8 @@
end;
{$IFDEF THREADSAFE}
finally
- ReadUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndRead;
end;
{$ENDIF THREADSAFE}
end;
@@ -7314,7 +7584,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := FAllowDefaultElements or not ItemsEqual(AValue, 0);
@@ -7348,7 +7619,8 @@
end;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -7360,7 +7632,8 @@
if ReadOnly then
raise EJclReadOnlyError.Create;
{$IFDEF THREADSAFE}
- WriteLock;
+ if FThreadSafe then
+ SyncReaderWriter.BeginWrite;
try
{$ENDIF THREADSAFE}
Result := False;
@@ -7375,7 +7648,8 @@
Result := Insert(Index, It.Previous) and Result;
{$IFDEF THREADSAFE}
finally
- WriteUnlock;
+ if FThreadSafe then
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
end;
@@ -7395,7 +7...
[truncated message content] |
|
From: <ou...@us...> - 2008-01-26 15:53:38
|
Revision: 2318
http://jcl.svn.sourceforge.net/jcl/?rev=2318&view=rev
Author: outchy
Date: 2008-01-26 07:53:37 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
changing ThreadSafe synchronization for containers to JclSynch.TJclMultiReadExclusiveWrite
Modified Paths:
--------------
trunk/jcl/source/common/JclAbstractContainers.pas
Modified: trunk/jcl/source/common/JclAbstractContainers.pas
===================================================================
--- trunk/jcl/source/common/JclAbstractContainers.pas 2008-01-26 15:15:54 UTC (rev 2317)
+++ trunk/jcl/source/common/JclAbstractContainers.pas 2008-01-26 15:53:37 UTC (rev 2318)
@@ -27,7 +27,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -43,18 +43,10 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- {$IFDEF CLR}
- System.Threading,
- {$ELSE}
- {$IFDEF MSWINDOWS}
- Windows,
- {$ENDIF MSWINDOWS}
- {$ENDIF CLR}
{$IFDEF HAS_UNIT_LIBC}
Libc,
{$ENDIF HAS_UNIT_LIBC}
- SyncObjs,
- SysUtils, Classes, JclBase, JclContainerIntf, JclSysUtils;
+ SysUtils, Classes, JclBase, JclContainerIntf, JclSynch, JclSysUtils;
type
{$IFDEF KEEP_DEPRECATED}
@@ -65,22 +57,16 @@
{$IFDEF THREADSAFE}
private
FThreadSafe: Boolean;
- {$IFDEF CLR}
- FReaderWriterLock: ReaderWriterLock;
- FUpgradedWrite: Boolean;
- FLockCookie: LockCookie;
- {$ELSE ~CLR}
- FCriticalSection: TCriticalSection;
- {$ENDIF ~CLR}
+ SyncReaderWriter: TJclMultiReadExclusiveWrite;
protected
procedure ReadLock;
procedure ReadUnlock;
procedure WriteLock;
procedure WriteUnlock;
public
+ constructor Create;
destructor Destroy; override;
{$ENDIF THREADSAFE}
- constructor Create;
end;
TJclAbstractContainerBase = class(TJclAbstractLockable, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
@@ -658,92 +644,43 @@
//=== { TJclAbstractLockable } ===============================================
+{$IFDEF THREADSAFE}
+
constructor TJclAbstractLockable.Create;
begin
inherited Create;
- {$IFDEF THREADSAFE}
- {$IFDEF CLR}
- FReaderWriterLock := ReaderWriterLock.Create;
- {$ELSE ~CLR}
- FCriticalSection := TCriticalSection.Create;
- {$ENDIF ~CLR}
FThreadSafe := True;
- {$ENDIF THREADSAFE}
+ SyncReaderWriter := TJclMultiReadExclusiveWrite.Create{$IFNDEF CLR}(mpReaders){$ENDIF ~CLR};
end;
-{$IFDEF THREADSAFE}
destructor TJclAbstractLockable.Destroy;
begin
- {$IFDEF CLR}
- FReaderWriterLock.Free;
- {$ELSE ~CLR}
- FCriticalSection.Free;
- {$ENDIF ~CLR}
+ SyncReaderWriter.Free;
inherited Destroy;
end;
procedure TJclAbstractLockable.ReadLock;
begin
if FThreadSafe then
- begin
- {$IFDEF CLR}
- // if current thread has write access, no need to request a read access
- if not FReaderWriterLock.IsWriterLockHeld then
- FReaderWriterLock.AcquireReaderLock(-1);
- {$ELSE ~CLR}
- FCriticalSection.Acquire;
- {$ENDIF ~CLR}
- end;
+ SyncReaderWriter.BeginRead;
end;
procedure TJclAbstractLockable.ReadUnlock;
begin
if FThreadSafe then
- begin
- {$IFDEF CLR}
- // if current thread has write access, no need to release read access
- if not FReaderWriterLock.IsWriterLockHeld then
- FReaderWriterLock.ReleaseReaderLock;
- {$ELSE ~CLR}
- FCriticalSection.Release;
- {$ENDIF ~CLR}
- end;
+ SyncReaderWriter.EndRead;
end;
procedure TJclAbstractLockable.WriteLock;
begin
if FThreadSafe then
- begin
- {$IFDEF CLR}
- if FReaderWriterLock.IsReaderLockHeld then
- begin
- FLockCookie := FReaderWriterLock.UpgradeToWriterLock(-1);
- FUpgradedWrite := True;
- end
- else
- FReaderWriterLock.AcquireWriterLock(-1);
- {$ELSE ~CLR}
- FCriticalSection.Acquire;
- {$ENDIF ~CLR}
- end;
+ SyncReaderWriter.BeginWrite;
end;
procedure TJclAbstractLockable.WriteUnlock;
begin
if FThreadSafe then
- begin
- {$IFDEF CLR}
- if FUpgradedWrite then
- begin
- FUpgradedWrite := False;
- FReaderWriterLock.DowngradeFromWriterLock(FLockCookie);
- end
- else
- FReaderWriterLock.ReleaseWriterLock;
- {$ELSE ~CLR}
- FCriticalSection.Release;
- {$ENDIF ~CLR}
- end;
+ SyncReaderWriter.EndWrite;
end;
{$ENDIF THREADSAFE}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 15:15:56
|
Revision: 2317
http://jcl.svn.sourceforge.net/jcl/?rev=2317&view=rev
Author: outchy
Date: 2008-01-26 07:15:54 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
the installer now compiles .net containers package.
.net containers package now depends on Jedi.Jcl.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
trunk/jcl/packages/d11.net/Jedi.JclContainers.dpk
trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj
trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr
trunk/jcl/packages/xml/JclContainers-R.xml
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/install/JclInstall.pas 2008-01-26 15:15:54 UTC (rev 2317)
@@ -659,12 +659,16 @@
VersionDirExp = '\%%s';
{$ENDIF}
+ // native packages
JclDpk = 'Jcl';
JclContainersDpk = 'JclContainers';
JclVclDpk = 'JclVcl';
JclVClxDpk = 'JclVClx';
- JediJclDpk = 'Jedi.Jcl';
+ // .net packages
+ JediJclDpk = 'Jedi.Jcl';
+ JediJclContainersDpk = 'Jedi.JclContainers';
+
JclExpertBase = 'JclBaseExpert';
JclExpertDebug = 'JclDebugExpert';
JclExpertAnalyzer = 'JclProjectAnalysisExpert';
@@ -1802,7 +1806,7 @@
{$IFDEF MSWINDOWS}
else
// CLR installation
- Result := CompileCLRPackage(JediJclDpk);
+ Result := CompileCLRPackage(JediJclDpk) and CompileCLRPackage(JediJclContainersDpk);
{$ENDIF MSWINDOWS}
end;
end;
Modified: trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 15:15:54 UTC (rev 2317)
@@ -179,6 +179,7 @@
<FileList>
<File FileName="" ContainerId="" ModuleName="Borland.Delphi"/>
<File FileName="" ContainerId="" ModuleName="Borland.VclRtl"/>
+ <File FileName="" ContainerId="" ModuleName="Jedi.Jcl"/>
<File FileName="..\..\source\common\JclAbstractContainers.pas" ContainerId="" ModuleName="JclAbstractContainers"/>
<File FileName="..\..\source\common\JclAlgorithms.pas" ContainerId="" ModuleName="JclAlgorithms"/>
<File FileName="..\..\source\common\JclArrayLists.pas" ContainerId="" ModuleName="JclArrayLists"/>
Modified: trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk 2008-01-26 15:15:54 UTC (rev 2317)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
- Last generated: 26-01-2008 14:49:58 UTC
+ Last generated: 26-01-2008 15:05:38 UTC
-----------------------------------------------------------------------------
}
@@ -35,7 +35,8 @@
requires
Borland.Delphi,
- Borland.VclRtl
+ Borland.VclRtl,
+ Jedi.Jcl
;
contains
Modified: trunk/jcl/packages/d11.net/Jedi.JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.JclContainers.dpk 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/d11.net/Jedi.JclContainers.dpk 2008-01-26 15:15:54 UTC (rev 2317)
@@ -4,7 +4,7 @@
DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
- Last generated: 16-01-2008 21:18:35 UTC
+ Last generated: 26-01-2008 15:05:39 UTC
-----------------------------------------------------------------------------
}
@@ -35,7 +35,8 @@
requires
Borland.Delphi,
- Borland.VclRtl
+ Borland.VclRtl,
+ Jedi.Jcl
;
contains
Modified: trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj 2008-01-26 15:15:54 UTC (rev 2317)
@@ -8,7 +8,7 @@
<DCC_DCCCompiler>DCCIL</DCC_DCCCompiler>
<DCC_DependencyCheckOutputName>Jedi.JclContainers.bpl</DCC_DependencyCheckOutputName>
<DCC_EnabledPackages>true</DCC_EnabledPackages>
- <DCC_UsePackage>Borland.Delphi;Borland.VclRtl</DCC_UsePackage>
+ <DCC_UsePackage>Borland.Delphi;Borland.VclRtl;Jedi.Jcl</DCC_UsePackage>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Version>7.0</Version>
Modified: trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj 2008-01-26 15:15:54 UTC (rev 2317)
@@ -179,6 +179,7 @@
<FileList>
<File FileName="" ContainerId="" ModuleName="Borland.Delphi"/>
<File FileName="" ContainerId="" ModuleName="Borland.VclRtl"/>
+ <File FileName="" ContainerId="" ModuleName="Jedi.Jcl"/>
<File FileName="..\..\source\common\JclAbstractContainers.pas" ContainerId="" ModuleName="JclAbstractContainers"/>
<File FileName="..\..\source\common\JclAlgorithms.pas" ContainerId="" ModuleName="JclAlgorithms"/>
<File FileName="..\..\source\common\JclArrayLists.pas" ContainerId="" ModuleName="JclArrayLists"/>
Modified: trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr 2008-01-26 15:15:54 UTC (rev 2317)
@@ -2,7 +2,8 @@
uses
Borland.Delphi,
- Borland.VclRtl
+ Borland.VclRtl,
+ Jedi.Jcl
,
JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
Modified: trunk/jcl/packages/xml/JclContainers-R.xml
===================================================================
--- trunk/jcl/packages/xml/JclContainers-R.xml 2008-01-26 14:59:14 UTC (rev 2316)
+++ trunk/jcl/packages/xml/JclContainers-R.xml 2008-01-26 15:15:54 UTC (rev 2317)
@@ -19,6 +19,7 @@
<Package Name="Jcl" Targets="allLibSuffix" Condition=""/>
<Package Name="Borland.Delphi" Targets="JclDotNet" Condition=""/>
<Package Name="Borland.VclRtl" Targets="JclDotNet" Condition=""/>
+ <Package Name="Jedi.Jcl" Targets="JclDotNet" Condition=""/>
</Requires>
<Contains>
<File Name="..\..\source\common\JclAbstractContainers.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 14:59:16
|
Revision: 2316
http://jcl.svn.sourceforge.net/jcl/?rev=2316&view=rev
Author: outchy
Date: 2008-01-26 06:59:14 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
moved JclSynch from source\common to source\windows.
JclSynch compatible with .NET 1.1
Delphi.net 2006 libraries switched to packages.
Modified Paths:
--------------
trunk/jcl/lib/d10.net/windows.exc
trunk/jcl/lib/d11.net/windows.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/d10.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d10.net/template.bdsproj
trunk/jcl/packages/d11/Jcl.dpk
trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
trunk/jcl/packages/d11.net/Jedi.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/d9.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d9.net/Jedi.Jcl.dpr
trunk/jcl/packages/k3/Jcl.bpk
trunk/jcl/packages/k3/Jcl.dpk
trunk/jcl/packages/xml/Jcl-R.xml
Added Paths:
-----------
trunk/jcl/packages/d10.net/Jedi.Jcl.dpk
trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
trunk/jcl/packages/d10.net/template.dpk
trunk/jcl/source/common/JclSynch.pas
Removed Paths:
-------------
trunk/jcl/packages/d10.net/Jedi.Jcl.dpr
trunk/jcl/packages/d10.net/Jedi.JclContainers.dpr
trunk/jcl/packages/d10.net/template.dpr
trunk/jcl/source/windows/JclSynch.pas
Modified: trunk/jcl/lib/d10.net/windows.exc
===================================================================
--- trunk/jcl/lib/d10.net/windows.exc 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/lib/d10.net/windows.exc 2008-01-26 14:59:14 UTC (rev 2316)
@@ -21,7 +21,6 @@
JclShell.pas
JclStructStorage.pas
JclSvcCtrl.pas
-JclSynch.pas
JclTask.pas
JclTD32.pas
JclUnicode.pas
Modified: trunk/jcl/lib/d11.net/windows.exc
===================================================================
--- trunk/jcl/lib/d11.net/windows.exc 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/lib/d11.net/windows.exc 2008-01-26 14:59:14 UTC (rev 2316)
@@ -21,7 +21,6 @@
JclShell.pas
JclStructStorage.pas
JclSvcCtrl.pas
-JclSynch.pas
JclTask.pas
JclTD32.pas
JclUnicode.pas
Modified: trunk/jcl/lib/d9.net/windows.exc
===================================================================
--- trunk/jcl/lib/d9.net/windows.exc 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/lib/d9.net/windows.exc 2008-01-26 14:59:14 UTC (rev 2316)
@@ -21,7 +21,6 @@
JclShell.pas
JclStructStorage.pas
JclSvcCtrl.pas
-JclSynch.pas
JclTask.pas
JclTD32.pas
JclUnicode.pas
Modified: trunk/jcl/packages/c5/JclC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.bpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/c5/JclC50.bpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:25 UTC
+ Last generated: 26-01-2008 11:41:41 UTC
*****************************************************************************
-->
<PROJECT>
@@ -47,6 +47,7 @@
..\..\lib\c5\JclStreams.obj
..\..\lib\c5\JclStrHashMap.obj
..\..\lib\c5\JclStrings.obj
+ ..\..\lib\c5\JclSynch.obj
..\..\lib\c5\JclSysInfo.obj
..\..\lib\c5\JclSysUtils.obj
..\..\lib\c5\JclUnitConv.obj
@@ -77,7 +78,6 @@
..\..\lib\c5\JclShell.obj
..\..\lib\c5\JclStructStorage.obj
..\..\lib\c5\JclSvcCtrl.obj
- ..\..\lib\c5\JclSynch.obj
..\..\lib\c5\JclTask.obj
..\..\lib\c5\JclTD32.obj
..\..\lib\c5\JclUnicode.obj
@@ -108,7 +108,7 @@
vcljpg50.bpi
"/>
<PATHCPP value=".;"/>
- <PATHPAS value=".;..\..\source\common;..\..\source\windows;..\..\source\vcl;"/>
+ <PATHPAS value=".;..\..\source\common;..\..\source\Common;..\..\source\windows;..\..\source\vcl;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
@@ -118,7 +118,7 @@
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="JclC50.cpp"/>
<INCLUDEPATH value="..\..\source;..\..\source\windows;..\..\source\vcl;..\..\source\common;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\source\common;..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\lib\c5;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\source\common;..\..\source\common;..\..\source\Common;..\..\source\windows;..\..\source\vcl;..\..\lib\c5;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
Modified: trunk/jcl/packages/c5/JclC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclC50.cpp 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/c5/JclC50.cpp 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:25 UTC
+ Last generated: 26-01-2008 11:41:41 UTC
-----------------------------------------------------------------------------
*/
@@ -44,6 +44,7 @@
USEUNIT("..\..\source\common\JclStreams.pas");
USEUNIT("..\..\source\common\JclStrHashMap.pas");
USEUNIT("..\..\source\common\JclStrings.pas");
+USEUNIT("..\..\source\Common\JclSynch.pas");
USEUNIT("..\..\source\common\JclSysInfo.pas");
USEUNIT("..\..\source\common\JclSysUtils.pas");
USEUNIT("..\..\source\common\JclUnitConv.pas");
@@ -74,7 +75,6 @@
USEUNIT("..\..\source\windows\JclShell.pas");
USEUNIT("..\..\source\windows\JclStructStorage.pas");
USEUNIT("..\..\source\windows\JclSvcCtrl.pas");
-USEUNIT("..\..\source\windows\JclSynch.pas");
USEUNIT("..\..\source\windows\JclTask.pas");
USEUNIT("..\..\source\windows\JclTD32.pas");
USEUNIT("..\..\source\windows\JclUnicode.pas");
Modified: trunk/jcl/packages/c5/JclC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/c5/JclC50.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:26 UTC
+ Last generated: 26-01-2008 11:41:42 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -103,7 +104,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/c6/Jcl.bpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:26 UTC
+ Last generated: 26-01-2008 11:41:43 UTC
*****************************************************************************
-->
<PROJECT>
@@ -47,6 +47,7 @@
..\..\lib\c6\JclStreams.obj
..\..\lib\c6\JclStrHashMap.obj
..\..\lib\c6\JclStrings.obj
+ ..\..\lib\c6\JclSynch.obj
..\..\lib\c6\JclSysInfo.obj
..\..\lib\c6\JclSysUtils.obj
..\..\lib\c6\JclUnitConv.obj
@@ -77,7 +78,6 @@
..\..\lib\c6\JclShell.obj
..\..\lib\c6\JclStructStorage.obj
..\..\lib\c6\JclSvcCtrl.obj
- ..\..\lib\c6\JclSynch.obj
..\..\lib\c6\JclTask.obj
..\..\lib\c6\JclTD32.obj
..\..\lib\c6\JclUnicode.obj
@@ -103,7 +103,7 @@
rtl.bpi
"/>
<PATHCPP value=".;"/>
- <PATHPAS value=".;..\..\source\common;..\..\source\windows;"/>
+ <PATHPAS value=".;..\..\source\common;..\..\source\Common;..\..\source\windows;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
@@ -113,7 +113,7 @@
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="Jcl.cpp"/>
<INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\source\visclx;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\..\source\common;..\..\source\common;..\..\source\windows;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <LIBPATH value="..\..\source\common;..\..\source\common;..\..\source\Common;..\..\source\windows;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
<WARNINGS value="-w-par"/>
<OTHERFILES value=""/>
</MACROS>
@@ -172,6 +172,7 @@
<FILE FILENAME="..\..\source\common\JclStreams.pas" FORMNAME="" UNITNAME="JclStreams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclStrHashMap.pas" FORMNAME="" UNITNAME="JclStrHashMap" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclStrings.pas" FORMNAME="" UNITNAME="JclStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\Common\JclSynch.pas" FORMNAME="" UNITNAME="JclSynch" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSysInfo.pas" FORMNAME="" UNITNAME="JclSysInfo" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSysUtils.pas" FORMNAME="" UNITNAME="JclSysUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitConv.pas" FORMNAME="" UNITNAME="JclUnitConv" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -202,7 +203,6 @@
<FILE FILENAME="..\..\source\windows\JclShell.pas" FORMNAME="" UNITNAME="JclShell" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclStructStorage.pas" FORMNAME="" UNITNAME="JclStructStorage" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclSvcCtrl.pas" FORMNAME="" UNITNAME="JclSvcCtrl" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\windows\JclSynch.pas" FORMNAME="" UNITNAME="JclSynch" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclTask.pas" FORMNAME="" UNITNAME="JclTask" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclTD32.pas" FORMNAME="" UNITNAME="JclTD32" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\windows\JclUnicode.pas" FORMNAME="" UNITNAME="JclUnicode" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/c6/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:26 UTC
+ Last generated: 26-01-2008 11:41:43 UTC
-----------------------------------------------------------------------------
}
@@ -72,6 +72,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -102,7 +103,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/cs1/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:29 UTC
+ Last generated: 26-01-2008 11:41:47 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -103,7 +104,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d10/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:30 UTC
+ Last generated: 26-01-2008 11:41:48 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj 2008-01-26 14:59:14 UTC (rev 2316)
@@ -3,7 +3,7 @@
<PersonalityInfo>
<Option>
<Option Name="Personality">DelphiDotNet.Personality</Option>
- <Option Name="ProjectType">Library</Option>
+ <Option Name="ProjectType"></Option>
<Option Name="Version">2.0</Option>
<Option Name="GUID">{44DB645B-C167-410D-9334-38AF9F0C7913}</Option>
</Option>
@@ -203,11 +203,11 @@
<File FileName="..\..\source\common\JclStatistics.pas" ContainerId="" ModuleName="JclStatistics"/>
<File FileName="..\..\source\common\JclStreams.pas" ContainerId="" ModuleName="JclStreams"/>
<File FileName="..\..\source\common\JclStrings.pas" ContainerId="" ModuleName="JclStrings"/>
+ <File FileName="..\..\source\Common\JclSynch.pas" ContainerId="" ModuleName="JclSynch"/>
<File FileName="..\..\source\common\JclSysInfo.pas" ContainerId="" ModuleName="JclSysInfo"/>
<File FileName="..\..\source\common\JclSysUtils.pas" ContainerId="" ModuleName="JclSysUtils"/>
<File FileName="..\..\source\common\JclUnitConv.pas" ContainerId="" ModuleName="JclUnitConv"/>
<File FileName="..\..\source\common\JclValidation.pas" ContainerId="" ModuleName="JclValidation"/>
- <File FileName="..\..\source\windows\JclSynch.pas" ContainerId="" ModuleName="JclSynch"/>
</FileList>
</DelphiDotNet.Personality>
</BorlandProject>
Added: trunk/jcl/packages/d10.net/Jedi.Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.Jcl.dpk (rev 0)
+++ trunk/jcl/packages/d10.net/Jedi.Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -0,0 +1,95 @@
+package Jedi.Jcl;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
+
+ Last generated: 26-01-2008 11:41:50 UTC
+-----------------------------------------------------------------------------
+}
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48000000}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+ Borland.Delphi,
+ Borland.VclRtl
+ ;
+
+contains
+ JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
+ JclBase in '..\..\source\common\JclBase.pas' ,
+ JclComplex in '..\..\source\common\JclComplex.pas' ,
+ JclCounter in '..\..\source\common\JclCounter.pas' ,
+ JclDateTime in '..\..\source\common\JclDateTime.pas' ,
+ JclEDI in '..\..\source\common\JclEDI.pas' ,
+ JclEDISEF in '..\..\source\common\JclEDISEF.pas' ,
+ JclEDITranslators in '..\..\source\common\JclEDITranslators.pas' ,
+ JclEDIXML in '..\..\source\common\JclEDIXML.pas' ,
+ JclEDI_ANSIX12 in '..\..\source\common\JclEDI_ANSIX12.pas' ,
+ JclEDI_ANSIX12_Ext in '..\..\source\common\JclEDI_ANSIX12_Ext.pas' ,
+ JclEDI_UNEDIFACT in '..\..\source\common\JclEDI_UNEDIFACT.pas' ,
+ JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
+ JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
+ JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
+ JclLogic in '..\..\source\common\JclLogic.pas' ,
+ JclMath in '..\..\source\common\JclMath.pas' ,
+ JclMime in '..\..\source\common\JclMime.pas' ,
+ JclResources in '..\..\source\common\JclResources.pas' ,
+ JclRTTI in '..\..\source\common\JclRTTI.pas' ,
+ JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
+ JclStatistics in '..\..\source\common\JclStatistics.pas' ,
+ JclStreams in '..\..\source\common\JclStreams.pas' ,
+ JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
+ JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
+ JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+ JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
+ JclValidation in '..\..\source\common\JclValidation.pas'
+ ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('JEDI Code Library RTL package')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('1.102.0.2726')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.
Property changes on: trunk/jcl/packages/d10.net/Jedi.Jcl.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Deleted: trunk/jcl/packages/d10.net/Jedi.Jcl.dpr
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.Jcl.dpr 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10.net/Jedi.Jcl.dpr 2008-01-26 14:59:14 UTC (rev 2316)
@@ -1,64 +0,0 @@
-Package Jedi.Jcl;
-
-uses
- Borland.Delphi,
- Borland.VclRtl
- ,
- JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
- JclBase in '..\..\source\common\JclBase.pas' ,
- JclComplex in '..\..\source\common\JclComplex.pas' ,
- JclCounter in '..\..\source\common\JclCounter.pas' ,
- JclDateTime in '..\..\source\common\JclDateTime.pas' ,
- JclEDI in '..\..\source\common\JclEDI.pas' ,
- JclEDISEF in '..\..\source\common\JclEDISEF.pas' ,
- JclEDITranslators in '..\..\source\common\JclEDITranslators.pas' ,
- JclEDIXML in '..\..\source\common\JclEDIXML.pas' ,
- JclEDI_ANSIX12 in '..\..\source\common\JclEDI_ANSIX12.pas' ,
- JclEDI_ANSIX12_Ext in '..\..\source\common\JclEDI_ANSIX12_Ext.pas' ,
- JclEDI_UNEDIFACT in '..\..\source\common\JclEDI_UNEDIFACT.pas' ,
- JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
- JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
- JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
- JclLogic in '..\..\source\common\JclLogic.pas' ,
- JclMath in '..\..\source\common\JclMath.pas' ,
- JclMime in '..\..\source\common\JclMime.pas' ,
- JclResources in '..\..\source\common\JclResources.pas' ,
- JclRTTI in '..\..\source\common\JclRTTI.pas' ,
- JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
- JclStatistics in '..\..\source\common\JclStatistics.pas' ,
- JclStreams in '..\..\source\common\JclStreams.pas' ,
- JclStrings in '..\..\source\common\JclStrings.pas' ,
- JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
- JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
- JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
- JclValidation in '..\..\source\common\JclValidation.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas'
- ;
-
-{$LIBSUFFIX '10'}
-
-[assembly: AssemblyTitle('JEDI Code Library')]
-[assembly: AssemblyDescription('JEDI Code Library RTL package')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('1.102.0.2726')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-
-begin
-end.
Modified: trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj 2008-01-26 14:59:14 UTC (rev 2316)
@@ -3,7 +3,7 @@
<PersonalityInfo>
<Option>
<Option Name="Personality">DelphiDotNet.Personality</Option>
- <Option Name="ProjectType">Library</Option>
+ <Option Name="ProjectType"></Option>
<Option Name="Version">2.0</Option>
<Option Name="GUID">{71D14CDC-6386-44FD-B861-4C4213CFFF08}</Option>
</Option>
Added: trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk (rev 0)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -0,0 +1,80 @@
+package Jedi.JclContainers;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 26-01-2008 14:49:58 UTC
+-----------------------------------------------------------------------------
+}
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48500000}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+ Borland.Delphi,
+ Borland.VclRtl
+ ;
+
+contains
+ JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
+ JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
+ JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
+ JclArraySets in '..\..\source\common\JclArraySets.pas' ,
+ JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
+ JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
+ JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
+ JclHashSets in '..\..\source\common\JclHashSets.pas' ,
+ JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
+ JclQueues in '..\..\source\common\JclQueues.pas' ,
+ JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
+ JclStacks in '..\..\source\common\JclStacks.pas' ,
+ JclTrees in '..\..\source\common\JclTrees.pas' ,
+ JclVectors in '..\..\source\common\JclVectors.pas'
+ ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('JEDI Code Library Containers package')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('1.102.0.2726')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.
Property changes on: trunk/jcl/packages/d10.net/Jedi.JclContainers.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Deleted: trunk/jcl/packages/d10.net/Jedi.JclContainers.dpr
===================================================================
--- trunk/jcl/packages/d10.net/Jedi.JclContainers.dpr 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10.net/Jedi.JclContainers.dpr 2008-01-26 14:59:14 UTC (rev 2316)
@@ -1,49 +0,0 @@
-Package Jedi.JclContainers;
-
-uses
- Borland.Delphi,
- Borland.VclRtl
- ,
- JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
- JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
- JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
- JclArraySets in '..\..\source\common\JclArraySets.pas' ,
- JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
- JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
- JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
- JclHashSets in '..\..\source\common\JclHashSets.pas' ,
- JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
- JclQueues in '..\..\source\common\JclQueues.pas' ,
- JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
- JclStacks in '..\..\source\common\JclStacks.pas' ,
- JclTrees in '..\..\source\common\JclTrees.pas' ,
- JclVectors in '..\..\source\common\JclVectors.pas'
- ;
-
-{$LIBSUFFIX '10'}
-
-[assembly: AssemblyTitle('JEDI Code Library')]
-[assembly: AssemblyDescription('JEDI Code Library Containers package')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('1.102.0.2726')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-
-begin
-end.
Modified: trunk/jcl/packages/d10.net/template.bdsproj
===================================================================
--- trunk/jcl/packages/d10.net/template.bdsproj 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10.net/template.bdsproj 2008-01-26 14:59:14 UTC (rev 2316)
@@ -3,7 +3,7 @@
<PersonalityInfo>
<Option>
<Option Name="Personality">DelphiDotNet.Personality</Option>
- <Option Name="ProjectType">Library</Option>
+ <Option Name="ProjectType"></Option>
<Option Name="Version">2.0</Option>
<Option Name="GUID">%GUID%</Option>
</Option>
Added: trunk/jcl/packages/d10.net/template.dpk
===================================================================
--- trunk/jcl/packages/d10.net/template.dpk (rev 0)
+++ trunk/jcl/packages/d10.net/template.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -0,0 +1,76 @@
+package %NAME%;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (%XMLNAME%)
+
+ Last generated: %DATETIME%
+-----------------------------------------------------------------------------
+}
+<%%% BEGIN PROGRAMONLY %%%>
+<%%% DO NOT GENERATE %%%>
+<%%% END PROGRAMONLY %%%>
+<%%% BEGIN LIBRARYONLY %%%>
+<%%% DO NOT GENERATE %%%>
+<%%% END LIBRARYONLY %%%>
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $%IMAGE_BASE%}
+{$%TYPE%ONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+<%%% START REQUIRES %%%>
+ %NAME%,
+<%%% END REQUIRES %%%>
+ ;
+
+contains
+<%%% START FILES %%%>
+ %UNITNAME% in '%FILENAME%' {%FORMNAMEANDTYPE%},
+<%%% END FILES %%%>
+ ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('%DESCRIPTION%')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.
\ No newline at end of file
Property changes on: trunk/jcl/packages/d10.net/template.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Deleted: trunk/jcl/packages/d10.net/template.dpr
===================================================================
--- trunk/jcl/packages/d10.net/template.dpr 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d10.net/template.dpr 2008-01-26 14:59:14 UTC (rev 2316)
@@ -1,39 +0,0 @@
-%PROJECT% %NAME%;
-
-uses
-<%%% START REQUIRES %%%>
- %NAME%,
-<%%% END REQUIRES %%%>
- ,
-<%%% START FILES %%%>
- %UNITNAME% in '%FILENAME%' {%FORMNAMEANDTYPE%},
-<%%% END FILES %%%>
- ;
-
-{$LIBSUFFIX '10'}
-
-[assembly: AssemblyTitle('JEDI Code Library')]
-[assembly: AssemblyDescription('%DESCRIPTION%')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2008 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-
-begin
-end.
Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d11/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:32 UTC
+ Last generated: 26-01-2008 11:41:50 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d11.net/Jedi.Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:33 UTC
+ Last generated: 26-01-2008 11:41:50 UTC
-----------------------------------------------------------------------------
}
@@ -63,11 +63,11 @@
JclStatistics in '..\..\source\common\JclStatistics.pas' ,
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
- JclValidation in '..\..\source\common\JclValidation.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas'
+ JclValidation in '..\..\source\common\JclValidation.pas'
;
[assembly: AssemblyTitle('JEDI Code Library for .NET')]
Modified: trunk/jcl/packages/d11.net/Jedi.Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.Jcl.dproj 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d11.net/Jedi.Jcl.dproj 2008-01-26 14:59:14 UTC (rev 2316)
@@ -119,11 +119,11 @@
<DCCReference Include="..\..\source\common\JclStatistics.pas"/>
<DCCReference Include="..\..\source\common\JclStreams.pas"/>
<DCCReference Include="..\..\source\common\JclStrings.pas"/>
+ <DCCReference Include="..\..\source\Common\JclSynch.pas"/>
<DCCReference Include="..\..\source\common\JclSysInfo.pas"/>
<DCCReference Include="..\..\source\common\JclSysUtils.pas"/>
<DCCReference Include="..\..\source\common\JclUnitConv.pas"/>
<DCCReference Include="..\..\source\common\JclValidation.pas"/>
- <DCCReference Include="..\..\source\windows\JclSynch.pas"/>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
</Project>
Modified: trunk/jcl/packages/d5/JclD50.dpk
===================================================================
--- trunk/jcl/packages/d5/JclD50.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d5/JclD50.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:27 UTC
+ Last generated: 26-01-2008 11:41:44 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d6/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d6/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:27 UTC
+ Last generated: 26-01-2008 11:41:45 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d7/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d7/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d7/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:28 UTC
+ Last generated: 26-01-2008 11:41:45 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d8/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d8/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d8/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:29 UTC
+ Last generated: 26-01-2008 11:41:46 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d9/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d9/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d9/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:29 UTC
+ Last generated: 26-01-2008 11:41:47 UTC
-----------------------------------------------------------------------------
}
@@ -73,6 +73,7 @@
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
@@ -104,7 +105,6 @@
JclShell in '..\..\source\windows\JclShell.pas' ,
JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas' ,
JclTask in '..\..\source\windows\JclTask.pas' ,
JclTD32 in '..\..\source\windows\JclTD32.pas' ,
JclUnicode in '..\..\source\windows\JclUnicode.pas' ,
Modified: trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj 2008-01-26 14:59:14 UTC (rev 2316)
@@ -203,11 +203,11 @@
<File FileName="..\..\source\common\JclStatistics.pas" ContainerId="" ModuleName="JclStatistics"/>
<File FileName="..\..\source\common\JclStreams.pas" ContainerId="" ModuleName="JclStreams"/>
<File FileName="..\..\source\common\JclStrings.pas" ContainerId="" ModuleName="JclStrings"/>
+ <File FileName="..\..\source\Common\JclSynch.pas" ContainerId="" ModuleName="JclSynch"/>
<File FileName="..\..\source\common\JclSysInfo.pas" ContainerId="" ModuleName="JclSysInfo"/>
<File FileName="..\..\source\common\JclSysUtils.pas" ContainerId="" ModuleName="JclSysUtils"/>
<File FileName="..\..\source\common\JclUnitConv.pas" ContainerId="" ModuleName="JclUnitConv"/>
<File FileName="..\..\source\common\JclValidation.pas" ContainerId="" ModuleName="JclValidation"/>
- <File FileName="..\..\source\windows\JclSynch.pas" ContainerId="" ModuleName="JclSynch"/>
</FileList>
</DelphiDotNet.Personality>
</BorlandProject>
Modified: trunk/jcl/packages/d9.net/Jedi.Jcl.dpr
===================================================================
--- trunk/jcl/packages/d9.net/Jedi.Jcl.dpr 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/d9.net/Jedi.Jcl.dpr 2008-01-26 14:59:14 UTC (rev 2316)
@@ -28,11 +28,11 @@
JclStatistics in '..\..\source\common\JclStatistics.pas' ,
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
+ JclSynch in '..\..\source\Common\JclSynch.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
- JclValidation in '..\..\source\common\JclValidation.pas' ,
- JclSynch in '..\..\source\windows\JclSynch.pas'
+ JclValidation in '..\..\source\common\JclValidation.pas'
;
{$LIBSUFFIX '9'}
Modified: trunk/jcl/packages/k3/Jcl.bpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.bpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/k3/Jcl.bpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -38,6 +38,7 @@
..\..\lib\k3\JclStreams.obj
..\..\lib\k3\JclStrHashMap.obj
..\..\lib\k3\JclStrings.obj
+ ..\..\lib\k3\JclSynch.obj
..\..\lib\k3\JclSysInfo.obj
..\..\lib\k3\JclSysUtils.obj
..\..\lib\k3\JclUnitConv.obj
@@ -126,6 +127,7 @@
<FILE FILENAME="../../source/common/JclStreams.pas" FORMNAME="" UNITNAME="JclStreams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclStrHashMap.pas" FORMNAME="" UNITNAME="JclStrHashMap" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclStrings.pas" FORMNAME="" UNITNAME="JclStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="../../source/Common/JclSynch.pas" FORMNAME="" UNITNAME="JclSynch" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclSysInfo.pas" FORMNAME="" UNITNAME="JclSysInfo" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclSysUtils.pas" FORMNAME="" UNITNAME="JclSysUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="../../source/common/JclUnitConv.pas" FORMNAME="" UNITNAME="JclUnitConv" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/k3/Jcl.dpk
===================================================================
--- trunk/jcl/packages/k3/Jcl.dpk 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/k3/Jcl.dpk 2008-01-26 14:59:14 UTC (rev 2316)
@@ -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: 16-01-2008 21:16:31 UTC
+ Last generated: 26-01-2008 11:41:49 UTC
-----------------------------------------------------------------------------
}
@@ -74,6 +74,7 @@
JclStreams in '../../source/common/JclStreams.pas' ,
JclStrHashMap in '../../source/common/JclStrHashMap.pas' ,
JclStrings in '../../source/common/JclStrings.pas' ,
+ JclSynch in '../../source/Common/JclSynch.pas' ,
JclSysInfo in '../../source/common/JclSysInfo.pas' ,
JclSysUtils in '../../source/common/JclSysUtils.pas' ,
JclUnitConv in '../../source/common/JclUnitConv.pas' ,
Modified: trunk/jcl/packages/xml/Jcl-R.xml
===================================================================
--- trunk/jcl/packages/xml/Jcl-R.xml 2008-01-26 12:48:56 UTC (rev 2315)
+++ trunk/jcl/packages/xml/Jcl-R.xml 2008-01-26 14:59:14 UTC (rev 2316)
@@ -52,6 +52,7 @@
<File Name="..\..\source\common\JclStreams.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclStrHashMap.pas" Targets="JclDev" Formname="" Condition=""/>
<File Name="..\..\source\common\JclStrings.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
+ <File Name="..\..\source\Common\JclSynch.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclSysInfo.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclSysUtils.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\common\JclUnitConv.pas" Targets="JclDev,JclDotNet" Formname="" Condition=""/>
@@ -83,7 +84,6 @@
<File Name="..\..\source\windows\JclShell.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclStructStorage.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclSvcCtrl.pas" Targets="WinDev" Formname="" Condition=""/>
- <File Name="..\..\source\windows\JclSynch.pas" Targets="WinDev,JclDotNet" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclTask.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclTD32.pas" Targets="WinDev" Formname="" Condition=""/>
<File Name="..\..\source\windows\JclUnicode.pas" Targets="WinDev" Formname="" Condition=""/>
Copied: trunk/jcl/source/common/JclSynch.pas (from rev 2311, trunk/jcl/source/windows/JclSynch.pas)
===================================================================
--- trunk/jcl/source/common/JclSynch.pas (rev 0)
+++ trunk/jcl/source/common/JclSynch.pas 2008-01-26 14:59:14 UTC (rev 2316)
@@ -0,0 +1,1695 @@
+{**************************************************************************************************}
+{ }
+{ 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 JclSynch.pas. }
+{ }
+{ The Initial Developers of the Original Code are Marcel van Brakel and Azret Botash. }
+{ Portions created by these individuals are Copyright (C) of these individuals. }
+{ All Rights Reserved. }
+{ }
+{ Contributor(s): }
+{ Marcel van Brakel }
+{ Olivier Sannier (obones) }
+{ Matthias Thoma (mthoma) }
+{ }
+{**************************************************************************************************}
+{ }
+{ This unit contains various classes and support routines for implementing synchronisation in }
+{ multithreaded applications. This ranges from interlocked access to simple typed variables to }
+{ wrapper classes for synchronisation primitives provided by the operating system }
+{ (critical section, semaphore, mutex etc). It also includes three user defined classes to }
+{ complement these. }
+{ }
+{**************************************************************************************************}
+{ }
+{ Last modified: $Date:: $ }
+{ Revision: $Rev:: $ }
+{ Author: $Author:: $ }
+{ }
+{**************************************************************************************************}
+
+unit JclSynch;
+
+{$I jcl.inc}
+
+interface
+
+uses
+ {$IFDEF UNITVERSIONING}
+ JclUnitVersioning,
+ {$ENDIF UNITVERSIONING}
+ {$IFDEF CLR}
+ System.Threading,
+ {$IFDEF CLR20}
+ System.Security.AccessControl,
+ {$ENDIF CLR20}
+ {$ENDIF CLR}
+ {$IFDEF MSWINDOWS}
+ Windows,
+ {$ENDIF MSWINDOWS}
+ JclBase;
+
+// Locked Integer manipulation
+//
+// Routines to manipulate simple typed variables in a thread safe manner
+{$IFNDEF CLR11}
+function LockedAdd(var Target: Integer; Value: Integer): Integer;
+{$ENDIF ~CLR11}
+function LockedCompareExchange(var Target: Integer; Exch, Comp: Integer): Integer; overload;
+{$IFDEF CLR}
+function LockedCompareExchange(var Target: TObject; Exch, Comp: TObject): TObject; overload;
+{$ELSE}
+function LockedCompareExchange(var Target: Pointer; Exch, Comp: Pointer): Pointer; overload;
+{$ENDIF CLR}
+function LockedDec(var Target: Integer): Integer;
+function LockedExchange(var Target: Integer; Value: Integer): Integer;
+function LockedExchangeAdd(var Target: Integer; Value: Integer): Integer;
+function LockedExchangeDec(var Target: Integer): Integer;
+function LockedExchangeInc(var Target: Integer): Integer;
+function LockedExchangeSub(var Target: Integer; Value: Integer): Integer;
+function LockedInc(var Target: Integer): Integer;
+{$IFNDEF CLR11}
+function LockedSub(var Target: Integer; Value: Integer): Integer;
+{$ENDIF ~CLR11}
+
+// TJclDispatcherObject
+//
+// Base class for operating system provided synchronisation primitives
+type
+ TJclWaitResult = (wrAbandoned, wrError, wrIoCompletion, wrSignaled, wrTimeout);
+
+ {$IFDEF CLR}
+ TJclWaitHandle = System.Threading.WaitHandle;
+ {$ELSE}
+ TJclWaitHandle = THandle;
+ {$ENDIF CLR}
+
+ TJclDispatcherObject = class(TObject)
+ private
+ FExisted: Boolean;
+ FHandle: TJclWaitHandle;
+ FName: string;
+ public
+ constructor Attach(AHandle: TJclWaitHandle);
+ destructor Destroy; override;
+ //function MsgWaitFor(const TimeOut: Cardinal): TJclWaitResult; Mask: DWORD): TJclWaitResult;
+ //function MsgWaitForEx(const TimeOut: Cardinal): TJclWaitResult; Mask: DWORD): TJclWaitResult;
+ {$IFNDEF CLR11}
+ function SignalAndWait(const Obj: TJclDispatcherObject; TimeOut: Cardinal;
+ Alertable: Boolean): TJclWaitResult;
+ {$ENDIF CLR11}
+ function WaitAlertable(const TimeOut: Cardinal): TJclWaitResult;
+ function WaitFor(const TimeOut: Cardinal): TJclWaitResult;
+ function WaitForever: TJclWaitResult;
+ property Existed: Boolean read FExisted;
+ property Handle: TJclWaitHandle read FHandle;
+ property Name: string read FName;
+ end;
+
+// Wait functions
+//
+// Object enabled Wait functions (takes TJclDispatcher objects as parameter as
+// opposed to handles) mostly for convenience
+function WaitForMultipleObjects(const Objects: array of TJclDispatcherObject;
+ WaitAll: Boolean; TimeOut: Cardinal): Cardinal;
+function WaitAlertableForMultipleObjects(const Objects: array of TJclDispatcherObject;
+ WaitAll: Boolean; TimeOut: Cardinal): Cardinal;
+
+type
+ TJclCriticalSection = class(TObject)
+ private
+ FCriticalSection: TRTLCriticalSection;
+ public
+ constructor Create; virtual;
+ destructor Destroy; override;
+ {$IFNDEF CLR}
+ class procedure CreateAndEnter(var CS: TJclCriticalSection);
+ {$ENDIF ~CLR}
+ procedure Enter;
+ procedure Leave;
+ end;
+
+ {$IFNDEF CLR}
+ TJclCriticalSectionEx = class(TJclCriticalSection)
+ private
+ FSpinCount: Cardinal;
+ function GetSpinCount: Cardinal;
+ procedure SetSpinCount(const Value: Cardinal);
+ public
+ constructor Create; override;
+ constructor CreateEx(SpinCount: Cardinal; NoFailEnter: Boolean); virtual;
+ class function GetSpinTimeOut: Cardinal;
+ class procedure SetSpinTimeOut(const Value: Cardinal);
+ function TryEnter: Boolean;
+ property SpinCount: Cardinal read GetSpinCount write SetSpinCount;
+ end;
+ {$ENDIF ~CLR}
+
+ TJclEvent = class(TJclDispatcherObject)
+ public
+ constructor Create({$IFNDEF CLR}SecAttr: PSecurityAttributes;{$ENDIF} Manual, Signaled: Boolean; const Name: string);
+ {$IFNDEF CLR}
+ cons...
[truncated message content] |
|
From: <ou...@us...> - 2008-01-26 12:49:01
|
Revision: 2315
http://jcl.svn.sourceforge.net/jcl/?rev=2315&view=rev
Author: outchy
Date: 2008-01-26 04:48:56 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
disabling TJclTabSet of .net compatibility.
Modified Paths:
--------------
trunk/jcl/source/common/JclStrings.pas
Modified: trunk/jcl/source/common/JclStrings.pas
===================================================================
--- trunk/jcl/source/common/JclStrings.pas 2008-01-26 11:32:00 UTC (rev 2314)
+++ trunk/jcl/source/common/JclStrings.pas 2008-01-26 12:48:56 UTC (rev 2315)
@@ -48,7 +48,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -393,7 +393,7 @@
function DotNetFormat(const Fmt: string; const Arg0, Arg1: System.Object): string; overload;
function DotNetFormat(const Fmt: string; const Arg0, Arg1, Arg2: System.Object): string; overload;
-{$ELSE}
+{$ELSE ~CLR}
type
FormatException = class(EJclError);
@@ -474,15 +474,12 @@
property MaxCapacity: Integer read FMaxCapacity;
end;
-
// DotNetFormat() uses the .NET format style: "{argX}"
function DotNetFormat(const Fmt: string; const Args: array of const): string; overload;
function DotNetFormat(const Fmt: string; const Arg0: Variant): string; overload;
function DotNetFormat(const Fmt: string; const Arg0, Arg1: Variant): string; overload;
function DotNetFormat(const Fmt: string; const Arg0, Arg1, Arg2: Variant): string; overload;
-{$ENDIF CLR}
-
// TJclTabSet
type
TJclTabSet = class {$IFNDEF CLR}(TInterfacedObject, IToString){$ENDIF}
@@ -527,10 +524,10 @@
function UpdatePosition(S: string; var Column, Line: Integer): Integer; overload;
// Conversions
- class function FromString(S: string): TJclTabSet; {$IFDEF SUPPORTS_STATIC}static; {$ENDIF}
- function ToString: string; {$IFDEF CLR}override; {$ENDIF}overload;
+ function ToString: string; overload;
function ToString(FormattingOptions: Integer): string; overload;
-
+ class function FromString(S: string): TJclTabSet; {$IFDEF SUPPORTS_STATIC} static; {$ENDIF}
+
// Properties
property ActualTabWidth: Integer read InternalTabWidth;
property Count: Integer read GetCount;
@@ -565,19 +562,18 @@
function StrOptimizeTabs(S: string; TabWidth: Integer): string; {$IFDEF SUPPORTS_INLINE}inline; {$ENDIF}overload;
function StrOptimizeTabs(S: string; TabSet: TJclTabSet): string; {$IFDEF SUPPORTS_INLINE}inline; {$ENDIF}overload;
-{$IFNDEF CLR}
// move to JclBase?
type
NullReferenceException = class (EJclError)
public
constructor Create; overload;
end;
-{$ENDIF ~CLR}
-
function AnsiCompareNaturalStr(const S1, S2: string): Integer;
function AnsiCompareNaturalText(const S1, S2: string): Integer;
+{$ENDIF ~CLR}
+
// Exceptions
type
EJclStringError = EJclError;
@@ -5119,6 +5115,7 @@
end;
{$ENDIF CLR}
+{$IFNDEF CLR}
function StrExpandTabs(S: string): string;
begin
// use an empty tab set, which will default to a tab width of 2
@@ -5832,14 +5829,12 @@
Result := Column;
end;
-{$IFNDEF CLR}
-{ NullReferenceException }
+//=== { NullReferenceException } =============================================
constructor NullReferenceException.Create;
begin
CreateRes(@RsArg_NullReferenceException);
end;
-{$ENDIF ~CLR}
function AnsiCompareNatural(const S1, S2: string; insensitive: Boolean): Integer;
var
@@ -5957,6 +5952,8 @@
Result := AnsiCompareNatural(S1, S2, True);
end;
+{$ENDIF ~CLR}
+
{$IFDEF CLR}
{$IFDEF UNITVERSIONING}
initialization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-01-26 11:32:03
|
Revision: 2314
http://jcl.svn.sourceforge.net/jcl/?rev=2314&view=rev
Author: outchy
Date: 2008-01-26 03:32:00 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
moving repository expert units to a dedicated directory.
Modified Paths:
--------------
trunk/jcl/docs/Readme.txt
trunk/jcl/packages/c5/JclRepositoryExpertC50.bpk
trunk/jcl/packages/c5/JclRepositoryExpertC50.cpp
trunk/jcl/packages/c5/JclRepositoryExpertC50.dpk
trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.bpf
trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.bpr
trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.cpp
trunk/jcl/packages/c6/JclRepositoryExpert.bpk
trunk/jcl/packages/c6/JclRepositoryExpert.cpp
trunk/jcl/packages/c6/JclRepositoryExpert.dpk
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpf
trunk/jcl/packages/c6/JclRepositoryExpertDLL.bpr
trunk/jcl/packages/c6/JclRepositoryExpertDLL.cpp
trunk/jcl/packages/d10/JclRepositoryExpert.dpk
trunk/jcl/packages/d10/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d11/JclRepositoryExpert.dpk
trunk/jcl/packages/d11/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d5/JclRepositoryExpertD50.dpk
trunk/jcl/packages/d5/JclRepositoryExpertDLLD50.dpr
trunk/jcl/packages/d6/JclRepositoryExpert.dpk
trunk/jcl/packages/d6/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d7/JclRepositoryExpert.dpk
trunk/jcl/packages/d7/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/d9/JclRepositoryExpert.dpk
trunk/jcl/packages/d9/JclRepositoryExpertDLL.dpr
trunk/jcl/packages/xml/JclRepositoryExpert-D.xml
trunk/jcl/packages/xml/JclRepositoryExpertDLL-L.xml
Added Paths:
-----------
trunk/jcl/experts/repository/
trunk/jcl/experts/repository/JclOtaExcDlgFileFrame.dfm
trunk/jcl/experts/repository/JclOtaExcDlgFileFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgFormFrame.dfm
trunk/jcl/experts/repository/JclOtaExcDlgFormFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgIcons.RES
trunk/jcl/experts/repository/JclOtaExcDlgIcons.rc
trunk/jcl/experts/repository/JclOtaExcDlgIgnoreFrame.dfm
trunk/jcl/experts/repository/JclOtaExcDlgIgnoreFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas
trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.dfm
trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgTraceFrame.dfm
trunk/jcl/experts/repository/JclOtaExcDlgTraceFrame.pas
trunk/jcl/experts/repository/JclOtaExcDlgWizard.dfm
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/repository/dirinfo.txt
Removed Paths:
-------------
trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.dfm
trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.pas
trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.dfm
trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.pas
trunk/jcl/experts/debug/dialog/JclOtaExcDlgIcons.RES
trunk/jcl/experts/debug/dialog/JclOtaExcDlgIcons.rc
trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.dfm
trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.pas
trunk/jcl/experts/debug/dialog/JclOtaExcDlgRepository.pas
trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.dfm
trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.pas
trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.dfm
trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.pas
trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.dfm
trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.pas
trunk/jcl/experts/debug/dialog/JclOtaRepositoryReg.pas
trunk/jcl/experts/debug/dialog/JclOtaRepositoryUtils.pas
trunk/jcl/experts/debug/dialog/JclOtaTemplates.pas
Modified: trunk/jcl/docs/Readme.txt
===================================================================
--- trunk/jcl/docs/Readme.txt 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/docs/Readme.txt 2008-01-26 11:32:00 UTC (rev 2314)
@@ -213,6 +213,7 @@
experts\debug\tools - Tools for creating files with JCL debug information
experts\favfolders - Favorite folders combobox in IDE open/save file dialogs
experts\projectanalyzer - Project Analyzer IDE expert
+experts\repository - Repository expert
experts\useswizard - JCL uses wizard
experts\versioncontrol - Integration of TortoiseCVS and TortoiseSVN in the IDE
examples - JCL example applications
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.dfm 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.dfm 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,79 +0,0 @@
-inherited JclOtaExcDlgFilePage: TJclOtaExcDlgFilePage
- object LabelLanguage: TLabel
- Left = 23
- Top = 27
- Width = 59
- Height = 13
- Caption = 'RsLanguage'
- FocusControl = ComboBoxLanguage
- end
- object LabelFormName: TLabel
- Left = 23
- Top = 182
- Width = 63
- Height = 13
- Caption = 'RsFormName'
- FocusControl = EditFormName
- end
- object LabelFileName: TLabel
- Left = 23
- Top = 75
- Width = 55
- Height = 13
- Caption = 'RsFileName'
- FocusControl = EditFileName
- end
- object LabelFormAncestor: TLabel
- Left = 23
- Top = 222
- Width = 79
- Height = 13
- Caption = 'RsFormAncestor'
- FocusControl = EditFormAncestor
- end
- object ComboBoxLanguage: TComboBox
- Left = 136
- Top = 24
- Width = 249
- Height = 21
- Style = csDropDownList
- ItemHeight = 13
- TabOrder = 0
- OnClick = ComboBoxLanguageClick
- end
- object EditFormName: TEdit
- Left = 136
- Top = 179
- Width = 249
- Height = 21
- TabOrder = 1
- end
- object EditFileName: TEdit
- Left = 136
- Top = 72
- Width = 249
- Height = 21
- TabOrder = 2
- end
- object ButtonFileBrowse: TButton
- Left = 391
- Top = 72
- Width = 25
- Height = 21
- Caption = '...'
- TabOrder = 3
- OnClick = ButtonFileBrowseClick
- end
- object EditFormAncestor: TEdit
- Left = 136
- Top = 219
- Width = 249
- Height = 21
- TabOrder = 4
- end
- object SaveDialogFileName: TSaveDialog
- Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofNoReadOnlyReturn, ofEnableSizing]
- Left = 260
- Top = 96
- end
-end
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgFileFrame.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,205 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgFileFrame.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 JclOtaExcDlgFileFrame;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls,
- JclBorlandTools, JclOtaWizardFrame, JclOtaExcDlgRepository;
-
-type
- TJclOtaExcDlgFilePage = class(TJclWizardFrame)
- ComboBoxLanguage: TComboBox;
- LabelLanguage: TLabel;
- EditFormName: TEdit;
- LabelFormName: TLabel;
- EditFileName: TEdit;
- LabelFileName: TLabel;
- ButtonFileBrowse: TButton;
- EditFormAncestor: TEdit;
- LabelFormAncestor: TLabel;
- SaveDialogFileName: TSaveDialog;
- procedure ButtonFileBrowseClick(Sender: TObject);
- procedure ComboBoxLanguageClick(Sender: TObject);
- private
- FParams: TJclOtaExcDlgParams;
- procedure AdjustFileExtension;
- function GetSelectedLanguage: TJclBorPersonality;
- protected
- function GetSupportsNext: Boolean; override;
- property SelectedLanguage: TJclBorPersonality read GetSelectedLanguage;
- public
- constructor Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams); reintroduce;
-
- procedure PageActivated(Direction: TJclWizardDirection); override;
- procedure PageDesactivated(Direction: TJclWizardDirection); override;
-
- property Params: TJclOtaExcDlgParams read FParams write FParams;
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- JclStrings, JclOtaResources;
-
-//=== { TJclOtaExcDlgFilePage } ==============================================
-
-procedure TJclOtaExcDlgFilePage.AdjustFileExtension;
-var
- AFileName: string;
-begin
- AFileName := EditFileName.Text;
- if AFileName <> '' then
- begin
- case SelectedLanguage of
- bpDelphi32:
- AFileName := ChangeFileExt(AFileName, SourceExtensionPAS);
- bpBCBuilder32:
- AFileName := ChangeFileExt(AFileName, SourceExtensionCPP);
- end;
- EditFileName.Text := AFileName;
- end;
-end;
-
-procedure TJclOtaExcDlgFilePage.ButtonFileBrowseClick(Sender: TObject);
- procedure AddFilter(const NewDescription, NewExtension: string);
- var
- AFilter: string;
- begin
- AFilter := SaveDialogFileName.Filter;
- if AFilter <> '' then
- AFilter := StrEnsureSuffix('|',AFilter);
- AFilter := Format('%s%s (*%s)|*%s',[AFilter, NewDescription, NewExtension, NewExtension]);
- SaveDialogFileName.Filter := AFilter;
- end;
-begin
- SaveDialogFileName.FileName := EditFileName.Text;
- SaveDialogFileName.Title := RsFileNameDialog;
-
- SaveDialogFileName.Filter := '';
- AddFilter('All files', '.*');
- if (bpDelphi32 in Params.Languages) or (bpBCBuilder32 in Params.Languages) then
- AddFilter(SourceDescriptionPAS, SourceExtensionPAS);
- if bpBCBuilder32 in Params.Languages then
- AddFilter(SourceDescriptionCPP, SourceExtensionCPP);
-
- if ComboBoxLanguage.ItemIndex > -1 then
- case SelectedLanguage of
- bpDelphi32 :
- SaveDialogFileName.FilterIndex := 2;
- bpBCBuilder32 :
- SaveDialogFileName.FilterIndex := 3;
- else
- SaveDialogFileName.FilterIndex := 1;
- end
- else
- SaveDialogFileName.DefaultExt := '';
-
- if SaveDialogFileName.Execute then
- EditFileName.Text := SaveDialogFileName.FileName;
- AdjustFileExtension;
-end;
-
-procedure TJclOtaExcDlgFilePage.ComboBoxLanguageClick(Sender: TObject);
-begin
- AdjustFileExtension;
-end;
-
-constructor TJclOtaExcDlgFilePage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
-begin
- FParams := AParams;
- inherited Create(AOwner);
-
- Caption := RsExcDlgFileOptions;
- LabelLanguage.Caption := RsLanguage;
- LabelFileName.Caption := RsFileName;
- LabelFormName.Caption := RsFormName;
- LabelFormAncestor.Caption := RsFormAncestor;
-end;
-
-function TJclOtaExcDlgFilePage.GetSelectedLanguage: TJclBorPersonality;
-begin
- if ComboBoxLanguage.ItemIndex > -1 then
- Result := TJclBorPersonality(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex])
- else
- Result := bpUnknown;
-end;
-
-function TJclOtaExcDlgFilePage.GetSupportsNext: Boolean;
-begin
- Result := (ComboBoxLanguage.ItemIndex > -1) and (EditFormName.Text <> '') and (EditFormAncestor.Text <> '')
- and (( SelectedLanguage = Params.ActivePersonality)
- or (EditFileName.Text <> ''));
-end;
-
-procedure TJclOtaExcDlgFilePage.PageActivated(Direction: TJclWizardDirection);
-var
- Language: TJclBorPersonality;
- ItemIndex: Integer;
-begin
- inherited PageActivated(Direction);
-
- ComboBoxLanguage.Items.Clear;
-
- for Language := Low(TJclBorPersonality) to High(TJclBorPersonality) do
- if Language in Params.Languages then
- begin
- ItemIndex := ComboBoxLanguage.Items.AddObject(JclBorPersonalityDescription[Language], TObject(Language));
- if Language = Params.Language then
- ComboBoxLanguage.ItemIndex := ItemIndex;
- end;
-
- EditFileName.Text := Params.FileName;
- EditFormName.Text := Params.FormName;
- EditFormAncestor.Text := Params.FormAncestor;
-end;
-
-procedure TJclOtaExcDlgFilePage.PageDesactivated(
- Direction: TJclWizardDirection);
-begin
- inherited PageDesactivated(Direction);
-
- if ComboBoxLanguage.ItemIndex > -1 then
- Params.Language := SelectedLanguage
- else
- Params.Language := bpUnknown;
- Params.FileName := EditFileName.Text;
- Params.FormName := EditFormName.Text;
- Params.FormAncestor := EditFormAncestor.Text;
-end;
-
-end.
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.dfm 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.dfm 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,65 +0,0 @@
-inherited JclOtaExcDlgFormPage: TJclOtaExcDlgFormPage
- object LabelEMailAddress: TLabel
- Left = 97
- Top = 186
- Width = 36
- Height = 13
- Caption = 'RsEmail'
- FocusControl = EditEMail
- end
- object LabelSubject: TLabel
- Left = 97
- Top = 226
- Width = 48
- Height = 13
- Caption = 'RsSubject'
- FocusControl = EditSubject
- end
- object CheckBoxMail: TCheckBox
- Left = 72
- Top = 144
- Width = 233
- Height = 17
- Caption = 'RsDialogWithMailButton'
- TabOrder = 0
- OnClick = CheckBoxMailClick
- end
- object EditEMail: TEdit
- Left = 160
- Top = 183
- Width = 193
- Height = 21
- TabOrder = 1
- end
- object CheckBoxModalDialog: TCheckBox
- Left = 72
- Top = 24
- Width = 233
- Height = 17
- Caption = 'RsModalDialog'
- TabOrder = 2
- end
- object CheckBoxSizeable: TCheckBox
- Left = 72
- Top = 64
- Width = 233
- Height = 17
- Caption = 'RsSizeable'
- TabOrder = 3
- end
- object EditSubject: TEdit
- Left = 160
- Top = 223
- Width = 193
- Height = 21
- TabOrder = 4
- end
- object CheckBoxAutoScrollBars: TCheckBox
- Left = 72
- Top = 104
- Width = 233
- Height = 17
- Caption = 'RsAutoScrollBars'
- TabOrder = 5
- end
-end
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgFormFrame.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,144 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgFormFrame.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 JclOtaExcDlgFormFrame;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls,
- JclOtaExcDlgRepository, JclOtaWizardFrame;
-
-type
- TJclOtaExcDlgFormPage = class(TJclWizardFrame)
- CheckBoxMail: TCheckBox;
- LabelEMailAddress: TLabel;
- EditEMail: TEdit;
- CheckBoxModalDialog: TCheckBox;
- CheckBoxSizeable: TCheckBox;
- EditSubject: TEdit;
- LabelSubject: TLabel;
- CheckBoxAutoScrollBars: TCheckBox;
- procedure CheckBoxMailClick(Sender: TObject);
- private
- FParams: TJclOtaExcDlgParams;
- procedure UpdateMailEdits;
- protected
- function GetSupportsNext: Boolean; override;
- public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
-
- procedure PageActivated(Direction: TJclWizardDirection); override;
- procedure PageDesactivated(Direction: TJclWizardDirection); override;
-
- property Params: TJclOtaExcDlgParams read FParams write FParams;
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- JclOtaResources;
-
-//=== { TJclOtaExcDlgFormPage } ==============================================
-
-procedure TJclOtaExcDlgFormPage.CheckBoxMailClick(Sender: TObject);
-begin
- UpdateMailEdits;
-end;
-
-constructor TJclOtaExcDlgFormPage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
-begin
- FParams := AParams;
- inherited Create(AOwner);
-
- Caption := RsExcDlgFormOptions;
- CheckBoxMail.Caption := RsDialogWithMailButton;
- LabelEMailAddress.Caption := RsEMail;
- LabelSubject.Caption := RsSubject;
- CheckBoxModalDialog.Caption := RsModalDialog;
- CheckBoxSizeable.Caption := RsSizeableDialog;
- CheckBoxAutoScrollBars.Caption := RsAutoScrollBars;
-end;
-
-function TJclOtaExcDlgFormPage.GetSupportsNext: Boolean;
-begin
- Result := (not CheckBoxMail.Checked) or ((EditEMail.Text <> '') and (EditSubject.Text <> ''));
-end;
-
-procedure TJclOtaExcDlgFormPage.PageActivated(Direction: TJclWizardDirection);
-begin
- inherited PageActivated(Direction);
-
- CheckBoxMail.Checked := Params.SendEMail;
- EditEMail.Text := Params.EMailAddress;
- EditSubject.Text := Params.EMailSubject;
- CheckBoxModalDialog.Checked := Params.ModalDialog;
- CheckBoxSizeable.Checked := Params.SizeableDialog;
- CheckBoxAutoScrollBars.Checked := Params.AutoScrollBars;
-
- UpdateMailEdits;
-end;
-
-procedure TJclOtaExcDlgFormPage.PageDesactivated(
- Direction: TJclWizardDirection);
-begin
- inherited PageDesactivated(Direction);
-
- Params.SendEMail := CheckBoxMail.Checked;
- Params.EMailAddress := EditEMail.Text;
- Params.EMailSubject := EditSubject.Text;
- Params.ModalDialog := CheckBoxModalDialog.Checked;
- Params.SizeableDialog := CheckBoxSizeable.Checked;
- Params.AutoScrollBars := CheckBoxAutoScrollBars.Checked;
-end;
-
-procedure TJclOtaExcDlgFormPage.UpdateMailEdits;
-begin
- if CheckBoxMail.Checked then
- begin
- EditEMail.Enabled := True;
- EditSubject.Enabled := True;
- EditEMail.Color := clWindow;
- EditSubject.Color := clWindow;
- end
- else
- begin
- EditEMail.Enabled := False;
- EditSubject.Enabled := False;
- EditEMail.ParentColor := True;
- EditSubject.ParentColor := True;
- end;
-end;
-
-end.
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgIcons.RES
===================================================================
(Binary files differ)
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgIcons.rc
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgIcons.rc 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgIcons.rc 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,2 +0,0 @@
-JCLEXCDLG ICON "ExceptDlg.ico"
-JCLEXCDLGCPP ICON "ExceptDlgCpp.ico"
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.dfm 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.dfm 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,34 +0,0 @@
-inherited JclOtaExcDlgIgnorePage: TJclOtaExcDlgIgnorePage
- object LabelIgnoredExceptions: TLabel
- Left = 120
- Top = 80
- Width = 102
- Height = 13
- Caption = 'RsIgnoredExceptions'
- FocusControl = MemoIgnoredExceptions
- end
- object CheckBoxTraceAllExceptions: TCheckBox
- Left = 96
- Top = 16
- Width = 393
- Height = 17
- Caption = 'RsTraceAllExceptions'
- TabOrder = 0
- OnClick = CheckBoxTraceAllExceptionsClick
- end
- object CheckBoxTraceEAbort: TCheckBox
- Left = 120
- Top = 48
- Width = 369
- Height = 17
- Caption = 'RsTraceEAbort'
- TabOrder = 1
- end
- object MemoIgnoredExceptions: TMemo
- Left = 120
- Top = 99
- Width = 369
- Height = 177
- TabOrder = 2
- end
-end
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgIgnoreFrame.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,124 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgIgnoreFrame.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 JclOtaExcDlgIgnoreFrame;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls,
- JclOtaExcDlgRepository, JclOtaWizardFrame;
-
-type
- TJclOtaExcDlgIgnorePage = class(TJclWizardFrame)
- CheckBoxTraceAllExceptions: TCheckBox;
- CheckBoxTraceEAbort: TCheckBox;
- LabelIgnoredExceptions: TLabel;
- MemoIgnoredExceptions: TMemo;
- procedure CheckBoxTraceAllExceptionsClick(Sender: TObject);
- private
- FParams: TJclOtaExcDlgParams;
- procedure UpdateControls;
- public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
-
- procedure PageActivated(Direction: TJclWizardDirection); override;
- procedure PageDesactivated(Direction: TJclWizardDirection); override;
-
- property Params: TJclOtaExcDlgParams read FParams write FParams;
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- JclOtaResources;
-
-//=== { TJclOtaExcDlgIgnorePage } ============================================
-
-procedure TJclOtaExcDlgIgnorePage.CheckBoxTraceAllExceptionsClick(
- Sender: TObject);
-begin
- UpdateControls;
-end;
-
-constructor TJclOtaExcDlgIgnorePage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
-begin
- FParams := AParams;
- inherited Create(AOwner);
-
- Caption := RsExcDlgIgnoreOptions;
- CheckBoxTraceAllExceptions.Caption := RsTraceAllExceptions;
- CheckBoxTraceEAbort.Caption := RsTraceEAbort;
- LabelIgnoredExceptions.Caption := RsIgnoredExceptions;
-end;
-
-procedure TJclOtaExcDlgIgnorePage.PageActivated(Direction: TJclWizardDirection);
-begin
- inherited PageActivated(Direction);
-
- CheckBoxTraceAllExceptions.Checked := Params.TraceAllExceptions;
- CheckBoxTraceEAbort.Checked := Params.TraceEAbort;
- MemoIgnoredExceptions.Lines.Assign(Params.IgnoredExceptions);
- UpdateControls;
-end;
-
-procedure TJclOtaExcDlgIgnorePage.PageDesactivated(
- Direction: TJclWizardDirection);
-begin
- inherited PageDesactivated(Direction);
-
- Params.TraceAllExceptions := CheckBoxTraceAllExceptions.Checked;
- Params.TraceEAbort := CheckBoxTraceEAbort.Checked;
- Params.IgnoredExceptions.Assign(MemoIgnoredExceptions.Lines);
-end;
-
-procedure TJclOtaExcDlgIgnorePage.UpdateControls;
-begin
- if CheckBoxTraceAllExceptions.Checked then
- begin
- CheckBoxTraceEAbort.Enabled := False;
- MemoIgnoredExceptions.Enabled := False;
- LabelIgnoredExceptions.Enabled := False;
- MemoIgnoredExceptions.ParentColor := True;
- end
- else
- begin
- CheckBoxTraceEAbort.Enabled := True;
- MemoIgnoredExceptions.Enabled := True;
- LabelIgnoredExceptions.Enabled := True;
- MemoIgnoredExceptions.Color := clWindow;
- end;
-end;
-
-end.
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgRepository.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgRepository.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgRepository.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,174 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgRepository.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 JclOtaExcDlgRepository;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Classes, Forms,
- JclBorlandTools,
- JclOtaTemplates;
-
-type
- TJclOtaExcDlgParams = class(TJclOtaTemplateParams)
- private
- FHookDll: Boolean;
- FFileName: string;
- FCodeDetails: Boolean;
- FModuleName: Boolean;
- FModuleOffset: Boolean;
- FDelayedTrace: Boolean;
- FFormName: string;
- FLogFile: Boolean;
- FLogFileName: string;
- FAddressOffset: Boolean;
- FVirtualAddress: Boolean;
- FActivePersonality: TJclBorPersonality;
- FLanguages: TJclBorPersonalities;
- FRawData: Boolean;
- FSendEMail: Boolean;
- FEMailAddress: string;
- FFormAncestor: string;
- FModalDialog: Boolean;
- FSizeableDialog: Boolean;
- FEMailSubject: string;
- FDesigner: TJclBorDesigner;
- FModuleList: Boolean;
- FOSInfo: Boolean;
- FActiveControls: Boolean;
- FStackList: Boolean;
- FAutoScrollBars: Boolean;
- FMainThreadOnly: Boolean;
- FAllThreads: Boolean;
- FTraceEAbort: Boolean;
- FIgnoredExceptions: TStrings;
- FTraceAllExceptions: Boolean;
- function GetIgnoredExceptionsCount: Integer;
- public
- constructor Create; reintroduce;
- destructor Destroy; override;
- published
- // file options
- property Languages: TJclBorPersonalities read FLanguages write FLanguages;
- property ActivePersonality: TJclBorPersonality read FActivePersonality
- write FActivePersonality;
- property FileName: string read FFileName write FFileName;
- property FormName: string read FFormName write FFormName;
- property FormAncestor: string read FFormAncestor write FFormAncestor;
- property Designer: TJclBorDesigner read FDesigner write FDesigner;
- // form options
- property ModalDialog: Boolean read FModalDialog write FModalDialog;
- property SendEMail: Boolean read FSendEMail write FSendEMail;
- property EMailAddress: string read FEMailAddress write FEMailAddress;
- property EMailSubject: string read FEMailSubject write FEMailSubject;
- property SizeableDialog: Boolean read FSizeableDialog write FSizeableDialog;
- property AutoScrollBars: Boolean read FAutoScrollBars write FAutoScrollBars;
- // system options
- property DelayedTrace: Boolean read FDelayedTrace write FDelayedTrace;
- property HookDll: Boolean read FHookDll write FHookDll;
- property LogFile: Boolean read FLogFile write FLogFile;
- property LogFileName: string read FLogFileName write FLogFileName;
- property OSInfo: Boolean read FOSInfo write FOSInfo;
- property ModuleList: Boolean read FModuleList write FModuleList;
- property ActiveControls: Boolean read FActiveControls write FActiveControls;
- property MainThreadOnly: Boolean read FMainThreadOnly write FMainThreadOnly;
- // ignored exceptions
- property TraceAllExceptions: Boolean read FTraceAllExceptions
- write FTraceAllExceptions;
- property TraceEAbort: Boolean read FTraceEAbort write FTraceEAbort;
- property IgnoredExceptions: TStrings read FIgnoredExceptions write FIgnoredExceptions;
- property IgnoredExceptionsCount: Integer read GetIgnoredExceptionsCount;
- // trace options
- property StackList: Boolean read FStackList write FStackList;
- property RawData: Boolean read FRawData write FRawData;
- property ModuleName: Boolean read FModuleName write FModuleName;
- property ModuleOffset: Boolean read FModuleOffset write FModuleOffset;
- property AllThreads: Boolean read FAllThreads write FAllThreads;
- //property AddressOffset: Boolean read FAddressOffset write FAddressOffset;
- property CodeDetails: Boolean read FCodeDetails write FCodeDetails;
- property VirtualAddress: Boolean read FVirtualAddress write FVirtualAddress;
- end;
-
-implementation
-
-{$R JclOtaExcDlgIcons.res}
-
-//=== { TJclOtaExcDlgParams } ================================================
-
-constructor TJclOtaExcDlgParams.Create;
-begin
- inherited Create;
-
- FHookDll := True;
- FLanguage := bpUnknown;
- FLanguages := [bpUnknown];
- FFileName := '';
- FCodeDetails := True;
- FModuleName := True;
- FModuleOffset := False;
- FDelayedTrace := True;
- FFormName := 'ExceptionDialog';
- FFormAncestor := TForm.ClassName;
- FLogFile := False;
- FLogFileName := '';
- FAddressOffset := True;
- FVirtualAddress := False;
- FActivePersonality := bpUnknown;
- FRawData := False;
- FSendEMail := False;
- FEMailAddress := '';
- FEMailSubject := '';
- FModalDialog := True;
- FSizeableDialog := False;
- FDesigner := bdVCL;
- FModuleList := True;
- FOSInfo := True;
- FActiveControls := True;
- FStackList := True;
- FAutoScrollBars := True;
- FMainThreadOnly := False;
- FTraceEAbort := False;
- FTraceAllExceptions := False;
- FIgnoredExceptions := TStringList.Create;
-end;
-
-destructor TJclOtaExcDlgParams.Destroy;
-begin
- FIgnoredExceptions.Free;
- inherited Destroy;
-end;
-
-function TJclOtaExcDlgParams.GetIgnoredExceptionsCount: Integer;
-begin
- Result := FIgnoredExceptions.Count;
-end;
-
-end.
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.dfm 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.dfm 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,73 +0,0 @@
-inherited JclOtaExcDlgSystemPage: TJclOtaExcDlgSystemPage
- object LabelLogFileName: TLabel
- Left = 170
- Top = 159
- Width = 55
- Height = 13
- Caption = 'RsFileName'
- end
- object CheckBoxDelayed: TCheckBox
- Left = 120
- Top = 26
- Width = 265
- Height = 17
- Caption = 'RsDelayedStackTrace'
- TabOrder = 0
- end
- object CheckBoxHookDll: TCheckBox
- Left = 120
- Top = 57
- Width = 265
- Height = 17
- Caption = 'RsHookDll'
- TabOrder = 1
- end
- object CheckBoxLogFile: TCheckBox
- Left = 120
- Top = 121
- Width = 265
- Height = 17
- Caption = 'RsLogFile'
- TabOrder = 2
- OnClick = CheckBoxLogFileClick
- end
- object EditLogFileName: TEdit
- Left = 240
- Top = 156
- Width = 145
- Height = 21
- TabOrder = 3
- end
- object CheckBoxModuleList: TCheckBox
- Left = 120
- Top = 200
- Width = 265
- Height = 17
- Caption = 'RsModuleList'
- TabOrder = 4
- end
- object CheckBoxOSInfo: TCheckBox
- Left = 120
- Top = 232
- Width = 265
- Height = 17
- Caption = 'RsOSInfo'
- TabOrder = 5
- end
- object CheckBoxActiveControls: TCheckBox
- Left = 120
- Top = 264
- Width = 265
- Height = 17
- Caption = 'RsActiveControls'
- TabOrder = 6
- end
- object CheckBoxMainThreadOnly: TCheckBox
- Left = 120
- Top = 89
- Width = 265
- Height = 17
- Caption = 'RsMainThreadOnly'
- TabOrder = 7
- end
-end
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgSystemFrame.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,147 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgSystemFrame.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 JclOtaExcDlgSystemFrame;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls,
- JclOtaExcDlgRepository, JclOtaWizardFrame;
-
-type
- TJclOtaExcDlgSystemPage = class(TJclWizardFrame)
- CheckBoxDelayed: TCheckBox;
- CheckBoxHookDll: TCheckBox;
- CheckBoxLogFile: TCheckBox;
- LabelLogFileName: TLabel;
- EditLogFileName: TEdit;
- CheckBoxModuleList: TCheckBox;
- CheckBoxOSInfo: TCheckBox;
- CheckBoxActiveControls: TCheckBox;
- CheckBoxMainThreadOnly: TCheckBox;
- procedure CheckBoxLogFileClick(Sender: TObject);
- private
- FParams: TJclOtaExcDlgParams;
- procedure UpdateLogEdits;
- protected
- function GetSupportsNext: Boolean; override;
- public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
-
- procedure PageActivated(Direction: TJclWizardDirection); override;
- procedure PageDesactivated(Direction: TJclWizardDirection); override;
-
- property Params: TJclOtaExcDlgParams read FParams write FParams;
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- JclOtaResources;
-
-//=== { TJclOtaExcDlgSystemPage } ============================================
-
-procedure TJclOtaExcDlgSystemPage.CheckBoxLogFileClick(Sender: TObject);
-begin
- UpdateLogEdits;
-end;
-
-constructor TJclOtaExcDlgSystemPage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
-begin
- FParams := AParams;
- inherited Create(AOwner);
-
- Caption := RsExcDlgSystemOptions;
- CheckBoxDelayed.Caption := RsDelayedStackTrace;
- CheckBoxHookDll.Caption := RsHookDll;
- CheckBoxLogFile.Caption := RsLogTrace;
- LabelLogFileName.Caption := RsFileName;
- CheckBoxModuleList.Caption := RsModuleList;
- CheckBoxOSInfo.Caption := RsOSInfo;
- CheckBoxActiveControls.Caption := RsActiveControls;
- CheckBoxMainThreadOnly.Caption := RsMainThreadOnly;
-end;
-
-function TJclOtaExcDlgSystemPage.GetSupportsNext: Boolean;
-begin
- Result := (not CheckBoxLogFile.Checked) or (EditLogFileName.Text <> '');
-end;
-
-procedure TJclOtaExcDlgSystemPage.PageActivated(Direction: TJclWizardDirection);
-begin
- inherited PageActivated(Direction);
-
- CheckBoxDelayed.Checked := Params.DelayedTrace;
- CheckBoxHookDll.Checked := Params.HookDll;
- CheckBoxLogFile.Checked := Params.LogFile;
- EditLogFileName.Text := Params.LogFileName;
- CheckBoxModuleList.Checked := Params.ModuleList;
- CheckBoxOSInfo.Checked := Params.OSInfo;
- CheckBoxActiveControls.Checked := Params.ActiveControls;
- CheckBoxMainThreadOnly.Checked := Params.MainThreadOnly;
-
- UpdateLogEdits;
-end;
-
-procedure TJclOtaExcDlgSystemPage.PageDesactivated(
- Direction: TJclWizardDirection);
-begin
- inherited PageDesactivated(Direction);
-
- Params.DelayedTrace := CheckBoxDelayed.Checked;
- Params.HookDll := CheckBoxHookDll.Checked;
- Params.LogFile := CheckBoxLogFile.Checked;
- Params.LogFileName := EditLogFileName.Text;
- Params.ModuleList := CheckBoxModuleList.Checked;
- Params.OSInfo := CheckBoxOSInfo.Checked;
- Params.ActiveControls := CheckBoxActiveControls.Checked;
- Params.MainThreadOnly := CheckBoxMainThreadOnly.Checked;
-end;
-
-procedure TJclOtaExcDlgSystemPage.UpdateLogEdits;
-begin
- if CheckBoxLogFile.Checked then
- begin
- EditLogFileName.Enabled := True;
- EditLogFileName.Color := clWindow;
- end
- else
- begin
- EditLogFileName.Enabled := False;
- EditLogFileName.ParentColor := True;
- end;
-end;
-
-end.
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.dfm 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.dfm 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,83 +0,0 @@
-inherited JclOtaExcDlgTracePage: TJclOtaExcDlgTracePage
- object LabelPreview: TLabel
- Left = 303
- Top = 7
- Width = 51
- Height = 13
- Caption = 'RsPreview'
- end
- object CheckBoxRawData: TCheckBox
- Left = 56
- Top = 57
- Width = 233
- Height = 17
- Caption = 'RsRawData'
- TabOrder = 0
- OnClick = CheckBoxClick
- end
- object CheckBoxModuleName: TCheckBox
- Left = 56
- Top = 95
- Width = 233
- Height = 17
- Caption = 'RsModuleName'
- TabOrder = 1
- OnClick = CheckBoxClick
- end
- object CheckBoxCodeDetails: TCheckBox
- Left = 56
- Top = 175
- Width = 233
- Height = 17
- Caption = 'RsCodeDetails'
- TabOrder = 2
- OnClick = CheckBoxClick
- end
- object CheckBoxVirtualAddress: TCheckBox
- Left = 56
- Top = 214
- Width = 233
- Height = 17
- Caption = 'RsVirtualAddress'
- TabOrder = 3
- OnClick = CheckBoxClick
- end
- object CheckBoxModuleOffset: TCheckBox
- Left = 56
- Top = 136
- Width = 233
- Height = 17
- Caption = 'RsModuleOffset'
- TabOrder = 4
- OnClick = CheckBoxClick
- end
- object MemoStack: TMemo
- Left = 303
- Top = 26
- Width = 313
- Height = 263
- ParentColor = True
- ReadOnly = True
- ScrollBars = ssBoth
- TabOrder = 6
- WordWrap = False
- end
- object CheckBoxStackList: TCheckBox
- Left = 32
- Top = 26
- Width = 257
- Height = 17
- Caption = 'RsStackList'
- TabOrder = 5
- OnClick = CheckBoxStackListClick
- end
- object CheckBoxAllThreads: TCheckBox
- Left = 56
- Top = 248
- Width = 233
- Height = 17
- Caption = 'RsAllThreads'
- TabOrder = 7
- OnClick = CheckBoxClick
- end
-end
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgTraceFrame.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,220 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgTraceFrame.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 JclOtaExcDlgTraceFrame;
-
-interface
-
-{$I jcl.inc}
-
-uses
- Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
- Dialogs, StdCtrls, JclDebug,
- JclOtaExcDlgRepository, JclOtaWizardFrame;
-
-type
- TJclOtaExcDlgTracePage = class(TJclWizardFrame)
- CheckBoxRawData: TCheckBox;
- CheckBoxModuleName: TCheckBox;
- CheckBoxCodeDetails: TCheckBox;
- CheckBoxVirtualAddress: TCheckBox;
- CheckBoxModuleOffset: TCheckBox;
- MemoStack: TMemo;
- LabelPreview: TLabel;
- CheckBoxStackList: TCheckBox;
- CheckBoxAllThreads: TCheckBox;
- procedure CheckBoxClick(Sender: TObject);
- procedure CheckBoxStackListClick(Sender: TObject);
- private
- FParams: TJclOtaExcDlgParams;
- FTestThread: TJclDebugThread;
- procedure UpdatePreview;
- procedure UpdateCheckBoxes;
- public
- constructor Create(AOwner: TComponent; AParams: TJclOtaExcDlgParams); reintroduce;
- destructor Destroy; override;
-
- procedure PageActivated(Direction: TJclWizardDirection); override;
- procedure PageDesactivated(Direction: TJclWizardDirection); override;
-
- property Params: TJclOtaExcDlgParams read FParams write FParams;
- end;
-
- // in interface to be exported and have basic debug informations based on exports
- TTestThread = class(TJclDebugThread)
- private
- procedure ExecuteTask;
- procedure ExecuteSubTask;
- protected
- procedure Execute; override;
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- JclOtaResources;
-
-//=== { TTestThread } ========================================================
-
-{$W+}
-
-procedure TTestThread.Execute;
-begin
- ExecuteTask;
-end;
-
-{$IFNDEF STACKFRAMES_ON}
-{$W-}
-{$ENDIF ~STACKFRAMES_ON}
-
-procedure TTestThread.ExecuteTask;
-begin
- ExecuteSubTask;
-end;
-
-procedure TTestThread.ExecuteSubTask;
-begin
- while not Terminated do
- Sleep(100);
-end;
-
-//=== { TJclOtaExcDlgTracePage } =============================================
-
-procedure TJclOtaExcDlgTracePage.CheckBoxClick(Sender: TObject);
-begin
- UpdatePreview;
-end;
-
-procedure TJclOtaExcDlgTracePage.CheckBoxStackListClick(Sender: TObject);
-begin
- UpdateCheckBoxes;
-end;
-
-constructor TJclOtaExcDlgTracePage.Create(AOwner: TComponent;
- AParams: TJclOtaExcDlgParams);
-begin
- FParams := AParams;
- inherited Create(AOwner);
- FTestThread := TTestThread.Create(False, 'MyTaskThread');
-
- Caption := RsExcDlgTraceOptions;
- CheckBoxStackList.Caption := RsStackList;
- CheckBoxRawData.Caption := RsRawData;
- CheckBoxModuleName.Caption := RsModuleName;
-// CheckBoxAddressOffset.Caption := RsAddressOffset;
- CheckBoxCodeDetails.Caption := RsCodeDetails;
- CheckBoxVirtualAddress.Caption := RsVirtualAddress;
- CheckBoxModuleOffset.Caption := RsModuleOffset;
- LabelPreview.Caption := RsPreview;
- CheckBoxAllThreads.Caption := RsAllThreads;
-end;
-
-destructor TJclOtaExcDlgTracePage.Destroy;
-begin
- FTestThread.Free;
- inherited Destroy;
-end;
-
-procedure TJclOtaExcDlgTracePage.PageActivated(Direction: TJclWizardDirection);
-begin
- inherited PageActivated(Direction);
-
- CheckBoxStackList.Checked := Params.StackList;
- CheckBoxRawData.Checked := Params.RawData;
- CheckBoxModuleName.Checked := Params.ModuleName;
-// CheckBoxAddressOffset.Checked := Params.AddressOffset;
- CheckBoxCodeDetails.Checked := Params.CodeDetails;
- CheckBoxVirtualAddress.Checked := Params.VirtualAddress;
- CheckBoxModuleOffset.Checked := Params.ModuleOffset;
- CheckBoxAllThreads.Checked := Params.AllThreads;
-
- UpdateCheckBoxes;
-end;
-
-procedure TJclOtaExcDlgTracePage.PageDesactivated(
- Direction: TJclWizardDirection);
-begin
- inherited PageDesactivated(Direction);
-
- Params.StackList := CheckBoxStackList.Checked;
- Params.RawData := CheckBoxRawData.Checked;
- Params.ModuleName := CheckBoxModuleName.Checked;
-// Params.AddressOffset := CheckBoxAddressOffset.Checked;
- Params.CodeDetails := CheckBoxCodeDetails.Checked;
- Params.VirtualAddress := CheckBoxVirtualAddress.Checked;
- Params.ModuleOffset := CheckBoxModuleOffset.Checked;
- Params.AllThreads := CheckBoxAllThreads.Checked;
-end;
-
-procedure TJclOtaExcDlgTracePage.UpdateCheckBoxes;
-var
- AEnabled: Boolean;
-begin
- AEnabled := CheckBoxStackList.Enabled;
-
- CheckBoxRawData.Enabled := AEnabled;
- CheckBoxModuleName.Enabled := AEnabled;
- CheckBoxCodeDetails.Enabled := AEnabled;
- CheckBoxVirtualAddress.Enabled := AEnabled;
- CheckBoxModuleOffset.Enabled := AEnabled;
-end;
-
-procedure TJclOtaExcDlgTracePage.UpdatePreview;
-var
- AStack: TJclStackInfoList;
-begin
- MemoStack.Lines.Clear;
-
- if CheckBoxAllThreads.Checked then
- MemoStack.Lines.Add('Main thread stack trace');
-
- AStack := TJclStackInfoList.Create(CheckBoxRawData.Checked, 0, nil, False);
- try
- AStack.AddToStrings(MemoStack.Lines, CheckBoxModuleName.Checked,
- CheckBoxModuleOffset.Checked, CheckBoxCodeDetails.Checked, CheckBoxVirtualAddress.Checked);
- finally
- AStack.Free;
- end;
-
- if CheckBoxAllThreads.Checked then
- begin
- MemoStack.Lines.Add('');
- MemoStack.Lines.Add(Format('Stack trace for thread: "%s" (%s)', [FTestThread.ThreadName, FTestThread.ClassName]));
- AStack := JclCreateThreadStackTrace(CheckBoxRawData.Checked, FTestThread.Handle);
- try
- AStack.AddToStrings(MemoStack.Lines, CheckBoxModuleName.Checked,
- CheckBoxModuleOffset.Checked, CheckBoxCodeDetails.Checked, CheckBoxVirtualAddress.Checked);
- finally
- AStack.Free;
- end;
- end;
-end;
-
-end.
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.dfm 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.dfm 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,5 +0,0 @@
-inherited JclOtaExcDlgForm: TJclOtaExcDlgForm
- Caption = 'JclOtaExcDlgForm'
- PixelsPerInch = 96
- TextHeight = 13
-end
Deleted: trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.pas 2008-01-25 19:50:46 UTC (rev 2313)
+++ trunk/jcl/experts/debug/dialog/JclOtaExcDlgWizard.pas 2008-01-26 11:32:00 UTC (rev 2314)
@@ -1,109 +0,0 @@
-{**************************************************************************************************}
-{ }
-{ Project JEDI Code Library (JCL) }
-{ }
-{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
-{ you may not use this file except in compliance with the License. You may obtain a copy of the }
-{ License at http://www.mozilla.org/MPL/ }
-{ }
-{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF }
-{ ANY KIND, either express or implied. See the License for the specific language governing rights }
-{ and limitations under the License. }
-{ }
-{ The Original Code is JclOtaExcDlgWizard.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: }
-{ ...
[truncated message content] |
|
From: <ou...@us...> - 2008-01-25 19:50:48
|
Revision: 2313
http://jcl.svn.sourceforge.net/jcl/?rev=2313&view=rev
Author: outchy
Date: 2008-01-25 11:50:46 -0800 (Fri, 25 Jan 2008)
Log Message:
-----------
splitting containers from Jcl.bpl to a different package JclContainers.bpl
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
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/d10.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d10.net/Jedi.Jcl.dpr
trunk/jcl/packages/d11/Jcl.dpk
trunk/jcl/packages/d11/Jcl.res
trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
trunk/jcl/packages/d11.net/Jedi.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/d9.net/Jedi.Jcl.bdsproj
trunk/jcl/packages/d9.net/Jedi.Jcl.dpr
trunk/jcl/packages/k3/Jcl.bpk
trunk/jcl/packages/k3/Jcl.dpk
trunk/jcl/packages/resources.mak
trunk/jcl/packages/xml/Jcl-R.xml
Added Paths:
-----------
trunk/jcl/packages/c5/JclContainersC50.bpk
trunk/jcl/packages/c5/JclContainersC50.cpp
trunk/jcl/packages/c5/JclContainersC50.dof
trunk/jcl/packages/c5/JclContainersC50.dpk
trunk/jcl/packages/c5/JclContainersC50.rc
trunk/jcl/packages/c5/JclContainersC50.res
trunk/jcl/packages/c6/JclContainers.bpk
trunk/jcl/packages/c6/JclContainers.cpp
trunk/jcl/packages/c6/JclContainers.dof
trunk/jcl/packages/c6/JclContainers.dpk
trunk/jcl/packages/c6/JclContainers.rc
trunk/jcl/packages/c6/JclContainers.res
trunk/jcl/packages/cs1/JclContainers.bdsproj
trunk/jcl/packages/cs1/JclContainers.dpk
trunk/jcl/packages/cs1/JclContainers.rc
trunk/jcl/packages/cs1/JclContainers.res
trunk/jcl/packages/d10/JclContainers.bdsproj
trunk/jcl/packages/d10/JclContainers.dpk
trunk/jcl/packages/d10/JclContainers.rc
trunk/jcl/packages/d10/JclContainers.res
trunk/jcl/packages/d10.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d10.net/Jedi.JclContainers.dpr
trunk/jcl/packages/d11/JclContainers.dpk
trunk/jcl/packages/d11/JclContainers.dproj
trunk/jcl/packages/d11/JclContainers.rc
trunk/jcl/packages/d11/JclContainers.res
trunk/jcl/packages/d11.net/Jedi.JclContainers.dpk
trunk/jcl/packages/d11.net/Jedi.JclContainers.dproj
trunk/jcl/packages/d5/JclContainersD50.dof
trunk/jcl/packages/d5/JclContainersD50.dpk
trunk/jcl/packages/d5/JclContainersD50.rc
trunk/jcl/packages/d5/JclContainersD50.res
trunk/jcl/packages/d6/JclContainers.dof
trunk/jcl/packages/d6/JclContainers.dpk
trunk/jcl/packages/d6/JclContainers.rc
trunk/jcl/packages/d6/JclContainers.res
trunk/jcl/packages/d7/JclContainers.dof
trunk/jcl/packages/d7/JclContainers.dpk
trunk/jcl/packages/d7/JclContainers.rc
trunk/jcl/packages/d7/JclContainers.res
trunk/jcl/packages/d8/JclContainers.bdsproj
trunk/jcl/packages/d8/JclContainers.dpk
trunk/jcl/packages/d8/JclContainers.rc
trunk/jcl/packages/d8/JclContainers.res
trunk/jcl/packages/d9/JclContainers.bdsproj
trunk/jcl/packages/d9/JclContainers.dpk
trunk/jcl/packages/d9/JclContainers.rc
trunk/jcl/packages/d9/JclContainers.res
trunk/jcl/packages/d9.net/Jedi.JclContainers.bdsproj
trunk/jcl/packages/d9.net/Jedi.JclContainers.dpr
trunk/jcl/packages/k3/JclContainers.bpf
trunk/jcl/packages/k3/JclContainers.bpk
trunk/jcl/packages/k3/JclContainers.dpk
trunk/jcl/packages/k3/JclContainers.kof
trunk/jcl/packages/k3/JclContainers.rc
trunk/jcl/packages/k3/JclContainers.res
trunk/jcl/packages/xml/JclContainers-R.xml
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/install/JclInstall.pas 2008-01-25 19:50:46 UTC (rev 2313)
@@ -659,10 +659,11 @@
VersionDirExp = '\%%s';
{$ENDIF}
- JclDpk = 'Jcl';
- JclVclDpk = 'JclVcl';
- JclVClxDpk = 'JclVClx';
- JediJclDpk = 'Jedi.Jcl';
+ JclDpk = 'Jcl';
+ JclContainersDpk = 'JclContainers';
+ JclVclDpk = 'JclVcl';
+ JclVClxDpk = 'JclVClx';
+ JediJclDpk = 'Jedi.Jcl';
JclExpertBase = 'JclBaseExpert';
JclExpertDebug = 'JclDebugExpert';
@@ -1779,7 +1780,8 @@
MarkOptionBegin(joPackages);
if CLRVersion = '' then
begin
- Result := CompilePackage(FullPackageFileName(Target, JclDpk));
+ Result := CompilePackage(FullPackageFileName(Target, JclDpk))
+ and CompilePackage(FullPackageFileName(Target, JclContainersDpk));
if Result and OptionChecked[joVclPackage] then
begin
@@ -2262,21 +2264,28 @@
end;
procedure UnregisterPackages(ATarget: TJclBorRADToolInstallation);
+ {$IFNDEF KYLIX}
+ var
+ ABDSTarget: TJclBDSInstallation;
+ {$ENDIF ~KYLIX}
begin
if CLRVersion = '' then
begin
{$IFNDEF KYLIX}
if ATarget.RadToolKind = brBorlandDevStudio then
begin
- (ATarget as TJclBDSInstallation).CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclDpk)));
+ ABDSTarget := ATarget as TJclBDSInstallation;
+ ABDSTarget.CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclDpk)));
+ ABDSTarget.CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclContainersDpk)));
if RuntimeInstallation and ATarget.SupportsVisualCLX then
- (ATarget as TJclBDSInstallation).CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclVClxDpk)));
+ ABDSTarget.CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclVClxDpk)));
if RuntimeInstallation and ATarget.SupportsVCL then
- (ATarget as TJclBDSInstallation).CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclVclDpk)));
+ ABDSTarget.CleanPackageCache(BinaryFileName(GetBPLPath, Distribution.JclPath + FullPackageFileName(ATarget, JclVclDpk)));
end;
{$ENDIF KYLIX}
//ioJclPackages
ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclDpk), GetBplPath);
+ ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclContainersDpk), GetBplPath);
if RuntimeInstallation and ATarget.SupportsVisualCLX then
ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclVClxDpk), GetBplPath);
if RuntimeInstallation and ATarget.SupportsVCL then
@@ -2292,6 +2301,7 @@
if CLRVersion = '' then
begin
DeletePackage(FullPackageFileName(Target, JclDpk));
+ DeletePackage(FullPackageFileName(Target, JclContainersDpk));
if RuntimeInstallation and Target.SupportsVisualCLX then
DeletePackage(FullPackageFileName(Target, JclVClxDpk));
if RuntimeInstallation and Target.SupportsVCL then
Modified: trunk/jcl/packages/c5/JclC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.bpk 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/packages/c5/JclC50.bpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -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: 22-11-2007 17:05:17 UTC
+ Last generated: 16-01-2008 21:16:25 UTC
*****************************************************************************
-->
<PROJECT>
@@ -16,17 +16,11 @@
..\..\lib\c5\JclC50.obj
..\..\lib\c5\bzip2.obj
..\..\lib\c5\Jcl8087.obj
- ..\..\lib\c5\JclAbstractContainers.obj
- ..\..\lib\c5\JclAlgorithms.obj
..\..\lib\c5\JclAnsiStrings.obj
- ..\..\lib\c5\JclArrayLists.obj
- ..\..\lib\c5\JclArraySets.obj
..\..\lib\c5\JclBase.obj
- ..\..\lib\c5\JclBinaryTrees.obj
..\..\lib\c5\JclBorlandTools.obj
..\..\lib\c5\JclComplex.obj
..\..\lib\c5\JclCompression.obj
- ..\..\lib\c5\JclContainerIntf.obj
..\..\lib\c5\JclCounter.obj
..\..\lib\c5\JclDateTime.obj
..\..\lib\c5\JclEDI.obj
@@ -39,34 +33,26 @@
..\..\lib\c5\JclEDI_UNEDIFACT_Ext.obj
..\..\lib\c5\JclExprEval.obj
..\..\lib\c5\JclFileUtils.obj
- ..\..\lib\c5\JclHashMaps.obj
- ..\..\lib\c5\JclHashSets.obj
..\..\lib\c5\JclIniFiles.obj
- ..\..\lib\c5\JclLinkedLists.obj
..\..\lib\c5\JclLogic.obj
..\..\lib\c5\JclMath.obj
..\..\lib\c5\JclMIDI.obj
..\..\lib\c5\JclMime.obj
..\..\lib\c5\JclPCRE.obj
- ..\..\lib\c5\JclQueues.obj
..\..\lib\c5\JclResources.obj
..\..\lib\c5\JclRTTI.obj
..\..\lib\c5\JclSimpleXml.obj
..\..\lib\c5\JclSchedule.obj
- ..\..\lib\c5\JclSortedMaps.obj
- ..\..\lib\c5\JclStacks.obj
..\..\lib\c5\JclStatistics.obj
..\..\lib\c5\JclStreams.obj
..\..\lib\c5\JclStrHashMap.obj
..\..\lib\c5\JclStrings.obj
..\..\lib\c5\JclSysInfo.obj
..\..\lib\c5\JclSysUtils.obj
- ..\..\lib\c5\JclTrees.obj
..\..\lib\c5\JclUnitConv.obj
..\..\lib\c5\JclUnitVersioning.obj
..\..\lib\c5\JclUnitVersioningProviders.obj
..\..\lib\c5\JclValidation.obj
- ..\..\lib\c5\JclVectors.obj
..\..\lib\c5\JclWideStrings.obj
..\..\lib\c5\pcre.obj
..\..\lib\c5\Hardlinks.obj
Modified: trunk/jcl/packages/c5/JclC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclC50.cpp 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/packages/c5/JclC50.cpp 2008-01-25 19:50:46 UTC (rev 2313)
@@ -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: 22-11-2007 17:05:17 UTC
+ Last generated: 16-01-2008 21:16:25 UTC
-----------------------------------------------------------------------------
*/
@@ -13,17 +13,11 @@
USERES("JclC50.res");
USEUNIT("..\..\source\common\bzip2.pas");
USEUNIT("..\..\source\common\Jcl8087.pas");
-USEUNIT("..\..\source\common\JclAbstractContainers.pas");
-USEUNIT("..\..\source\common\JclAlgorithms.pas");
USEUNIT("..\..\source\common\JclAnsiStrings.pas");
-USEUNIT("..\..\source\common\JclArrayLists.pas");
-USEUNIT("..\..\source\common\JclArraySets.pas");
USEUNIT("..\..\source\common\JclBase.pas");
-USEUNIT("..\..\source\common\JclBinaryTrees.pas");
USEUNIT("..\..\source\common\JclBorlandTools.pas");
USEUNIT("..\..\source\common\JclComplex.pas");
USEUNIT("..\..\source\common\JclCompression.pas");
-USEUNIT("..\..\source\common\JclContainerIntf.pas");
USEUNIT("..\..\source\common\JclCounter.pas");
USEUNIT("..\..\source\common\JclDateTime.pas");
USEUNIT("..\..\source\common\JclEDI.pas");
@@ -36,34 +30,26 @@
USEUNIT("..\..\source\common\JclEDI_UNEDIFACT_Ext.pas");
USEUNIT("..\..\source\common\JclExprEval.pas");
USEUNIT("..\..\source\common\JclFileUtils.pas");
-USEUNIT("..\..\source\common\JclHashMaps.pas");
-USEUNIT("..\..\source\common\JclHashSets.pas");
USEUNIT("..\..\source\common\JclIniFiles.pas");
-USEUNIT("..\..\source\common\JclLinkedLists.pas");
USEUNIT("..\..\source\common\JclLogic.pas");
USEUNIT("..\..\source\common\JclMath.pas");
USEUNIT("..\..\source\common\JclMIDI.pas");
USEUNIT("..\..\source\common\JclMime.pas");
USEUNIT("..\..\source\common\JclPCRE.pas");
-USEUNIT("..\..\source\common\JclQueues.pas");
USEUNIT("..\..\source\common\JclResources.pas");
USEUNIT("..\..\source\common\JclRTTI.pas");
USEUNIT("..\..\source\common\JclSimpleXml.pas");
USEUNIT("..\..\source\common\JclSchedule.pas");
-USEUNIT("..\..\source\common\JclSortedMaps.pas");
-USEUNIT("..\..\source\common\JclStacks.pas");
USEUNIT("..\..\source\common\JclStatistics.pas");
USEUNIT("..\..\source\common\JclStreams.pas");
USEUNIT("..\..\source\common\JclStrHashMap.pas");
USEUNIT("..\..\source\common\JclStrings.pas");
USEUNIT("..\..\source\common\JclSysInfo.pas");
USEUNIT("..\..\source\common\JclSysUtils.pas");
-USEUNIT("..\..\source\common\JclTrees.pas");
USEUNIT("..\..\source\common\JclUnitConv.pas");
USEUNIT("..\..\source\common\JclUnitVersioning.pas");
USEUNIT("..\..\source\common\JclUnitVersioningProviders.pas");
USEUNIT("..\..\source\common\JclValidation.pas");
-USEUNIT("..\..\source\common\JclVectors.pas");
USEUNIT("..\..\source\common\JclWideStrings.pas");
USEUNIT("..\..\source\common\pcre.pas");
USEUNIT("..\..\source\windows\Hardlinks.pas");
Modified: trunk/jcl/packages/c5/JclC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclC50.dpk 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/packages/c5/JclC50.dpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -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: 22-11-2007 17:05:17 UTC
+ Last generated: 16-01-2008 21:16:26 UTC
-----------------------------------------------------------------------------
}
@@ -42,17 +42,11 @@
contains
bzip2 in '..\..\source\common\bzip2.pas' ,
Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
- JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
- JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
- JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
- JclArraySets in '..\..\source\common\JclArraySets.pas' ,
JclBase in '..\..\source\common\JclBase.pas' ,
- JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
JclBorlandTools in '..\..\source\common\JclBorlandTools.pas' ,
JclComplex in '..\..\source\common\JclComplex.pas' ,
JclCompression in '..\..\source\common\JclCompression.pas' ,
- JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
JclCounter in '..\..\source\common\JclCounter.pas' ,
JclDateTime in '..\..\source\common\JclDateTime.pas' ,
JclEDI in '..\..\source\common\JclEDI.pas' ,
@@ -65,34 +59,26 @@
JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
JclExprEval in '..\..\source\common\JclExprEval.pas' ,
JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
- JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
- JclHashSets in '..\..\source\common\JclHashSets.pas' ,
JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
- JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
JclLogic in '..\..\source\common\JclLogic.pas' ,
JclMath in '..\..\source\common\JclMath.pas' ,
JclMIDI in '..\..\source\common\JclMIDI.pas' ,
JclMime in '..\..\source\common\JclMime.pas' ,
JclPCRE in '..\..\source\common\JclPCRE.pas' ,
- JclQueues in '..\..\source\common\JclQueues.pas' ,
JclResources in '..\..\source\common\JclResources.pas' ,
JclRTTI in '..\..\source\common\JclRTTI.pas' ,
JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
JclSchedule in '..\..\source\common\JclSchedule.pas' ,
- JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
- JclStacks in '..\..\source\common\JclStacks.pas' ,
JclStatistics in '..\..\source\common\JclStatistics.pas' ,
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
- JclTrees in '..\..\source\common\JclTrees.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
JclValidation in '..\..\source\common\JclValidation.pas' ,
- JclVectors in '..\..\source\common\JclVectors.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
Added: trunk/jcl/packages/c5/JclContainersC50.bpk
===================================================================
--- trunk/jcl/packages/c5/JclContainersC50.bpk (rev 0)
+++ trunk/jcl/packages/c5/JclContainersC50.bpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<!--
+*****************************************************************************
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 16-01-2008 21:18:34 UTC
+*****************************************************************************
+-->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="JclContainersC50.bpl"/>
+ <OBJFILES value="
+ ..\..\lib\c5\JclContainersC50.obj
+ ..\..\lib\c5\JclAbstractContainers.obj
+ ..\..\lib\c5\JclAlgorithms.obj
+ ..\..\lib\c5\JclArrayLists.obj
+ ..\..\lib\c5\JclArraySets.obj
+ ..\..\lib\c5\JclBinaryTrees.obj
+ ..\..\lib\c5\JclContainerIntf.obj
+ ..\..\lib\c5\JclHashMaps.obj
+ ..\..\lib\c5\JclHashSets.obj
+ ..\..\lib\c5\JclLinkedLists.obj
+ ..\..\lib\c5\JclQueues.obj
+ ..\..\lib\c5\JclSortedMaps.obj
+ ..\..\lib\c5\JclStacks.obj
+ ..\..\lib\c5\JclTrees.obj
+ ..\..\lib\c5\JclVectors.obj
+ "/>
+ <RESFILES value="JclContainersC50.res"/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)
+ "/>
+ <LIBFILES value="
+ "/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="
+ vcl50.bpi
+ JclC50.bpi
+ "/>
+ <PATHCPP value=".;"/>
+ <PATHPAS value=".;..\..\source\common;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="ilink32"/>
+ <USERDEFINES value="_DEBUG;BCB"/>
+ <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
+ <MAINSOURCE value="JclContainersC50.cpp"/>
+ <INCLUDEPATH value="..\..\source;..\..\source\windows;..\..\source\vcl;..\..\source\common;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..\..\source\common;..\..\source\common;..\..\lib\c5;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <WARNINGS value="-w-par"/>
+ <OTHERFILES value=""/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\..\source -I..\..\source\windows -I..\..\source\vcl -I..\..\source\common
+ -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_DEBUG -boa"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c
+ -tWM"/>
+ <PFLAGS value="-N0..\..\lib\c5 -N2..\..\lib\c5 -$YD -$W -$O- -$A8 -v -JPHNE -M
+ -LUvcl50
+ -U$(BCB)\Projects\Lib -U..\..\lib\c5
+ "/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zd"/>
+ <LFLAGS value="-I..\..\lib\c5 -D"JEDI Code Library Containers package for C++Builder 5"
+ -b:0x48500000 -aa -Tpp -Gpr -x -Gn -Gl -Gi -v"/>
+ <OTHERFILES value=""/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+ <OTHERFILES value=""/>
+ </LINKER>
+ <BUILDTOOLS>
+ </BUILDTOOLS>
+
+ <IDEOPTIONS>
+ </IDEOPTIONS>
+</PROJECT>
Property changes on: trunk/jcl/packages/c5/JclContainersC50.bpk
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c5/JclContainersC50.cpp
===================================================================
--- trunk/jcl/packages/c5/JclContainersC50.cpp (rev 0)
+++ trunk/jcl/packages/c5/JclContainersC50.cpp 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,40 @@
+//---------------------------------------------------------------------------
+/*
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 16-01-2008 21:18:34 UTC
+-----------------------------------------------------------------------------
+*/
+
+#include <vcl.h>
+#pragma hdrstop
+USERES("JclContainersC50.res");
+USEUNIT("..\..\source\common\JclAbstractContainers.pas");
+USEUNIT("..\..\source\common\JclAlgorithms.pas");
+USEUNIT("..\..\source\common\JclArrayLists.pas");
+USEUNIT("..\..\source\common\JclArraySets.pas");
+USEUNIT("..\..\source\common\JclBinaryTrees.pas");
+USEUNIT("..\..\source\common\JclContainerIntf.pas");
+USEUNIT("..\..\source\common\JclHashMaps.pas");
+USEUNIT("..\..\source\common\JclHashSets.pas");
+USEUNIT("..\..\source\common\JclLinkedLists.pas");
+USEUNIT("..\..\source\common\JclQueues.pas");
+USEUNIT("..\..\source\common\JclSortedMaps.pas");
+USEUNIT("..\..\source\common\JclStacks.pas");
+USEUNIT("..\..\source\common\JclTrees.pas");
+USEUNIT("..\..\source\common\JclVectors.pas");
+USEPACKAGE("vcl50.bpi");
+USEPACKAGE("JclC50.bpi");
+//---------------------------------------------------------------------------
+#pragma package(smart_init)
+//---------------------------------------------------------------------------
+// Package source.
+//---------------------------------------------------------------------------
+#pragma argsused
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
+{
+ return 1;
+}
+//---------------------------------------------------------------------------
Property changes on: trunk/jcl/packages/c5/JclContainersC50.cpp
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c5/JclContainersC50.dof
===================================================================
--- trunk/jcl/packages/c5/JclContainersC50.dof (rev 0)
+++ trunk/jcl/packages/c5/JclContainersC50.dof 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,5 @@
+[Directories]
+UnitOutputDir=..\..\lib\c5
+SearchPath=..\..\source
+Conditionals=BCB
+
Property changes on: trunk/jcl/packages/c5/JclContainersC50.dof
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c5/JclContainersC50.dpk
===================================================================
--- trunk/jcl/packages/c5/JclContainersC50.dpk (rev 0)
+++ trunk/jcl/packages/c5/JclContainersC50.dpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,59 @@
+package JclContainersC50;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 16-01-2008 21:18:34 UTC
+-----------------------------------------------------------------------------
+}
+
+{$R *.res}
+{$ALIGN ON}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48500000}
+{$DESCRIPTION 'JEDI Code Library Containers package'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ vcl50,
+ JclC50
+ ;
+
+contains
+ JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
+ JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
+ JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
+ JclArraySets in '..\..\source\common\JclArraySets.pas' ,
+ JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
+ JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
+ JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
+ JclHashSets in '..\..\source\common\JclHashSets.pas' ,
+ JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
+ JclQueues in '..\..\source\common\JclQueues.pas' ,
+ JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
+ JclStacks in '..\..\source\common\JclStacks.pas' ,
+ JclTrees in '..\..\source\common\JclTrees.pas' ,
+ JclVectors in '..\..\source\common\JclVectors.pas'
+ ;
+
+end.
Property changes on: trunk/jcl/packages/c5/JclContainersC50.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c5/JclContainersC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclContainersC50.rc (rev 0)
+++ trunk/jcl/packages/c5/JclContainersC50.rc 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,32 @@
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION 1,102,0,2726
+PRODUCTVERSION 1,102,0,2726
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "Project JEDI\0"
+ VALUE "FileDescription", "JEDI Code Library Containers package\0"
+ VALUE "FileVersion", "1.102.0.2726\0"
+ VALUE "InternalName", "JclContainersC50\0"
+ VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
+ VALUE "OriginalFilename", "JclContainersC50C50.bpl\0"
+ VALUE "ProductName", "JEDI Code Library\0"
+ VALUE "ProductVersion", "1.102 Build 2726\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END
Property changes on: trunk/jcl/packages/c5/JclContainersC50.rc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c5/JclContainersC50.res
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/packages/c5/JclContainersC50.res
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/packages/c6/Jcl.bpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -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: 22-11-2007 17:05:17 UTC
+ Last generated: 16-01-2008 21:16:26 UTC
*****************************************************************************
-->
<PROJECT>
@@ -16,17 +16,11 @@
..\..\lib\c6\Jcl.obj
..\..\lib\c6\bzip2.obj
..\..\lib\c6\Jcl8087.obj
- ..\..\lib\c6\JclAbstractContainers.obj
- ..\..\lib\c6\JclAlgorithms.obj
..\..\lib\c6\JclAnsiStrings.obj
- ..\..\lib\c6\JclArrayLists.obj
- ..\..\lib\c6\JclArraySets.obj
..\..\lib\c6\JclBase.obj
- ..\..\lib\c6\JclBinaryTrees.obj
..\..\lib\c6\JclBorlandTools.obj
..\..\lib\c6\JclComplex.obj
..\..\lib\c6\JclCompression.obj
- ..\..\lib\c6\JclContainerIntf.obj
..\..\lib\c6\JclCounter.obj
..\..\lib\c6\JclDateTime.obj
..\..\lib\c6\JclEDI.obj
@@ -39,34 +33,26 @@
..\..\lib\c6\JclEDI_UNEDIFACT_Ext.obj
..\..\lib\c6\JclExprEval.obj
..\..\lib\c6\JclFileUtils.obj
- ..\..\lib\c6\JclHashMaps.obj
- ..\..\lib\c6\JclHashSets.obj
..\..\lib\c6\JclIniFiles.obj
- ..\..\lib\c6\JclLinkedLists.obj
..\..\lib\c6\JclLogic.obj
..\..\lib\c6\JclMath.obj
..\..\lib\c6\JclMIDI.obj
..\..\lib\c6\JclMime.obj
..\..\lib\c6\JclPCRE.obj
- ..\..\lib\c6\JclQueues.obj
..\..\lib\c6\JclResources.obj
..\..\lib\c6\JclRTTI.obj
..\..\lib\c6\JclSimpleXml.obj
..\..\lib\c6\JclSchedule.obj
- ..\..\lib\c6\JclSortedMaps.obj
- ..\..\lib\c6\JclStacks.obj
..\..\lib\c6\JclStatistics.obj
..\..\lib\c6\JclStreams.obj
..\..\lib\c6\JclStrHashMap.obj
..\..\lib\c6\JclStrings.obj
..\..\lib\c6\JclSysInfo.obj
..\..\lib\c6\JclSysUtils.obj
- ..\..\lib\c6\JclTrees.obj
..\..\lib\c6\JclUnitConv.obj
..\..\lib\c6\JclUnitVersioning.obj
..\..\lib\c6\JclUnitVersioningProviders.obj
..\..\lib\c6\JclValidation.obj
- ..\..\lib\c6\JclVectors.obj
..\..\lib\c6\JclWideStrings.obj
..\..\lib\c6\pcre.obj
..\..\lib\c6\Hardlinks.obj
@@ -155,17 +141,11 @@
<FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\bzip2.pas" FORMNAME="" UNITNAME="bzip2" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\Jcl8087.pas" FORMNAME="" UNITNAME="Jcl8087" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclAbstractContainers.pas" FORMNAME="" UNITNAME="JclAbstractContainers" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclAlgorithms.pas" FORMNAME="" UNITNAME="JclAlgorithms" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclAnsiStrings.pas" FORMNAME="" UNITNAME="JclAnsiStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclArrayLists.pas" FORMNAME="" UNITNAME="JclArrayLists" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclArraySets.pas" FORMNAME="" UNITNAME="JclArraySets" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclBase.pas" FORMNAME="" UNITNAME="JclBase" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclBinaryTrees.pas" FORMNAME="" UNITNAME="JclBinaryTrees" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclBorlandTools.pas" FORMNAME="" UNITNAME="JclBorlandTools" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclComplex.pas" FORMNAME="" UNITNAME="JclComplex" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclCompression.pas" FORMNAME="" UNITNAME="JclCompression" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclContainerIntf.pas" FORMNAME="" UNITNAME="JclContainerIntf" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclCounter.pas" FORMNAME="" UNITNAME="JclCounter" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclDateTime.pas" FORMNAME="" UNITNAME="JclDateTime" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclEDI.pas" FORMNAME="" UNITNAME="JclEDI" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -178,34 +158,26 @@
<FILE FILENAME="..\..\source\common\JclEDI_UNEDIFACT_Ext.pas" FORMNAME="" UNITNAME="JclEDI_UNEDIFACT_Ext" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclExprEval.pas" FORMNAME="" UNITNAME="JclExprEval" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclFileUtils.pas" FORMNAME="" UNITNAME="JclFileUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclHashMaps.pas" FORMNAME="" UNITNAME="JclHashMaps" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclHashSets.pas" FORMNAME="" UNITNAME="JclHashSets" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclIniFiles.pas" FORMNAME="" UNITNAME="JclIniFiles" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclLinkedLists.pas" FORMNAME="" UNITNAME="JclLinkedLists" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclLogic.pas" FORMNAME="" UNITNAME="JclLogic" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclMath.pas" FORMNAME="" UNITNAME="JclMath" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclMIDI.pas" FORMNAME="" UNITNAME="JclMIDI" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclMime.pas" FORMNAME="" UNITNAME="JclMime" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclPCRE.pas" FORMNAME="" UNITNAME="JclPCRE" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclQueues.pas" FORMNAME="" UNITNAME="JclQueues" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclResources.pas" FORMNAME="" UNITNAME="JclResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclRTTI.pas" FORMNAME="" UNITNAME="JclRTTI" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSimpleXml.pas" FORMNAME="" UNITNAME="JclSimpleXml" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSchedule.pas" FORMNAME="" UNITNAME="JclSchedule" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclSortedMaps.pas" FORMNAME="" UNITNAME="JclSortedMaps" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclStacks.pas" FORMNAME="" UNITNAME="JclStacks" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclStatistics.pas" FORMNAME="" UNITNAME="JclStatistics" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclStreams.pas" FORMNAME="" UNITNAME="JclStreams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclStrHashMap.pas" FORMNAME="" UNITNAME="JclStrHashMap" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclStrings.pas" FORMNAME="" UNITNAME="JclStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSysInfo.pas" FORMNAME="" UNITNAME="JclSysInfo" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclSysUtils.pas" FORMNAME="" UNITNAME="JclSysUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclTrees.pas" FORMNAME="" UNITNAME="JclTrees" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitConv.pas" FORMNAME="" UNITNAME="JclUnitConv" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitVersioning.pas" FORMNAME="" UNITNAME="JclUnitVersioning" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclUnitVersioningProviders.pas" FORMNAME="" UNITNAME="JclUnitVersioningProviders" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\source\common\JclValidation.pas" FORMNAME="" UNITNAME="JclValidation" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\source\common\JclVectors.pas" FORMNAME="" UNITNAME="JclVectors" 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\windows\Hardlinks.pas" FORMNAME="" UNITNAME="Hardlinks" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/packages/c6/Jcl.dpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -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: 22-11-2007 17:05:18 UTC
+ Last generated: 16-01-2008 21:16:26 UTC
-----------------------------------------------------------------------------
}
@@ -41,17 +41,11 @@
contains
bzip2 in '..\..\source\common\bzip2.pas' ,
Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
- JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
- JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
- JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
- JclArraySets in '..\..\source\common\JclArraySets.pas' ,
JclBase in '..\..\source\common\JclBase.pas' ,
- JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
JclBorlandTools in '..\..\source\common\JclBorlandTools.pas' ,
JclComplex in '..\..\source\common\JclComplex.pas' ,
JclCompression in '..\..\source\common\JclCompression.pas' ,
- JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
JclCounter in '..\..\source\common\JclCounter.pas' ,
JclDateTime in '..\..\source\common\JclDateTime.pas' ,
JclEDI in '..\..\source\common\JclEDI.pas' ,
@@ -64,34 +58,26 @@
JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
JclExprEval in '..\..\source\common\JclExprEval.pas' ,
JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
- JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
- JclHashSets in '..\..\source\common\JclHashSets.pas' ,
JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
- JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
JclLogic in '..\..\source\common\JclLogic.pas' ,
JclMath in '..\..\source\common\JclMath.pas' ,
JclMIDI in '..\..\source\common\JclMIDI.pas' ,
JclMime in '..\..\source\common\JclMime.pas' ,
JclPCRE in '..\..\source\common\JclPCRE.pas' ,
- JclQueues in '..\..\source\common\JclQueues.pas' ,
JclResources in '..\..\source\common\JclResources.pas' ,
JclRTTI in '..\..\source\common\JclRTTI.pas' ,
JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
JclSchedule in '..\..\source\common\JclSchedule.pas' ,
- JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
- JclStacks in '..\..\source\common\JclStacks.pas' ,
JclStatistics in '..\..\source\common\JclStatistics.pas' ,
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
- JclTrees in '..\..\source\common\JclTrees.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
JclValidation in '..\..\source\common\JclValidation.pas' ,
- JclVectors in '..\..\source\common\JclVectors.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
Added: trunk/jcl/packages/c6/JclContainers.bpk
===================================================================
--- trunk/jcl/packages/c6/JclContainers.bpk (rev 0)
+++ trunk/jcl/packages/c6/JclContainers.bpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<!--
+*****************************************************************************
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 16-01-2008 21:18:34 UTC
+*****************************************************************************
+-->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.06.00"/>
+ <PROJECT value="JclContainersC60.bpl"/>
+ <OBJFILES value="
+ ..\..\lib\c6\JclContainers.obj
+ ..\..\lib\c6\JclAbstractContainers.obj
+ ..\..\lib\c6\JclAlgorithms.obj
+ ..\..\lib\c6\JclArrayLists.obj
+ ..\..\lib\c6\JclArraySets.obj
+ ..\..\lib\c6\JclBinaryTrees.obj
+ ..\..\lib\c6\JclContainerIntf.obj
+ ..\..\lib\c6\JclHashMaps.obj
+ ..\..\lib\c6\JclHashSets.obj
+ ..\..\lib\c6\JclLinkedLists.obj
+ ..\..\lib\c6\JclQueues.obj
+ ..\..\lib\c6\JclSortedMaps.obj
+ ..\..\lib\c6\JclStacks.obj
+ ..\..\lib\c6\JclTrees.obj
+ ..\..\lib\c6\JclVectors.obj
+ "/>
+ <RESFILES value="JclContainers.res"/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)
+ "/>
+ <LIBFILES value="
+ "/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="
+ rtl.bpi
+ Jcl.bpi
+ "/>
+ <PATHCPP value=".;"/>
+ <PATHPAS value=".;..\..\source\common;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="ilink32"/>
+ <USERDEFINES value="_DEBUG;BCB"/>
+ <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
+ <MAINSOURCE value="JclContainers.cpp"/>
+ <INCLUDEPATH value="..\..\source\common;..\..\source\windows;..\..\source\vcl;..\..\source\visclx;..\..\experts\common;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..\..\source\common;..\..\source\common;..\..\lib\c6;..\..\lib\c6;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;$(BCB)\lib\debug"/>
+ <WARNINGS value="-w-par"/>
+ <OTHERFILES value=""/>
+ </MACROS>
+ <OPTIONS>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c -tWM
+ "/>
+ <PFLAGS value="-U..\..\lib\c6 -N0..\..\lib\c6 -N2..\..\lib\c6 -I..\..\source -$YD -$W -$O- -$A8 -v -JPHNE -M
+
+ "/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zd"/>
+ <LFLAGS value="-I..\..\lib\c6 -GB"JclContainers" -D"JEDI Code Library Containers package for C++Builder 6"
+ -b:0x48500000 -aa -Tpp -Gpr -x -Gn -Gl -Gi -v"/>
+ <OTHERFILES value=""/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+ <OTHERFILES value=""/>
+ </LINKER>
+ <FILELIST>
+ <FILE FILENAME="JclContainers.res" FORMNAME="" UNITNAME="JclContainers.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="JclContainers.cpp" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="Jcl.bpi" FORMNAME="" UNITNAME="Jcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclAbstractContainers.pas" FORMNAME="" UNITNAME="JclAbstractContainers" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclAlgorithms.pas" FORMNAME="" UNITNAME="JclAlgorithms" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclArrayLists.pas" FORMNAME="" UNITNAME="JclArrayLists" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclArraySets.pas" FORMNAME="" UNITNAME="JclArraySets" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclBinaryTrees.pas" FORMNAME="" UNITNAME="JclBinaryTrees" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclContainerIntf.pas" FORMNAME="" UNITNAME="JclContainerIntf" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclHashMaps.pas" FORMNAME="" UNITNAME="JclHashMaps" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclHashSets.pas" FORMNAME="" UNITNAME="JclHashSets" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclLinkedLists.pas" FORMNAME="" UNITNAME="JclLinkedLists" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclQueues.pas" FORMNAME="" UNITNAME="JclQueues" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclSortedMaps.pas" FORMNAME="" UNITNAME="JclSortedMaps" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclStacks.pas" FORMNAME="" UNITNAME="JclStacks" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclTrees.pas" FORMNAME="" UNITNAME="JclTrees" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\source\common\JclVectors.pas" FORMNAME="" UNITNAME="JclVectors" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ </FILELIST>
+ <BUILDTOOLS>
+ </BUILDTOOLS>
+
+ <IDEOPTIONS>
+[Linker]
+LibPrefix=
+LibSuffix=C60
+LibVersion=
+ </IDEOPTIONS>
+</PROJECT>
Property changes on: trunk/jcl/packages/c6/JclContainers.bpk
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c6/JclContainers.cpp
===================================================================
--- trunk/jcl/packages/c6/JclContainers.cpp (rev 0)
+++ trunk/jcl/packages/c6/JclContainers.cpp 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,25 @@
+//---------------------------------------------------------------------------
+/*
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 16-01-2008 21:18:34 UTC
+-----------------------------------------------------------------------------
+*/
+
+#include <vcl.h>
+#include <windows.h>
+#pragma hdrstop
+//---------------------------------------------------------------------------
+#pragma package(smart_init)
+//---------------------------------------------------------------------------
+// Package source.
+//---------------------------------------------------------------------------
+#pragma argsused
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
+{
+ return 1;
+}
+//---------------------------------------------------------------------------
+
Property changes on: trunk/jcl/packages/c6/JclContainers.cpp
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c6/JclContainers.dof
===================================================================
--- trunk/jcl/packages/c6/JclContainers.dof (rev 0)
+++ trunk/jcl/packages/c6/JclContainers.dof 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,5 @@
+[Directories]
+UnitOutputDir=..\..\lib\c6
+SearchPath=..\..\source
+Conditionals=BCB
+
Property changes on: trunk/jcl/packages/c6/JclContainers.dof
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c6/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/c6/JclContainers.dpk (rev 0)
+++ trunk/jcl/packages/c6/JclContainers.dpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,58 @@
+package JclContainers;
+{
+-----------------------------------------------------------------------------
+ DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+ ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
+
+ Last generated: 16-01-2008 21:18:34 UTC
+-----------------------------------------------------------------------------
+}
+
+{$R *.res}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48500000}
+{$DESCRIPTION 'JEDI Code Library Containers package'}
+{$LIBSUFFIX 'C60'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+requires
+ rtl,
+ Jcl
+ ;
+contains
+ JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
+ JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
+ JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
+ JclArraySets in '..\..\source\common\JclArraySets.pas' ,
+ JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
+ JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
+ JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
+ JclHashSets in '..\..\source\common\JclHashSets.pas' ,
+ JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
+ JclQueues in '..\..\source\common\JclQueues.pas' ,
+ JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
+ JclStacks in '..\..\source\common\JclStacks.pas' ,
+ JclTrees in '..\..\source\common\JclTrees.pas' ,
+ JclVectors in '..\..\source\common\JclVectors.pas'
+ ;
+end.
Property changes on: trunk/jcl/packages/c6/JclContainers.dpk
___________________________________________________________________
Name: svn:keywords
+ URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c6/JclContainers.rc
===================================================================
--- trunk/jcl/packages/c6/JclContainers.rc (rev 0)
+++ trunk/jcl/packages/c6/JclContainers.rc 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,32 @@
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION 1,102,0,2726
+PRODUCTVERSION 1,102,0,2726
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "Project JEDI\0"
+ VALUE "FileDescription", "JEDI Code Library Containers package\0"
+ VALUE "FileVersion", "1.102.0.2726\0"
+ VALUE "InternalName", "JclContainers\0"
+ VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
+ VALUE "OriginalFilename", "JclContainersC60.bpl\0"
+ VALUE "ProductName", "JEDI Code Library\0"
+ VALUE "ProductVersion", "1.102 Build 2726\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END
Property changes on: trunk/jcl/packages/c6/JclContainers.rc
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/jcl/packages/c6/JclContainers.res
===================================================================
(Binary files differ)
Property changes on: trunk/jcl/packages/c6/JclContainers.res
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk 2008-01-23 17:52:56 UTC (rev 2312)
+++ trunk/jcl/packages/cs1/Jcl.dpk 2008-01-25 19:50:46 UTC (rev 2313)
@@ -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: 22-11-2007 17:05:19 UTC
+ Last generated: 16-01-2008 21:16:29 UTC
-----------------------------------------------------------------------------
}
@@ -42,17 +42,11 @@
contains
bzip2 in '..\..\source\common\bzip2.pas' ,
Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
- JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
- JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
- JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
- JclArraySets in '..\..\source\common\JclArraySets.pas' ,
JclBase in '..\..\source\common\JclBase.pas' ,
- JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
JclBorlandTools in '..\..\source\common\JclBorlandTools.pas' ,
JclComplex in '..\..\source\common\JclComplex.pas' ,
JclCompression in '..\..\source\common\JclCompression.pas' ,
- JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
JclCounter in '..\..\source\common\JclCounter.pas' ,
JclDateTime in '..\..\source\common\JclDateTime.pas' ,
JclEDI in '..\..\source\common\JclEDI.pas' ,
@@ -65,34 +59,26 @@
JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
JclExprEval in '..\..\source\common\JclExprEval.pas' ,
JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
- JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
- JclHashSets in '..\..\source\common\JclHashSets.pas' ,
JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
- JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
JclLogic in '..\..\source\common\JclLogic.pas' ,
JclMath in '..\..\source\common\JclMath.pas' ,
JclMIDI in '..\..\source\common\JclMIDI.pas' ,
JclMime in '..\..\source\common\JclMime.pas' ,
JclPCRE in '..\..\source\common\JclPCRE.pas' ,
- JclQueues in '..\..\source\common\JclQueues.pas' ,
JclResources in '..\..\source\common\JclResources.pas' ,
JclRTTI in '..\..\source\common\JclRTTI.pas' ,
JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
JclSchedule in '..\..\source\common\JclSchedule.pas' ,
- JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
- JclStacks in '..\..\source\common\JclStacks.pas' ,
JclStatistics in '..\..\source\common\JclStatistics.pas' ,
JclStreams in '..\..\source\common\JclStreams.pas' ,
JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
JclStrings in '..\..\source\common\JclStrings.pas' ,
JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
- JclTrees in '..\..\source\common\JclTrees.pas' ,
JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
JclValidation in '..\..\source\common\JclValidation.pas' ,
- JclVectors in '..\..\source\common\JclVectors.pas' ,
JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
pcre in '..\..\source\common\pcre.pas' ,
Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
Added: trunk/jcl/packages/cs1/JclContainers.bdsproj
===================================================================
--- trunk/jcl/packages/cs1/JclContainers.bdsproj (rev 0)
+++ trunk/jcl/packages/cs1/JclContainers.bdsproj 2008-01-25 19:50:46 UTC (rev 2313)
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BorlandProject>
+ <PersonalityInfo>
+ <Option>
+ <Option Name="Personality">Delphi.Personality</Option>
+ <Option Name="ProjectType"></Option>
+ <Option Name="Version">1.0</Option>
+ <Option Name="GUID">{71D14CDC-6386-44FD-B861-4C4213CFFF08}</Option>
+ </Option>
+ </PersonalityInfo>
+ <Delphi.Personality>
+ <Source>
+ <Source Name="MainSource">JclContainers.dpk</Source>
+ </Source>
+ <FileVersion>
+ <FileVersion Name="Version">7.0</FileVersion>
+ </FileVersion>
+ <Compiler>
+ <Compiler Name="A">8</Compiler>
+ <Compiler Name="B">0</Compiler>
+ <Compiler Name="C">0</Compiler>
+ <Compiler Name="D">0</Compiler>
+ <Compiler Name="E">0</Compiler>
+ <Compiler Name="F">0</Compiler>
+ <Compiler Name="G">1</Compiler>
+ <Compiler Name="H">1</Compiler>
+ <Compiler Name="I">1</Compiler>
+ <Compiler Name="J">1</Compiler>
+ <Compiler Name="K">0</Compiler>
+ <Compiler Name="L">0</Compiler>
+ <Compiler Name="M">0</Compiler>
+ <Compiler Name="N">1</Compiler>
+ <Compiler Name="O">1</Compiler>
+ <Compiler Name="P">1</Compiler>
+ <Compiler Name="Q">0</Compiler>
+ <Compiler Name="R">1</Compiler>
+ <Compiler Name="S">0</Compiler>
+ <Compiler Name="T">0</Compiler>
+ <Compiler Name="U">0</Compiler>
+ <Compiler Name="V">1</Compiler>
+ <Compiler Name="W">0</Compiler>
+ <Compiler Name="X">1</Compiler>
+ <Compiler Name="Y">0</Compiler>
+ <Compiler Name="Z">1</Compiler>
+ <Compiler Name="ShowHints">True</Compiler>
+ <Compiler Name="ShowWarnings">True</Compiler>
+ <Compiler Name="UnitAliases"></Compiler>
+ <Compiler Name="NamespacePrefix"></Compiler>
+ <Compiler Name="GenerateDocumentation">False</Compiler>
+ <Compiler Name="DefaultNamespace"></Compiler>
+ <Compiler Name="SymbolDeprecated">True</Compiler>
+ <Compiler Name="SymbolLibrary">True</Compiler>
+ <Compiler Name="SymbolPlatform">True</Compiler>
+ <Compiler Name="SymbolExperimental">True</Compiler>
+ <Compiler Name="UnitLibrary">True</Compiler>
+ <Compiler Name="UnitPlatform">True</Compiler>
+ <Compiler Name="UnitDeprecated">True</Compiler>
+ <Compiler Name="UnitExperimental">True</Compiler>
+ <Compiler Name="HResultCompat">True</Compiler>
+ <Compiler Name="HidingMember">True</Compiler>
+ <Compiler Name="HiddenVirtual">True</Compiler>
+ <Compiler Name="Garbage">True</Compiler>
+ <Compiler Name="BoundsError">True</Compiler>
+ <Compiler Name="ZeroNilCompat">True</Compiler>
+ <Compiler Name="StringConstTruncated">True</Compiler>
+ <Compiler Name="ForLoopVarVarPar">True</Compiler>
+ <Compiler Name="TypedConstVarPar">True</Compiler>
+ <Compiler ...
[truncated message content] |
49 messages has been excluded from this view by a project administrator.
