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-10-05 12:57:33
|
Revision: 2516
http://jcl.svn.sourceforge.net/jcl/?rev=2516&view=rev
Author: outchy
Date: 2008-10-05 12:56:31 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
ZLibModuleHandle is not used when ZLib code is statically linked into JCL code.
Modified Paths:
--------------
trunk/jcl/source/common/zlibh.pas
Modified: trunk/jcl/source/common/zlibh.pas
===================================================================
--- trunk/jcl/source/common/zlibh.pas 2008-10-05 12:50:18 UTC (rev 2515)
+++ trunk/jcl/source/common/zlibh.pas 2008-10-05 12:56:31 UTC (rev 2516)
@@ -2081,9 +2081,6 @@
ZLIBinflateSyncPointExportName = 'inflateSyncPoint';
ZLIBget_crc_tableExportName = 'get_crc_table';
-var
- ZLibModuleHandle: TModuleHandle = INVALID_MODULEHANDLE_VALUE;
-
{$IFDEF ZLIB_STATICLINK}
{$LINK ..\windows\obj\zlib\adler32.obj} // OS: CHECKTHIS - Kylix version may need forward slashes?
@@ -2219,7 +2216,10 @@
end;
{$ENDIF ~LINK_TO_MSVCRT}
-{$ENDIF ZLIB_STATICLINK}
+{$ELSE ~ZLIB_STATICLINK}
+var
+ ZLibModuleHandle: TModuleHandle = INVALID_MODULEHANDLE_VALUE;
+{$ENDIF ~ZLIB_STATICLINK}
function IsZLibLoaded: Boolean;
begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-10-05 12:53:00
|
Revision: 2515
http://jcl.svn.sourceforge.net/jcl/?rev=2515&view=rev
Author: outchy
Date: 2008-10-05 12:50:18 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
The return value of HashMul should always be positive.
Modified Paths:
--------------
trunk/jcl/source/common/JclHashMaps.pas
trunk/jcl/source/prototypes/JclHashMaps.pas
Modified: trunk/jcl/source/common/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/common/JclHashMaps.pas 2008-10-05 09:21:02 UTC (rev 2514)
+++ trunk/jcl/source/common/JclHashMaps.pas 2008-10-05 12:50:18 UTC (rev 2515)
@@ -2527,10 +2527,11 @@
JclResources;
function HashMul(Key, Range: Integer): Integer;
+// return a value between 0 and (Range-1) based on integer-hash Key
const
A = 0.6180339887; // (sqrt(5) - 1) / 2
begin
- Result := Trunc(Range * (Frac(Key * A)));
+ Result := Trunc(Range * (Frac(Abs(Key * A))));
end;
//=== { TJclIntfIntfBucket } ==========================================
Modified: trunk/jcl/source/prototypes/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashMaps.pas 2008-10-05 09:21:02 UTC (rev 2514)
+++ trunk/jcl/source/prototypes/JclHashMaps.pas 2008-10-05 12:50:18 UTC (rev 2515)
@@ -764,10 +764,11 @@
JclResources;
function HashMul(Key, Range: Integer): Integer;
+// return a value between 0 and (Range-1) based on integer-hash Key
const
A = 0.6180339887; // (sqrt(5) - 1) / 2
begin
- Result := Trunc(Range * (Frac(Key * A)));
+ Result := Trunc(Range * (Frac(Abs(Key * A))));
end;
{$JPPEXPANDMACRO JCLHASHMAPTYPESIMP(TJclIntfIntfBucket,nil,nil)}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2008-10-05 09:22:05
|
Revision: 2514
http://jcl.svn.sourceforge.net/jcl/?rev=2514&view=rev
Author: obones
Date: 2008-10-05 09:21:02 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
TJclStringStream is "abstract", better use one of its derived classes.
Modified Paths:
--------------
trunk/jcl/source/common/JclSimpleXml.pas
Modified: trunk/jcl/source/common/JclSimpleXml.pas
===================================================================
--- trunk/jcl/source/common/JclSimpleXml.pas 2008-10-04 14:07:42 UTC (rev 2513)
+++ trunk/jcl/source/common/JclSimpleXml.pas 2008-10-05 09:21:02 UTC (rev 2514)
@@ -1486,7 +1486,7 @@
begin
StrStream := TStringStream.Create(Value);
try
- Stream := TJclStringStream.Create(StrStream);
+ Stream := TJclAutoStream.Create(StrStream);
try
LoadFromStringStream(Stream);
finally
@@ -1504,7 +1504,7 @@
begin
StrStream := TStringStream.Create('');
try
- Stream := TJclStringStream.Create(StrStream);
+ Stream := TJclAutoStream.Create(StrStream);
try
SaveToStringStream(Stream);
Result := StrStream.DataString;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cyc...@us...> - 2008-10-04 14:07:54
|
Revision: 2513
http://jcl.svn.sourceforge.net/jcl/?rev=2513&view=rev
Author: cycocrew
Date: 2008-10-04 14:07:42 +0000 (Sat, 04 Oct 2008)
Log Message:
-----------
Fixed JCL Help integration into Delphi 2009 IDE
Modified Paths:
--------------
trunk/jcl/source/common/JclBorlandTools.pas
Modified: trunk/jcl/source/common/JclBorlandTools.pas
===================================================================
--- trunk/jcl/source/common/JclBorlandTools.pas 2008-10-04 10:04:43 UTC (rev 2512)
+++ trunk/jcl/source/common/JclBorlandTools.pas 2008-10-04 14:07:42 UTC (rev 2513)
@@ -964,7 +964,7 @@
BCBKeyName = '\SOFTWARE\Borland\C++Builder';
BDSKeyName = '\SOFTWARE\Borland\BDS';
- CDSKeyName = '\SOFTWARE\Codegear\BDS';
+ CDSKeyName = '\SOFTWARE\CodeGear\BDS';
DelphiKeyName = '\SOFTWARE\Borland\Delphi';
BDSVersions: array [1..6] of TBDSVersionInfo = (
@@ -1850,8 +1850,13 @@
FHxRegister := nil;
FHxPlugin := nil;
if Assigned(Installation) then
- FIdeNameSpace := Format(Help2BorlandNameSpace, [Installation.IDEVersionNumber])
+ begin
+ if (Installation.IDEVersionNumber = 6) then
+ FIdeNameSpace := 'embarcadero.rs2009'
else
+ FIdeNameSpace := Format(Help2BorlandNameSpace, [Installation.IDEVersionNumber]);
+ end
+ else
FIdeNameSpace := '';
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-10-04 10:04:48
|
Revision: 2512
http://jcl.svn.sourceforge.net/jcl/?rev=2512&view=rev
Author: outchy
Date: 2008-10-04 10:04:43 +0000 (Sat, 04 Oct 2008)
Log Message:
-----------
makedist script files to generate daily and weekly zips at http://jcl.sourceforge.net/daily/
Modified Paths:
--------------
trunk/thirdparty/svn_cleaner/SvnCleaner.xml
Added Paths:
-----------
trunk/thirdparty/makedist/JclTesting.xml
trunk/thirdparty/makedist/howto-daily-weekly.txt
trunk/thirdparty/makedist/howto-release.txt
trunk/thirdparty/makedist/winscp-jcl-daily.txt
Property Changed:
----------------
trunk/thirdparty/makedist/
Property changes on: trunk/thirdparty/makedist
___________________________________________________________________
Modified: svn:ignore
- *.exe
*.dproj
*.local
*.identcache
*.dcu
+ *.exe
*.dproj
*.local
*.identcache
*.dcu
*.log
*.zip
*.gz
*.7z
daily
sandbox
jcl-daily-source-0.txt
jcl-daily-source-1.txt
jcl-daily-source-2.txt
jcl-weekly-hlp-0.txt
jcl-weekly-h2-0.txt
7z.dll
Added: trunk/thirdparty/makedist/JclTesting.xml
===================================================================
--- trunk/thirdparty/makedist/JclTesting.xml (rev 0)
+++ trunk/thirdparty/makedist/JclTesting.xml 2008-10-04 10:04:43 UTC (rev 2512)
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<makedist>
+ <task name="jcl-daily-source" selected="0">
+ <action classname="TLogCleaner"/>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="..\..\"/>
+ <configuration index="2" caption="Parameters" value="update"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TXmlGetter">
+ <configuration index="0" caption="Xml or command file" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="..\..\"/>
+ <configuration index="2" caption="Arguments" value="info --xml"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Key" value="info\entry\\revision"/>
+ <configuration index="5" caption="Environment variable" value="VersionRevision"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="sandbox"/>
+ <configuration index="2" caption="Parameters" value="export -rBASE --native-eol CRLF --force ..\..\..\jcl\ ."/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TVariableWriter">
+ <configuration index="0" caption="Destination file" value="sandbox\jcl-revision.txt"/>
+ <configuration index="1" caption="Expression" value="%VersionRevision%"/>
+ <configuration index="2" caption="Append" value="no"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionMajor"/>
+ <configuration index="2" caption="Environment variable" value="VersionMajor"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionMinor"/>
+ <configuration index="2" caption="Environment variable" value="VersionMinor"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionRelease"/>
+ <configuration index="2" caption="Environment variable" value="VersionRelease"/>
+ </action>
+ <action classname="TBuildCalculator">
+ <configuration index="0" caption="Year" value="2000"/>
+ <configuration index="1" caption="Month" value="03"/>
+ <configuration index="2" caption="Day" value="01"/>
+ <configuration index="3" caption="Environment variable" value="VersionBuild"/>
+ </action>
+ <action classname="TVariableWriter">
+ <configuration index="0" caption="Destination file" value="sandbox\jcl-build.txt"/>
+ <configuration index="1" caption="Expression" value="%VersionBuild%"/>
+ <configuration index="2" caption="Append" value="no"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%ComSpec%"/>
+ <configuration index="1" caption="Working directory" value="sandbox\devtools\"/>
+ <configuration index="2" caption="Parameters" value="/C included_files.bat"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TVariableSetter">
+ <configuration index="0" caption="Expression" value="jcl-%VersionMajor%.%VersionMinor%.%VersionRelease%.%VersionBuild%.7z"/>
+ <configuration index="1" caption="Environment variable" value="ArchiveName"/>
+ </action>
+ <action classname="TArchiveMaker">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ <configuration index="1" caption="Filter" value="*"/>
+ <configuration index="2" caption="Archive name" value="%ArchiveName%"/>
+ </action>
+ <action classname="TDirectoryRemover">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ <configuration index="1" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileTouch">
+ <configuration index="0" caption="Path name" value="jcl-daily-source-0.txt"/>
+ </action>
+ <action classname="TFileTouch">
+ <configuration index="0" caption="Path name" value="jcl-daily-source-1.txt"/>
+ </action>
+ <action classname="TFileTouch">
+ <configuration index="0" caption="Path name" value="jcl-daily-source-2.txt"/>
+ </action>
+ <action classname="TVariableReader">
+ <configuration index="0" caption="Source file" value="jcl-daily-source-0.txt"/>
+ <configuration index="1" caption="Environment variable" value="OldArchiveName"/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="."/>
+ <configuration index="1" caption="Filter" value="jcl-daily-source-0.txt"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileMover">
+ <configuration index="0" caption="Old file name" value="jcl-daily-source-1.txt"/>
+ <configuration index="1" caption="New file name" value="jcl-daily-source-0.txt"/>
+ </action>
+ <action classname="TFileMover">
+ <configuration index="0" caption="Old file name" value="jcl-daily-source-2.txt"/>
+ <configuration index="1" caption="New file name" value="jcl-daily-source-1.txt"/>
+ </action>
+ <action classname="TVariableWriter">
+ <configuration index="0" caption="Destination file" value="jcl-daily-source-2.txt"/>
+ <configuration index="1" caption="Expression" value="%ArchiveName%"/>
+ <configuration index="2" caption="Append" value="no"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="daily"/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="daily"/>
+ <configuration index="1" caption="Filter" value="%OldArchiveName%"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileMover">
+ <configuration index="0" caption="Old file name" value="%ArchiveName%"/>
+ <configuration index="1" caption="New file name" value="daily\%ArchiveName%"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%WINSCP%"/>
+ <configuration index="1" caption="Working directory" value="."/>
+ <configuration index="2" caption="Parameters" value="/console /script=winscp-jcl-daily.txt"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TLogSaver">
+ <configuration index="0" caption="File name" value="jcl-%VersionMajor%.%VersionMinor%.%VersionRelease%.%VersionBuild%.log"/>
+ <configuration index="1" caption="Append" value="no"/>
+ </action>
+ </task>
+ <task name="jcl-weekly-hlp" selected="0">
+ <action classname="TLogCleaner"/>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="..\..\"/>
+ <configuration index="2" caption="Parameters" value="update"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TXmlGetter">
+ <configuration index="0" caption="Xml or command file" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="..\..\"/>
+ <configuration index="2" caption="Arguments" value="info --xml"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Key" value="info\entry\\revision"/>
+ <configuration index="5" caption="Environment variable" value="VersionRevision"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="sandbox"/>
+ <configuration index="2" caption="Parameters" value="export -rBASE --native-eol CRLF --force ..\..\..\ ."/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\jcl\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionMajor"/>
+ <configuration index="2" caption="Environment variable" value="VersionMajor"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\jcl\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionMinor"/>
+ <configuration index="2" caption="Environment variable" value="VersionMinor"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\jcl\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionRelease"/>
+ <configuration index="2" caption="Environment variable" value="VersionRelease"/>
+ </action>
+ <action classname="TBuildCalculator">
+ <configuration index="0" caption="Year" value="2000"/>
+ <configuration index="1" caption="Month" value="03"/>
+ <configuration index="2" caption="Day" value="01"/>
+ <configuration index="3" caption="Environment variable" value="VersionBuild"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%ComSpec%"/>
+ <configuration index="1" caption="Working directory" value="sandbox\jcl\devtools\"/>
+ <configuration index="2" caption="Parameters" value="/C included_files.bat"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TVariableSetter">
+ <configuration index="0" caption="Expression" value="jcl-%VersionMajor%.%VersionMinor%.%VersionRelease%.%VersionBuild%-winhelp.7z"/>
+ <configuration index="1" caption="Environment variable" value="ArchiveName"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="sandbox\jcl\help"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%DMCC%"/>
+ <configuration index="1" caption="Working directory" value="sandbox\help"/>
+ <configuration index="2" caption="Parameters" value="-config "HLP" -noshow -w3 JclHelp.dox"/>
+ <configuration index="3" caption="Valid exit codes" value="0;20;30"/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TArchiveMaker">
+ <configuration index="0" caption="Directory" value="sandbox\jcl"/>
+ <configuration index="1" caption="Filter" value="*help*"/>
+ <configuration index="2" caption="Archive name" value="%ArchiveName%"/>
+ </action>
+ <action classname="TDirectoryRemover">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ <configuration index="1" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileTouch">
+ <configuration index="0" caption="Path name" value="jcl-weekly-hlp-0.txt"/>
+ </action>
+ <action classname="TVariableReader">
+ <configuration index="0" caption="Source file" value="jcl-weekly-hlp-0.txt"/>
+ <configuration index="1" caption="Environment variable" value="OldArchiveName"/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="."/>
+ <configuration index="1" caption="Filter" value="jcl-weekly-hlp-0.txt"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TVariableWriter">
+ <configuration index="0" caption="Destination file" value="jcl-weekly-hlp-0.txt"/>
+ <configuration index="1" caption="Expression" value="%ArchiveName%"/>
+ <configuration index="2" caption="Append" value="no"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="daily"/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="daily"/>
+ <configuration index="1" caption="Filter" value="%OldArchiveName%"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileMover">
+ <configuration index="0" caption="Old file name" value="%ArchiveName%"/>
+ <configuration index="1" caption="New file name" value="daily\%ArchiveName%"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%WINSCP%"/>
+ <configuration index="1" caption="Working directory" value="."/>
+ <configuration index="2" caption="Parameters" value="/console /script=winscp-jcl-daily.txt"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TLogSaver">
+ <configuration index="0" caption="File name" value="jcl-%VersionMajor%.%VersionMinor%.%VersionRelease%.%VersionBuild%-winhelp.log"/>
+ <configuration index="1" caption="Append" value="no"/>
+ </action>
+ </task>
+ <task name="jcl-weekly-h2" selected="0">
+ <action classname="TLogCleaner"/>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="..\..\"/>
+ <configuration index="2" caption="Parameters" value="update"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TXmlGetter">
+ <configuration index="0" caption="Xml or command file" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="..\..\"/>
+ <configuration index="2" caption="Arguments" value="info --xml"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Key" value="info\entry\\revision"/>
+ <configuration index="5" caption="Environment variable" value="VersionRevision"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%SVN%"/>
+ <configuration index="1" caption="Working directory" value="sandbox"/>
+ <configuration index="2" caption="Parameters" value="export -rBASE --native-eol CRLF --force ..\..\..\ ."/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\jcl\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionMajor"/>
+ <configuration index="2" caption="Environment variable" value="VersionMajor"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\jcl\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionMinor"/>
+ <configuration index="2" caption="Environment variable" value="VersionMinor"/>
+ </action>
+ <action classname="TConstantParser">
+ <configuration index="0" caption="Source file" value="sandbox\jcl\source\common\JclBase.pas"/>
+ <configuration index="1" caption="Constant name" value="JclVersionRelease"/>
+ <configuration index="2" caption="Environment variable" value="VersionRelease"/>
+ </action>
+ <action classname="TBuildCalculator">
+ <configuration index="0" caption="Year" value="2000"/>
+ <configuration index="1" caption="Month" value="03"/>
+ <configuration index="2" caption="Day" value="01"/>
+ <configuration index="3" caption="Environment variable" value="VersionBuild"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%ComSpec%"/>
+ <configuration index="1" caption="Working directory" value="sandbox\jcl\devtools\"/>
+ <configuration index="2" caption="Parameters" value="/C included_files.bat"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TVariableSetter">
+ <configuration index="0" caption="Expression" value="jcl-%VersionMajor%.%VersionMinor%.%VersionRelease%.%VersionBuild%-htmlhelp2.7z"/>
+ <configuration index="1" caption="Environment variable" value="ArchiveName"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="sandbox\jcl\help"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%DMCC%"/>
+ <configuration index="1" caption="Working directory" value="sandbox\help"/>
+ <configuration index="2" caption="Parameters" value="-config "H2" -noshow -w3 JclHelp.dox"/>
+ <configuration index="3" caption="Valid exit codes" value="0;20;30"/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="sandbox\jcl\help"/>
+ <configuration index="1" caption="Filter" value="*.html;*.css;*.js;*.gif;*.jpg;*.png;*.c;*.h;*.inc"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TArchiveMaker">
+ <configuration index="0" caption="Directory" value="sandbox\jcl"/>
+ <configuration index="1" caption="Filter" value="*help*"/>
+ <configuration index="2" caption="Archive name" value="%ArchiveName%"/>
+ </action>
+ <action classname="TDirectoryRemover">
+ <configuration index="0" caption="Directory" value="sandbox"/>
+ <configuration index="1" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileTouch">
+ <configuration index="0" caption="Path name" value="jcl-weekly-h2-0.txt"/>
+ </action>
+ <action classname="TVariableReader">
+ <configuration index="0" caption="Source file" value="jcl-weekly-h2-0.txt"/>
+ <configuration index="1" caption="Environment variable" value="OldArchiveName"/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="."/>
+ <configuration index="1" caption="Filter" value="jcl-weekly-h2-0.txt"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TVariableWriter">
+ <configuration index="0" caption="Destination file" value="jcl-weekly-h2-0.txt"/>
+ <configuration index="1" caption="Expression" value="%ArchiveName%"/>
+ <configuration index="2" caption="Append" value="no"/>
+ </action>
+ <action classname="TDirectoryCreator">
+ <configuration index="0" caption="Directory" value="daily"/>
+ </action>
+ <action classname="TFileRemover">
+ <configuration index="0" caption="Directory" value="daily"/>
+ <configuration index="1" caption="Filter" value="%OldArchiveName%"/>
+ <configuration index="2" caption="Move to recycle bin" value="no"/>
+ </action>
+ <action classname="TFileMover">
+ <configuration index="0" caption="Old file name" value="%ArchiveName%"/>
+ <configuration index="1" caption="New file name" value="daily\%ArchiveName%"/>
+ </action>
+ <action classname="TCommandLineCaller">
+ <configuration index="0" caption="Application" value="%WINSCP%"/>
+ <configuration index="1" caption="Working directory" value="."/>
+ <configuration index="2" caption="Parameters" value="/console /script=winscp-jcl-daily.txt"/>
+ <configuration index="3" caption="Valid exit codes" value=""/>
+ <configuration index="4" caption="Result file" value=""/>
+ </action>
+ <action classname="TLogSaver">
+ <configuration index="0" caption="File name" value="jcl-%VersionMajor%.%VersionMinor%.%VersionRelease%.%VersionBuild%-htmlhelp2.log"/>
+ <configuration index="1" caption="Append" value="no"/>
+ </action>
+ </task>
+</makedist>
Property changes on: trunk/thirdparty/makedist/JclTesting.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:eol-style
+ native
Added: trunk/thirdparty/makedist/howto-daily-weekly.txt
===================================================================
--- trunk/thirdparty/makedist/howto-daily-weekly.txt (rev 0)
+++ trunk/thirdparty/makedist/howto-daily-weekly.txt 2008-10-04 10:04:43 UTC (rev 2512)
@@ -0,0 +1,14 @@
+1/ In WinSCP: create a session that connects to host web.sourceforge.net with login "username,jcl";
+2/ Save this session as "jcl.web.sourceforge.net";
+3/ Set environment variable "DCC2006" to the compilator of Delphi 2006 or RAD Studio 2007;
+4/ Set environment variable "DMCC" to Doc-o-matic command line compiler;
+5/ Set environment variable "SVN" to up-to-date subversion executable;
+6/ Set environment variable "WINSCP" to WinSCP executable;
+7/ Copy 7z.dll from sevenzip distribution to trunk/thirdparty/makedist/
+8/ Compile makedist.exe
+9/ Execute the following commands in planified tasks:
+
+MakeDist.exe /c=JclTesting.xml /s=jcl-weekly-h2,jcl-weekly-hlp /x
+MakeDist.exe /c=JclTesting.xml /s=jcl-daily-source /x
+
+These actions complete in less than an hour.
\ No newline at end of file
Property changes on: trunk/thirdparty/makedist/howto-daily-weekly.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/thirdparty/makedist/howto-release.txt
===================================================================
--- trunk/thirdparty/makedist/howto-release.txt (rev 0)
+++ trunk/thirdparty/makedist/howto-release.txt 2008-10-04 10:04:43 UTC (rev 2512)
@@ -0,0 +1,14 @@
+1/ In WinSCP: create a session that connects to host web.sourceforge.net with login "username,jcl";
+2/ Save this session as "jcl.web.sourceforge.net";
+3/ Set environment variable "DCC2006" to the compilator of Delphi 2006 or RAD Studio 2007;
+4/ Set environment variable "DMCC" to Doc-o-matic command line compiler;
+5/ Set environment variable "SVN" to up-to-date subversion executable;
+6/ Set environment variable "WINSCP" to WinSCP executable;
+7/ Copy 7z.dll from sevenzip distribution to trunk/thirdparty/makedist/
+8/ Compile makedist.exe
+9/ Execute the command:
+
+MakeDist.exe /c=JclFiles.xml /x
+
+This action requires more than an hour to complete.
+
Property changes on: trunk/thirdparty/makedist/howto-release.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: trunk/thirdparty/makedist/winscp-jcl-daily.txt
===================================================================
--- trunk/thirdparty/makedist/winscp-jcl-daily.txt (rev 0)
+++ trunk/thirdparty/makedist/winscp-jcl-daily.txt 2008-10-04 10:04:43 UTC (rev 2512)
@@ -0,0 +1,7 @@
+option batch on
+option confirm off
+option transfer binary
+open jcl.web.sourceforge.net
+synchronize remote -delete C:\dev\jcl\thirdparty\makedist\daily /home/groups/j/jc/jcl/htdocs/daily
+close
+exit
\ No newline at end of file
Property changes on: trunk/thirdparty/makedist/winscp-jcl-daily.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: trunk/thirdparty/svn_cleaner/SvnCleaner.xml
===================================================================
--- trunk/thirdparty/svn_cleaner/SvnCleaner.xml 2008-10-01 18:27:04 UTC (rev 2511)
+++ trunk/thirdparty/svn_cleaner/SvnCleaner.xml 2008-10-04 10:04:43 UTC (rev 2512)
@@ -429,6 +429,18 @@
<value>*.local</value>
<value>*.identcache</value>
<value>*.dcu</value>
+ <value>*.log</value>
+ <value>*.zip</value>
+ <value>*.gz</value>
+ <value>*.7z</value>
+ <value>daily</value>
+ <value>sandbox</value>
+ <value>jcl-daily-source-0.txt</value>
+ <value>jcl-daily-source-1.txt</value>
+ <value>jcl-daily-source-2.txt</value>
+ <value>jcl-weekly-hlp-0.txt</value>
+ <value>jcl-weekly-h2-0.txt</value>
+ <value>7z.dll</value>
</property>
</setting>
</setting>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-10-01 18:27:15
|
Revision: 2511
http://jcl.svn.sourceforge.net/jcl/?rev=2511&view=rev
Author: outchy
Date: 2008-10-01 18:27:04 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
Text representing the revision is located on the first line of jcl-revision.txt.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-10-01 18:16:11 UTC (rev 2510)
+++ trunk/jcl/install/JclInstall.pas 2008-10-01 18:27:04 UTC (rev 2511)
@@ -3480,7 +3480,7 @@
TextFile := TJclAnsiMappedTextReader.Create(DailyFileName);
try
RevisionText := string(TextFile.ReadLn);
- Result := StrToIntDef(string(TextFile.ReadLn), 0);
+ Result := StrToIntDef(RevisionText, 0);
finally
TextFile.Free;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-10-01 18:16:22
|
Revision: 2510
http://jcl.svn.sourceforge.net/jcl/?rev=2510&view=rev
Author: outchy
Date: 2008-10-01 18:16:11 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
added ignore mask on included files for Delphi 2009.
Property Changed:
----------------
trunk/jcl/source/include/
Property changes on: trunk/jcl/source/include
___________________________________________________________________
Modified: svn:ignore
- jclc5.inc
jclc6.inc
jcld5.inc
jcld6.inc
jcld7.inc
jclcs1.inc
jcld8.inc
jcld9.inc
jcld9.net.inc
jcld10.inc
jcld10.net.inc
jclkd3.inc
jclkc3.inc
jcld11.inc
jcld11.net.inc
+ jclc5.inc
jclc6.inc
jcld5.inc
jcld6.inc
jcld7.inc
jclcs1.inc
jcld8.inc
jcld9.inc
jcld9.net.inc
jcld10.inc
jcld10.net.inc
jclkd3.inc
jclkc3.inc
jcld11.inc
jcld11.net.inc
jcld12.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2008-10-01 07:20:14
|
Revision: 2509
http://jcl.svn.sourceforge.net/jcl/?rev=2509&view=rev
Author: obones
Date: 2008-10-01 07:20:02 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
Readded LoadFromString and SaveToString, they are very much useful when it comes to loading XML parts from various sources.
Modified Paths:
--------------
trunk/jcl/source/common/JclSimpleXml.pas
Modified: trunk/jcl/source/common/JclSimpleXml.pas
===================================================================
--- trunk/jcl/source/common/JclSimpleXml.pas 2008-09-30 22:57:19 UTC (rev 2508)
+++ trunk/jcl/source/common/JclSimpleXml.pas 2008-10-01 07:20:02 UTC (rev 2509)
@@ -356,6 +356,8 @@
procedure LoadFromStringStream(StringStream: TJclStringStream; AParent: TJclSimpleXML = nil); virtual; abstract;
procedure SaveToStringStream(StringStream: TJclStringStream; const Level: string = ''; AParent: TJclSimpleXML = nil); virtual;
abstract;
+ procedure LoadFromString(const Value: string);
+ function SaveToString: string;
procedure GetBinaryValue(Stream: TStream);
property Data: {$IFDEF CLR} TObject {$ELSE} Pointer {$ENDIF} read FData write FData;
function GetChildIndex(const AChild: TJclSimpleXMLElem): Integer;
@@ -1477,6 +1479,43 @@
Result := FSimpleXML;
end;
+procedure TJclSimpleXMLElem.LoadFromString(const Value: string);
+var
+ Stream: TJclStringStream;
+ StrStream: TStringStream;
+begin
+ StrStream := TStringStream.Create(Value);
+ try
+ Stream := TJclStringStream.Create(StrStream);
+ try
+ LoadFromStringStream(Stream);
+ finally
+ Stream.Free;
+ end;
+ finally
+ StrStream.Free;
+ end;
+end;
+
+function TJclSimpleXMLElem.SaveToString: string;
+var
+ Stream: TJclStringStream;
+ StrStream: TStringStream;
+begin
+ StrStream := TStringStream.Create('');
+ try
+ Stream := TJclStringStream.Create(StrStream);
+ try
+ SaveToStringStream(Stream);
+ Result := StrStream.DataString;
+ finally
+ Stream.Free;
+ end;
+ finally
+ StrStream.Free;
+ end;
+end;
+
procedure TJclSimpleXMLElem.SetBoolValue(const Value: Boolean);
begin
FValue := BoolToStr(Value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-30 22:57:34
|
Revision: 2508
http://jcl.svn.sourceforge.net/jcl/?rev=2508&view=rev
Author: outchy
Date: 2008-09-30 22:57:19 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
changed the name of the file containing revision information for daily zips.
Modified Paths:
--------------
trunk/jcl/install/JclInstall.pas
Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas 2008-09-30 22:54:38 UTC (rev 2507)
+++ trunk/jcl/install/JclInstall.pas 2008-09-30 22:57:19 UTC (rev 2508)
@@ -782,7 +782,7 @@
ReadmeFileName = 'Readme.txt';
{$ENDIF}
- DailyRevisionFileName = 'daily_revision.log';
+ DailyRevisionFileName = 'jcl-revision.txt';
EntriesFileName1 = '.svn' + DirDelimiter + 'entries';
EntriesFileName2 = '_svn' + DirDelimiter + 'entries';
@@ -3470,7 +3470,6 @@
var
DailyFileName, SvnEntriesFileName, RevisionText: string;
TextFile: TJclAnsiMappedTextReader;
- Index: Integer;
begin
Result := 0;
@@ -3481,13 +3480,7 @@
TextFile := TJclAnsiMappedTextReader.Create(DailyFileName);
try
RevisionText := string(TextFile.ReadLn);
- if RevisionText <> '' then
- begin
- Index := Length(RevisionText) - 1; // skip the '.'
- while (Index > 1) and CharIsDigit(RevisionText[Index]) do
- Dec(Index);
- Result := StrToIntDef(Copy(RevisionText, Index + 1, Length(RevisionText) - Index - 1), 0);
- end;
+ Result := StrToIntDef(string(TextFile.ReadLn), 0);
finally
TextFile.Free;
end;
@@ -3961,4 +3954,4 @@
initialization
JediInstall.InstallCore.AddProduct(TJclDistribution.Create);
-end.
+end.
\ 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-09-30 22:54:51
|
Revision: 2507
http://jcl.svn.sourceforge.net/jcl/?rev=2507&view=rev
Author: outchy
Date: 2008-09-30 22:54:38 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
Sourceforge changed access to shell servers.
MakeDist.exe is now used to generate daily zips.
Removed Paths:
-------------
trunk/shell/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-30 22:49:19
|
Revision: 2506
http://jcl.svn.sourceforge.net/jcl/?rev=2506&view=rev
Author: outchy
Date: 2008-09-30 22:49:03 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
New actions to save and load environment variables to files.
Fixed help display.
Modified Paths:
--------------
trunk/thirdparty/makedist/MakeDist.dpr
trunk/thirdparty/makedist/MakeDistActions.pas
Modified: trunk/thirdparty/makedist/MakeDist.dpr
===================================================================
--- trunk/thirdparty/makedist/MakeDist.dpr 2008-09-30 19:32:18 UTC (rev 2505)
+++ trunk/thirdparty/makedist/MakeDist.dpr 2008-09-30 22:49:03 UTC (rev 2506)
@@ -40,7 +40,7 @@
WriteLn('Copyright Florent Ouchet (c), February 2008');
WriteLn;
end;
- if ParamPos('help') > 0 then
+ if (ParamPos('?') > 0) or (ParamPos('h') > 0) then
begin
WriteLn('Usage:');
WriteLn(' MakeDist.exe [/cConfigFile] : launch the graphical GUI');
@@ -57,6 +57,7 @@
WriteLn(' /u=Task1[,Task2] Unselect these tasks');
WriteLn(' /x Execute selected tasks of a project');
WriteLn;
+ ReadLn;
end;
ConfigurationPos := ParamPos('c');
Modified: trunk/thirdparty/makedist/MakeDistActions.pas
===================================================================
--- trunk/thirdparty/makedist/MakeDistActions.pas 2008-09-30 19:32:18 UTC (rev 2505)
+++ trunk/thirdparty/makedist/MakeDistActions.pas 2008-09-30 22:49:03 UTC (rev 2506)
@@ -7,7 +7,7 @@
uses
Windows, SysUtils, Classes,
- JclSysUtils,
+ JclSysUtils, JclStreams,
MakeDistMain;
type
@@ -173,6 +173,55 @@
function Execute(const AMessageHandler: TTextHandler): Boolean; override;
end;
+ // load an environment variable from a file
+ TVariableReader = class(TDistAction)
+ private
+ FSourceFile: string;
+ FEnvironmentVariable: string;
+ protected
+ function GetCaption: string; override;
+ function GetConfigCount: Integer; override;
+ function GetConfigCaption(Index: Integer): string; override;
+ function GetConfigValue(Index: Integer): string; override;
+ procedure SetConfigValue(Index: Integer; const Value: string); override;
+ public
+ class function GetDescription: string; override;
+ function Execute(const AMessageHandler: TTextHandler): Boolean; override;
+ end;
+
+ // compute an environment variable
+ TVariableSetter = class(TDistAction)
+ private
+ FExpression: string;
+ FEnvironmentVariable: string;
+ protected
+ function GetCaption: string; override;
+ function GetConfigCount: Integer; override;
+ function GetConfigCaption(Index: Integer): string; override;
+ function GetConfigValue(Index: Integer): string; override;
+ procedure SetConfigValue(Index: Integer; const Value: string); override;
+ public
+ class function GetDescription: string; override;
+ function Execute(const AMessageHandler: TTextHandler): Boolean; override;
+ end;
+
+ // save an environment variable to a file
+ TVariableWriter = class(TDistAction)
+ private
+ FDestinationFile: string;
+ FExpression: string;
+ FAppend: string;
+ protected
+ function GetCaption: string; override;
+ function GetConfigCount: Integer; override;
+ function GetConfigCaption(Index: Integer): string; override;
+ function GetConfigValue(Index: Integer): string; override;
+ procedure SetConfigValue(Index: Integer; const Value: string); override;
+ public
+ class function GetDescription: string; override;
+ function Execute(const AMessageHandler: TTextHandler): Boolean; override;
+ end;
+
// compute the number of days between now and a start date
TBuildCalculator = class(TDistAction)
private
@@ -227,6 +276,9 @@
FWorkingDirectory: string;
FParameters: string;
FValidExitCodes: string;
+ FResultFile: string;
+ FResultStringStream: TJclAnsiStream;
+ procedure WriteResult(const Text: string);
protected
function GetCaption: string; override;
function GetConfigCount: Integer; override;
@@ -291,9 +343,12 @@
DateUtils, JclDateTime, JclStrings, JclFileUtils, JclSysInfo, JclSimpleXml, JclCompression;
const
- StdActionsClasses: array [0..14] of TDistActionClass =
- ( TBuildCalculator, TConstantParser, TDirectoryCreator, TDirectoryRemover, TEolConverter, TFileCopier,
- TFileCreator, TFileMover, TFileRemover, TFileTouch, TXmlGetter, TCommandLineCaller, TArchiveMaker,
+ StdActionsClasses: array [0..17] of TDistActionClass =
+ ( TBuildCalculator, TConstantParser,
+ TVariableReader, TVariableSetter, TVariableWriter,
+ TDirectoryCreator, TDirectoryRemover, TEolConverter,
+ TFileCopier, TFileCreator, TFileMover, TFileRemover, TFileTouch,
+ TXmlGetter, TCommandLineCaller, TArchiveMaker,
TLogSaver, TLogCleaner );
procedure RegisterStandardActions;
@@ -714,12 +769,12 @@
ExpandEnvironmentVar(MoveToRecycleBin);
MoveToRecBin := AnsiSameText(MoveToRecycleBin, 'yes');
+ Result := True;
FileList := TStringList.Create;
try
BuildFileList(PathAddSeparator(Directory) + Filter, faAnyFile and (not faDirectory), FileList);
if FileList.Count > 0 then
begin
- Result := True;
for Index := 0 to FileList.Count - 1 do
begin
FileName := FileList.Strings[Index];
@@ -734,11 +789,6 @@
AMessageHandler(IntToStr(FileList.Count) + ' files were deleted')
else
AMessageHandler('Failed to remove ' + IntToStr(FileList.Count) + ' files');
- end
- else
- begin
- AMessageHandler('No files were found');
- Result := False;
end;
finally
FileList.Free;
@@ -1153,6 +1203,249 @@
end;
end;
+//=== { TVariableReader } ====================================================
+
+function TVariableReader.Execute(const AMessageHandler: TTextHandler): Boolean;
+var
+ SourceFile, EnvironmentVariable: string;
+ Reader: TJclAnsiMappedTextReader;
+begin
+ SourceFile := FSourceFile;
+ ExpandEnvironmentVar(SourceFile);
+ EnvironmentVariable := FEnvironmentVariable;
+ ExpandEnvironmentVar(EnvironmentVariable);
+
+ AMessageHandler('Read ' + EnvironmentVariable + ' from ' + SourceFile);
+
+ if FileGetSize(SourceFile) <> 0 then
+ begin
+ Reader := TJclAnsiMappedTextReader.Create(SourceFile);
+ try
+ SetEnvironmentVar(EnvironmentVariable, string(Reader.ReadLn));
+ finally
+ Reader.Free;
+ end;
+ end
+ else
+ SetEnvironmentVar(EnvironmentVariable, '');
+ Result := True;
+end;
+
+function TVariableReader.GetCaption: string;
+begin
+ Result := 'Load environment variable ' + FEnvironmentVariable + ' from file ' + FSourceFile;
+end;
+
+function TVariableReader.GetConfigCaption(Index: Integer): string;
+begin
+ case Index of
+ 0:
+ Result := 'Source file';
+ 1:
+ Result := 'Environment variable';
+ else
+ Result := '';
+ end;
+end;
+
+function TVariableReader.GetConfigCount: Integer;
+begin
+ Result := 2;
+end;
+
+function TVariableReader.GetConfigValue(Index: Integer): string;
+begin
+ case Index of
+ 0:
+ Result := FSourceFile;
+ 1:
+ Result := FEnvironmentVariable;
+ else
+ Result := '';
+ end;
+end;
+
+class function TVariableReader.GetDescription: string;
+begin
+ Result := 'Load an environment variable from a file';
+end;
+
+procedure TVariableReader.SetConfigValue(Index: Integer; const Value: string);
+begin
+ case Index of
+ 0:
+ FSourceFile := Value;
+ 1:
+ FEnvironmentVariable := Value;
+ end;
+end;
+
+//=== { TVariableSetter } ====================================================
+
+function TVariableSetter.Execute(const AMessageHandler: TTextHandler): Boolean;
+var
+ EnvironmentVariable, Expression: string;
+begin
+ EnvironmentVariable := FEnvironmentVariable;
+ ExpandEnvironmentVar(EnvironmentVariable);
+ Expression := FExpression;
+ ExpandEnvironmentVar(Expression);
+
+ AMessageHandler('set ' + EnvironmentVariable + '=' + Expression);
+ SetEnvironmentVar(EnvironmentVariable, Expression);
+ Result := True;
+end;
+
+function TVariableSetter.GetCaption: string;
+begin
+ Result := 'Set environment variable ' + FEnvironmentVariable + ' to ' + FExpression;
+end;
+
+function TVariableSetter.GetConfigCaption(Index: Integer): string;
+begin
+ case Index of
+ 0:
+ Result := 'Expression';
+ 1:
+ Result := 'Environment variable';
+ else
+ Result := '';
+ end;
+end;
+
+function TVariableSetter.GetConfigCount: Integer;
+begin
+ Result := 2;
+end;
+
+function TVariableSetter.GetConfigValue(Index: Integer): string;
+begin
+ case Index of
+ 0:
+ Result := FExpression;
+ 1:
+ Result := FEnvironmentVariable;
+ else
+ Result := '';
+ end;
+end;
+
+class function TVariableSetter.GetDescription: string;
+begin
+ Result := 'set an environment variable to an expression';
+end;
+
+procedure TVariableSetter.SetConfigValue(Index: Integer; const Value: string);
+begin
+ case Index of
+ 0:
+ FExpression := Value;
+ 1:
+ FEnvironmentVariable := Value;
+ end;
+end;
+
+//=== { TVariableWriter } ====================================================
+
+function TVariableWriter.Execute(const AMessageHandler: TTextHandler): Boolean;
+var
+ DestinationFile, Expression, Append: string;
+ DestinationStream: TFileStream;
+ StringStream: TJclAnsiStream;
+begin
+ DestinationFile := FDestinationFile;
+ ExpandEnvironmentVar(DestinationFile);
+ Expression := FExpression;
+ ExpandEnvironmentVar(Expression);
+ Append := FAppend;
+ ExpandEnvironmentVar(Append);
+
+ if AnsiSameText(Append, 'yes') and FileExists(DestinationFile) then
+ begin
+ AMessageHandler('Append ' + Expression + ' to ' + DestinationFile);
+ DestinationStream := TFileStream.Create(DestinationFile, fmOpenReadWrite);
+ DestinationStream.Seek(0, soEnd);
+ end
+ else
+ begin
+ AMessageHandler('Write ' + Expression + ' to ' + DestinationFile);
+ DestinationStream := TFileStream.Create(DestinationFile, fmCreate);
+ end;
+ try
+ StringStream := TJclAnsiStream.Create(DestinationStream, False);
+ try
+ StringStream.WriteString(Expression, 1, Length(Expression));
+ finally
+ StringStream.Free;
+ end;
+ finally
+ DestinationStream.Free;
+ end;
+ Result := True;
+end;
+
+function TVariableWriter.GetCaption: string;
+var
+ Append: string;
+begin
+ Append := FAppend;
+ ExpandEnvironmentVar(Append);
+ if AnsiSameText(Append, 'yes') then
+ Result := 'Append ' + FExpression + ' to file ' + FDestinationFile
+ else
+ Result := 'Save ' + FExpression + ' to file ' + FDestinationFile;
+end;
+
+function TVariableWriter.GetConfigCaption(Index: Integer): string;
+begin
+ case Index of
+ 0:
+ Result := 'Destination file';
+ 1:
+ Result := 'Expression';
+ 2:
+ Result := 'Append';
+ else
+ Result := '';
+ end;
+end;
+
+function TVariableWriter.GetConfigCount: Integer;
+begin
+ Result := 3;
+end;
+
+function TVariableWriter.GetConfigValue(Index: Integer): string;
+begin
+ case Index of
+ 0:
+ Result := FDestinationFile;
+ 1:
+ Result := FExpression;
+ 2:
+ Result := FAppend;
+ else
+ Result := '';
+ end;
+end;
+
+class function TVariableWriter.GetDescription: string;
+begin
+ Result := 'Save an environment variable to a file';
+end;
+
+procedure TVariableWriter.SetConfigValue(Index: Integer; const Value: string);
+begin
+ case Index of
+ 0:
+ FDestinationFile := Value;
+ 1:
+ FExpression := Value;
+ 2:
+ FAppend := Value;
+ end;
+end;
+
{ TBuildCalculator }
function TBuildCalculator.Execute(const AMessageHandler: TTextHandler): Boolean;
@@ -1466,8 +1759,9 @@
function TCommandLineCaller.Execute(const AMessageHandler: TTextHandler): Boolean;
var
- Application, WorkingDirectory, Parameters, ValidExitCodes: string;
+ Application, WorkingDirectory, Parameters, ValidExitCodes, ResultFile: string;
ReturnValue: Integer;
+ ResultFileStream: TFileStream;
begin
Application := FApplication;
ExpandEnvironmentVar(Application);
@@ -1477,11 +1771,32 @@
ExpandEnvironmentVar(Parameters);
ValidExitCodes := FValidExitCodes;
ExpandEnvironmentVar(ValidExitCodes);
+ ResultFile := FResultFile;
+ ExpandEnvironmentVar(ResultFile);
- if WorkingDirectory <> '' then
- SetCurrentDir(WorkingDirectory);
AMessageHandler('Executing ' + Application + ' ' + Parameters + ' in directory ' + WorkingDirectory);
- ReturnValue := JclSysUtils.Execute(Application + ' ' + Parameters, AMessageHandler, False);
+ if ResultFile <> '' then
+ begin
+ ResultFileStream := TFileStream.Create(ResultFile, fmCreate);
+ try
+ FResultStringStream := TJclAnsiStream.Create(ResultFileStream, False);
+ try
+ if WorkingDirectory <> '' then
+ SetCurrentDir(WorkingDirectory);
+ ReturnValue := JclSysUtils.Execute(Application + ' ' + Parameters, WriteResult, True);
+ finally
+ FreeAndNil(FResultStringStream);
+ end;
+ finally
+ ResultFileStream.Free;
+ end;
+ end
+ else
+ begin
+ if WorkingDirectory <> '' then
+ SetCurrentDir(WorkingDirectory);
+ ReturnValue := JclSysUtils.Execute(Application + ' ' + Parameters, AMessageHandler, False);
+ end;
if ValidExitCodes = '' then
Result := ReturnValue = 0
else
@@ -1508,6 +1823,8 @@
Result := 'Parameters';
3:
Result := 'Valid exit codes';
+ 4:
+ Result := 'Result file';
else
Result := '';
end;
@@ -1515,7 +1832,7 @@
function TCommandLineCaller.GetConfigCount: Integer;
begin
- Result := 4;
+ Result := 5;
end;
function TCommandLineCaller.GetConfigValue(Index: Integer): string;
@@ -1529,6 +1846,8 @@
Result := FParameters;
3:
Result := FValidExitCodes;
+ 4:
+ Result := FResultFile;
else
Result := '';
end;
@@ -1550,9 +1869,17 @@
FParameters := Value;
3:
FValidExitCodes := Value;
+ 4:
+ FResultFile := Value;
end;
end;
+procedure TCommandLineCaller.WriteResult(const Text: string);
+begin
+ if Assigned(FResultStringStream) then
+ FResultStringStream.WriteString(Text,1,Length(Text));
+end;
+
//=== { TArchiveMaker } ======================================================
function TArchiveMaker.Execute(const AMessageHandler: TTextHandler): Boolean;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-30 19:32:30
|
Revision: 2505
http://jcl.svn.sourceforge.net/jcl/?rev=2505&view=rev
Author: outchy
Date: 2008-09-30 19:32:18 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
HAS_UNIT_* used to be declared in RTLXXX_UP conditional sections.
Modified Paths:
--------------
trunk/jcl/source/include/jedi.inc
Modified: trunk/jcl/source/include/jedi.inc
===================================================================
--- trunk/jcl/source/include/jedi.inc 2008-09-28 11:26:05 UTC (rev 2504)
+++ trunk/jcl/source/include/jedi.inc 2008-09-30 19:32:18 UTC (rev 2505)
@@ -389,7 +389,7 @@
SUPPORTS_UNSAFE_WARNINGS Compiler supports unsafe warnings (D7)
SUPPORTS_WEAKPACKAGEUNIT Compiler supports the WEAKPACKAGEUNIT directive
SUPPORTS_COMPILETIME_MESSAGES Compiler supports the MESSAGE directive
- SUPPORTS_PACKAGES Compiler supports Packages
+ SUPPORTS_PACKAGES Compiler supports Packages
HAS_UNIT_LIBC Unit Libc exists (Kylix, FPC on Linux/x86)
HAS_UNIT_RTLCONSTS Unit RTLConsts exists (D6+/BCB6+/FPC)
HAS_UNIT_TYPES Unit Types exists (D6+/BCB6+/FPC)
@@ -1090,7 +1090,6 @@
{$IFDEF COMPILER12_UP}
{$DEFINE SUPPORTS_GENERICS}
- {$DEFINE HAS_UNIT_ANSISTRINGS}
{$IFNDEF CLR}
{$DEFINE SUPPORTS_UNICODE}
{$DEFINE SUPPORTS_UNICODE_STRING}
@@ -1113,6 +1112,11 @@
{$DEFINE HAS_UNIT_CONTNRS}
{$ENDIF RTL130_UP}
+{$IFDEF RTL200_UP}
+ {$DEFINE HAS_UNIT_ANSISTRINGS}
+ {$DEFINE HAS_UNIT_PNGIMAGE}
+{$ENDIF RTL200_UP}
+
{------------------------------------------------------------------------------}
{ Cross-platform related defines }
{------------------------------------------------------------------------------}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-28 11:26:08
|
Revision: 2504
http://jcl.svn.sourceforge.net/jcl/?rev=2504&view=rev
Author: outchy
Date: 2008-09-28 11:26:05 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
fixed linkage issue of BZip2 code with C++Builder 5 and C++Builder 6.
Modified Paths:
--------------
trunk/jcl/source/common/bzip2.pas
Modified: trunk/jcl/source/common/bzip2.pas
===================================================================
--- trunk/jcl/source/common/bzip2.pas 2008-09-27 12:45:53 UTC (rev 2503)
+++ trunk/jcl/source/common/bzip2.pas 2008-09-28 11:26:05 UTC (rev 2504)
@@ -346,7 +346,6 @@
const
{$IFDEF MSWINDOWS}
szBZIP2 = 'bzip2.dll'; // from http://gnuwin32.sourceforge.net/
- szMSVCRT = 'MSVCRT.DLL';
{$ENDIF MSWINDOWS}
{$IFDEF UNIX}
szBZIP2 = 'libbz2.so.1';
@@ -391,9 +390,16 @@
type
size_t = Longint;
-function _malloc(size: size_t): Pointer; cdecl; external szMSVCRT name 'malloc';
-procedure _free(pBlock: Pointer); cdecl; external szMSVCRT name 'free';
+function _malloc(size: size_t): Pointer; cdecl;
+begin
+ GetMem(Result, Size);
+end;
+procedure _free(pBlock: Pointer); cdecl;
+begin
+ FreeMem(pBlock);
+end;
+
procedure _bz_internal_error(errcode: Integer); cdecl;
begin
if Assigned(bz2_internal_error_event) then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-27 12:46:03
|
Revision: 2503
http://jcl.svn.sourceforge.net/jcl/?rev=2503&view=rev
Author: outchy
Date: 2008-09-27 12:45:53 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
deleted useless Unix target.
Modified Paths:
--------------
trunk/jcl/source/prototypes/Makefile.mak
Modified: trunk/jcl/source/prototypes/Makefile.mak
===================================================================
--- trunk/jcl/source/prototypes/Makefile.mak 2008-09-27 12:39:00 UTC (rev 2502)
+++ trunk/jcl/source/prototypes/Makefile.mak 2008-09-27 12:45:53 UTC (rev 2503)
@@ -16,7 +16,7 @@
ContainerOptions = $(Options) -m -ijcl.inc -f..\Common\\
UnixOptions = $(Options) -uMSWINDOWS -dUNIX -f..\unix\\
-release: VCL VisualCLX Windows Unix ContainersProt Containers
+release: VCL VisualCLX Windows ContainersProt Containers
VCL: ..\vcl\JclGraphics.pas \
..\vcl\JclGraphUtils.pas
@@ -71,10 +71,6 @@
_GraphUtils.pas
$(jpp) $(VClxOptions) $?
-..\unix\JclWin32.pas: \
- JclWin32.pas
- $(jpp) -ijcl.inc $(UnixOptions) $?
-
..\windows\JclWin32.pas: \
JclWin32.pas
$(jpp) -ijcl.inc $(WinOptions) $?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-27 12:39:03
|
Revision: 2502
http://jcl.svn.sourceforge.net/jcl/?rev=2502&view=rev
Author: outchy
Date: 2008-09-27 12:39:00 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
Mantis 2225: Stretch unexpectedly changes the pixel format
Modified Paths:
--------------
trunk/jcl/source/prototypes/_Graphics.pas
trunk/jcl/source/vcl/JclGraphics.pas
trunk/jcl/source/visclx/JclQGraphics.pas
Modified: trunk/jcl/source/prototypes/_Graphics.pas
===================================================================
--- trunk/jcl/source/prototypes/_Graphics.pas 2008-09-27 12:29:19 UTC (rev 2501)
+++ trunk/jcl/source/prototypes/_Graphics.pas 2008-09-27 12:39:00 UTC (rev 2502)
@@ -1324,6 +1324,7 @@
Radius: Single; Source: TGraphic; Target: TBitmap);
var
Temp: TBitmap;
+ OriginalPixelFormat: TPixelFormat;
begin
if Source.Empty then
Exit; // do nothing
@@ -1336,6 +1337,7 @@
// To allow Source = Target, the following assignment needs to be done initially
Temp.Assign(Source);
Temp.PixelFormat := pf32bit;
+ OriginalPixelFormat := Target.PixelFormat; //Save format
Target.FreeImage;
Target.PixelFormat := pf32bit;
@@ -1344,6 +1346,8 @@
{$IFDEF VCL}if not Target.Empty then{$ENDIF VCL}
DoStretch(FilterList[Filter], Radius, Temp, Target);
+
+ Target.PixelFormat := OriginalPixelFormat; //Restore original PixelFormat
finally
Temp.Free;
end;
Modified: trunk/jcl/source/vcl/JclGraphics.pas
===================================================================
--- trunk/jcl/source/vcl/JclGraphics.pas 2008-09-27 12:29:19 UTC (rev 2501)
+++ trunk/jcl/source/vcl/JclGraphics.pas 2008-09-27 12:39:00 UTC (rev 2502)
@@ -1285,6 +1285,7 @@
Radius: Single; Source: TGraphic; Target: TBitmap);
var
Temp: TBitmap;
+ OriginalPixelFormat: TPixelFormat;
begin
if Source.Empty then
Exit; // do nothing
@@ -1297,6 +1298,7 @@
// To allow Source = Target, the following assignment needs to be done initially
Temp.Assign(Source);
Temp.PixelFormat := pf32bit;
+ OriginalPixelFormat := Target.PixelFormat; //Save format
Target.FreeImage;
Target.PixelFormat := pf32bit;
@@ -1305,6 +1307,8 @@
if not Target.Empty then
DoStretch(FilterList[Filter], Radius, Temp, Target);
+
+ Target.PixelFormat := OriginalPixelFormat; //Restore original PixelFormat
finally
Temp.Free;
end;
Modified: trunk/jcl/source/visclx/JclQGraphics.pas
===================================================================
--- trunk/jcl/source/visclx/JclQGraphics.pas 2008-09-27 12:29:19 UTC (rev 2501)
+++ trunk/jcl/source/visclx/JclQGraphics.pas 2008-09-27 12:39:00 UTC (rev 2502)
@@ -928,6 +928,7 @@
Radius: Single; Source: TGraphic; Target: TBitmap);
var
Temp: TBitmap;
+ OriginalPixelFormat: TPixelFormat;
begin
if Source.Empty then
Exit; // do nothing
@@ -940,6 +941,7 @@
// To allow Source = Target, the following assignment needs to be done initially
Temp.Assign(Source);
Temp.PixelFormat := pf32bit;
+ OriginalPixelFormat := Target.PixelFormat; //Save format
Target.FreeImage;
Target.PixelFormat := pf32bit;
@@ -947,6 +949,8 @@
Target.Height := NewHeight;
DoStretch(FilterList[Filter], Radius, Temp, Target);
+
+ Target.PixelFormat := OriginalPixelFormat; //Restore original PixelFormat
finally
Temp.Free;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-27 12:29:22
|
Revision: 2501
http://jcl.svn.sourceforge.net/jcl/?rev=2501&view=rev
Author: outchy
Date: 2008-09-27 12:29:19 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
Mantis 2161: TJclPeMapImgHooks.HookImport can't hook one function in many modules.
Modified Paths:
--------------
trunk/jcl/source/windows/JclPeImage.pas
Modified: trunk/jcl/source/windows/JclPeImage.pas
===================================================================
--- trunk/jcl/source/windows/JclPeImage.pas 2008-09-27 11:38:53 UTC (rev 2500)
+++ trunk/jcl/source/windows/JclPeImage.pas 2008-09-27 12:29:19 UTC (rev 2501)
@@ -6072,6 +6072,7 @@
const FunctionName: string; NewAddress: Pointer; var OriginalAddress: Pointer): Boolean;
var
ModuleHandle: THandle;
+ OriginalItem: TJclPeMapImgHookItem;
begin
ModuleHandle := GetModuleHandle(PChar(ModuleName));
Result := (ModuleHandle <> 0);
@@ -6087,8 +6088,9 @@
SetLastError(ERROR_PROC_NOT_FOUND);
Exit;
end;
- Result := (ItemFromOriginalAddress[OriginalAddress] = nil) and (NewAddress <> nil) and
- (OriginalAddress <> NewAddress);
+ OriginalItem := ItemFromOriginalAddress[OriginalAddress];
+ Result := ((OriginalItem = nil) or (OriginalItem.ModuleName = ModuleName)) and
+ (NewAddress <> nil) and (OriginalAddress <> NewAddress);
if not Result then
begin
SetLastError(ERROR_ALREADY_EXISTS);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-27 11:39:04
|
Revision: 2500
http://jcl.svn.sourceforge.net/jcl/?rev=2500&view=rev
Author: outchy
Date: 2008-09-27 11:38:53 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
ThreadNameExpert is useless for D7+ since the IDE manages to display the name of the threads.
Added missing JclSIMDViewExpert in various project groups.
Modified Paths:
--------------
trunk/jcl/packages/JclPackagesD100.bdsgroup
trunk/jcl/packages/JclPackagesD110.groupproj
trunk/jcl/packages/JclPackagesD70.bpg
trunk/jcl/packages/JclPackagesD90.bdsgroup
trunk/jcl/packages/resources.mak
trunk/jcl/packages/xml/JclThreadNameExpert-D.xml
trunk/jcl/packages/xml/JclThreadNameExpertDLL-L.xml
Removed Paths:
-------------
trunk/jcl/packages/d10/JclThreadNameExpert.bdsproj
trunk/jcl/packages/d10/JclThreadNameExpert.dpk
trunk/jcl/packages/d10/JclThreadNameExpert.rc
trunk/jcl/packages/d10/JclThreadNameExpert.res
trunk/jcl/packages/d10/JclThreadNameExpertDLL.bdsproj
trunk/jcl/packages/d10/JclThreadNameExpertDLL.dpr
trunk/jcl/packages/d10/JclThreadNameExpertDLL.rc
trunk/jcl/packages/d10/JclThreadNameExpertDLL.res
trunk/jcl/packages/d11/JclThreadNameExpert.dpk
trunk/jcl/packages/d11/JclThreadNameExpert.dproj
trunk/jcl/packages/d11/JclThreadNameExpert.rc
trunk/jcl/packages/d11/JclThreadNameExpert.res
trunk/jcl/packages/d11/JclThreadNameExpertDLL.dpr
trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj
trunk/jcl/packages/d11/JclThreadNameExpertDLL.rc
trunk/jcl/packages/d11/JclThreadNameExpertDLL.res
trunk/jcl/packages/d12/JclThreadNameExpert.dpk
trunk/jcl/packages/d12/JclThreadNameExpert.dproj
trunk/jcl/packages/d12/JclThreadNameExpert.rc
trunk/jcl/packages/d12/JclThreadNameExpert.res
trunk/jcl/packages/d12/JclThreadNameExpertDLL.dpr
trunk/jcl/packages/d12/JclThreadNameExpertDLL.dproj
trunk/jcl/packages/d12/JclThreadNameExpertDLL.rc
trunk/jcl/packages/d12/JclThreadNameExpertDLL.res
trunk/jcl/packages/d7/JclThreadNameExpert.dof
trunk/jcl/packages/d7/JclThreadNameExpert.dpk
trunk/jcl/packages/d7/JclThreadNameExpert.rc
trunk/jcl/packages/d7/JclThreadNameExpert.res
trunk/jcl/packages/d7/JclThreadNameExpertDLL.RES
trunk/jcl/packages/d7/JclThreadNameExpertDLL.dof
trunk/jcl/packages/d7/JclThreadNameExpertDLL.dpr
trunk/jcl/packages/d7/JclThreadNameExpertDLL.rc
trunk/jcl/packages/d9/JclThreadNameExpert.RES
trunk/jcl/packages/d9/JclThreadNameExpert.bdsproj
trunk/jcl/packages/d9/JclThreadNameExpert.dpk
trunk/jcl/packages/d9/JclThreadNameExpert.rc
trunk/jcl/packages/d9/JclThreadNameExpertDLL.RES
trunk/jcl/packages/d9/JclThreadNameExpertDLL.bdsproj
trunk/jcl/packages/d9/JclThreadNameExpertDLL.dpr
trunk/jcl/packages/d9/JclThreadNameExpertDLL.rc
Modified: trunk/jcl/packages/JclPackagesD100.bdsgroup
===================================================================
--- trunk/jcl/packages/JclPackagesD100.bdsgroup 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/JclPackagesD100.bdsgroup 2008-09-27 11:38:53 UTC (rev 2500)
@@ -17,8 +17,9 @@
<Projects Name="JclFavoriteFoldersExpert100.bpl">d10\JclFavoriteFoldersExpert.bdsproj</Projects>
<Projects Name="JclProjectAnalysisExpert100.bpl">d10\JclProjectAnalysisExpert.bdsproj</Projects>
<Projects Name="JclRepositoryExpert100.bpl">d10\JclRepositoryExpert.bdsproj</Projects>
+ <Projects Name="JclSIMDViewExpert100.bpl">d10\JclSIMDViewExpert.bdsproj</Projects>
<Projects Name="JclVersionControlExpert100.bpl">d10\JclVersionControlExpert.bdsproj</Projects>
- <Projects Name="Targets">Jcl100.bpl JclVcl100.bpl JclContainers100.bpl JclBaseExpert100.bpl JclDebugExpert100.bpl JclFavoriteFoldersExpert100.bpl JclProjectAnalysisExpert100.bpl JclRepositoryExpert100.bpl JclVersionControlExpert100.bpl</Projects>
+ <Projects Name="Targets">Jcl100.bpl JclVcl100.bpl JclContainers100.bpl JclBaseExpert100.bpl JclDebugExpert100.bpl JclFavoriteFoldersExpert100.bpl JclProjectAnalysisExpert100.bpl JclRepositoryExpert100.bpl JclSIMDViewExpert100.bpl JclVersionControlExpert100.bpl</Projects>
</Projects>
<Dependencies/>
</Default.Personality>
Modified: trunk/jcl/packages/JclPackagesD110.groupproj
===================================================================
--- trunk/jcl/packages/JclPackagesD110.groupproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/JclPackagesD110.groupproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -82,6 +82,15 @@
<Target Name="JclRepositoryExpert:Make">
<MSBuild Projects="d11\JclRepositoryExpert.dproj" Targets="Make" />
</Target>
+ <Target Name="JclSIMDViewExpert">
+ <MSBuild Projects="d11\JclSIMDViewExpert.dproj" Targets="" />
+ </Target>
+ <Target Name="JclSIMDViewExpert:Clean">
+ <MSBuild Projects="d11\JclSIMDViewExpert.dproj" Targets="Clean" />
+ </Target>
+ <Target Name="JclSIMDViewExpert:Make">
+ <MSBuild Projects="d11\JclSIMDViewExpert.dproj" Targets="Make" />
+ </Target>
<Target Name="JclVersionControlExpert">
<MSBuild Projects="d11\JclVersionControlExpert.dproj" Targets="" />
</Target>
@@ -92,12 +101,12 @@
<MSBuild Projects="d11\JclVersionControlExpert.dproj" Targets="Make" />
</Target>
<Target Name="Build">
- <CallTarget Targets="Jcl;JclVcl;JclContainers;JclBaseExpert;JclDebugExpert;JclFavoriteFoldersExpert;JclProjectAnalysisExpert;JclRepositoryExpert;JclVersionControlExpert" />
+ <CallTarget Targets="Jcl;JclVcl;JclContainers;JclBaseExpert;JclDebugExpert;JclFavoriteFoldersExpert;JclProjectAnalysisExpert;JclRepositoryExpert;JclSIMDViewExpert;JclVersionControlExpert" />
</Target>
<Target Name="Clean">
- <CallTarget Targets="Jcl:Clean;JclVcl:Clean;JclContainers:Clean;JclBaseExpert:Clean;JclDebugExpert:Clean;JclFavoriteFoldersExpert:Clean;JclProjectAnalysisExpert:Clean;JclRepositoryExpert:Clean;JclVersionControlExpert:Clean" />
+ <CallTarget Targets="Jcl:Clean;JclVcl:Clean;JclContainers:Clean;JclBaseExpert:Clean;JclDebugExpert:Clean;JclFavoriteFoldersExpert:Clean;JclProjectAnalysisExpert:Clean;JclRepositoryExpert:Clean;JclSIMDViewExpert:Clean;JclVersionControlExpert:Clean" />
</Target>
<Target Name="Make">
- <CallTarget Targets="Jcl:Make;JclVcl:Make;JclContainers:Make;JclBaseExpert:Make;JclDebugExpert:Make;JclFavoriteFoldersExpert:Make;JclProjectAnalysisExpert:Make;JclRepositoryExpert:Make;JclVersionControlExpert:Make" />
+ <CallTarget Targets="Jcl:Make;JclVcl:Make;JclContainers:Make;JclBaseExpert:Make;JclDebugExpert:Make;JclFavoriteFoldersExpert:Make;JclProjectAnalysisExpert:Make;JclRepositoryExpert:Make;JclSIMDViewExpert:Make;JclVersionControlExpert:Make" />
</Target>
</Project>
\ No newline at end of file
Modified: trunk/jcl/packages/JclPackagesD70.bpg
===================================================================
--- trunk/jcl/packages/JclPackagesD70.bpg 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/JclPackagesD70.bpg 2008-09-27 11:38:53 UTC (rev 2500)
@@ -12,8 +12,7 @@
PROJECTS = Jcl70.bpl JclVcl70.bpl JclVClx70.bpl JclContainers70.bpl \
JclBaseExpert70.bpl JclDebugExpert70.bpl JclFavoriteFoldersExpert70.bpl \
JclProjectAnalysisExpert70.bpl JclRepositoryExpert70.bpl \
- JclSIMDViewExpert70.bpl JclThreadNameExpert70.bpl JclUsesExpert70.bpl \
- JclVersionControlExpert70.bpl
+ JclSIMDViewExpert70.bpl JclUsesExpert70.bpl JclVersionControlExpert70.bpl
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
@@ -48,9 +47,6 @@
JclSIMDViewExpert70.bpl: d7\JclSIMDViewExpert.dpk
$(DCC)
-JclThreadNameExpert70.bpl: d7\JclThreadNameExpert.dpk
- $(DCC)
-
JclUsesExpert70.bpl: d7\JclUsesExpert.dpk
$(DCC)
Modified: trunk/jcl/packages/JclPackagesD90.bdsgroup
===================================================================
--- trunk/jcl/packages/JclPackagesD90.bdsgroup 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/JclPackagesD90.bdsgroup 2008-09-27 11:38:53 UTC (rev 2500)
@@ -19,8 +19,9 @@
<Projects Name="JclFavoriteFoldersExpert90.bpl">d9\JclFavoriteFoldersExpert.bdsproj</Projects>
<Projects Name="JclProjectAnalysisExpert90.bpl">d9\JclProjectAnalysisExpert.bdsproj</Projects>
<Projects Name="JclRepositoryExpert90.bpl">d9\JclRepositoryExpert.bdsproj</Projects>
+ <Projects Name="JclSIMDViewExpert90.bpl">d9\JclSIMDViewExpert.bdsproj</Projects>
<Projects Name="JclVersionControlExpert90.bpl">d9\JclVersionControlExpert.bdsproj</Projects>
- <Projects Name="Targets">Jcl90.bpl JclVcl90.bpl JclContainers90.bpl JclBaseExpert90.bpl JclDebugExpert90.bpl JclFavoriteFoldersExpert90.bpl JclProjectAnalysisExpert90.bpl JclRepositoryExpert90.bpl JclVersionControlExpert90.bpl</Projects>
+ <Projects Name="Targets">Jcl90.bpl JclVcl90.bpl JclContainers90.bpl JclBaseExpert90.bpl JclDebugExpert90.bpl JclFavoriteFoldersExpert90.bpl JclProjectAnalysisExpert90.bpl JclRepositoryExpert90.bpl JclSIMDViewExpert90.bpl JclVersionControlExpert90.bpl</Projects>
</Projects>
<Dependencies/>
</Default.Personality>
Deleted: trunk/jcl/packages/d10/JclThreadNameExpert.bdsproj
===================================================================
--- trunk/jcl/packages/d10/JclThreadNameExpert.bdsproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d10/JclThreadNameExpert.bdsproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,163 +0,0 @@
-<?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">{69899FCE-ECA9-4BE8-8511-AA0ADBE93EC4}</Option>
- </Option>
- </PersonalityInfo>
- <Delphi.Personality>
- <Source>
- <Source Name="MainSource">JclThreadNameExpert.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 Name="AsgToTypedConst">True</Compiler>
- <Compiler Name="CaseLabelRange">True</Compiler>
- <Compiler Name="ForVariable">True</Compiler>
- <Compiler Name="ConstructingAbstract">True</Compiler>
- <Compiler Name="ComparisonFalse">True</Compiler>
- <Compiler Name="ComparisonTrue">True</Compiler>
- <Compiler Name="ComparingSignedUnsigned">True</Compiler>
- <Compiler Name="CombiningSignedUnsigned">True</Compiler>
- <Compiler Name="UnsupportedConstruct">True</Compiler>
- <Compiler Name="FileOpen">True</Compiler>
- <Compiler Name="FileOpenUnitSrc">True</Compiler>
- <Compiler Name="BadGlobalSymbol">True</Compiler>
- <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
- <Compiler Name="InvalidDirective">True</Compiler>
- <Compiler Name="PackageNoLink">True</Compiler>
- <Compiler Name="PackageThreadVar">True</Compiler>
- <Compiler Name="ImplicitImport">True</Compiler>
- <Compiler Name="HPPEMITIgnored">True</Compiler>
- <Compiler Name="NoRetVal">True</Compiler>
- <Compiler Name="UseBeforeDef">True</Compiler>
- <Compiler Name="ForLoopVarUndef">True</Compiler>
- <Compiler Name="UnitNameMismatch">True</Compiler>
- <Compiler Name="NoCFGFileFound">True</Compiler>
- <Compiler Name="MessageDirective">True</Compiler>
- <Compiler Name="ImplicitVariants">True</Compiler>
- <Compiler Name="UnicodeToLocale">True</Compiler>
- <Compiler Name="LocaleToUnicode">True</Compiler>
- <Compiler Name="ImagebaseMultiple">True</Compiler>
- <Compiler Name="SuspiciousTypecast">True</Compiler>
- <Compiler Name="PrivatePropAccessor">True</Compiler>
- <Compiler Name="UnsafeType">True</Compiler>
- <Compiler Name="UnsafeCode">True</Compiler>
- <Compiler Name="UnsafeCast">True</Compiler>
- <Compiler Name="OptionTruncated">True</Compiler>
- <Compiler Name="WideCharReduced">True</Compiler>
- <Compiler Name="DuplicatesIgnored">True</Compiler>
- <Compiler Name="UnitInitSeq">True</Compiler>
- <Compiler Name="LocalPInvoke">True</Compiler>
- <Compiler Name="CodePage"></Compiler>
- </Compiler>
- <Linker>
- <Linker Name="MapFile">0</Linker>
- <Linker Name="OutputObjs">44</Linker>
- <Linker Name="ConsoleApp">1</Linker>
- <Linker Name="DebugInfo">False</Linker>
- <Linker Name="RemoteSymbols">False</Linker>
- <Linker Name="GenerateDRC">False</Linker>
- <Linker Name="MinStackSize">16384</Linker>
- <Linker Name="MaxStackSize">1048576</Linker>
- <Linker Name="ImageBase">$580A0000</Linker>
- <Linker Name="ExeDescription">JCL Thread Name IDE expert</Linker>
- <Linker Name="GenerateHpps">True</Linker>
- </Linker>
- <Directories>
- <Directories Name="UnitOutputDir">..\..\lib\d10</Directories>
- <Directories Name="SearchPath">..\..\lib\d10;..\..\source\include</Directories>
- <Directories Name="OutputDir"></Directories>
- <Directories Name="PackageDLLOutputDir"></Directories>
- <Directories Name="PackageDCPOutputDir">..\..\lib\d10</Directories>
- <Directories Name="Packages">rtl;vcl;designide;Jcl;JclBaseExpert</Directories>
- <Directories Name="Conditionals"></Directories>
- <Directories Name="DebugSourceDirs"></Directories>
- <Directories Name="UsePackages">True</Directories>
- </Directories>
- <Parameters>
- </Parameters>
- <Language>
- </Language>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">103</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">3111</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1053</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">JCL Thread Name IDE expert</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.103.0.3111</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName">JclThreadNameExpert</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">JclThreadNameExpert100.bpl</VersionInfoKeys>
- <VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.103 Build 3111</VersionInfoKeys>
- </VersionInfoKeys>
- </Delphi.Personality>
-</BorlandProject>
Deleted: trunk/jcl/packages/d10/JclThreadNameExpert.dpk
===================================================================
--- trunk/jcl/packages/d10/JclThreadNameExpert.dpk 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d10/JclThreadNameExpert.dpk 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,51 +0,0 @@
-package JclThreadNameExpert;
-{
------------------------------------------------------------------------------
- DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
- ALWAYS EDIT THE RELATED XML FILE (JclThreadNameExpert-D.xml)
-
- Last generated: 27-02-2006 20:07:10 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 ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $580A0000}
-{$DESCRIPTION 'JCL Thread Name IDE expert'}
-{$LIBSUFFIX '100'}
-{$DESIGNONLY}
-{$IMPLICITBUILD OFF}
-
-requires
- rtl,
- vcl,
- designide,
- Jcl,
- JclBaseExpert
- ;
-
-contains
- ThreadExpertSharedNames in '..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas' ,
- ThreadExpertUnit in '..\..\experts\debug\threadnames\ThreadExpertUnit.pas'
- ;
-
-end.
Deleted: trunk/jcl/packages/d10/JclThreadNameExpert.rc
===================================================================
--- trunk/jcl/packages/d10/JclThreadNameExpert.rc 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d10/JclThreadNameExpert.rc 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,32 +0,0 @@
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,103,0,3111
-PRODUCTVERSION 1,103,0,3111
- 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", "JCL Thread Name IDE expert\0"
- VALUE "FileVersion", "1.103.0.3111\0"
- VALUE "InternalName", "JclThreadNameExpert\0"
- VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
- VALUE "OriginalFilename", "JclThreadNameExpert100.bpl\0"
- VALUE "ProductName", "JEDI Code Library\0"
- VALUE "ProductVersion", "1.103 Build 3111\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1252
- END
-END
Deleted: trunk/jcl/packages/d10/JclThreadNameExpertDLL.bdsproj
===================================================================
--- trunk/jcl/packages/d10/JclThreadNameExpertDLL.bdsproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d10/JclThreadNameExpertDLL.bdsproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,163 +0,0 @@
-<?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">{3C894FD6-550B-4C59-9FA8-F2C3EB03C568}</Option>
- </Option>
- </PersonalityInfo>
- <Delphi.Personality>
- <Source>
- <Source Name="MainSource">JclThreadNameExpertDLL.dpr</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 Name="AsgToTypedConst">True</Compiler>
- <Compiler Name="CaseLabelRange">True</Compiler>
- <Compiler Name="ForVariable">True</Compiler>
- <Compiler Name="ConstructingAbstract">True</Compiler>
- <Compiler Name="ComparisonFalse">True</Compiler>
- <Compiler Name="ComparisonTrue">True</Compiler>
- <Compiler Name="ComparingSignedUnsigned">True</Compiler>
- <Compiler Name="CombiningSignedUnsigned">True</Compiler>
- <Compiler Name="UnsupportedConstruct">True</Compiler>
- <Compiler Name="FileOpen">True</Compiler>
- <Compiler Name="FileOpenUnitSrc">True</Compiler>
- <Compiler Name="BadGlobalSymbol">True</Compiler>
- <Compiler Name="DuplicateConstructorDestructor">True</Compiler>
- <Compiler Name="InvalidDirective">True</Compiler>
- <Compiler Name="PackageNoLink">True</Compiler>
- <Compiler Name="PackageThreadVar">True</Compiler>
- <Compiler Name="ImplicitImport">True</Compiler>
- <Compiler Name="HPPEMITIgnored">True</Compiler>
- <Compiler Name="NoRetVal">True</Compiler>
- <Compiler Name="UseBeforeDef">True</Compiler>
- <Compiler Name="ForLoopVarUndef">True</Compiler>
- <Compiler Name="UnitNameMismatch">True</Compiler>
- <Compiler Name="NoCFGFileFound">True</Compiler>
- <Compiler Name="MessageDirective">True</Compiler>
- <Compiler Name="ImplicitVariants">True</Compiler>
- <Compiler Name="UnicodeToLocale">True</Compiler>
- <Compiler Name="LocaleToUnicode">True</Compiler>
- <Compiler Name="ImagebaseMultiple">True</Compiler>
- <Compiler Name="SuspiciousTypecast">True</Compiler>
- <Compiler Name="PrivatePropAccessor">True</Compiler>
- <Compiler Name="UnsafeType">True</Compiler>
- <Compiler Name="UnsafeCode">True</Compiler>
- <Compiler Name="UnsafeCast">True</Compiler>
- <Compiler Name="OptionTruncated">True</Compiler>
- <Compiler Name="WideCharReduced">True</Compiler>
- <Compiler Name="DuplicatesIgnored">True</Compiler>
- <Compiler Name="UnitInitSeq">True</Compiler>
- <Compiler Name="LocalPInvoke">True</Compiler>
- <Compiler Name="CodePage"></Compiler>
- </Compiler>
- <Linker>
- <Linker Name="MapFile">0</Linker>
- <Linker Name="OutputObjs">44</Linker>
- <Linker Name="ConsoleApp">1</Linker>
- <Linker Name="DebugInfo">False</Linker>
- <Linker Name="RemoteSymbols">False</Linker>
- <Linker Name="GenerateDRC">False</Linker>
- <Linker Name="MinStackSize">16384</Linker>
- <Linker Name="MaxStackSize">1048576</Linker>
- <Linker Name="ImageBase">$580A0000</Linker>
- <Linker Name="ExeDescription">JCL Thread Name IDE expert</Linker>
- <Linker Name="GenerateHpps">False</Linker>
- </Linker>
- <Directories>
- <Directories Name="UnitOutputDir">..\..\lib\d10</Directories>
- <Directories Name="SearchPath">..\..\lib\d10;..\..\source\include</Directories>
- <Directories Name="OutputDir"></Directories>
- <Directories Name="PackageDLLOutputDir"></Directories>
- <Directories Name="PackageDCPOutputDir">..\..\lib\d10</Directories>
- <Directories Name="Packages">rtl;vcl;designide;Jcl;JclBaseExpert</Directories>
- <Directories Name="Conditionals"></Directories>
- <Directories Name="DebugSourceDirs"></Directories>
- <Directories Name="UsePackages">True</Directories>
- </Directories>
- <Parameters>
- </Parameters>
- <Language>
- </Language>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">103</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">3111</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">True</VersionInfo>
- <VersionInfo Name="Locale">1053</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">JCL Thread Name IDE expert</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.103.0.3111</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName">JclThreadNameExpertDLL</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">JclThreadNameExpertDLL100.dll</VersionInfoKeys>
- <VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.103 Build 3111</VersionInfoKeys>
- </VersionInfoKeys>
- </Delphi.Personality>
-</BorlandProject>
Deleted: trunk/jcl/packages/d10/JclThreadNameExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d10/JclThreadNameExpertDLL.dpr 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d10/JclThreadNameExpertDLL.dpr 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,46 +0,0 @@
-Library JclThreadNameExpertDLL;
-{
------------------------------------------------------------------------------
- DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
- ALWAYS EDIT THE RELATED XML FILE (JclThreadNameExpertDLL-L.xml)
-
- Last generated: 27-02-2006 20:07:10 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 ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $580A0000}
-{$DESCRIPTION 'JCL Thread Name IDE expert'}
-{$LIBSUFFIX '100'}
-{$IMPLICITBUILD OFF}
-
-uses
- ToolsAPI,
- ThreadExpertSharedNames in '..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas' ,
- ThreadExpertUnit in '..\..\experts\debug\threadnames\ThreadExpertUnit.pas'
- ;
-
-exports
- JCLWizardInit name WizardEntryPoint;
-
-end.
Deleted: trunk/jcl/packages/d10/JclThreadNameExpertDLL.rc
===================================================================
--- trunk/jcl/packages/d10/JclThreadNameExpertDLL.rc 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d10/JclThreadNameExpertDLL.rc 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,32 +0,0 @@
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,103,0,3111
-PRODUCTVERSION 1,103,0,3111
- 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", "JCL Thread Name IDE expert\0"
- VALUE "FileVersion", "1.103.0.3111\0"
- VALUE "InternalName", "JclThreadNameExpertDLL\0"
- VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
- VALUE "OriginalFilename", "JclThreadNameExpertDLL100.dll\0"
- VALUE "ProductName", "JEDI Code Library\0"
- VALUE "ProductVersion", "1.103 Build 3111\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1252
- END
-END
Deleted: trunk/jcl/packages/d11/JclThreadNameExpert.dpk
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpert.dpk 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d11/JclThreadNameExpert.dpk 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,51 +0,0 @@
-package JclThreadNameExpert;
-{
------------------------------------------------------------------------------
- DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
- ALWAYS EDIT THE RELATED XML FILE (JclThreadNameExpert-D.xml)
-
- Last generated: 16-04-2007 07:23:45 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 ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $580A0000}
-{$DESCRIPTION 'JCL Thread Name IDE expert'}
-{$LIBSUFFIX '110'}
-{$DESIGNONLY}
-{$IMPLICITBUILD OFF}
-
-requires
- rtl,
- vcl,
- designide,
- Jcl,
- JclBaseExpert
- ;
-
-contains
- ThreadExpertSharedNames in '..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas' ,
- ThreadExpertUnit in '..\..\experts\debug\threadnames\ThreadExpertUnit.pas'
- ;
-
-end.
Deleted: trunk/jcl/packages/d11/JclThreadNameExpert.dproj
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpert.dproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d11/JclThreadNameExpert.dproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,96 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{69899FCE-ECA9-4BE8-8511-AA0ADBE93EC4}</ProjectGuid>
- <MainSource>JclThreadNameExpert.dpk</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert</DCC_UsePackage>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <Version>7.0</Version>
- <DCC_DebugInformation>False</DCC_DebugInformation>
- <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
- <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
- <DCC_Define>RELEASE</DCC_Define>
- <DCC_DcuOutput>..\..\lib\d11</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d11</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d11</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d11</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d11;..\..\source\include</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d11;..\..\source\include</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d11;..\..\source\include</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d11;..\..\source\include</DCC_IncludePath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <Version>7.0</Version>
- <DCC_DcuOutput>..\..\lib\d11\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d11\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d11\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d11\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source\include</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source\include</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d11\debug;..\..\source\include</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d11\debug;..\..\source\include</DCC_IncludePath>
- </PropertyGroup>
- <ProjectExtensions>
- <Borland.Personality>Delphi.Personality</Borland.Personality>
- <Borland.ProjectType>Package</Borland.ProjectType>
- <BorlandProject>
- <BorlandProject xmlns="">
- <Delphi.Personality>
- <Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">103</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">3111</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1031</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">JCL Thread Name IDE expert</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.103.0.3111</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName">JclThreadNameExpert</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">JclThreadNameExpert110.bpl</VersionInfoKeys>
- <VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.103 Build 3111</VersionInfoKeys>
- </VersionInfoKeys>
- <Source>
- <Source Name="MainSource">JclThreadNameExpert.dpk</Source>
- </Source>
- <Package_Options>
- <Package_Options Name="LibSuffix">110</Package_Options>
- </Package_Options>
- </Delphi.Personality>
- </BorlandProject>
- </BorlandProject>
- </ProjectExtensions>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
- <ItemGroup>
- <DelphiCompile Include="JclThreadNameExpert.dpk">
- <MainSource>MainSource</MainSource>
- </DelphiCompile>
- <DCCReference Include="rtl.dcp" />
- <DCCReference Include="vcl.dcp" />
- <DCCReference Include="designide.dcp" />
- <DCCReference Include="Jcl.dcp" />
- <DCCReference Include="JclBaseExpert.dcp" />
- <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas" />
- <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertUnit.pas" />
- </ItemGroup>
-</Project>
Deleted: trunk/jcl/packages/d11/JclThreadNameExpert.rc
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpert.rc 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d11/JclThreadNameExpert.rc 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,32 +0,0 @@
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,103,0,3111
-PRODUCTVERSION 1,103,0,3111
- 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", "JCL Thread Name IDE expert\0"
- VALUE "FileVersion", "1.103.0.3111\0"
- VALUE "InternalName", "JclThreadNameExpert\0"
- VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
- VALUE "OriginalFilename", "JclThreadNameExpert110.bpl\0"
- VALUE "ProductName", "JEDI Code Library\0"
- VALUE "ProductVersion", "1.103 Build 3111\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1252
- END
-END
Deleted: trunk/jcl/packages/d11/JclThreadNameExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpertDLL.dpr 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d11/JclThreadNameExpertDLL.dpr 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,46 +0,0 @@
-Library JclThreadNameExpertDLL;
-{
------------------------------------------------------------------------------
- DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
- ALWAYS EDIT THE RELATED XML FILE (JclThreadNameExpertDLL-L.xml)
-
- Last generated: 30-03-2008 16:06:05 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 ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $580A0000}
-{$DESCRIPTION 'JCL Thread Name IDE expert'}
-{$LIBSUFFIX '110'}
-{$IMPLICITBUILD OFF}
-
-uses
- ToolsAPI,
- ThreadExpertSharedNames in '..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas' ,
- ThreadExpertUnit in '..\..\experts\debug\threadnames\ThreadExpertUnit.pas'
- ;
-
-exports
- JCLWizardInit name WizardEntryPoint;
-
-end.
Deleted: trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,96 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{3C894FD6-550B-4C59-9FA8-F2C3EB03C568}</ProjectGuid>
- <MainSource>JclThreadNameExpertDLL.dpr</MainSource>
- <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert</DCC_UsePackage>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <Version>7.0</Version>
- <DCC_DebugInformation>False</DCC_DebugInformation>
- <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
- <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
- <DCC_Define>RELEASE</DCC_Define>
- <DCC_DcuOutput>..\..\lib\d11</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d11</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d11</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d11</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d11;..\..\source\include</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d11;..\..\source\include</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d11;..\..\source\include</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d11;..\..\source\include</DCC_IncludePath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <Version>7.0</Version>
- <DCC_DcuOutput>..\..\lib\d11\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d11\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d11\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d11\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d11\debug;..\..\source\include</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d11\debug;..\..\source\include</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d11\debug;..\..\source\include</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d11\debug;..\..\source\include</DCC_IncludePath>
- </PropertyGroup>
- <ProjectExtensions>
- <Borland.Personality>Delphi.Personality</Borland.Personality>
- <Borland.ProjectType>Package</Borland.ProjectType>
- <BorlandProject>
- <BorlandProject xmlns="">
- <Delphi.Personality>
- <Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">103</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">3111</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1031</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">JCL Thread Name IDE expert</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.103.0.3111</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName">JclThreadNameExpertDLL</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">JclThreadNameExpertDLL110.dll</VersionInfoKeys>
- <VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.103 Build 3111</VersionInfoKeys>
- </VersionInfoKeys>
- <Source>
- <Source Name="MainSource">JclThreadNameExpertDLL.dpr</Source>
- </Source>
- <Package_Options>
- <Package_Options Name="LibSuffix">110</Package_Options>
- </Package_Options>
- </Delphi.Personality>
- </BorlandProject>
- </BorlandProject>
- </ProjectExtensions>
- <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
- <ItemGroup>
- <DelphiCompile Include="JclThreadNameExpertDLL.dpr">
- <MainSource>MainSource</MainSource>
- </DelphiCompile>
- <DCCReference Include="rtl.dcp" />
- <DCCReference Include="vcl.dcp" />
- <DCCReference Include="designide.dcp" />
- <DCCReference Include="Jcl.dcp" />
- <DCCReference Include="JclBaseExpert.dcp" />
- <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas" />
- <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertUnit.pas" />
- </ItemGroup>
-</Project>
Deleted: trunk/jcl/packages/d11/JclThreadNameExpertDLL.rc
===================================================================
--- trunk/jcl/packages/d11/JclThreadNameExpertDLL.rc 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d11/JclThreadNameExpertDLL.rc 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,32 +0,0 @@
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,103,0,3111
-PRODUCTVERSION 1,103,0,3111
- 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", "JCL Thread Name IDE expert\0"
- VALUE "FileVersion", "1.103.0.3111\0"
- VALUE "InternalName", "JclThreadNameExpertDLL\0"
- VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
- VALUE "OriginalFilename", "JclThreadNameExpertDLL110.dll\0"
- VALUE "ProductName", "JEDI Code Library\0"
- VALUE "ProductVersion", "1.103 Build 3111\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1252
- END
-END
Deleted: trunk/jcl/packages/d12/JclThreadNameExpert.dpk
===================================================================
--- trunk/jcl/packages/d12/JclThreadNameExpert.dpk 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d12/JclThreadNameExpert.dpk 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,51 +0,0 @@
-package JclThreadNameExpert;
-{
------------------------------------------------------------------------------
- DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
- ALWAYS EDIT THE RELATED XML FILE (JclThreadNameExpert-D.xml)
-
- Last generated: 06-04-2008 12:02:32 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 ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $580A0000}
-{$DESCRIPTION 'JCL Thread Name IDE expert'}
-{$LIBSUFFIX '120'}
-{$DESIGNONLY}
-{$IMPLICITBUILD OFF}
-
-requires
- rtl,
- vcl,
- designide,
- Jcl,
- JclBaseExpert
- ;
-
-contains
- ThreadExpertSharedNames in '..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas' ,
- ThreadExpertUnit in '..\..\experts\debug\threadnames\ThreadExpertUnit.pas'
- ;
-
-end.
Deleted: trunk/jcl/packages/d12/JclThreadNameExpert.dproj
===================================================================
--- trunk/jcl/packages/d12/JclThreadNameExpert.dproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d12/JclThreadNameExpert.dproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,145 +0,0 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{69899FCE-ECA9-4BE8-8511-AA0ADBE93EC4}</ProjectGuid>
- <MainSource>JclThreadNameExpert.dpk</MainSource>
- <ProjectVersion>12</ProjectVersion>
- <ProjectVersion>11.1</ProjectVersion>
- <Config Condition="'$(Config)'==''">Release</Config>
- <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_Release)'!=''">
- <Cfg_Release>true</Cfg_Release>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_Debug)'!=''">
- <Cfg_Debug>true</Cfg_Debug>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Base)'!=''">
- <DCC_WriteableConstants>true</DCC_WriteableConstants>
- <DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
- <DllSuffix>120</DllSuffix>
- <GenDll>true</GenDll>
- <GenPackage>true</GenPackage>
- <DCC_ImageBase>$580A0000</DCC_ImageBase>
- <DCC_UsePackage>rtl;vcl;designide;Jcl;JclBaseExpert</DCC_UsePackage>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_Release)'!=''">
- <DCC_AssertionsAtRuntime>false</DCC_AssertionsAtRuntime>
- <DCC_DebugInformation>False</DCC_DebugInformation>
- <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
- <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
- <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
- <DCC_DcuOutput>..\..\lib\d12</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d12</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d12</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d12</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d12;..\..\source\include</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d12;..\..\source\include</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d12;..\..\source\include</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d12;..\..\source\include</DCC_IncludePath>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Cfg_Debug)'!=''">
- <DCC_DebugInformation>True</DCC_DebugInformation>
- <DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
- <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
- <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
- <DCC_DcuOutput>..\..\lib\d12\debug</DCC_DcuOutput>
- <DCC_ObjOutput>..\..\lib\d12\debug</DCC_ObjOutput>
- <DCC_HppOutput>..\..\lib\d12\debug</DCC_HppOutput>
- <DCC_DcpOutput>..\..\lib\d12\debug</DCC_DcpOutput>
- <DCC_UnitSearchPath>..\..\lib\d12\debug;..\..\source\include</DCC_UnitSearchPath>
- <DCC_ResourcePath>..\..\lib\d12\debug;..\..\source\include</DCC_ResourcePath>
- <DCC_ObjPath>..\..\lib\d12\debug;..\..\source\include</DCC_ObjPath>
- <DCC_IncludePath>..\..\lib\d12\debug;..\..\source\include</DCC_IncludePath>
- </PropertyGroup>
- <ItemGroup>
- <DelphiCompile Include="JclThreadNameExpert.dpk">
- <MainSource>MainSource</MainSource>
- </DelphiCompile>
- <DCCReference Include="rtl.dcp" />
- <DCCReference Include="vcl.dcp" />
- <DCCReference Include="designide.dcp" />
- <DCCReference Include="Jcl.dcp" />
- <DCCReference Include="JclBaseExpert.dcp" />
- <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas" />
- <DCCReference Include="..\..\experts\debug\threadnames\ThreadExpertUnit.pas" />
- <BuildConfiguration Include="Base">
- <Key>Base</Key>
- </BuildConfiguration>
- <BuildConfiguration Include="Release">
- <Key>Cfg_Release</Key>
- <CfgParent>Base</CfgParent>
- </BuildConfiguration>
- <BuildConfiguration Include="Debug">
- <Key>Cfg_Debug</Key>
- <CfgParent>Base</CfgParent>
- </BuildConfiguration>
- </ItemGroup>
- <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
- <ProjectExtensions>
- <Borland.Personality>Delphi.Personality</Borland.Personality>
- <Borland.ProjectType>Package</Borland.ProjectType>
- <Borland.PersonalityVersion>1.0</Borland.PersonalityVersion>
- <BorlandProject>
- <BorlandProject>
- <Delphi.Personality>
- <Parameters>
- <Parameters Name="UseLauncher">False</Parameters>
- <Parameters Name="LoadAllSymbols">True</Parameters>
- <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
- </Parameters>
- <VersionInfo>
- <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
- <VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
- <VersionInfo Name="MinorVer">103</VersionInfo>
- <VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">3111</VersionInfo>
- <VersionInfo Name="Debug">False</VersionInfo>
- <VersionInfo Name="PreRelease">False</VersionInfo>
- <VersionInfo Name="Special">False</VersionInfo>
- <VersionInfo Name="Private">False</VersionInfo>
- <VersionInfo Name="DLL">False</VersionInfo>
- <VersionInfo Name="Locale">1031</VersionInfo>
- <VersionInfo Name="CodePage">1252</VersionInfo>
- </VersionInfo>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">JEDI Code Library RTL package</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.102.0.2726</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName">Jcl</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">Jcl110.bpl</VersionInfoKeys>
- <VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.102 Build 2726</VersionInfoKeys>
- </VersionInfoKeys>
- <Source>
- <Source Name="MainSource">Jcl.dpk</Source>
- </Source>
- <VersionInfoKeys>
- <VersionInfoKeys Name="CompanyName">Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="FileDescription">JCL Thread Name IDE expert</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">1.103.0.3111</VersionInfoKeys>
- <VersionInfoKeys Name="InternalName">JclThreadNameExpert</VersionInfoKeys>
- <VersionInfoKeys Name="LegalCopyright">Copyright (C) 1999, 2008 Project JEDI</VersionInfoKeys>
- <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
- <VersionInfoKeys Name="OriginalFilename">JclThreadNameExpert120.bpl</VersionInfoKeys>
- <VersionInfoKeys Name="ProductName">JEDI Code Library</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">1.103 Build 3111</VersionInfoKeys>
- </VersionInfoKeys>
- <Source>
- <Source Name="MainSource">JclThreadNameExpert.dpk</Source>
- </Source>
- <Excluded_Packages/>
- </Delphi.Personality>
- </BorlandProject>
- </BorlandProject>
- </ProjectExtensions>
- </Project>
Deleted: trunk/jcl/packages/d12/JclThreadNameExpert.rc
===================================================================
--- trunk/jcl/packages/d12/JclThreadNameExpert.rc 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d12/JclThreadNameExpert.rc 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,32 +0,0 @@
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,103,0,3111
-PRODUCTVERSION 1,103,0,3111
- 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", "JCL Thread Name IDE expert\0"
- VALUE "FileVersion", "1.103.0.3111\0"
- VALUE "InternalName", "JclThreadNameExpert\0"
- VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
- VALUE "OriginalFilename", "JclThreadNameExpert120.bpl\0"
- VALUE "ProductName", "JEDI Code Library\0"
- VALUE "ProductVersion", "1.103 Build 3111\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1252
- END
-END
Deleted: trunk/jcl/packages/d12/JclThreadNameExpertDLL.dpr
===================================================================
--- trunk/jcl/packages/d12/JclThreadNameExpertDLL.dpr 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d12/JclThreadNameExpertDLL.dpr 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,46 +0,0 @@
-Library JclThreadNameExpertDLL;
-{
------------------------------------------------------------------------------
- DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
- ALWAYS EDIT THE RELATED XML FILE (JclThreadNameExpertDLL-L.xml)
-
- Last generated: 06-04-2008 12:02:32 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 ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $580A0000}
-{$DESCRIPTION 'JCL Thread Name IDE expert'}
-{$LIBSUFFIX '120'}
-{$IMPLICITBUILD OFF}
-
-uses
- ToolsAPI,
- ThreadExpertSharedNames in '..\..\experts\debug\threadnames\ThreadExpertSharedNames.pas' ,
- ThreadExpertUnit in '..\..\experts\debug\threadnames\ThreadExpertUnit.pas'
- ;
-
-exports
- JCLWizardInit name WizardEntryPoint;
-
-end.
Deleted: trunk/jcl/packages/d12/JclThreadNameExpertDLL.dproj
===================================================================
--- trunk/jcl/packages/d12/JclThreadNameExpertDLL.dproj 2008-09-27 11:08:40 UTC (rev 2499)
+++ trunk/jcl/packages/d12/JclThreadNameExpertDLL.dproj 2008-09-27 11:38:53 UTC (rev 2500)
@@ -1,145 +0,0 @@
- <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{3C894FD6-550B-4C59-9FA8-F2C3EB03C568}</ProjectGuid>
- <MainSource>JclThreadNameExpertDLL.dpr</MainSource>
- <ProjectVersion>12</ProjectVersion>
- <ProjectVersion>11.1</ProjectVersion>
- <Config Condition="'$(Config)'==''">Release</Config>
- <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_Release)'!=''">
- <Cfg_Release>true</Cfg_Release>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_Debug)'!=''">
- <Cfg_Debug>true</Cfg_Debug>
- <CfgParent>Base</CfgParent>
- <Base>true</Base>
- </PropertyGroup>
- <PropertyGroup...
[truncated message content] |
|
From: <ou...@us...> - 2008-09-27 11:08:44
|
Revision: 2499
http://jcl.svn.sourceforge.net/jcl/?rev=2499&view=rev
Author: outchy
Date: 2008-09-27 11:08:40 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
Unit PngImage was introduced in Delphi 2009.
Modified Paths:
--------------
trunk/jcl/source/include/jedi.inc
Modified: trunk/jcl/source/include/jedi.inc
===================================================================
--- trunk/jcl/source/include/jedi.inc 2008-09-27 10:26:07 UTC (rev 2498)
+++ trunk/jcl/source/include/jedi.inc 2008-09-27 11:08:40 UTC (rev 2499)
@@ -398,6 +398,7 @@
HAS_UNIT_DATEUTILS Unit DateUtils exists (D6+/BCB6+/FPC)
HAS_UNIT_CONTNRS Unit contnrs exists (D6+/BCB6+/FPC)
HAS_UNIT_ANSISTRINGS Unit AnsiStrings exists (D12+)
+ HAS_UNIT_PNGIMAGE Unit PngImage exists (D12+)
XPLATFORM_RTL The RTL supports crossplatform function names (e.g. RaiseLastOSError) (D6+/BCB6+/FPC)
SUPPORTS_UNICODE string type is aliased to an unicode string (WideString or UnicodeString) (DX.net, D12+)
SUPPORTS_UNICODE_STRING Compiler supports UnicodeString (D12+)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-27 10:26:11
|
Revision: 2498
http://jcl.svn.sourceforge.net/jcl/?rev=2498&view=rev
Author: outchy
Date: 2008-09-27 10:26:07 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
OTA and NTA interfaces now retrieved on demand.
Modified Paths:
--------------
trunk/jcl/experts/common/JclOtaResources.pas
trunk/jcl/experts/common/JclOtaUtils.pas
trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas
trunk/jcl/experts/debug/simdview/JclSIMDView.pas
trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas
trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas
trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas
trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas
trunk/jcl/experts/useswizard/JCLUsesWizard.pas
trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas
Modified: trunk/jcl/experts/common/JclOtaResources.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaResources.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/common/JclOtaResources.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -40,17 +40,18 @@
//=== JclOtaUtils.pas ========================================================
resourcestring
- RsENoIDEServices = 'Unable to get Borland IDE Services';
+ RsENoOTAServices = 'Unable to get Borland IDE Services';
RsENoNTAServices = 'Unable to get Borland NTA Services';
- RsENoSplashServices = 'Unable to get Borland Splash Services';
- RsENoAboutServices = 'Unable to get Borland About Services';
- RsENoModuleServices = 'Unable to get Borland Module Services';
- RsENoWizardServices = 'Unable to get Borland Wizard Services';
- RsENoPackageServices = 'Unable to get Borland Package Services';
- RsENoPersonalityServices = 'Unable to get Borland Personality Services';
- RsENoProjectManager = 'Unable to get project manager';
- RsENoMessageServices = 'Unable to get Borland Message Services';
- RsENoGalleryCategoryManager = 'Unable to get Borland Gallery Category Manager';
+ RsENoDebuggerServices = 'Unable to get Borland Debugger Services';
+ RsENoNTASplashServices = 'Unable to get Borland Splash Services';
+ RsENoOTAAboutServices = 'Unable to get Borland About Services';
+ RsENoOTAModuleServices = 'Unable to get Borland Module Services';
+ RsENoOTAWizardServices = 'Unable to get Borland Wizard Services';
+ RsENoOTAPackageServices = 'Unable to get Borland Package Services';
+ RsENoOTAPersonalityServices = 'Unable to get Borland Personality Services';
+ RsENoOTAProjectManager = 'Unable to get project manager';
+ RsENoOTAMessageServices = 'Unable to get Borland Message Services';
+ RsENoOTAGalleryCategoryManager = 'Unable to get Borland Gallery Category Manager';
RsENoModule = 'Unable to get Module';
RsBadModuleHInstance = 'Unable to get module HInstance';
RsENoRootDir = 'RootDir is empty';
@@ -274,7 +275,6 @@
//=== JclSIMDView.pas ========================================================
resourcestring
- RsENoDebuggerServices = 'Unable to get Borland Debugger Services';
RsENoViewMenuItem = 'View menu item not found';
RsENoDebugWindowsMenuItem = 'Debug windows menu item not found';
Modified: trunk/jcl/experts/common/JclOtaUtils.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUtils.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/common/JclOtaUtils.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -23,7 +23,7 @@
{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
-{ }
+{ $Date$ xpin }
{**************************************************************************************************}
unit JclOtaUtils;
@@ -136,20 +136,8 @@
private
FEnvVariables: TStringList;
FRootDir: string;
- FServices: IOTAServices;
- FNTAServices: INTAServices;
- FOTAModuleServices: IOTAModuleServices;
FSettings: TJclOTASettings;
- {$IFDEF BDS}
- FOTAPersonalityServices: IOTAPersonalityServices;
- {$ENDIF BDS}
- {$IFDEF BDS4_UP}
- FProjectManager: IOTAProjectManager;
- {$ENDIF BDS4_UP}
- FOTAMessageServices: IOTAMessageServices;
function GetModuleHInstance: Cardinal;
- function GetActiveProject: IOTAProject;
- function GetProjectGroup: IOTAProjectGroup;
function GetRootDir: string;
procedure ReadEnvVariables;
procedure ConfigurationActionUpdate(Sender: TObject);
@@ -157,6 +145,23 @@
function GetActivePersonality: TJclBorPersonality;
function GetDesigner: string;
public
+ class function GetNTAServices: INTAServices;
+ class function GetOTAServices: IOTAServices;
+ class function GetOTADebuggerServices: IOTADebuggerServices;
+ class function GetOTAModuleServices: IOTAModuleServices;
+ class function GetOTAPackageServices: IOTAPackageServices;
+ {$IFDEF BDS}
+ class function GetOTAPersonalityServices: IOTAPersonalityServices;
+ class function GetOTAGalleryCategoryManager: IOTAGalleryCategoryManager;
+ {$ENDIF BDS}
+ {$IFDEF BDS4_UP}
+ class function GetOTAProjectManager: IOTAProjectManager;
+ {$ENDIF BDS4_UP}
+ class function GetOTAMessageServices: IOTAMessageServices;
+ class function GetOTAWizardServices: IOTAWizardServices;
+ class function GetActiveProject: IOTAProject;
+ class function GetProjectGroup: IOTAProjectGroup;
+ class function IsPersonalityLoaded(const PersonalityName: string): Boolean;
class procedure AddExpert(AExpert: TJclOTAExpertBase);
class procedure RemoveExpert(AExpert: TJclOTAExpertBase);
class function GetExpertCount: Integer;
@@ -189,21 +194,8 @@
procedure RegisterAction(Action: TCustomAction);
procedure UnregisterAction(Action: TCustomAction);
- property ActiveProject: IOTAProject read GetActiveProject;
property Settings: TJclOTASettings read FSettings;
- property NTAServices: INTAServices read FNTAServices;
- property ProjectGroup: IOTAProjectGroup read GetProjectGroup;
property RootDir: string read GetRootDir;
- property Services: IOTAServices read FServices;
- property OTAModuleServices: IOTAModuleServices read FOTAModuleServices;
- {$IFDEF BDS}
- property OTAPersonalityServices: IOTAPersonalityServices read FOTAPersonalityServices;
- {$ENDIF BDS}
- {$IFDEF BDS4_UP}
- property ProjectManager: IOTAProjectManager read FProjectManager;
- {$ENDIF BDS4_UP}
- property OTAMessageServices: IOTAMessageServices read FOTAMessageServices;
-
property ActivePersonality: TJclBorPersonality read GetActivePersonality;
property Designer: string read GetDesigner;
@@ -639,7 +631,7 @@
Supports(BorlandIDEServices,IOTAServices,OTAServices);
if not Assigned(OTAServices) then
- raise EJclExpertException.CreateTrace(RsENoIDEServices);
+ raise EJclExpertException.CreateTrace(RsENoOTAServices);
FBaseKeyName := StrEnsureSuffix(NativeBackSlash, OTAServices.GetBaseRegistryKey);
@@ -885,34 +877,7 @@
RegisterSplashScreen;
RegisterAboutBox;
{$ENDIF BDS}
-
- Supports(BorlandIDEServices, IOTAServices, FServices);
- if not Assigned(FServices) then
- raise EJclExpertException.CreateTrace(RsENoIDEServices);
- Supports(BorlandIDEServices, INTAServices, FNTAServices);
- if not Assigned(FNTAServices) then
- raise EJclExpertException.CreateTrace(RsENoNTAServices);
-
- {$IFDEF BDS}
- Supports(BorlandIDEServices, IOTAPersonalityServices, FOTAPersonalityServices);
- if not Assigned(FOTAPersonalityServices) then
- raise EJclExpertException.CreateTrace(RsENoPersonalityServices);
- {$ENDIF BDS}
-
- {$IFDEF BDS4_UP}
- if not Supports(BorlandIDEServices, IOTAProjectManager, FProjectManager) then
- raise EJclExpertException.CreateRes(@RsENoProjectManager);
- {$ENDIF BDS4_UP}
-
- Supports(BorlandIDEServices, IOTAModuleServices, FOTAModuleServices);
- if not Assigned(FOTAModuleServices) then
- raise EJclExpertException.CreateTrace(RsENoModuleServices);
-
- Supports(BorlandIDEServices, IOTAMessageServices, FOTAMessageServices);
- if not Assigned(FOTAMessageServices) then
- raise EJclExpertException.CreateTrace(RsENoMessageServices);
-
FEnvVariables := TStringList.Create;
FSettings := TJclOTASettings.Create(AName);
end;
@@ -922,9 +887,6 @@
FreeAndNil(FSettings);
FreeAndNil(FEnvVariables);
- FServices := nil;
- FNTAServices := nil;
-
inherited Destroy;
end;
@@ -970,16 +932,18 @@
Result := (ExecutableFileName <> '');
end;
-function TJclOTAExpertBase.GetActiveProject: IOTAProject;
+class function TJclOTAExpertBase.GetActiveProject: IOTAProject;
var
- TempProjectGroup: IOTAProjectGroup;
+ ProjectGroup: IOTAProjectGroup;
+ OTAModuleServices: IOTAModuleServices;
Index: Integer;
begin
Result := nil;
- TempProjectGroup := ProjectGroup;
+ ProjectGroup := GetProjectGroup;
+ OTAModuleServices := GetOTAModuleServices;
- if Assigned(TempProjectGroup) then
- Result := TempProjectGroup.ActiveProject
+ if Assigned(ProjectGroup) then
+ Result := ProjectGroup.ActiveProject
else
for Index := 0 to OTAModuleServices.ModuleCount - 1 do
if Supports(OTAModuleServices.Modules[Index], IOTAProject, Result) then
@@ -989,7 +953,7 @@
function TJclOTAExpertBase.GetDesigner: string;
begin
{$IFDEF COMPILER6_UP}
- Result := Services.GetActiveDesignerType;
+ Result := GetOTAServices.GetActiveDesignerType;
{$ELSE COMPILER6_UP}
Result := JclDesignerAny;
{$ENDIF COMPILER6_UP}
@@ -1037,7 +1001,85 @@
raise EJclExpertException.CreateTrace(RsBadModuleHInstance);
end;
+class function TJclOTAExpertBase.GetNTAServices: INTAServices;
+begin
+ Supports(BorlandIDEServices, INTAServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoNTAServices);
+end;
+
+{$IFDEF BDS}
+class function TJclOTAExpertBase.GetOTAGalleryCategoryManager: IOTAGalleryCategoryManager;
+begin
+ Supports(BorlandIDEServices, IOTAGalleryCategoryManager, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAGalleryCategoryManager);
+end;
+{$ENDIF BDS}
+
+class function TJclOTAExpertBase.GetOTADebuggerServices: IOTADebuggerServices;
+begin
+ Supports(BorlandIDEServices, IOTADebuggerServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoDebuggerServices);
+end;
+
+class function TJclOTAExpertBase.GetOTAMessageServices: IOTAMessageServices;
+begin
+ Supports(BorlandIDEServices, IOTAMessageServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAMessageServices);
+end;
+
+class function TJclOTAExpertBase.GetOTAModuleServices: IOTAModuleServices;
+begin
+ Supports(BorlandIDEServices, IOTAModuleServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAModuleServices);
+end;
+
+class function TJclOTAExpertBase.GetOTAPackageServices: IOTAPackageServices;
+begin
+ Supports(BorlandIDEServices, IOTAPackageServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAPackageServices);
+end;
+
+{$IFDEF BDS}
+class function TJclOTAExpertBase.GetOTAPersonalityServices: IOTAPersonalityServices;
+begin
+ Supports(BorlandIDEServices, IOTAPersonalityServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAPersonalityServices);
+end;
+{$ENDIF BDS}
+
+{$IFDEF BDS4_UP}
+class function TJclOTAExpertBase.GetOTAProjectManager: IOTAProjectManager;
+begin
+ Supports(BorlandIDEServices, IOTAProjectManager, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateRes(@RsENoOTAProjectManager);
+end;
+{$ENDIF BDS4_UP}
+
+class function TJclOTAExpertBase.GetOTAServices: IOTAServices;
+begin
+ Supports(BorlandIDEServices, IOTAServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAServices);
+end;
+
+class function TJclOTAExpertBase.GetOTAWizardServices: IOTAWizardServices;
+begin
+ Supports(BorlandIDEServices, IOTAWizardServices, Result);
+ if not Assigned(Result) then
+ raise EJclExpertException.CreateTrace(RsENoOTAWizardServices);
+end;
+
function TJclOTAExpertBase.GetOutputDirectory(const Project: IOTAProject): string;
+var
+ EnvironmentOptions: IOTAEnvironmentOptions;
begin
if not Assigned(Project) then
raise EJclExpertException.CreateTrace(RsENoActiveProject);
@@ -1053,9 +1095,10 @@
if Result = '' then
begin
- if not Assigned(FServices.GetEnvironmentOptions) then
+ EnvironmentOptions := GetOTAServices.GetEnvironmentOptions;
+ if not Assigned(EnvironmentOptions) then
raise EJclExpertException.CreateTrace(RsENoEnvironmentOptions);
- Result := FServices.GetEnvironmentOptions.Values[BPLOutputDirOptionName];
+ Result := EnvironmentOptions.Values[BPLOutputDirOptionName];
end;
end
else
@@ -1075,35 +1118,39 @@
{$IFDEF BDS}
var
PersonalityText: string;
+ OTAPersonalityServices: IOTAPersonalityServices;
{$IFDEF COMPILER9_UP}
- CurrentProject: IOTAProject;
+ ActiveProject: IOTAProject;
{$ENDIF COMPILER9_UP}
-{$ENDIF BDS}
begin
-{$IFDEF BDS}
{$IFDEF COMPILER9_UP}
- CurrentProject := ActiveProject;
- if Assigned(CurrentProject) then
- PersonalityText := CurrentProject.Personality
+ ActiveProject := ActiveProject;
+ if Assigned(ActiveProject) then
+ PersonalityText := ActiveProject.Personality
else
{$ENDIF COMPILER9_UP}
- PersonalityText := OTAPersonalityServices.CurrentPersonality;
+ OTAPersonalityServices := GetOTAPersonalityServices;
+ PersonalityText := OTAPersonalityServices.CurrentPersonality;
Result := PersonalityTextToId(PersonalityText);
+end;
{$ELSE BDS}
-{$IFDEF DELPHI}
+begin
+ {$IFDEF DELPHI}
Result := bpDelphi32;
-{$ENDIF DELPHI}
-{$IFDEF BCB}
+ {$ENDIF DELPHI}
+ {$IFDEF BCB}
Result := bpBCBuilder32;
-{$ENDIF BCB}
+ {$ENDIF BCB}
+end;
{$ENDIF BDS}
-end;
-function TJclOTAExpertBase.GetProjectGroup: IOTAProjectGroup;
+class function TJclOTAExpertBase.GetProjectGroup: IOTAProjectGroup;
var
+ OTAModuleServices: IOTAModuleServices;
AModule: IOTAModule;
I: Integer;
begin
+ OTAModuleServices := GetOTAModuleServices;
for I := 0 to OTAModuleServices.ModuleCount - 1 do
begin
AModule := OTAModuleServices.Modules[I];
@@ -1112,7 +1159,6 @@
if AModule.QueryInterface(IOTAProjectGroup, Result) = S_OK then
Exit;
end;
-
Result := nil;
end;
@@ -1159,7 +1205,7 @@
function TJclOTAExpertBase.IsInstalledPackage(const Project: IOTAProject): Boolean;
var
PackageFileName, ExecutableNameNoExt: TFileName;
- APackageServices: IOTAPackageServices;
+ OTAPackageServices: IOTAPackageServices;
I: Integer;
begin
if not Assigned(Project) then
@@ -1176,15 +1222,11 @@
if not Project.ProjectOptions.Values[RuntimeOnlyOptionName] then
begin
ExecutableNameNoExt := ChangeFileExt(GetMapFileName(Project), '');
+ OTAPackageServices := GetOTAPackageServices;
- Supports(BorlandIDEServices, IOTAPackageServices, APackageServices);
-
- if not Assigned(APackageServices) then
- raise EJclExpertException.CreateTrace(RsENoPackageServices);
-
- for I := 0 to APackageServices.PackageCount - 1 do
+ for I := 0 to OTAPackageServices.PackageCount - 1 do
begin
- PackageFileName := ChangeFileExt(APackageServices.PackageNames[I], BinaryExtensionPackage);
+ PackageFileName := ChangeFileExt(OTAPackageServices.PackageNames[I], BinaryExtensionPackage);
PackageFileName := GetModulePath(GetModuleHandle(PChar(PackageFileName)));
if AnsiSameText(ChangeFileExt(PackageFileName, ''), ExecutableNameNoExt) then
begin
@@ -1266,6 +1308,29 @@
Result := AnsiSameText(FileExtension, SourceExtensionDelphiPackage);
end;
+class function TJclOTAExpertBase.IsPersonalityLoaded(
+ const PersonalityName: string): Boolean;
+{$IFDEF BDS}
+var
+ OTAPersonalityServices: IOTAPersonalityServices;
+ Index: Integer;
+begin
+ OTAPersonalityServices := GetOTAPersonalityServices;
+ Result := False;
+
+ for Index := 0 to OTAPersonalityServices.PersonalityCount - 1 do
+ if SameText(OTAPersonalityServices.Personalities[Index], PersonalityName) then
+ begin
+ Result := True;
+ Break;
+ end;
+end;
+{$ELSE BDS}
+begin
+ Result := True;
+end;
+{$ENDIF BDS}
+
procedure TJclOTAExpertBase.ReadEnvVariables;
{$IFDEF COMPILER6_UP}
var
@@ -1375,10 +1440,12 @@
end;
procedure TJclOTAExpertBase.UnregisterAction(Action: TCustomAction);
+var
+ NTAServices: INTAServices;
begin
if Action.Name <> '' then
ActionSettings.SaveInteger(Action.Name, Action.ShortCut);
-
+
if Assigned(GlobalActionList) then
begin
GlobalActionList.Remove(Action);
@@ -1393,15 +1460,16 @@
end;
end;
+ NTAServices := GetNTAServices;
// remove action from toolbar to avoid crash when recompile package inside the IDE.
- CheckToolBarButton(FNTAServices.ToolBar[sCustomToolBar], Action);
- CheckToolBarButton(FNTAServices.ToolBar[sStandardToolBar], Action);
- CheckToolBarButton(FNTAServices.ToolBar[sDebugToolBar], Action);
- CheckToolBarButton(FNTAServices.ToolBar[sViewToolBar], Action);
- CheckToolBarButton(FNTAServices.ToolBar[sDesktopToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sCustomToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sStandardToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sDebugToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sViewToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sDesktopToolBar], Action);
{$IFDEF COMPILER7_UP}
- CheckToolBarButton(FNTAServices.ToolBar[sInternetToolBar], Action);
- CheckToolBarButton(FNTAServices.ToolBar[sCORBAToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sInternetToolBar], Action);
+ CheckToolBarButton(NTAServices.ToolBar[sCORBAToolBar], Action);
{$ENDIF COMPILER7_UP}
end;
@@ -1411,7 +1479,10 @@
Category: string;
Index: Integer;
IDEMenuItem, ToolsMenuItem: TMenuItem;
+ NTAServices: INTAServices;
begin
+ NTAServices := GetNTAServices;
+
if not Assigned(ConfigurationAction) then
begin
Category := '';
@@ -1526,7 +1597,7 @@
begin
Supports(BorlandIDEServices,IOTAAboutBoxServices, AboutBoxServices);
if not Assigned(AboutBoxServices) then
- raise EJclExpertException.CreateTrace(RsENoAboutServices);
+ raise EJclExpertException.CreateTrace(RsENoOTAAboutServices);
ProductImage := LoadBitmap(FindResourceHInstance(HInstance), 'JCLSPLASH');
if ProductImage = 0 then
raise EJclExpertException.CreateTrace(RsENoBitmapResources);
Modified: trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas
===================================================================
--- trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -220,18 +220,10 @@
JCLWizardIndex: Integer = -1;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
except
on ExceptionObj: TObject do
begin
@@ -243,18 +235,12 @@
function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclDebugExtension.Create);
- JCLWizardIndex := OTAWizardServices.AddWizard(TJclDebugExtension.Create);
-
Result := True;
except
on ExceptionObj: TObject do
@@ -307,6 +293,7 @@
Succ: Boolean;
MapFileSize, JclDebugDataSize, LineNumberErrors, C: Integer;
EnabledActions: TDebugExpertActions;
+ OTAMessageServices: IOTAMessageServices;
procedure OutputToolMessage(const Msg: string);
begin
@@ -321,6 +308,7 @@
if JclDisablePostCompilationProcess or (FCurrentProject = nil) then
Exit;
+ OTAMessageServices := GetOTAMessageServices;
EnabledActions := GetProjectActions(FCurrentProject);
if EnabledActions <> [] then
begin
@@ -552,25 +540,25 @@
procedure TJclDebugExtension.DebugExpertActionExecute(Sender: TObject);
var
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
begin
- if ProjectActions[AProject] <> [] then
+ if ProjectActions[ActiveProject] <> [] then
begin
// disable all actions
- ProjectStates[deGenerateJdbg, AProject] := DisableDebugExpertState(ProjectStates[deGenerateJdbg, AProject]);
- ProjectStates[deInsertJdbg, AProject] := DisableDebugExpertState(ProjectStates[deInsertJdbg, AProject]);
- ProjectStates[deDeleteMapFile, AProject] := DisableDebugExpertState(ProjectStates[deDeleteMapFile, AProject]);
+ ProjectStates[deGenerateJdbg, ActiveProject] := DisableDebugExpertState(ProjectStates[deGenerateJdbg, ActiveProject]);
+ ProjectStates[deInsertJdbg, ActiveProject] := DisableDebugExpertState(ProjectStates[deInsertJdbg, ActiveProject]);
+ ProjectStates[deDeleteMapFile, ActiveProject] := DisableDebugExpertState(ProjectStates[deDeleteMapFile, ActiveProject]);
end
else
begin
// enable all actions
- ProjectStates[deGenerateJdbg, AProject] := EnableDebugExpertState(ProjectStates[deGenerateJdbg, AProject]);
- ProjectStates[deInsertJdbg, AProject] := EnableDebugExpertState(ProjectStates[deInsertJdbg, AProject]);
- ProjectStates[deDeleteMapFile, AProject] := EnableDebugExpertState(ProjectStates[deDeleteMapFile, AProject]);
+ ProjectStates[deGenerateJdbg, ActiveProject] := EnableDebugExpertState(ProjectStates[deGenerateJdbg, ActiveProject]);
+ ProjectStates[deInsertJdbg, ActiveProject] := EnableDebugExpertState(ProjectStates[deInsertJdbg, ActiveProject]);
+ ProjectStates[deDeleteMapFile, ActiveProject] := EnableDebugExpertState(ProjectStates[deDeleteMapFile, ActiveProject]);
end;
end;
except
@@ -586,16 +574,16 @@
var
AAction: TCustomAction;
AEnabled: Boolean;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AAction := Sender as TCustomAction;
- AProject := ActiveProject;
- AEnabled := AProject <> nil;
+ ActiveProject := GetActiveProject;
+ AEnabled := ActiveProject <> nil;
AAction.Enabled := AEnabled;
if AEnabled then
begin
- AAction.Checked := ProjectActions[AProject] <> [];
+ AAction.Checked := ProjectActions[ActiveProject] <> [];
AAction.ImageIndex := FDebugImageIndex;
end
else
@@ -611,12 +599,12 @@
procedure TJclDebugExtension.DebugExpertMenuClick(Sender: TObject);
var
EnabledActions: TDebugExpertActions;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- EnabledActions := ProjectActions[AProject]
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ EnabledActions := ProjectActions[ActiveProject]
else
EnabledActions := [];
FGenerateJdbgItem.Checked := deGenerateJdbg in EnabledActions;
@@ -635,18 +623,18 @@
CheckTag, Index: Integer;
APopupMenu: TPopupMenu;
AMenuItem: TMenuItem;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
TestState: TDebugExpertState;
IndexAction: TDebugExpertAction;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
begin
- TestState := ProjectStates[Low(TDebugExpertAction), AProject];
+ TestState := ProjectStates[Low(TDebugExpertAction), ActiveProject];
CheckTag := DebugExpertStateToInt(TestState);
for IndexAction := Succ(Low(TDebugExpertAction)) to High(TDebugExpertAction) do
- if TestState <> ProjectStates[IndexAction, AProject] then
+ if TestState <> ProjectStates[IndexAction, ActiveProject] then
begin
CheckTag := -1;
Break;
@@ -667,7 +655,7 @@
for Index := 0 to APopupMenu.Items.Count - 1 do
begin
AMenuItem := APopupMenu.Items.Items[Index];
- AMenuItem.Enabled := (AProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ AMenuItem.Enabled := (ActiveProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
AMenuItem.Checked := AMenuItem.Tag = CheckTag;
end;
@@ -682,16 +670,16 @@
procedure TJclDebugExtension.DebugExpertSubMenuClick(Sender: TObject);
var
AState: TDebugExpertState;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AState := IntToDebugExpertState((Sender as TComponent).Tag);
- AProject := ActiveProject;
- if AProject <> nil then
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
begin
- ProjectStates[deGenerateJdbg, AProject] := AState;
- ProjectStates[deInsertJdbg, AProject] := AState;
- ProjectStates[deDeleteMapFile, AProject] := AState;
+ ProjectStates[deGenerateJdbg, ActiveProject] := AState;
+ ProjectStates[deInsertJdbg, ActiveProject] := AState;
+ ProjectStates[deDeleteMapFile, ActiveProject] := AState;
end
else
begin
@@ -709,12 +697,12 @@
procedure TJclDebugExtension.DeleteMapFileActionExecute(Sender: TObject);
var
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- ProjectStates[deDeleteMapFile, AProject] := ToggleDebugExpertState(ProjectStates[deDeleteMapFile, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ ProjectStates[deDeleteMapFile, ActiveProject] := ToggleDebugExpertState(ProjectStates[deDeleteMapFile, ActiveProject])
else
GlobalStates[deDeleteMapFile] := ToggleDebugExpertState(GlobalStates[deDeleteMapFile]);
except
@@ -730,16 +718,16 @@
var
AAction: TCustomAction;
AEnabled: Boolean;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AAction := Sender as TCustomAction;
- AProject := ActiveProject;
- AEnabled := AProject <> nil;
+ ActiveProject := GetActiveProject;
+ AEnabled := ActiveProject <> nil;
AAction.Enabled := AEnabled;
if AEnabled then
begin
- AAction.Checked := ProjectStates[deDeleteMapFile, AProject] in [deAlwaysEnabled, deProjectEnabled];
+ AAction.Checked := ProjectStates[deDeleteMapFile, ActiveProject] in [deAlwaysEnabled, deProjectEnabled];
AAction.ImageIndex := FDeleteMapFileImageIndex;
end
else
@@ -759,19 +747,19 @@
var
AMenuItem, BMenuItem: TMenuItem;
CheckTag, Index: Integer;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- CheckTag := DebugExpertStateToInt(ProjectStates[deDeleteMapFile, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ CheckTag := DebugExpertStateToInt(ProjectStates[deDeleteMapFile, ActiveProject])
else
CheckTag := DebugExpertStateToInt(GlobalStates[deDeleteMapFile]);
AMenuItem := Sender as TMenuItem;
for Index := 0 to AMenuItem.Count - 1 do
begin
BMenuItem := AMenuItem.Items[Index];
- BMenuItem.Enabled := (AProject <> nil) or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ BMenuItem.Enabled := (ActiveProject <> nil) or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
BMenuItem.Checked := BMenuItem.Tag = CheckTag;
end;
@@ -788,19 +776,19 @@
AMenu: TPopupMenu;
AMenuItem: TMenuItem;
CheckTag, Index: Integer;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- CheckTag := DebugExpertStateToInt(ProjectStates[deDeleteMapFile, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ CheckTag := DebugExpertStateToInt(ProjectStates[deDeleteMapFile, ActiveProject])
else
CheckTag := DebugExpertStateToInt(GlobalStates[deDeleteMapFile]);
AMenu := Sender as TPopupMenu;
for Index := 0 to AMenu.Items.Count - 1 do
begin
AMenuItem := AMenu.Items.Items[Index];
- AMenuItem.Enabled := (AProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ AMenuItem.Enabled := (ActiveProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
AMenuItem.Checked := AMenuItem.Tag = CheckTag;
end;
@@ -815,15 +803,15 @@
procedure TJclDebugExtension.DeleteMapFileSubMenuClick(Sender: TObject);
var
AState: TDebugExpertState;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AState := IntToDebugExpertState((Sender as TComponent).Tag);
- AProject := ActiveProject;
- if AProject <> nil then
- ProjectStates[deDeleteMapFile, AProject] := AState
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ ProjectStates[deDeleteMapFile, ActiveProject] := AState
else
- GlobalStates[deDeleteMapFile] := AState;
+ GlobalStates[deDeleteMapFile] := AState;
except
on ExceptionObj: TObject do
begin
@@ -834,12 +822,12 @@
procedure TJclDebugExtension.GenerateJdbgActionExecute(Sender: TObject);
var
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- ProjectStates[deGenerateJdbg, AProject] := ToggleDebugExpertState(ProjectStates[deGenerateJdbg, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ ProjectStates[deGenerateJdbg, ActiveProject] := ToggleDebugExpertState(ProjectStates[deGenerateJdbg, ActiveProject])
else
GlobalStates[deGenerateJdbg] := ToggleDebugExpertState(GlobalStates[deGenerateJdbg]);
except
@@ -855,16 +843,16 @@
var
AAction: TCustomAction;
AEnabled: Boolean;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AAction := Sender as TCustomAction;
- AProject := ActiveProject;
- AEnabled := AProject <> nil;
+ ActiveProject := GetActiveProject;
+ AEnabled := ActiveProject <> nil;
AAction.Enabled := AEnabled;
if AEnabled then
begin
- AAction.Checked := ProjectStates[deGenerateJdbg, AProject] in [deAlwaysEnabled, deProjectEnabled];
+ AAction.Checked := ProjectStates[deGenerateJdbg, ActiveProject] in [deAlwaysEnabled, deProjectEnabled];
AAction.ImageIndex := FGenerateJdbgImageIndex;
end
else
@@ -884,19 +872,19 @@
var
AMenuItem, BMenuItem: TMenuItem;
CheckTag, Index: Integer;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- CheckTag := DebugExpertStateToInt(ProjectStates[deGenerateJdbg, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ CheckTag := DebugExpertStateToInt(ProjectStates[deGenerateJdbg, ActiveProject])
else
CheckTag := DebugExpertStateToInt(GlobalStates[deGenerateJdbg]);
AMenuItem := Sender as TMenuItem;
for Index := 0 to AMenuItem.Count - 1 do
begin
BMenuItem := AMenuItem.Items[Index];
- BMenuItem.Enabled := (AProject <> nil) or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ BMenuItem.Enabled := (ActiveProject <> nil) or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
BMenuItem.Checked := BMenuItem.Tag = CheckTag;
end;
@@ -913,19 +901,19 @@
AMenu: TPopupMenu;
AMenuItem: TMenuItem;
CheckTag, Index: Integer;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- CheckTag := DebugExpertStateToInt(ProjectStates[deGenerateJdbg, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ CheckTag := DebugExpertStateToInt(ProjectStates[deGenerateJdbg, ActiveProject])
else
CheckTag := DebugExpertStateToInt(GlobalStates[deGenerateJdbg]);
AMenu := Sender as TPopupMenu;
for Index := 0 to AMenu.Items.Count - 1 do
begin
AMenuItem := AMenu.Items.Items[Index];
- AMenuItem.Enabled := (AProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ AMenuItem.Enabled := (ActiveProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
AMenuItem.Checked := AMenuItem.Tag = CheckTag;
end;
@@ -940,13 +928,13 @@
procedure TJclDebugExtension.GenerateJdbgSubMenuClick(Sender: TObject);
var
AState: TDebugExpertState;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AState := IntToDebugExpertState((Sender as TComponent).Tag);
- AProject := ActiveProject;
- if AProject <> nil then
- ProjectStates[deGenerateJdbg, AProject] := AState
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ ProjectStates[deGenerateJdbg, ActiveProject] := AState
else
GlobalStates[deGenerateJdbg] := AState;
except
@@ -1019,12 +1007,12 @@
procedure TJclDebugExtension.InsertJdbgActionExecute(Sender: TObject);
var
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- ProjectStates[deInsertJdbg, AProject] := ToggleDebugExpertState(ProjectStates[deInsertJdbg, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ ProjectStates[deInsertJdbg, ActiveProject] := ToggleDebugExpertState(ProjectStates[deInsertJdbg, ActiveProject])
else
GlobalStates[deInsertJdbg] := ToggleDebugExpertState(GlobalStates[deInsertJdbg]);
except
@@ -1040,16 +1028,16 @@
var
AAction: TCustomAction;
AEnabled: Boolean;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AAction := Sender as TCustomAction;
- AProject := ActiveProject;
- AEnabled := AProject <> nil;
+ ActiveProject := GetActiveProject;
+ AEnabled := ActiveProject <> nil;
AAction.Enabled := AEnabled;
if AEnabled then
begin
- AAction.Checked := ProjectStates[deInsertJdbg, AProject] in [deAlwaysEnabled, deProjectEnabled];
+ AAction.Checked := ProjectStates[deInsertJdbg, ActiveProject] in [deAlwaysEnabled, deProjectEnabled];
AAction.ImageIndex := FInsertJdbgImageIndex
end
else
@@ -1069,19 +1057,19 @@
var
AMenuItem, BMenuItem: TMenuItem;
CheckTag, Index: Integer;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- CheckTag := DebugExpertStateToInt(ProjectStates[deInsertJdbg, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ CheckTag := DebugExpertStateToInt(ProjectStates[deInsertJdbg, ActiveProject])
else
CheckTag := DebugExpertStateToInt(GlobalStates[deInsertJdbg]);
AMenuItem := Sender as TMenuItem;
for Index := 0 to AMenuItem.Count - 1 do
begin
BMenuItem := AMenuItem.Items[Index];
- BMenuItem.Enabled := (AProject <> nil) or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ BMenuItem.Enabled := (ActiveProject <> nil) or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (BMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
BMenuItem.Checked := BMenuItem.Tag = CheckTag;
end;
@@ -1098,19 +1086,19 @@
AMenu: TPopupMenu;
AMenuItem: TMenuItem;
CheckTag, Index: Integer;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- AProject := ActiveProject;
- if AProject <> nil then
- CheckTag := DebugExpertStateToInt(ProjectStates[deInsertJdbg, AProject])
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ CheckTag := DebugExpertStateToInt(ProjectStates[deInsertJdbg, ActiveProject])
else
CheckTag := DebugExpertStateToInt(GlobalStates[deInsertJdbg]);
AMenu := Sender as TPopupMenu;
for Index := 0 to AMenu.Items.Count - 1 do
begin
AMenuItem := AMenu.Items.Items[Index];
- AMenuItem.Enabled := (AProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
+ AMenuItem.Enabled := (ActiveProject <> nil) or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysDisabled))
or (AMenuItem.Tag = DebugExpertStateToInt(deAlwaysEnabled));
AMenuItem.Checked := AMenuItem.Tag = CheckTag;
end;
@@ -1125,13 +1113,13 @@
procedure TJclDebugExtension.InsertJdbgSubMenuClick(Sender: TObject);
var
AState: TDebugExpertState;
- AProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
AState := IntToDebugExpertState((Sender as TComponent).Tag);
- AProject := ActiveProject;
- if AProject <> nil then
- ProjectStates[deInsertJdbg, AProject] := AState
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ ProjectStates[deInsertJdbg, ActiveProject] := AState
else
GlobalStates[deInsertJdbg] := AState;
except
@@ -1235,8 +1223,17 @@
IDEActionList: TActionList;
I: Integer;
ImageBmp: TBitmap;
+ NTAServices: INTAServices;
+ OTAServices: IOTAServices;
+ {$IFDEF BDS4_UP}
+ OTAProjectManager: IOTAProjectManager;
+ {$ENDIF BDS4_UP}
begin
inherited RegisterCommands;
+
+ NTAServices := GetNTAServices;
+ OTAServices := GetOTAServices;
+
IDEActionList := TActionList(NTAServices.ActionList);
IDEMainMenu := NTAServices.MainMenu;
ImageBmp := TBitmap.Create;
@@ -1351,10 +1348,11 @@
end;
// register notifiers
- FIDENotifierIndex := Services.AddNotifier(TIdeNotifier.Create(Self));
+ FIDENotifierIndex := OTAServices.AddNotifier(TIdeNotifier.Create(Self));
{$IFDEF BDS4_UP}
- FProjectManagerNotifierIndex := ProjectManager.AddMenuCreatorNotifier(TProjectManagerNotifier.Create(Self,
- NTAServices, ProjectManager));
+ OTAProjectManager := GetOTAProjectManager;
+ FProjectManagerNotifierIndex := OTAProjectManager.AddMenuCreatorNotifier(TProjectManagerNotifier.Create(Self,
+ NTAServices, OTAProjectManager));
{$ENDIF BDS4_UP}
LoadExpertValues;
@@ -1421,10 +1419,10 @@
inherited UnregisterCommands;
{$IFDEF BDS4_UP}
if FProjectManagerNotifierIndex <> -1 then
- ProjectManager.RemoveMenuCreatorNotifier(FProjectManagerNotifierIndex);
+ GetOTAProjectManager.RemoveMenuCreatorNotifier(FProjectManagerNotifierIndex);
{$ENDIF BDS4_UP}
if FIDENotifierIndex <> -1 then
- Services.RemoveNotifier(FIDENotifierIndex);
+ GetOTAServices.RemoveNotifier(FIDENotifierIndex);
// save settings
SaveExpertValues;
Modified: trunk/jcl/experts/debug/simdview/JclSIMDView.pas
===================================================================
--- trunk/jcl/experts/debug/simdview/JclSIMDView.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/debug/simdview/JclSIMDView.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -160,18 +160,10 @@
JCLWizardIndex: Integer = -1;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
except
on ExceptionObj: TObject do
begin
@@ -183,18 +175,12 @@
function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclSIMDWizard.Create);
- JCLWizardIndex := OTAWizardServices.AddWizard(TJclSIMDWizard.Create);
-
Result := True;
except
on ExceptionObj: TObject do
@@ -307,12 +293,12 @@
IDEMenu: TMenu;
ViewMenu: TMenuItem;
Category: string;
+ NTAServices: INTAServices;
begin
inherited RegisterCommands;
- Supports(Services, IOTADebuggerServices, FDebuggerServices);
- if not Assigned(FDebuggerServices) then
- raise EJclExpertException.CreateTrace(RsENoDebuggerServices);
+ NTAServices := GetNTAServices;
+ FDebuggerServices := GetOTADebuggerServices;
Category := '';
for I := 0 to NTAServices.ActionList.ActionCount - 1 do
Modified: trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas
===================================================================
--- trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/debug/threadnames/ThreadExpertUnit.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -133,18 +133,10 @@
JCLWizardIndex: Integer = -1;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
except
on ExceptionObj: TObject do
begin
@@ -156,18 +148,12 @@
function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclThreadsExpert.Create);
- JCLWizardIndex := OTAWizardServices.AddWizard(TJclThreadsExpert.Create);
-
Result := True;
except
on ExceptionObj: TObject do
Modified: trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas
===================================================================
--- trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/favfolders/IdeOpenDlgFavoriteUnit.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -90,18 +90,10 @@
JCLWizardIndex: Integer = -1;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
except
on ExceptionObj: TObject do
begin
@@ -113,18 +105,12 @@
function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclOpenDialogsFavoriteExpert.Create);
- JCLWizardIndex := OTAWizardServices.AddWizard(TJclOpenDialogsFavoriteExpert.Create);
-
Result := True;
except
on ExceptionObj: TObject do
Modified: trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas
===================================================================
--- trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/projectanalyzer/ProjAnalyzerImpl.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -112,18 +112,10 @@
JCLWizardIndex: Integer;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
except
on ExceptionObj: TObject do
begin
@@ -135,18 +127,12 @@
function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJclProjectAnalyzerExpert.Create);
- JCLWizardIndex := OTAWizardServices.AddWizard(TJclProjectAnalyzerExpert.Create);
-
Result := True;
except
on ExceptionObj: TObject do
@@ -172,12 +158,12 @@
procedure TJclProjectAnalyzerExpert.ActionExecute(Sender: TObject);
var
- TempActiveProject: IOTAProject;
+ ActiveProject: IOTAProject;
begin
try
- TempActiveProject := ActiveProject;
- if TempActiveProject <> nil then
- AnalyzeProject(TempActiveProject)
+ ActiveProject := GetActiveProject;
+ if ActiveProject <> nil then
+ AnalyzeProject(ActiveProject)
else
raise EJclExpertException.CreateTrace(RsENoActiveProject);
except
@@ -191,16 +177,16 @@
procedure TJclProjectAnalyzerExpert.ActionUpdate(Sender: TObject);
var
- TempActiveProject: IOTAProject;
+ ActiveProject: IOTAProject;
ProjectName: string;
begin
try
- TempActiveProject := ActiveProject;
- if Assigned(TempActiveProject) then
- ProjectName := ExtractFileName(TempActiveProject.FileName)
+ ActiveProject := GetActiveProject;
+ if Assigned(ActiveProject) then
+ ProjectName := ExtractFileName(ActiveProject.FileName)
else
ProjectName := '';
- FBuildAction.Enabled := Assigned(TempActiveProject);
+ FBuildAction.Enabled := Assigned(ActiveProject);
if not FBuildAction.Enabled then
ProjectName := RsProjectNone;
FBuildAction.Caption := Format(RsAnalyzeActionCaption, [ProjectName]);
@@ -288,9 +274,15 @@
IDEActionList: TActionList;
I: Integer;
ImageBmp: TBitmap;
+ NTAServices: INTAServices;
+ {$IFDEF BDS4_UP}
+ OTAProjectManager: IOTAProjectManager;
+ {$ENDIF BDS4_UP}
begin
inherited RegisterCommands;
+ NTAServices := GetNTAServices;
+
// create actions
FBuildAction := TAction.Create(nil);
FBuildAction.Caption := Format(RsAnalyzeActionCaption, [RsProjectNone]);
@@ -308,8 +300,9 @@
// create project manager notifier
{$IFDEF BDS4_UP}
- FProjectManagerNotifierIndex := ProjectManager.AddMenuCreatorNotifier(TProjectManagerNotifier.Create(Self,
- ProjectManager));
+ OTAProjectManager := GetOTAProjectManager;
+ FProjectManagerNotifierIndex := OTAProjectManager.AddMenuCreatorNotifier(TProjectManagerNotifier.Create(Self,
+ OTAProjectManager));
{$ENDIF BDS4_UP}
// create menu item
@@ -352,7 +345,7 @@
// remove notifier
{$IFDEF BDS4_UP}
if FProjectManagerNotifierIndex <> -1 then
- ProjectManager.RemoveMenuCreatorNotifier(FProjectManagerNotifierIndex);
+ GetOTAProjectManager.RemoveMenuCreatorNotifier(FProjectManagerNotifierIndex);
{$ENDIF BDS4_UP}
UnregisterAction(FBuildAction);
Modified: trunk/jcl/experts/repository/JclOtaRepositoryReg.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/repository/JclOtaRepositoryReg.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -102,43 +102,15 @@
JclStrings, JclFileUtils, JclRegistry,
JclOtaResources, JclOtaConsts, JclOtaTemplates, JclOtaExcDlgWizard;
-
-function IsPersonalityLoaded(const BorlandIDEServices: IBorlandIDEServices;
- const PersonalityName: string): Boolean;
-{$IFDEF BDS}
-var
- PersonalityServices: IOTAPersonalityServices;
- Index: Integer;
-begin
- Supports(BorlandIDEServices, IOTAPersonalityServices, PersonalityServices);
- if not Assigned(PersonalityServices) then
- raise EJclExpertException.CreateTrace(RsENoPersonalityServices);
-
- Result := False;
-
- for Index := 0 to PersonalityServices.PersonalityCount - 1 do
- if SameText(PersonalityServices.Personalities[Index], PersonalityName) then
- begin
- Result := True;
- Break;
- end;
-end;
-{$ELSE BDS}
-begin
- Result := True;
-end;
-{$ENDIF BDS}
-
-
procedure Register;
begin
try
{$IFDEF DELPHI}
- if IsPersonalityLoaded(BorlandIDEServices, JclDelphiPersonality) then
+ if TJclOTAExpertBase.IsPersonalityLoaded(JclDelphiPersonality) then
RegisterPackageWizard(TJclExcDlgDelphiExpert.Create);
{$ENDIF DELPHI}
{$IFDEF BCB}
- if IsPersonalityLoaded(BorlandIDEServices, JclCBuilderPersonality) then
+ if TJclOTAExpertBase.IsPersonalityLoaded(JclCBuilderPersonality) then
RegisterPackageWizard(TJclExcDlgCBuilderExpert.Create);
{$ENDIF BCB}
except
@@ -163,10 +135,8 @@
OTAWizardServices: IOTAWizardServices;
begin
try
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
+ OTAWizardServices := TJclOTAExpertBase.GetOTAWizardServices;
+
{$IFDEF DELPHI}
if JCLDelphiWizardIndex <> -1 then
OTAWizardServices.RemoveWizard(JCLDelphiWizardIndex);
@@ -193,9 +163,7 @@
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ OTAWizardServices := TJclOTAExpertBase.GetOTAWizardServices;
{$IFDEF DELPHI}
//if IsPersonalityLoaded(BorlandIDEServices, JclDelphiPersonality) then
@@ -248,10 +216,7 @@
SourceExtension, SourceTemplate, SourceContent, SourceFileName: string;
OTAServices: IOTAServices;
begin
- Supports(BorlandIDEServices,IOTAServices,OTAServices);
- if not Assigned(OTAServices) then
- raise EJclExpertException.CreateTrace(RsENoIDEServices);
-
+ OTAServices := GetOTAServices;
JclSettingsKeyName := StrEnsureSuffix('\', OTAServices.GetBaseRegistryKey) + RegJclKey;
TemplatePath := PathAddSeparator(RegReadString(HKCU, JclSettingsKeyName, 'RootDir')) + TemplateSubDir;
Modified: trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/repository/JclOtaRepositoryUtils.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -65,9 +65,6 @@
FItemType: TJclRepositoryItemType;
FDesigner: string;
FPersonality: string;
- {$IFDEF BDS}
- FOTAGalleryCategoryManager: IOTAGalleryCategoryManager;
- {$ENDIF BDS}
protected
procedure Execute; override;
function GetName: string; override;
@@ -82,11 +79,6 @@
// override to customize
procedure DoExecute(const Personality: TJclBorPersonality); virtual;
function IsVisible(const Personality: TJclBorPersonality): Boolean; virtual;
-
- {$IFDEF BDS}
- property OTAGalleryCategoryManager: IOTAGalleryCategoryManager
- read FOTAGalleryCategoryManager;
- {$ENDIF BDS}
public
// IOTARepositoryWizard
function GetAuthor: string;
@@ -211,12 +203,6 @@
FItemType := AItemType;
FDesigner := ADesigner;
FPersonality := APersonality;
-
- {$IFDEF BDS}
- Supports(BorlandIDEServices, IOTAGalleryCategoryManager, FOTAGalleryCategoryManager);
- if not Assigned(FOTAGalleryCategoryManager) then
- raise EJclExpertException.CreateTrace(RsENoGalleryCategoryManager);
- {$ENDIF BDS}
end;
function TJclOTARepositoryExpert.CreateForm(const FormAncestor, FormName: string;
@@ -226,11 +212,11 @@
var
AModuleCreator: IOTAModuleCreator;
begin
- AModuleCreator := TJclOtaFormCreator.Create(ActiveProject, FormAncestor,
+ AModuleCreator := TJclOtaFormCreator.Create(GetActiveProject, FormAncestor,
FormName, FormFileName, FormContent, SourceFileName, SourceContent,
HeaderFileName, HeaderContent);
try
- Result := OTAModuleServices.CreateModule(AModuleCreator);
+ Result := GetOTAModuleServices.CreateModule(AModuleCreator);
finally
AModuleCreator := nil;
end;
@@ -238,9 +224,6 @@
destructor TJclOTARepositoryExpert.Destroy;
begin
- {$IFDEF BDS}
- FOTAGalleryCategoryManager := nil;
- {$ENDIF BDS}
inherited Destroy;
end;
@@ -292,7 +275,7 @@
function TJclOTARepositoryExpert.GetGalleryCategory: IOTAGalleryCategory;
begin
try
- Result := OTAGalleryCategoryManager.FindCategory(FGalleryCategory);
+ Result := GetOTAGalleryCategoryManager.FindCategory(FGalleryCategory);
except
on ExceptionObj: TObject do
begin
Modified: trunk/jcl/experts/useswizard/JCLUsesWizard.pas
===================================================================
--- trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/useswizard/JCLUsesWizard.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -146,18 +146,10 @@
JCLWizardIndex: Integer = -1;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
if JCLWizardIndex <> -1 then
- begin
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
-
- OTAWizardServices.RemoveWizard(JCLWizardIndex);
- end;
+ TJclOTAExpertBase.GetOTAWizardServices.RemoveWizard(JCLWizardIndex);
except
on ExceptionObj: TObject do
begin
@@ -169,18 +161,12 @@
function JCLWizardInit(const BorlandIDEServices: IBorlandIDEServices;
RegisterProc: TWizardRegisterProc;
var TerminateProc: TWizardTerminateProc): Boolean stdcall;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
TerminateProc := JclWizardTerminate;
- Supports(BorlandIDEServices, IOTAWizardServices, OTAWizardServices);
- if not Assigned(OTAWizardServices) then
- raise EJclExpertException.CreateTrace(RsENoWizardServices);
+ JCLWizardIndex := TJclOTAExpertBase.GetOTAWizardServices.AddWizard(TJCLUsesWizard.Create);
- JCLWizardIndex := OTAWizardServices.AddWizard(TJCLUsesWizard.Create);
-
Result := True;
except
on ExceptionObj: TObject do
@@ -509,8 +495,10 @@
procedure TJCLUsesWizard.LoadSettings;
var
DefaultIniFile, DefaultRegKey: string;
+ OTAServices: IOTAServices;
begin
- DefaultRegKey := StrEnsureSuffix(NativeBackslash, Services.GetBaseRegistryKey) + RegJclKey;
+ OTAServices := GetOTAServices;
+ DefaultRegKey := StrEnsureSuffix(NativeBackslash, OTAServices.GetBaseRegistryKey) + RegJclKey;
DefaultIniFile := RegReadStringDef(HKCU, DefaultRegKey, JclRootDirValueName, '');
if DefaultIniFile <> '' then
DefaultIniFile := PathAddSeparator(DefaultIniFile) + JclIniFileLocation;
@@ -738,7 +726,7 @@
ChangeList: TStrings;
IntfLength, ImplLength: Integer;
Writer: IOTAEditWriter;
- Project: IOTAProject;
+ ActiveProject: IOTAProject;
begin
GoalSource := '';
with BorlandIDEServices as IOTAEditorServices do
@@ -789,9 +777,9 @@
end;
// attempt to recompile
- Project := ActiveProject;
- if Assigned(Project) and Assigned(Project.ProjectBuilder) then
- Project.ProjectBuilder.BuildProject(cmOTAMake, True, True);
+ ActiveProject := GetActiveProject;
+ if Assigned(ActiveProject) and Assigned(ActiveProject.ProjectBuilder) then
+ ActiveProject.ProjectBuilder.BuildProject(cmOTAMake, True, True);
end;
finally
ChangeList.Free;
@@ -835,9 +823,9 @@
end;
// attempt to recompile
- Project := ActiveProject;
- if Assigned(Project) and Assigned(Project.ProjectBuilder) then
- Project.ProjectBuilder.BuildProject(cmOTAMake, True, True);
+ ActiveProject := GetActiveProject;
+ if Assigned(ActiveProject) and Assigned(ActiveProject.ProjectBuilder) then
+ ActiveProject.ProjectBuilder.BuildProject(cmOTAMake, True, True);
end;
finally
ChangeList.Free;
@@ -914,9 +902,9 @@
end;
// attempt to recompile
- Project := ActiveProject;
- if Assigned(Project) and Assigned(Project.ProjectBuilder) then
- Project.ProjectBuilder.BuildProject(cmOTAMake, True, True);
+ ActiveProject := GetActiveProject;
+ if Assigned(ActiveProject) and Assigned(ActiveProject.ProjectBuilder) then
+ ActiveProject.ProjectBuilder.BuildProject(cmOTAMake, True, True);
end;
finally
ChangeList.Free;
Modified: trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas
===================================================================
--- trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas 2008-09-27 09:45:37 UTC (rev 2497)
+++ trunk/jcl/experts/versioncontrol/JclVersionControlImpl.pas 2008-09-27 10:26:07 UTC (rev 2498)
@@ -62,7 +62,6 @@
FVersionCtrlMenu: TMenuItem;
FActions: array [TJclVersionControlActionType] of TCustomAction;
FLastPlugin: TJclVersionControlPlugin;
- FModuleServices: IOTAModuleServices;
FHideActions: Boolean;
FIconType: Integer;
FActOnTopSandbox: Boolean;
@@ -94,7 +93,6 @@
function SaveModules(const FileName: string;
const IncludeSubDirectories: Boolean): Boolean;
- property ModuleServices: IOTAModuleServices read FModuleServices;
property ActOnTopSandbox: Boolean read FActOnTopSandbox write FActOnTopSandbox;
property DisableActions: Boolean read FDisableActions write FDisableActions;
property HideActions: Boolean read FHideActions write FHideActions;
@@ -160,18 +158,10 @@
JCLWizardIndex: Integer = -1;
procedure JclWizardTerminate;
-var
- OTAWizardServices: IOTAWizardServices;
begin
try
...
[truncated message content] |
|
From: <cyc...@us...> - 2008-09-27 09:45:43
|
Revision: 2497
http://jcl.svn.sourceforge.net/jcl/?rev=2497&view=rev
Author: cycocrew
Date: 2008-09-27 09:45:37 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
JEDI.INC cosmetic changes
Modified Paths:
--------------
trunk/jcl/source/include/jcl.inc
trunk/jcl/source/include/jedi.inc
Modified: trunk/jcl/source/include/jcl.inc
===================================================================
--- trunk/jcl/source/include/jcl.inc 2008-09-24 20:40:10 UTC (rev 2496)
+++ trunk/jcl/source/include/jcl.inc 2008-09-27 09:45:37 UTC (rev 2497)
@@ -27,7 +27,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
Modified: trunk/jcl/source/include/jedi.inc
===================================================================
--- trunk/jcl/source/include/jedi.inc 2008-09-24 20:40:10 UTC (rev 2496)
+++ trunk/jcl/source/include/jedi.inc 2008-09-27 09:45:37 UTC (rev 2497)
@@ -30,7 +30,7 @@
{ This file defines various generic compiler directives used in different libraries, e.g. in the }
{ JEDI Code Library (JCL) and JEDI Visual Component Library Library (JVCL). The directives in }
{ this file are of generic nature and consist mostly of mappings from the VERXXX directives }
-{ defined by Delphi, C++ Builder and FPC to friendly names such as DELPHI5 and }
+{ defined by Delphi, C++Builder and FPC to friendly names such as DELPHI5 and }
{ SUPPORTS_WIDESTRING. These friendly names are subsequently used in the libraries to test for }
{ compiler versions and/or whether the compiler supports certain features (such as widestrings or }
{ 64 bit integers. The libraries provide an additional, library specific, include file. For the }
@@ -51,18 +51,18 @@
This file defines two directives to indicate which development environment the
library is being compiled with. Currently this can either be Delphi, Kylix,
- C++ Builder or FPC.
+ C++Builder or FPC.
Directive Description
------------------------------------------------------------------------------
DELPHI Defined if compiled with Delphi
KYLIX Defined if compiled with Kylix
DELPHICOMPILER Defined if compiled with Delphi or Kylix/Delphi
- BCB Defined if compiled with C++ Builder
- CPPBUILDER Defined if compiled with C++ Builder (alias for BCB)
- BCBCOMPILER Defined if compiled with C++ Builder or Kylix/C++
- DELPHILANGUAGE Defined if compiled with Delphi, Kylix or C++ Builder
- BORLAND Defined if compiled with Delphi, Kylix or C++ Builder
+ BCB Defined if compiled with C++Builder
+ CPPBUILDER Defined if compiled with C++Builder (alias for BCB)
+ BCBCOMPILER Defined if compiled with C++Builder or Kylix/C++
+ DELPHILANGUAGE Defined if compiled with Delphi, Kylix or C++Builder
+ BORLAND Defined if compiled with Delphi, Kylix or C++Builder
FPC Defined if compiled with FPC
- Platform Directives
@@ -131,11 +131,11 @@
DELPHI8 Defined when compiling with Delphi 8
DELPHI2005 Defined when compiling with Delphi 2005
DELPHI9 Alias for DELPHI2005
- DELPHI10 Defined when compiling with Delphi Personality of BDS 4.0
+ DELPHI10 Defined when compiling with Delphi 2006
DELPHI2006 Alias for DELPHI10
DELPHI11 Defined when compiling with Delphi 2007 for Win32
DELPHI2007 Alias for DELPHI11
- DELPHI12 Defined when compiling with Delphi for Win32 2009
+ DELPHI12 Defined when compiling with Delphi 2009 for Win32
DELPHI2009 Alias for DELPHI12
DELPHI1_UP Defined when compiling with Delphi 1 or higher
DELPHI2_UP Defined when compiling with Delphi 2 or higher
@@ -147,11 +147,11 @@
DELPHI8_UP Defined when compiling with Delphi 8 or higher
DELPHI2005_UP Defined when compiling with Delphi 2005 or higher
DELPHI9_UP Alias for DELPHI2005_UP
- DELPHI10_UP Defined when compiling with Delphi Personality of BDS 4.0 or higher
+ DELPHI10_UP Defined when compiling with Delphi 2006 or higher
DELPHI2006_UP Alias for DELPHI10_UP
DELPHI11_UP Defined when compiling with Delphi 2007 for Win32 or higher
DELPHI2007_UP Alias for DELPHI11_UP
- DELPHI12_UP Defined when compiling with Delphi for Win32 2009 or higher
+ DELPHI12_UP Defined when compiling with Delphi 2009 for Win32 or higher
DELPHI2009_UP Alias for DELPHI12_UP
@@ -196,35 +196,35 @@
DELPHICOMPILER7_UP Defined when compiling with Delphi 7 or higher
DELPHICOMPILER8_UP Defined when compiling with Delphi 8 or higher
DELPHICOMPILER9_UP Defined when compiling with Delphi 2005
- DELPHICOMPILER10_UP Defined when compiling with Delphi Personality of BDS 4.0 or higher
+ DELPHICOMPILER10_UP Defined when compiling with Delphi 2006 or higher
DELPHICOMPILER11_UP Defined when compiling with Delphi 2007 for Win32 or higher
- DELPHICOMPILER12_UP Defined when compiling with Delphi Personality of BDS 6.0 or higher
+ DELPHICOMPILER12_UP Defined when compiling with Delphi 2009 for Win32 or higher
-- C++ Builder Versions
+- C++Builder Versions
The following directives are direct mappings from the VERXXX directives to a
friendly name of the associated compiler. These directives are only defined if
- the compiler is C++ Builder (ie BCB is defined).
+ the compiler is C++Builder (ie BCB is defined).
Directive Description
------------------------------------------------------------------------------
- BCB1 Defined when compiling with C++ Builder 1
- BCB3 Defined when compiling with C++ Builder 3
- BCB4 Defined when compiling with C++ Builder 4
- BCB5 Defined when compiling with C++ Builder 5
- BCB6 Defined when compiling with C++ Builder 6
- BCB10 Defined when compiling with C++ Builder Personality of BDS 4.0 (also known as C++Builder 2006)
- BCB11 Defined when compiling with C++ Builder Personality of RAD Studio 2007 (also known as C++Builder 2007)
- BCB12 Defined when compiling with C++ Builder Personality of RAD Studio 2009 (also known as C++Builder 2009)
- BCB1_UP Defined when compiling with C++ Builder 1 or higher
- BCB3_UP Defined when compiling with C++ Builder 3 or higher
- BCB4_UP Defined when compiling with C++ Builder 4 or higher
- BCB5_UP Defined when compiling with C++ Builder 5 or higher
- BCB6_UP Defined when compiling with C++ Builder 6 or higher
- BCB10_UP Defined when compiling with C++ Builder Personality of BDS 4.0 or higher
- BCB11_UP Defined when compiling with C++ Builder Personality of RAD Studio 2007 or higher
- BCB12_UP Defined when compiling with C++ Builder Personality of RAD Studio 2009 or higher
+ BCB1 Defined when compiling with C++Builder 1
+ BCB3 Defined when compiling with C++Builder 3
+ BCB4 Defined when compiling with C++Builder 4
+ BCB5 Defined when compiling with C++Builder 5
+ BCB6 Defined when compiling with C++Builder 6
+ BCB10 Defined when compiling with C++Builder Personality of BDS 4.0 (also known as C++Builder 2006)
+ BCB11 Defined when compiling with C++Builder Personality of RAD Studio 2007 (also known as C++Builder 2007)
+ BCB12 Defined when compiling with C++Builder Personality of RAD Studio 2009 (also known as C++Builder 2009)
+ BCB1_UP Defined when compiling with C++Builder 1 or higher
+ BCB3_UP Defined when compiling with C++Builder 3 or higher
+ BCB4_UP Defined when compiling with C++Builder 4 or higher
+ BCB5_UP Defined when compiling with C++Builder 5 or higher
+ BCB6_UP Defined when compiling with C++Builder 6 or higher
+ BCB10_UP Defined when compiling with C++Builder Personality of BDS 4.0 or higher
+ BCB11_UP Defined when compiling with C++Builder Personality of RAD Studio 2007 or higher
+ BCB12_UP Defined when compiling with C++Builder Personality of RAD Studio 2009 or higher
- CodeGear RAD Studio / Borland Developer Studio Versions
@@ -238,7 +238,7 @@
Directive Description
------------------------------------------------------------------------------
- BDS Defined when compiling with a Borland Developer Studio version's dcc32.exe
+ BDS Defined when compiling with BDS version of dcc32.exe
BDS2 Defined when compiling with BDS 2.0 (Delphi 8)
BDS3 Defined when compiling with BDS 3.0 (Delphi 2005)
BDS4 Defined when compiling with BDS 4.0 (Borland Developer Studio 2006)
@@ -256,36 +256,36 @@
friendly name of the associated compiler. Unlike the DELPHI_X and BCB_X
directives, these directives are indepedent of the development environment.
That is, they are defined regardless of whether compilation takes place using
- Delphi or C++ Builder.
+ Delphi or C++Builder.
Directive Description
------------------------------------------------------------------------------
COMPILER1 Defined when compiling with Delphi 1
- COMPILER2 Defined when compiling with Delphi 2 or C++ Builder 1
+ COMPILER2 Defined when compiling with Delphi 2 or C++Builder 1
COMPILER3 Defined when compiling with Delphi 3
- COMPILER35 Defined when compiling with C++ Builder 3
- COMPILER4 Defined when compiling with Delphi 4 or C++ Builder 4
- COMPILER5 Defined when compiling with Delphi 5 or C++ Builder 5
- COMPILER6 Defined when compiling with Delphi 6 or C++ Builder 6
+ COMPILER35 Defined when compiling with C++Builder 3
+ COMPILER4 Defined when compiling with Delphi 4 or C++Builder 4
+ COMPILER5 Defined when compiling with Delphi 5 or C++Builder 5
+ COMPILER6 Defined when compiling with Delphi 6 or C++Builder 6
COMPILER7 Defined when compiling with Delphi 7
COMPILER8 Defined when compiling with Delphi 8
COMPILER9 Defined when compiling with Delphi 9
- COMPILER10 Defined when compiling with Delphi or C++ Builder Personalities of BDS 4.0
- COMPILER11 Defined when compiling with Delphi 2007 for Win32
- COMPILER12 Defined when compiling with Delphi or C++ Builder Personalities of BDS 6.0
+ COMPILER10 Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0
+ COMPILER11 Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0
+ COMPILER12 Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0
COMPILER1_UP Defined when compiling with Delphi 1 or higher
- COMPILER2_UP Defined when compiling with Delphi 2 or C++ Builder 1 or higher
+ COMPILER2_UP Defined when compiling with Delphi 2 or C++Builder 1 or higher
COMPILER3_UP Defined when compiling with Delphi 3 or higher
- COMPILER35_UP Defined when compiling with C++ Builder 3 or higher
- COMPILER4_UP Defined when compiling with Delphi 4 or C++ Builder 4 or higher
- COMPILER5_UP Defined when compiling with Delphi 5 or C++ Builder 5 or higher
- COMPILER6_UP Defined when compiling with Delphi 6 or C++ Builder 6 or higher
+ COMPILER35_UP Defined when compiling with C++Builder 3 or higher
+ COMPILER4_UP Defined when compiling with Delphi 4 or C++Builder 4 or higher
+ COMPILER5_UP Defined when compiling with Delphi 5 or C++Builder 5 or higher
+ COMPILER6_UP Defined when compiling with Delphi 6 or C++Builder 6 or higher
COMPILER7_UP Defined when compiling with Delphi 7
COMPILER8_UP Defined when compiling with Delphi 8
COMPILER9_UP Defined when compiling with Delphi Personalities of BDS 3.0
- COMPILER10_UP Defined when compiling with Delphi or C++ Builder Personalities of BDS 4.0 or higher
- COMPILER11_UP Defined when compiling with Delphi 2007 for Win32 or higher
- COMPILER12_UP Defined when compiling with Delphi or C++ Builder Personalities of BDS 6.0 or higher
+ COMPILER10_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 or higher
+ COMPILER11_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 or higher
+ COMPILER12_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 or higher
- RTL Versions
@@ -293,7 +293,7 @@
Use e.g. following to determine the exact RTL version since version 14.0:
{$IFDEF CONDITIONALEXPRESSIONS}
{$IF Declared(RTLVersion) and (RTLVersion >= 14.2)}
- // code for Delphi 6.02 or higher, Kylix 2 or higher, C++ Builder 6 or higher
+ // code for Delphi 6.02 or higher, Kylix 2 or higher, C++Builder 6 or higher
...
{$IFEND}
{$ENDIF}
@@ -302,20 +302,20 @@
------------------------------------------------------------------------------
RTL80_UP Defined when compiling with Delphi 1 or higher
RTL90_UP Defined when compiling with Delphi 2 or higher
- RTL93_UP Defined when compiling with C++ Builder 1 or higher
+ RTL93_UP Defined when compiling with C++Builder 1 or higher
RTL100_UP Defined when compiling with Delphi 3 or higher
- RTL110_UP Defined when compiling with C++ Builder 3 or higher
+ RTL110_UP Defined when compiling with C++Builder 3 or higher
RTL120_UP Defined when compiling with Delphi 4 or higher
- RTL125_UP Defined when compiling with C++ Builder 4 or higher
- RTL130_UP Defined when compiling with Delphi 5 or C++ Builder 5 or higher
- RTL140_UP Defined when compiling with Delphi 6, Kylix 1, 2 or 3 or C++ Builder 6 or higher
+ RTL125_UP Defined when compiling with C++Builder 4 or higher
+ RTL130_UP Defined when compiling with Delphi 5 or C++Builder 5 or higher
+ RTL140_UP Defined when compiling with Delphi 6, Kylix 1, 2 or 3 or C++Builder 6 or higher
RTL150_UP Defined when compiling with Delphi 7 or higher
RTL160_UP Defined when compiling with Delphi 8 or higher
RTL170_UP Defined when compiling with Delphi Personalities of BDS 3.0 or higher
- RTL180_UP Defined when compiling with Delphi or C++ Builder Personalities of BDS 4.0 or higher
- RTL185_UP Defined when compiling with Delphi 2007 for Win32 or higher
- RTL190_UP Defined when compiling with Delphi.NET of BDS 5.0 or later
- RTL200_UP Defined when compiling with Delphi or C++ Builder Personalities of BDS 6.0 or later
+ RTL180_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 4.0 or higher
+ RTL185_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 5.0 or higher
+ RTL190_UP Defined when compiling with Delphi.NET of BDS 5.0 or higher
+ RTL200_UP Defined when compiling with Delphi or C++Builder Personalities of BDS 6.0 or higher
- CLR Versions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-24 20:40:26
|
Revision: 2496
http://jcl.svn.sourceforge.net/jcl/?rev=2496&view=rev
Author: outchy
Date: 2008-09-24 20:40:10 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
Added unit versioning information to exception report.
Modified Paths:
--------------
trunk/jcl/experts/common/JclOtaResources.pas
trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas
trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas
trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.dfm
trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas
Modified: trunk/jcl/experts/common/JclOtaResources.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaResources.pas 2008-09-24 19:55:32 UTC (rev 2495)
+++ trunk/jcl/experts/common/JclOtaResources.pas 2008-09-24 20:40:10 UTC (rev 2496)
@@ -150,6 +150,7 @@
RsLogTrace = '&Add crash data to log file';
RsHookDll = '&Hook DLL';
RsModuleList = '&Module list';
+ RsUnitVersioning = '&Unit versioning';
RsOSInfo = '&Operating system informations';
RsActiveControls = '&List of active controls';
RsMainThreadOnly = '&Catch only exceptions of main thread';
Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas 2008-09-24 19:55:32 UTC (rev 2495)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas 2008-09-24 20:40:10 UTC (rev 2496)
@@ -30,7 +30,7 @@
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, ExtCtrls, AppEvnts,
- JclSysUtils,%if SendEMail JclMapi,%endif JclDebug;
+ JclSysUtils,%if SendEMail JclMapi,%endif %if UnitVersioning JclUnitVersioning, JclUnitVersioningProviders,%endif JclDebug;
const
UM_CREATEDETAILS = WM_USER + $100;
@@ -109,7 +109,7 @@
RsScreenRes = 'Display : %dx%d pixels, %d bpp';
RsActiveControl = 'Active Controls hierarchy:';
RsThread = 'Thread: %s';
- RsMissingVersionInfo = '(no version info)';
+ RsMissingVersionInfo = '(no module version info)';
%if AllThreads RsMainThreadCallStack = 'Call stack for main thread';
RsThreadCallStack = 'Call stack for thread %s';%endif
RsErrorMessage = 'There was an error during the execution of this program.' + NativeLineBreak +
@@ -119,6 +119,7 @@
'You may send it to the application vendor, helping him to understand what had happened.' + NativeLineBreak +
' Application title: %s' + NativeLineBreak +
' Application file: %s';
+%if UnitVersioning RsUnitVersioningIntro = 'Unit versioning information:';%endif
var
%FORMNAME%: T%FORMNAME%;
@@ -310,6 +311,10 @@
%if AllThreads ThreadList: TJclDebugThreadList;
AThreadID: DWORD;%endif %endif
PETarget: TJclPeTarget;
+%if UnitVersioning UnitVersioning: TUnitVersioning;
+ UnitVersioningModule: TUnitVersioningModule;
+ UnitVersion: TUnitVersion;
+ ModuleIndex, UnitIndex: Integer;%endif
begin
SL := TStringList.Create;
try
@@ -402,6 +407,8 @@
%if ModuleList // Modules list
if LoadedModulesList(SL, GetCurrentProcessId) then
begin
+%if UnitVersioning UnitVersioning := GetUnitVersioning;
+ UnitVersioning.RegisterProvider(TJclDefaultUnitVersioningProvider);%endif
DetailsMemo.Lines.Add(RsModulesList);
SL.CustomSort(SortModulesListByAddressCompare);
for I := 0 to SL.Count - 1 do
@@ -435,6 +442,20 @@
end
else
DetailsMemo.Lines.Add(ImageBaseStr + RsMissingVersionInfo);
+%if UnitVersioning for ModuleIndex := 0 to UnitVersioning.ModuleCount - 1 do
+ begin
+ UnitVersioningModule := UnitVersioning.Modules[ModuleIndex];
+ if UnitVersioningModule.Instance = ModuleBase then
+ begin
+ if UnitVersioningModule.Count > 0 then
+ DetailsMemo.Lines.Add(StrRepeat(' ', 11) + RsUnitVersioningIntro);
+ for UnitIndex := 0 to UnitVersioningModule.Count - 1 do
+ begin
+ UnitVersion := UnitVersioningModule.Items[UnitIndex];
+ DetailsMemo.Lines.Add(Format('%s%s %s %s %s', [StrRepeat(' ', 13), UnitVersion.LogPath, UnitVersion.RCSfile, UnitVersion.Revision, UnitVersion.Date]));
+ end;
+ end;
+ end;%endif
end;
NextDetailBlock;
end;
Modified: trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas 2008-09-24 19:55:32 UTC (rev 2495)
+++ trunk/jcl/experts/repository/JclOtaExcDlgRepository.pas 2008-09-24 20:40:10 UTC (rev 2496)
@@ -65,6 +65,7 @@
FEMailSubject: string;
FDesigner: TJclBorDesigner;
FModuleList: Boolean;
+ FUnitVersioning: Boolean;
FOSInfo: Boolean;
FActiveControls: Boolean;
FStackList: Boolean;
@@ -101,6 +102,7 @@
property LogFileName: string read FLogFileName write FLogFileName;
property OSInfo: Boolean read FOSInfo write FOSInfo;
property ModuleList: Boolean read FModuleList write FModuleList;
+ property UnitVersioning: Boolean read FUnitVersioning write FUnitVersioning;
property ActiveControls: Boolean read FActiveControls write FActiveControls;
property MainThreadOnly: Boolean read FMainThreadOnly write FMainThreadOnly;
// ignored exceptions
@@ -163,6 +165,7 @@
FSizeableDialog := False;
FDesigner := bdVCL;
FModuleList := True;
+ FUnitVersioning := True;
FOSInfo := True;
FActiveControls := True;
FStackList := True;
Modified: trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.dfm
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.dfm 2008-09-24 19:55:32 UTC (rev 2495)
+++ trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.dfm 2008-09-24 20:40:10 UTC (rev 2496)
@@ -1,14 +1,14 @@
inherited JclOtaExcDlgSystemPage: TJclOtaExcDlgSystemPage
object LabelLogFileName: TLabel
Left = 170
- Top = 159
+ Top = 139
Width = 55
Height = 13
Caption = 'RsFileName'
end
object CheckBoxDelayed: TCheckBox
Left = 120
- Top = 26
+ Top = 18
Width = 265
Height = 17
Caption = 'RsDelayedStackTrace'
@@ -16,7 +16,7 @@
end
object CheckBoxHookDll: TCheckBox
Left = 120
- Top = 57
+ Top = 49
Width = 265
Height = 17
Caption = 'RsHookDll'
@@ -24,7 +24,7 @@
end
object CheckBoxLogFile: TCheckBox
Left = 120
- Top = 121
+ Top = 113
Width = 265
Height = 17
Caption = 'RsLogFile'
@@ -33,18 +33,19 @@
end
object EditLogFileName: TEdit
Left = 240
- Top = 156
+ Top = 136
Width = 145
Height = 21
TabOrder = 3
end
object CheckBoxModuleList: TCheckBox
Left = 120
- Top = 200
+ Top = 176
Width = 265
Height = 17
Caption = 'RsModuleList'
TabOrder = 4
+ OnClick = CheckBoxModuleListClick
end
object CheckBoxOSInfo: TCheckBox
Left = 120
@@ -64,10 +65,18 @@
end
object CheckBoxMainThreadOnly: TCheckBox
Left = 120
- Top = 89
+ Top = 81
Width = 265
Height = 17
Caption = 'RsMainThreadOnly'
TabOrder = 7
end
+ object CheckBoxUnitVersioning: TCheckBox
+ Left = 152
+ Top = 199
+ Width = 233
+ Height = 17
+ Caption = 'RsUnitVersioning'
+ TabOrder = 8
+ end
end
Modified: trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas
===================================================================
--- trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas 2008-09-24 19:55:32 UTC (rev 2495)
+++ trunk/jcl/experts/repository/JclOtaExcDlgSystemFrame.pas 2008-09-24 20:40:10 UTC (rev 2496)
@@ -51,7 +51,9 @@
CheckBoxOSInfo: TCheckBox;
CheckBoxActiveControls: TCheckBox;
CheckBoxMainThreadOnly: TCheckBox;
+ CheckBoxUnitVersioning: TCheckBox;
procedure CheckBoxLogFileClick(Sender: TObject);
+ procedure CheckBoxModuleListClick(Sender: TObject);
private
FParams: TJclOtaExcDlgParams;
procedure UpdateLogEdits;
@@ -90,6 +92,11 @@
UpdateLogEdits;
end;
+procedure TJclOtaExcDlgSystemPage.CheckBoxModuleListClick(Sender: TObject);
+begin
+ CheckBoxUnitVersioning.Enabled := CheckBoxModuleList.Checked;
+end;
+
constructor TJclOtaExcDlgSystemPage.Create(AOwner: TComponent;
AParams: TJclOtaExcDlgParams);
begin
@@ -102,6 +109,7 @@
CheckBoxLogFile.Caption := RsLogTrace;
LabelLogFileName.Caption := RsFileName;
CheckBoxModuleList.Caption := RsModuleList;
+ CheckBoxUnitVersioning.Caption := RsUnitVersioning;
CheckBoxOSInfo.Caption := RsOSInfo;
CheckBoxActiveControls.Caption := RsActiveControls;
CheckBoxMainThreadOnly.Caption := RsMainThreadOnly;
@@ -121,6 +129,7 @@
CheckBoxLogFile.Checked := Params.LogFile;
EditLogFileName.Text := Params.LogFileName;
CheckBoxModuleList.Checked := Params.ModuleList;
+ CheckBoxUnitVersioning.Checked := Params.UnitVersioning;
CheckBoxOSInfo.Checked := Params.OSInfo;
CheckBoxActiveControls.Checked := Params.ActiveControls;
CheckBoxMainThreadOnly.Checked := Params.MainThreadOnly;
@@ -138,6 +147,7 @@
Params.LogFile := CheckBoxLogFile.Checked;
Params.LogFileName := EditLogFileName.Text;
Params.ModuleList := CheckBoxModuleList.Checked;
+ Params.UnitVersioning := CheckBoxUnitVersioning.Checked;
Params.OSInfo := CheckBoxOSInfo.Checked;
Params.ActiveControls := CheckBoxActiveControls.Checked;
Params.MainThreadOnly := CheckBoxMainThreadOnly.Checked;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-24 19:55:44
|
Revision: 2495
http://jcl.svn.sourceforge.net/jcl/?rev=2495&view=rev
Author: outchy
Date: 2008-09-24 19:55:32 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
Mantis 677: Some possible changes for ExceptDlg.pas.
Also renamed TextLabel to TextMemo.
Modified Paths:
--------------
trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm
trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas
trunk/jcl/experts/debug/dialog/ExceptDlg.dfm
trunk/jcl/experts/debug/dialog/ExceptDlg.pas
trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm
trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas
Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm 2008-09-23 21:08:21 UTC (rev 2494)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.dfm 2008-09-24 19:55:32 UTC (rev 2495)
@@ -6,7 +6,7 @@
%ifnot SizeableDialog BorderStyle = bsDialog%endif
Caption = '%FORMNAME%'
ClientHeight = 255
- ClientWidth = 432
+ ClientWidth = 483
Color = clBtnFace
Constraints.MinWidth = 200
Font.Charset = DEFAULT_CHARSET
@@ -29,14 +29,14 @@
object BevelDetails: TBevel
Left = 3
Top = 91
- Width = 422
+ Width = 473
Height = 9
Anchors = [akLeft, akTop, akRight]
Shape = bsTopLine
end
%if SendEMail
object SendBtn: TButton
- Left = 351
+ Left = 403
Top = 32
Width = 75
Height = 25
@@ -46,17 +46,15 @@
TabOrder = 0
OnClick = SendBtnClick
end%endif
- object TextLabel: TMemo
+ object TextMemo: TMemo
Left = 56
Top = 8
- Width = 281
+ Width = 332
Height = 75
Hint = 'Use Ctrl+C to copy the report to the clipboard'
Anchors = [akLeft, akTop, akRight]
BorderStyle = bsNone
Ctl3D = True
- Lines.Strings = (
- 'TextLabel')
ParentColor = True
ParentCtl3D = False
ReadOnly = True
@@ -64,7 +62,7 @@
WantReturns = False
end
object OkBtn: TButton
- Left = 352
+ Left = 403
Top = 4
Width = 75
Height = 25
@@ -75,7 +73,7 @@
TabOrder = 2
end
object DetailsBtn: TButton
- Left = 352
+ Left = 403
Top = 60
Width = 75
Height = 25
@@ -89,7 +87,7 @@
object DetailsMemo: TMemo
Left = 4
Top = 101
- Width = 421
+ Width = 472
Height = 147
Anchors = [akLeft, akTop, akRight, akBottom]
Font.Charset = DEFAULT_CHARSET
Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas 2008-09-23 21:08:21 UTC (rev 2494)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.Delphi32.pas 2008-09-24 19:55:32 UTC (rev 2495)
@@ -38,7 +38,7 @@
type
T%FORMNAME% = class(%ANCESTORNAME%)
%if SendEMail SendBtn: TButton;%endif
- TextLabel: TMemo;
+ TextMemo: TMemo;
OkBtn: TButton;
DetailsBtn: TButton;
BevelDetails: TBevel;
@@ -71,7 +71,7 @@
function ReportMaxColumns: Integer; virtual;
function ReportNewBlockDelimiterChar: Char; virtual;
procedure NextDetailBlock;
- procedure UpdateTextLabelScrollbars;
+ procedure UpdateTextMemoScrollbars;
public
procedure CopyReportToClipboard;
class procedure ExceptionHandler(Sender: TObject; E: Exception);
@@ -112,6 +112,13 @@
RsMissingVersionInfo = '(no version info)';
%if AllThreads RsMainThreadCallStack = 'Call stack for main thread';
RsThreadCallStack = 'Call stack for thread %s';%endif
+ RsErrorMessage = 'There was an error during the execution of this program.' + NativeLineBreak +
+ 'The application might become unstable and even useless.' + NativeLineBreak +
+ 'It''s recommended that you save your work and close this application.' + NativeLineBreak + NativeLineBreak;
+ RsDetailsIntro = 'Exception log with detailed tech info. Generated on %s.' + NativeLineBreak +
+ 'You may send it to the application vendor, helping him to understand what had happened.' + NativeLineBreak +
+ ' Application title: %s' + NativeLineBreak +
+ ' Application file: %s';
var
%FORMNAME%: T%FORMNAME%;
@@ -535,15 +542,15 @@
procedure T%FORMNAME%.FormPaint(Sender: TObject);
begin
- DrawIcon(Canvas.Handle, TextLabel.Left - GetSystemMetrics(SM_CXICON) - 15,
- TextLabel.Top, LoadIcon(0, IDI_ERROR));
+ DrawIcon(Canvas.Handle, TextMemo.Left - GetSystemMetrics(SM_CXICON) - 15,
+ TextMemo.Top, LoadIcon(0, IDI_ERROR));
end;
//--------------------------------------------------------------------------------------------------
procedure T%FORMNAME%.FormResize(Sender: TObject);
begin
- UpdateTextLabelScrollbars;
+ UpdateTextMemoScrollbars;
end;
//--------------------------------------------------------------------------------------------------
@@ -562,7 +569,7 @@
function T%FORMNAME%.GetReportAsText: string;
begin
- Result := StrEnsureSuffix(NativeCrLf, TextLabel.Text) + NativeCrLf + DetailsMemo.Text;
+ Result := StrEnsureSuffix(NativeCrLf, TextMemo.Text) + NativeCrLf + DetailsMemo.Text;
end;
//--------------------------------------------------------------------------------------------------
@@ -642,10 +649,14 @@
FThreadID := MainThreadID;
%if ActiveControls FLastActiveControl := Screen.ActiveControl;%endif
if E is Exception then
- TextLabel.Text := AdjustLineBreaks(StrEnsureSuffix('.', Exception(E).Message))
+ TextMemo.Text := RsErrorMessage + AdjustLineBreaks(StrEnsureSuffix('.', Exception(E).Message))
else
- TextLabel.Text := AdjustLineBreaks(StrEnsureSuffix('.', E.ClassName));
- UpdateTextLabelScrollbars;
+ TextMemo.Text := RsErrorMessage + AdjustLineBreaks(StrEnsureSuffix('.', E.ClassName));
+ UpdateTextMemoScrollbars;
+ NextDetailBlock;
+ //Arioch: some header for possible saving to txt-file/e-mail/clipboard/NTEvent...
+ DetailsMemo.Lines.Add(Format(RsDetailsIntro, [DateTimeToStr(Now), Application.Title, Application.ExeName]));
+ NextDetailBlock;
DetailsMemo.Lines.Add(Format(RsExceptionClass, [E.ClassName]));
if E is Exception then
DetailsMemo.Lines.Add(Format(RsExceptionMessage, [StrEnsureSuffix('.', Exception(E).Message)]));
@@ -671,13 +682,13 @@
//--------------------------------------------------------------------------------------------------
-procedure T%FORMNAME%.UpdateTextLabelScrollbars;
+procedure T%FORMNAME%.UpdateTextMemoScrollbars;
begin
-%if AutoScrollBars Canvas.Font := TextLabel.Font;
- if TextLabel.Lines.Count * Canvas.TextHeight('Wg') > TextLabel.ClientHeight then
- TextLabel.ScrollBars := ssVertical
+%if AutoScrollBars Canvas.Font := TextMemo.Font;
+ if TextMemo.Lines.Count * Canvas.TextHeight('Wg') > TextMemo.ClientHeight then
+ TextMemo.ScrollBars := ssVertical
else
- TextLabel.ScrollBars := ssNone;%endif
+ TextMemo.ScrollBars := ssNone;%endif
end;
//==================================================================================================
Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.dfm 2008-09-23 21:08:21 UTC (rev 2494)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.dfm 2008-09-24 19:55:32 UTC (rev 2495)
@@ -6,7 +6,7 @@
Caption = 'ExceptionDialog'
ClientHeight = 255
- ClientWidth = 432
+ ClientWidth = 483
Color = clBtnFace
Constraints.MinWidth = 200
Font.Charset = DEFAULT_CHARSET
@@ -29,23 +29,21 @@
object BevelDetails: TBevel
Left = 3
Top = 91
- Width = 422
+ Width = 473
Height = 9
Anchors = [akLeft, akTop, akRight]
Shape = bsTopLine
end
- object TextLabel: TMemo
+ object TextMemo: TMemo
Left = 56
Top = 8
- Width = 281
+ Width = 332
Height = 75
Hint = 'Use Ctrl+C to copy the report to the clipboard'
Anchors = [akLeft, akTop, akRight]
BorderStyle = bsNone
Ctl3D = True
- Lines.Strings = (
- 'TextLabel')
ParentColor = True
ParentCtl3D = False
ReadOnly = True
@@ -53,7 +51,7 @@
WantReturns = False
end
object OkBtn: TButton
- Left = 352
+ Left = 403
Top = 4
Width = 75
Height = 25
@@ -64,7 +62,7 @@
TabOrder = 2
end
object DetailsBtn: TButton
- Left = 352
+ Left = 403
Top = 60
Width = 75
Height = 25
@@ -78,7 +76,7 @@
object DetailsMemo: TMemo
Left = 4
Top = 101
- Width = 421
+ Width = 472
Height = 147
Anchors = [akLeft, akTop, akRight, akBottom]
Font.Charset = DEFAULT_CHARSET
Modified: trunk/jcl/experts/debug/dialog/ExceptDlg.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlg.pas 2008-09-23 21:08:21 UTC (rev 2494)
+++ trunk/jcl/experts/debug/dialog/ExceptDlg.pas 2008-09-24 19:55:32 UTC (rev 2495)
@@ -38,7 +38,7 @@
type
TExceptionDialog = class(TForm)
- TextLabel: TMemo;
+ TextMemo: TMemo;
OkBtn: TButton;
DetailsBtn: TButton;
BevelDetails: TBevel;
@@ -71,7 +71,7 @@
function ReportMaxColumns: Integer; virtual;
function ReportNewBlockDelimiterChar: Char; virtual;
procedure NextDetailBlock;
- procedure UpdateTextLabelScrollbars;
+ procedure UpdateTextMemoScrollbars;
public
procedure CopyReportToClipboard;
class procedure ExceptionHandler(Sender: TObject; E: Exception);
@@ -111,6 +111,13 @@
RsThread = 'Thread: %s';
RsMissingVersionInfo = '(no version info)';
+ RsErrorMessage = 'There was an error during the execution of this program.' + NativeLineBreak +
+ 'The application might become unstable and even useless.' + NativeLineBreak +
+ 'It''s recommended that you save your work and close this application.' + NativeLineBreak + NativeLineBreak;
+ RsDetailsIntro = 'Exception log with detailed tech info. Generated on %s.' + NativeLineBreak +
+ 'You may send it to the application vendor, helping him to understand what had happened.' + NativeLineBreak +
+ ' Application title: %s' + NativeLineBreak +
+ ' Application file: %s';
var
ExceptionDialog: TExceptionDialog;
@@ -479,15 +486,15 @@
procedure TExceptionDialog.FormPaint(Sender: TObject);
begin
- DrawIcon(Canvas.Handle, TextLabel.Left - GetSystemMetrics(SM_CXICON) - 15,
- TextLabel.Top, LoadIcon(0, IDI_ERROR));
+ DrawIcon(Canvas.Handle, TextMemo.Left - GetSystemMetrics(SM_CXICON) - 15,
+ TextMemo.Top, LoadIcon(0, IDI_ERROR));
end;
//--------------------------------------------------------------------------------------------------
procedure TExceptionDialog.FormResize(Sender: TObject);
begin
- UpdateTextLabelScrollbars;
+ UpdateTextMemoScrollbars;
end;
//--------------------------------------------------------------------------------------------------
@@ -506,7 +513,7 @@
function TExceptionDialog.GetReportAsText: string;
begin
- Result := StrEnsureSuffix(NativeCrLf, TextLabel.Text) + NativeCrLf + DetailsMemo.Text;
+ Result := StrEnsureSuffix(NativeCrLf, TextMemo.Text) + NativeCrLf + DetailsMemo.Text;
end;
//--------------------------------------------------------------------------------------------------
@@ -586,10 +593,14 @@
FThreadID := MainThreadID;
FLastActiveControl := Screen.ActiveControl;
if E is Exception then
- TextLabel.Text := AdjustLineBreaks(StrEnsureSuffix('.', Exception(E).Message))
+ TextMemo.Text := RsErrorMessage + AdjustLineBreaks(StrEnsureSuffix('.', Exception(E).Message))
else
- TextLabel.Text := AdjustLineBreaks(StrEnsureSuffix('.', E.ClassName));
- UpdateTextLabelScrollbars;
+ TextMemo.Text := RsErrorMessage + AdjustLineBreaks(StrEnsureSuffix('.', E.ClassName));
+ UpdateTextMemoScrollbars;
+ NextDetailBlock;
+ //Arioch: some header for possible saving to txt-file/e-mail/clipboard/NTEvent...
+ DetailsMemo.Lines.Add(Format(RsDetailsIntro, [DateTimeToStr(Now), Application.Title, Application.ExeName]));
+ NextDetailBlock;
DetailsMemo.Lines.Add(Format(RsExceptionClass, [E.ClassName]));
if E is Exception then
DetailsMemo.Lines.Add(Format(RsExceptionMessage, [StrEnsureSuffix('.', Exception(E).Message)]));
@@ -615,13 +626,13 @@
//--------------------------------------------------------------------------------------------------
-procedure TExceptionDialog.UpdateTextLabelScrollbars;
+procedure TExceptionDialog.UpdateTextMemoScrollbars;
begin
- Canvas.Font := TextLabel.Font;
- if TextLabel.Lines.Count * Canvas.TextHeight('Wg') > TextLabel.ClientHeight then
- TextLabel.ScrollBars := ssVertical
+ Canvas.Font := TextMemo.Font;
+ if TextMemo.Lines.Count * Canvas.TextHeight('Wg') > TextMemo.ClientHeight then
+ TextMemo.ScrollBars := ssVertical
else
- TextLabel.ScrollBars := ssNone;
+ TextMemo.ScrollBars := ssNone;
end;
//==================================================================================================
Modified: trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm 2008-09-23 21:08:21 UTC (rev 2494)
+++ trunk/jcl/experts/debug/dialog/ExceptDlgMail.dfm 2008-09-24 19:55:32 UTC (rev 2495)
@@ -6,7 +6,7 @@
Caption = 'ExceptionDialogMail'
ClientHeight = 255
- ClientWidth = 432
+ ClientWidth = 483
Color = clBtnFace
Constraints.MinWidth = 200
Font.Charset = DEFAULT_CHARSET
@@ -29,14 +29,14 @@
object BevelDetails: TBevel
Left = 3
Top = 91
- Width = 422
+ Width = 473
Height = 9
Anchors = [akLeft, akTop, akRight]
Shape = bsTopLine
end
object SendBtn: TButton
- Left = 351
+ Left = 403
Top = 32
Width = 75
Height = 25
@@ -46,17 +46,15 @@
TabOrder = 0
OnClick = SendBtnClick
end
- object TextLabel: TMemo
+ object TextMemo: TMemo
Left = 56
Top = 8
- Width = 281
+ Width = 332
Height = 75
Hint = 'Use Ctrl+C to copy the report to the clipboard'
Anchors = [akLeft, akTop, akRight]
BorderStyle = bsNone
Ctl3D = True
- Lines.Strings = (
- 'TextLabel')
ParentColor = True
ParentCtl3D = False
ReadOnly = True
@@ -64,7 +62,7 @@
WantReturns = False
end
object OkBtn: TButton
- Left = 352
+ Left = 403
Top = 4
Width = 75
Height = 25
@@ -75,7 +73,7 @@
TabOrder = 2
end
object DetailsBtn: TButton
- Left = 352
+ Left = 403
Top = 60
Width = 75
Height = 25
@@ -89,7 +87,7 @@
object DetailsMemo: TMemo
Left = 4
Top = 101
- Width = 421
+ Width = 472
Height = 147
Anchors = [akLeft, akTop, akRight, akBottom]
Font.Charset = DEFAULT_CHARSET
Modified: trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas
===================================================================
--- trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas 2008-09-23 21:08:21 UTC (rev 2494)
+++ trunk/jcl/experts/debug/dialog/ExceptDlgMail.pas 2008-09-24 19:55:32 UTC (rev 2495)
@@ -38,7 +38,7 @@
type
TExceptionDialogMail = class(TForm)
SendBtn: TButton;
- TextLabel: TMemo;
+ TextMemo: TMemo;
OkBtn: TButton;
DetailsBtn: TButton;
BevelDetails: TBevel;
@@ -71,7 +71,7 @@
function ReportMaxColumns: Integer; virtual;
function ReportNewBlockDelimiterChar: Char; virtual;
procedure NextDetailBlock;
- procedure UpdateTextLabelScrollbars;
+ procedure UpdateTextMemoScrollbars;
public
procedure CopyReportToClipboard;
class procedure ExceptionHandler(Sender: TObject; E: Exception);
@@ -111,6 +111,13 @@
RsThread = 'Thread: %s';
RsMissingVersionInfo = '(no version info)';
+ RsErrorMessage = 'There was an error during the execution of this program.' + NativeLineBreak +
+ 'The application might become unstable and even useless.' + NativeLineBreak +
+ 'It''s recommended that you save your work and close this application.' + NativeLineBreak + NativeLineBreak;
+ RsDetailsIntro = 'Exception log with detailed tech info. Generated on %s.' + NativeLineBreak +
+ 'You may send it to the application vendor, helping him to understand what had happened.' + NativeLineBreak +
+ ' Application title: %s' + NativeLineBreak +
+ ' Application file: %s';
var
ExceptionDialogMail: TExceptionDialogMail;
@@ -499,15 +506,15 @@
procedure TExceptionDialogMail.FormPaint(Sender: TObject);
begin
- DrawIcon(Canvas.Handle, TextLabel.Left - GetSystemMetrics(SM_CXICON) - 15,
- TextLabel.Top, LoadIcon(0, IDI_ERROR));
+ DrawIcon(Canvas.Handle, TextMemo.Left - GetSystemMetrics(SM_CXICON) - 15,
+ TextMemo.Top, LoadIcon(0, IDI_ERROR));
end;
//--------------------------------------------------------------------------------------------------
procedure TExceptionDialogMail.FormResize(Sender: TObject);
begin
- UpdateTextLabelScrollbars;
+ UpdateTextMemoScrollbars;
end;
//--------------------------------------------------------------------------------------------------
@@ -526,7 +533,7 @@
function TExceptionDialogMail.GetReportAsText: string;
begin
- Result := StrEnsureSuffix(NativeCrLf, TextLabel.Text) + NativeCrLf + DetailsMemo.Text;
+ Result := StrEnsureSuffix(NativeCrLf, TextMemo.Text) + NativeCrLf + DetailsMemo.Text;
end;
//--------------------------------------------------------------------------------------------------
@@ -606,10 +613,14 @@
FThreadID := MainThreadID;
FLastActiveControl := Screen.ActiveControl;
if E is Exception then
- TextLabel.Text := AdjustLineBreaks(StrEnsureSuffix('.', Exception(E).Message))
+ TextMemo.Text := RsErrorMessage + AdjustLineBreaks(StrEnsureSuffix('.', Exception(E).Message))
else
- TextLabel.Text := AdjustLineBreaks(StrEnsureSuffix('.', E.ClassName));
- UpdateTextLabelScrollbars;
+ TextMemo.Text := RsErrorMessage + AdjustLineBreaks(StrEnsureSuffix('.', E.ClassName));
+ UpdateTextMemoScrollbars;
+ NextDetailBlock;
+ //Arioch: some header for possible saving to txt-file/e-mail/clipboard/NTEvent...
+ DetailsMemo.Lines.Add(Format(RsDetailsIntro, [DateTimeToStr(Now), Application.Title, Application.ExeName]));
+ NextDetailBlock;
DetailsMemo.Lines.Add(Format(RsExceptionClass, [E.ClassName]));
if E is Exception then
DetailsMemo.Lines.Add(Format(RsExceptionMessage, [StrEnsureSuffix('.', Exception(E).Message)]));
@@ -635,13 +646,13 @@
//--------------------------------------------------------------------------------------------------
-procedure TExceptionDialogMail.UpdateTextLabelScrollbars;
+procedure TExceptionDialogMail.UpdateTextMemoScrollbars;
begin
- Canvas.Font := TextLabel.Font;
- if TextLabel.Lines.Count * Canvas.TextHeight('Wg') > TextLabel.ClientHeight then
- TextLabel.ScrollBars := ssVertical
+ Canvas.Font := TextMemo.Font;
+ if TextMemo.Lines.Count * Canvas.TextHeight('Wg') > TextMemo.ClientHeight then
+ TextMemo.ScrollBars := ssVertical
else
- TextLabel.ScrollBars := ssNone;
+ TextMemo.ScrollBars := ssNone;
end;
//==================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-23 21:08:31
|
Revision: 2494
http://jcl.svn.sourceforge.net/jcl/?rev=2494&view=rev
Author: outchy
Date: 2008-09-23 21:08:21 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
added scrollbars and buttons to copy and save text.
Modified Paths:
--------------
trunk/jcl/experts/common/JclOtaResources.pas
trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm
trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
Modified: trunk/jcl/experts/common/JclOtaResources.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaResources.pas 2008-09-23 20:35:57 UTC (rev 2493)
+++ trunk/jcl/experts/common/JclOtaResources.pas 2008-09-23 21:08:21 UTC (rev 2494)
@@ -100,6 +100,11 @@
RsShortcut = 'Shortcut';
RsRestore = '&Restore';
+//=== JclOtaUnitVersioningSheet.pas ==========================================
+resourcestring
+ RsCopyToClipboard = '&Copy to clipboard';
+ RsSaveAsText = '&Save as...';
+
//=== JclExpertConfigurationForm.pas =========================================
resourcestring
RsConfigurationCaption = 'JCL Options';
Modified: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm
===================================================================
--- trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm 2008-09-23 20:35:57 UTC (rev 2493)
+++ trunk/jcl/experts/common/JclOtaUnitVersioningSheet.dfm 2008-09-23 21:08:21 UTC (rev 2494)
@@ -10,10 +10,38 @@
Left = 8
Top = 8
Width = 353
- Height = 361
+ Height = 321
Anchors = [akLeft, akTop, akRight, akBottom]
ParentColor = True
ReadOnly = True
+ ScrollBars = ssBoth
TabOrder = 0
end
+ object ButtonCopyToClipboard: TButton
+ Left = 8
+ Top = 335
+ Width = 137
+ Height = 25
+ Anchors = [akLeft, akBottom]
+ Caption = 'RsCopyClipboard'
+ TabOrder = 1
+ OnClick = ButtonCopyToClipboardClick
+ end
+ object ButtonSaveAsText: TButton
+ Left = 151
+ Top = 335
+ Width = 137
+ Height = 25
+ Anchors = [akLeft, akBottom]
+ Caption = 'RsSaveAsText'
+ TabOrder = 2
+ OnClick = ButtonSaveAsTextClick
+ end
+ object SaveDialogText: TSaveDialog
+ DefaultExt = 'txt'
+ Filter = 'Text files (*.txt)|*.txt|All files (*.*)|*.*'
+ Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]
+ Left = 120
+ Top = 168
+ end
end
Modified: trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas 2008-09-23 20:35:57 UTC (rev 2493)
+++ trunk/jcl/experts/common/JclOtaUnitVersioningSheet.pas 2008-09-23 21:08:21 UTC (rev 2494)
@@ -40,6 +40,11 @@
type
TJclOtaUnitVersioningFrame = class(TFrame)
MemoUnitVersioning: TMemo;
+ ButtonCopyToClipboard: TButton;
+ ButtonSaveAsText: TButton;
+ SaveDialogText: TSaveDialog;
+ procedure ButtonCopyToClipboardClick(Sender: TObject);
+ procedure ButtonSaveAsTextClick(Sender: TObject);
private
public
constructor Create(AOwner: TComponent); override;
@@ -62,9 +67,22 @@
uses
ActnList, Menus,
ToolsApi,
- JclFileUtils, JclUnitVersioningProviders,
+ JclBase, JclFileUtils, JclUnitVersioningProviders,
JclOtaConsts, JclOtaResources, JclOtaUtils;
+procedure TJclOtaUnitVersioningFrame.ButtonCopyToClipboardClick(
+ Sender: TObject);
+begin
+ MemoUnitVersioning.SelectAll;
+ MemoUnitVersioning.CopyToClipboard;
+end;
+
+procedure TJclOtaUnitVersioningFrame.ButtonSaveAsTextClick(Sender: TObject);
+begin
+ if SaveDialogText.Execute then
+ MemoUnitVersioning.Lines.SaveToFile(SaveDialogText.FileName);
+end;
+
constructor TJclOtaUnitVersioningFrame.Create(AOwner: TComponent);
var
UnitVersioning: TUnitVersioning;
@@ -74,6 +92,9 @@
LongFileName: string;
begin
inherited Create(AOwner);
+ ButtonCopyToClipboard.Caption := RsCopyToClipboard;
+ ButtonSaveAsText.Caption := RsSaveAsText;
+
UnitVersioning := GetUnitVersioning;
UnitVersioning.RegisterProvider(TJclDefaultUnitVersioningProvider);
for I := 0 to Pred(UnitVersioning.ModuleCount) do
@@ -81,6 +102,7 @@
MemoUnitVersioning.Lines.BeginUpdate;
try
MemoUnitVersioning.Lines.Clear;
+ MemoUnitVersioning.Lines.Add(Format('JCL %d.%d.%d.%d', [JclVersionMajor, JclVersionMinor, JclVersionRelease, JclVersionBuild]));
for I := 0 to Pred(UnitVersioning.ModuleCount) do
begin
UnitVersioningModule := UnitVersioning.Modules[I];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-23 20:36:07
|
Revision: 2493
http://jcl.svn.sourceforge.net/jcl/?rev=2493&view=rev
Author: outchy
Date: 2008-09-23 20:35:57 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Mantis 4474: TWideStrings.LoadFromStream not working on small files.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-23 20:21:35 UTC (rev 2492)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-23 20:35:57 UTC (rev 2493)
@@ -5066,8 +5066,13 @@
FSaveFormat := sfUTF16LSB;
SetLength(SW, (Size - 2) div SizeOf(WideChar));
Assert((Size and 1) <> 1,'Number of chars must be a multiple of 2');
- System.Move(ByteOrderMask[2],SW[1],BytesRead-2); // max 4 bytes = 2 widechars
- Stream.Read(SW[3], Size-BytesRead); // first 2 chars were copied by System.Move
+ if BytesRead > 2 then
+ begin
+ System.Move(ByteOrderMask[2], SW[1], BytesRead-2); // max 4 bytes = 2 widechars
+ if Size > BytesRead then
+ // first 2 chars (maximum) were copied by System.Move
+ Stream.Read(SW[3], Size-BytesRead);
+ end;
SetText(SW);
Loaded := True;
end;
@@ -5079,9 +5084,14 @@
FSaveFormat := sfUTF16MSB;
SetLength(SW, (Size - 2) div SizeOf(WideChar));
Assert((Size and 1) <> 1,'Number of chars must be a multiple of 2');
- System.Move(ByteOrderMask[2],SW[1],BytesRead-2); // max 4 bytes = 2 widechars
- Stream.Read(SW[3], Size-BytesRead); // first 2 chars were copied by System.Move
- StrSwapByteOrder(PWideChar(SW));
+ if BytesRead > 2 then
+ begin
+ System.Move(ByteOrderMask[2],SW[1],BytesRead-2); // max 4 bytes = 2 widechars
+ if Size > BytesRead then
+ // first 2 chars (maximum) were copied by System.Move
+ Stream.Read(SW[3], Size-BytesRead);
+ StrSwapByteOrder(PWideChar(SW));
+ end;
SetText(SW);
Loaded := True;
end;
@@ -5092,9 +5102,14 @@
begin
FSaveFormat := sfUTF8;
SetLength(SA, (Size-3) div SizeOf(AnsiChar));
- System.Move(ByteOrderMask[3],SA[1],BytesRead-3); // max 3 bytes = 3 chars
- Stream.Read(SA[4], Size-BytesRead); // first 3 chars were copied by System.Move
- SW := UTF8ToWideString(SA);
+ if BytesRead > 3 then
+ begin
+ System.Move(ByteOrderMask[3],SA[1],BytesRead-3); // max 3 bytes = 3 chars
+ if Size > BytesRead then
+ // first 3 chars were copied by System.Move
+ Stream.Read(SA[4], Size-BytesRead);
+ SW := UTF8ToWideString(SA);
+ end;
SetText(SW);
Loaded := True;
end;
@@ -5104,8 +5119,12 @@
begin
FSaveFormat := sfAnsi;
SetLength(SA, Size div SizeOf(AnsiChar));
- System.Move(ByteOrderMask[0],SA[1],BytesRead); // max 6 bytes = 6 chars
- Stream.Read(SA[7], Size-BytesRead); // first 6 chars were copied by System.Move
+ if BytesRead > 0 then
+ begin
+ System.Move(ByteOrderMask[0], SA[1], BytesRead); // max 6 bytes = 6 chars
+ if Size > BytesRead then
+ Stream.Read(SA[7], Size-BytesRead); // first 6 chars were copied by System.Move
+ end;
SetText(StringToWideStringEx(SA, CodePageFromLocale(FLanguage)));
end;
finally
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ou...@us...> - 2008-09-23 20:22:32
|
Revision: 2492
http://jcl.svn.sourceforge.net/jcl/?rev=2492&view=rev
Author: outchy
Date: 2008-09-23 20:21:35 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Mantis 4475: TWideStrings.SaveToStream raise OutOfRange exception on empty input string.
Modified Paths:
--------------
trunk/jcl/source/common/JclUnicode.pas
Modified: trunk/jcl/source/common/JclUnicode.pas
===================================================================
--- trunk/jcl/source/common/JclUnicode.pas 2008-09-22 23:14:35 UTC (rev 2491)
+++ trunk/jcl/source/common/JclUnicode.pas 2008-09-23 20:21:35 UTC (rev 2492)
@@ -5195,29 +5195,39 @@
begin
if WithBOM then
Stream.WriteBuffer(BOM_UTF16_LSB[0],SizeOf(BOM_UTF16_LSB));
- Stream.WriteBuffer(SW[1],Length(SW)*SizeOf(UTF16));
+ if Length(SW) > 0 then
+ Stream.WriteBuffer(SW[1],Length(SW)*SizeOf(UTF16));
FSaved := True;
end;
sfUTF16MSB :
begin
if WithBOM then
Stream.WriteBuffer(BOM_UTF16_MSB[0],SizeOf(BOM_UTF16_MSB));
- StrSwapByteOrder(PWideChar(SW));
- Stream.WriteBuffer(SW[1],Length(SW)*SizeOf(UTF16));
+ if Length(SW) > 0 then
+ begin
+ StrSwapByteOrder(PWideChar(SW));
+ Stream.WriteBuffer(SW[1],Length(SW)*SizeOf(UTF16));
+ end;
FSaved := True;
end;
sfUTF8 :
begin
if WithBOM then
Stream.WriteBuffer(BOM_UTF8[0],SizeOf(BOM_UTF8));
- SA := WideStringToUTF8(SW);
- Stream.WriteBuffer(SA[1],Length(SA)*SizeOf(UTF8));
+ if Length(SW) > 0 then
+ begin
+ SA := WideStringToUTF8(SW);
+ Stream.WriteBuffer(SA[1],Length(SA)*SizeOf(UTF8));
+ end;
FSaved := True;
end;
sfAnsi :
begin
- SA := WideStringToStringEx(SW,CodePageFromLocale(FLanguage));
- Stream.WriteBuffer(SA[1],Length(SA)*SizeOf(AnsiChar));
+ if Length(SW) > 0 then
+ begin
+ SA := WideStringToStringEx(SW,CodePageFromLocale(FLanguage));
+ Stream.WriteBuffer(SA[1],Length(SA)*SizeOf(AnsiChar));
+ end;
FSaved := True;
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
49 messages has been excluded from this view by a project administrator.
