jcl-checkins-diff Mailing List for JEDI Code Library (Page 2)

Brought to you by: mthoma, obones, outchy, rrossmair

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

Flat | Threaded

<< < 1 2 3 4 .. 92 > >> (Page 2 of 92)

[Jcl-checkins-diff] SF.net SVN: jcl:[3867] tags/JCL-2.4-Build4571/jcl/source/include/

From: <ou...@us...> - 2012-09-05 18:06:29

Revision: 3867
          http://jcl.svn.sourceforge.net/jcl/?rev=3867&view=rev
Author:   outchy
Date:     2012-09-05 18:06:20 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
TortoiseSVN auto commit: changed externals to fixed revision.

Property Changed:
----------------
    tags/JCL-2.4-Build4571/jcl/source/include/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3866] tags/JCL-2.4-Build4571/

From: <ou...@us...> - 2012-09-05 18:05:59

Revision: 3866
          http://jcl.svn.sourceforge.net/jcl/?rev=3866&view=rev
Author:   outchy
Date:     2012-09-05 18:05:50 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
tag for JCL 2.4.1.4571 (stable)

Added Paths:
-----------
    tags/JCL-2.4-Build4571/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3865] branches/JCL_2.4

From: <ou...@us...> - 2012-09-05 18:00:46

Revision: 3865
          http://jcl.svn.sourceforge.net/jcl/?rev=3865&view=rev
Author:   outchy
Date:     2012-09-05 18:00:33 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
version numbers for JCL 2.4.1.4571.

Modified Paths:
--------------
    branches/JCL_2.4/jcl/devtools/pgEdit.xml
    branches/JCL_2.4/jcl/docs/Readme.html
    branches/JCL_2.4/jcl/docs/Readme.txt
    branches/JCL_2.4/jcl/packages/c6/Jcl.RES
    branches/JCL_2.4/jcl/packages/c6/Jcl.rc
    branches/JCL_2.4/jcl/packages/c6/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/c6/JclContainers.rc
    branches/JCL_2.4/jcl/packages/c6/JclContainers.res
    branches/JCL_2.4/jcl/packages/c6/JclDebugExpert.RES
    branches/JCL_2.4/jcl/packages/c6/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/c6/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpert.RES
    branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpert.RES
    branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/c6/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclThreadNameExpert.RES
    branches/JCL_2.4/jcl/packages/c6/JclThreadNameExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclThreadNameExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclThreadNameExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclUsesExpert.RES
    branches/JCL_2.4/jcl/packages/c6/JclUsesExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclUsesExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclUsesExpertDLL.res
    branches/JCL_2.4/jcl/packages/c6/JclVcl.RES
    branches/JCL_2.4/jcl/packages/c6/JclVcl.rc
    branches/JCL_2.4/jcl/packages/c6/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/c6/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/c6/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/c6/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/cs1/Jcl.RES
    branches/JCL_2.4/jcl/packages/cs1/Jcl.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/Jcl.rc
    branches/JCL_2.4/jcl/packages/cs1/JclBaseExpert.RES
    branches/JCL_2.4/jcl/packages/cs1/JclBaseExpert.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/cs1/JclContainers.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/JclContainers.rc
    branches/JCL_2.4/jcl/packages/cs1/JclContainers.res
    branches/JCL_2.4/jcl/packages/cs1/JclDeveloperTools.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/cs1/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.RES
    branches/JCL_2.4/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/cs1/JclVcl.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/JclVcl.rc
    branches/JCL_2.4/jcl/packages/cs1/JclVcl.res
    branches/JCL_2.4/jcl/packages/cs1/JclVersionControlExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/cs1/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/cs1/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/Jcl.bdsproj
    branches/JCL_2.4/jcl/packages/d10/Jcl.rc
    branches/JCL_2.4/jcl/packages/d10/Jcl.res
    branches/JCL_2.4/jcl/packages/d10/JclBaseExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclContainers.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d10/JclContainers.res
    branches/JCL_2.4/jcl/packages/d10/JclDebugExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclDebugExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/JclDeveloperTools.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d10/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d10/JclFavoriteFoldersExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclFavoriteFoldersExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/JclProjectAnalysisExpert.RES
    branches/JCL_2.4/jcl/packages/d10/JclProjectAnalysisExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclProjectAnalysisExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/JclRepositoryExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclRepositoryExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/JclSIMDViewExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclSIMDViewExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/JclStackTraceViewerExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclStackTraceViewerExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d10/JclVcl.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d10/JclVcl.res
    branches/JCL_2.4/jcl/packages/d10/JclVersionControlExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d10/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d10/JclVersionControlExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d10/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d10/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/Jcl.dproj
    branches/JCL_2.4/jcl/packages/d11/Jcl.rc
    branches/JCL_2.4/jcl/packages/d11/Jcl.res
    branches/JCL_2.4/jcl/packages/d11/JclBaseExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclContainers.dproj
    branches/JCL_2.4/jcl/packages/d11/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d11/JclContainers.res
    branches/JCL_2.4/jcl/packages/d11/JclDebugExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclDebugExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/JclDeveloperTools.dproj
    branches/JCL_2.4/jcl/packages/d11/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d11/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/JclProjectAnalysisExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclProjectAnalysisExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/JclRepositoryExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclRepositoryExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/JclSIMDViewExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclSIMDViewExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/JclStackTraceViewerExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclStackTraceViewerExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d11/JclVcl.dproj
    branches/JCL_2.4/jcl/packages/d11/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d11/JclVcl.res
    branches/JCL_2.4/jcl/packages/d11/JclVersionControlExpert.dproj
    branches/JCL_2.4/jcl/packages/d11/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d11/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d11/JclVersionControlExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d11/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d11/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/Jcl.dproj
    branches/JCL_2.4/jcl/packages/d12/Jcl.rc
    branches/JCL_2.4/jcl/packages/d12/Jcl.res
    branches/JCL_2.4/jcl/packages/d12/JclBaseExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclContainers.dproj
    branches/JCL_2.4/jcl/packages/d12/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d12/JclContainers.res
    branches/JCL_2.4/jcl/packages/d12/JclDebugExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclDebugExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/JclDeveloperTools.dproj
    branches/JCL_2.4/jcl/packages/d12/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d12/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d12/JclFavoriteFoldersExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/JclProjectAnalysisExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclProjectAnalysisExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclProjectAnalysisExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/JclRepositoryExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclRepositoryExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/JclSIMDViewExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclSIMDViewExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/JclStackTraceViewerExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclStackTraceViewerExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d12/JclVcl.dproj
    branches/JCL_2.4/jcl/packages/d12/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d12/JclVcl.res
    branches/JCL_2.4/jcl/packages/d12/JclVersionControlExpert.dproj
    branches/JCL_2.4/jcl/packages/d12/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d12/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d12/JclVersionControlExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d12/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d12/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/Jcl.dproj
    branches/JCL_2.4/jcl/packages/d14/Jcl.rc
    branches/JCL_2.4/jcl/packages/d14/Jcl.res
    branches/JCL_2.4/jcl/packages/d14/JclBaseExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclContainers.dproj
    branches/JCL_2.4/jcl/packages/d14/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d14/JclContainers.res
    branches/JCL_2.4/jcl/packages/d14/JclDebugExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclDebugExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/JclDeveloperTools.dproj
    branches/JCL_2.4/jcl/packages/d14/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d14/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d14/JclFavoriteFoldersExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/JclProjectAnalysisExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclProjectAnalysisExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclProjectAnalysisExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/JclRepositoryExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclRepositoryExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/JclSIMDViewExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclSIMDViewExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/JclStackTraceViewerExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclStackTraceViewerExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d14/JclVcl.dproj
    branches/JCL_2.4/jcl/packages/d14/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d14/JclVcl.res
    branches/JCL_2.4/jcl/packages/d14/JclVersionControlExpert.dproj
    branches/JCL_2.4/jcl/packages/d14/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d14/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d14/JclVersionControlExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d14/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d14/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/Jcl.dproj
    branches/JCL_2.4/jcl/packages/d15/Jcl.rc
    branches/JCL_2.4/jcl/packages/d15/Jcl.res
    branches/JCL_2.4/jcl/packages/d15/JclBaseExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclContainers.dproj
    branches/JCL_2.4/jcl/packages/d15/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d15/JclContainers.res
    branches/JCL_2.4/jcl/packages/d15/JclDebugExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclDebugExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/JclDeveloperTools.dproj
    branches/JCL_2.4/jcl/packages/d15/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d15/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d15/JclFavoriteFoldersExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclFavoriteFoldersExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/JclProjectAnalysisExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclProjectAnalysisExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclProjectAnalysisExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/JclRepositoryExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclRepositoryExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/JclSIMDViewExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclSIMDViewExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/JclStackTraceViewerExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclStackTraceViewerExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d15/JclVcl.dproj
    branches/JCL_2.4/jcl/packages/d15/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d15/JclVcl.res
    branches/JCL_2.4/jcl/packages/d15/JclVersionControlExpert.dproj
    branches/JCL_2.4/jcl/packages/d15/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d15/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d15/JclVersionControlExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d15/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d15/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/Jcl.dproj
    branches/JCL_2.4/jcl/packages/d16/Jcl.rc
    branches/JCL_2.4/jcl/packages/d16/Jcl.res
    branches/JCL_2.4/jcl/packages/d16/JclBaseExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclContainers.dproj
    branches/JCL_2.4/jcl/packages/d16/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d16/JclContainers.res
    branches/JCL_2.4/jcl/packages/d16/JclDebugExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclDebugExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/JclDeveloperTools.dproj
    branches/JCL_2.4/jcl/packages/d16/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d16/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d16/JclFavoriteFoldersExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclFavoriteFoldersExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/JclProjectAnalysisExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclProjectAnalysisExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclProjectAnalysisExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/JclRepositoryExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclRepositoryExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/JclSIMDViewExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclSIMDViewExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/JclStackTraceViewerExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclStackTraceViewerExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d16/JclVcl.dproj
    branches/JCL_2.4/jcl/packages/d16/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d16/JclVcl.res
    branches/JCL_2.4/jcl/packages/d16/JclVersionControlExpert.dproj
    branches/JCL_2.4/jcl/packages/d16/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d16/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d16/JclVersionControlExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d16/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d16/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/Jcl.dproj
    branches/JCL_2.4/jcl/packages/d17/Jcl.rc
    branches/JCL_2.4/jcl/packages/d17/Jcl.res
    branches/JCL_2.4/jcl/packages/d17/JclBaseExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclContainers.dproj
    branches/JCL_2.4/jcl/packages/d17/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d17/JclContainers.res
    branches/JCL_2.4/jcl/packages/d17/JclDebugExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclDebugExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclDebugExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/JclDeveloperTools.dproj
    branches/JCL_2.4/jcl/packages/d17/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d17/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d17/JclFavoriteFoldersExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclFavoriteFoldersExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclFavoriteFoldersExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/JclProjectAnalysisExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclProjectAnalysisExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclProjectAnalysisExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclProjectAnalysisExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/JclRepositoryExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclRepositoryExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/JclSIMDViewExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclSIMDViewExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclSIMDViewExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/JclStackTraceViewerExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclStackTraceViewerExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d17/JclVcl.dproj
    branches/JCL_2.4/jcl/packages/d17/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d17/JclVcl.res
    branches/JCL_2.4/jcl/packages/d17/JclVersionControlExpert.dproj
    branches/JCL_2.4/jcl/packages/d17/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d17/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d17/JclVersionControlExpertDLL.dproj
    branches/JCL_2.4/jcl/packages/d17/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d17/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d6/Jcl.rc
    branches/JCL_2.4/jcl/packages/d6/Jcl.res
    branches/JCL_2.4/jcl/packages/d6/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d6/JclContainers.res
    branches/JCL_2.4/jcl/packages/d6/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclDebugExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d6/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d6/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d6/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclFavoriteFoldersExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d6/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclProjectAnalysisExpert.RES
    branches/JCL_2.4/jcl/packages/d6/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclProjectAnalysisExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d6/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d6/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclSIMDViewExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d6/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d6/JclThreadNameExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclThreadNameExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclThreadNameExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d6/JclThreadNameExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclUsesExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclUsesExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclUsesExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d6/JclUsesExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d6/JclVcl.res
    branches/JCL_2.4/jcl/packages/d6/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d6/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d6/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d6/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d7/Jcl.rc
    branches/JCL_2.4/jcl/packages/d7/Jcl.res
    branches/JCL_2.4/jcl/packages/d7/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d7/JclContainers.res
    branches/JCL_2.4/jcl/packages/d7/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclDebugExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclDebugExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d7/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d7/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d7/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclFavoriteFoldersExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d7/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclProjectAnalysisExpert.RES
    branches/JCL_2.4/jcl/packages/d7/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclProjectAnalysisExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d7/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d7/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclSIMDViewExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclSIMDViewExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d7/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d7/JclUsesExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclUsesExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclUsesExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d7/JclUsesExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d7/JclVcl.res
    branches/JCL_2.4/jcl/packages/d7/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d7/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d7/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d7/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d8/Jcl.RES
    branches/JCL_2.4/jcl/packages/d8/Jcl.bdsproj
    branches/JCL_2.4/jcl/packages/d8/Jcl.rc
    branches/JCL_2.4/jcl/packages/d8/JclBaseExpert.RES
    branches/JCL_2.4/jcl/packages/d8/JclBaseExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d8/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d8/JclContainers.bdsproj
    branches/JCL_2.4/jcl/packages/d8/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d8/JclContainers.res
    branches/JCL_2.4/jcl/packages/d8/JclDeveloperTools.bdsproj
    branches/JCL_2.4/jcl/packages/d8/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d8/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d8/JclFavoriteFoldersExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d8/JclFavoriteFoldersExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d8/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d8/JclVcl.bdsproj
    branches/JCL_2.4/jcl/packages/d8/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d8/JclVcl.res
    branches/JCL_2.4/jcl/packages/d8/JclVersionControlExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d8/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d8/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/d9/Jcl.RES
    branches/JCL_2.4/jcl/packages/d9/Jcl.bdsproj
    branches/JCL_2.4/jcl/packages/d9/Jcl.rc
    branches/JCL_2.4/jcl/packages/d9/JclBaseExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclBaseExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclBaseExpert.res
    branches/JCL_2.4/jcl/packages/d9/JclContainers.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclContainers.rc
    branches/JCL_2.4/jcl/packages/d9/JclContainers.res
    branches/JCL_2.4/jcl/packages/d9/JclDebugExpert.RES
    branches/JCL_2.4/jcl/packages/d9/JclDebugExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclDebugExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclDebugExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d9/JclDebugExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclDebugExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclDeveloperTools.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclDeveloperTools.rc
    branches/JCL_2.4/jcl/packages/d9/JclDeveloperTools.res
    branches/JCL_2.4/jcl/packages/d9/JclFavoriteFoldersExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclFavoriteFoldersExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclFavoriteFoldersExpert.res
    branches/JCL_2.4/jcl/packages/d9/JclFavoriteFoldersExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d9/JclFavoriteFoldersExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclFavoriteFoldersExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclProjectAnalysisExpert.RES
    branches/JCL_2.4/jcl/packages/d9/JclProjectAnalysisExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclProjectAnalysisExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclProjectAnalysisExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d9/JclProjectAnalysisExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclProjectAnalysisExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclRepositoryExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclRepositoryExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclRepositoryExpert.res
    branches/JCL_2.4/jcl/packages/d9/JclRepositoryExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclRepositoryExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclRepositoryExpertDLL.res
    branches/JCL_2.4/jcl/packages/d9/JclSIMDViewExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclSIMDViewExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclSIMDViewExpertDLL.RES
    branches/JCL_2.4/jcl/packages/d9/JclSIMDViewExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclSIMDViewExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclSimdViewExpert.RES
    branches/JCL_2.4/jcl/packages/d9/JclStackTraceViewerExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclStackTraceViewerExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclStackTraceViewerExpert.res
    branches/JCL_2.4/jcl/packages/d9/JclStackTraceViewerExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclStackTraceViewerExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclStackTraceViewerExpertDLL.res
    branches/JCL_2.4/jcl/packages/d9/JclVcl.RES
    branches/JCL_2.4/jcl/packages/d9/JclVcl.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclVcl.rc
    branches/JCL_2.4/jcl/packages/d9/JclVersionControlExpert.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclVersionControlExpert.rc
    branches/JCL_2.4/jcl/packages/d9/JclVersionControlExpert.res
    branches/JCL_2.4/jcl/packages/d9/JclVersionControlExpertDLL.bdsproj
    branches/JCL_2.4/jcl/packages/d9/JclVersionControlExpertDLL.rc
    branches/JCL_2.4/jcl/packages/d9/JclVersionControlExpertDLL.res
    branches/JCL_2.4/jcl/packages/fpc/Jcl.lpk
    branches/JCL_2.4/jcl/packages/fpc/JclContainers.lpk
    branches/JCL_2.4/jcl/packages/fpc/JclDeveloperTools.lpk
    branches/JCL_2.4/jcl/packages/fpc/JclVcl.lpk
    branches/JCL_2.4/jcl/packages/help/Jcl.dox
    branches/JCL_2.4/jcl/packages/help/JclContainers.dox
    branches/JCL_2.4/jcl/packages/help/JclDeveloperTools.dox
    branches/JCL_2.4/jcl/packages/help/JclVcl.dox
    branches/JCL_2.4/jcl/source/common/JclBase.pas
    branches/JCL_2.4/thirdparty/makedist/winscp-jcl-files.txt

Modified: branches/JCL_2.4/jcl/devtools/pgEdit.xml
===================================================================
--- branches/JCL_2.4/jcl/devtools/pgEdit.xml	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/devtools/pgEdit.xml	2012-09-05 18:00:33 UTC (rev 3865)
@@ -100,8 +100,8 @@
       <ProjectProperties>
         <ProjectProperty name="VersionMajorNumber" value="2"/>
         <ProjectProperty name="VersionMinorNumber" value="4"/>
-        <ProjectProperty name="ReleaseNumber" value="0"/>
-        <ProjectProperty name="BuildNumber" value="4198"/>
+        <ProjectProperty name="ReleaseNumber" value="1"/>
+        <ProjectProperty name="BuildNumber" value="4571"/>
         <ProjectProperty name="Copyright" value="Copyright (C) 1999, 2012 Project JEDI"/>
       </ProjectProperties>
     </Model>

Modified: branches/JCL_2.4/jcl/docs/Readme.html
===================================================================
--- branches/JCL_2.4/jcl/docs/Readme.html	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/docs/Readme.html	2012-09-05 18:00:33 UTC (rev 3865)
@@ -15,8 +15,8 @@
 <h1>JEDI Code Library</h1>
 
 <p>Release 2.4<br>
-Build 4197<br>
-28-August-2011</p>
+Build 4571<br>
+05-September-2012</p>
 
 <hr><br>
 

Modified: branches/JCL_2.4/jcl/docs/Readme.txt
===================================================================
--- branches/JCL_2.4/jcl/docs/Readme.txt	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/docs/Readme.txt	2012-09-05 18:00:33 UTC (rev 3865)
@@ -3,8 +3,8 @@
 
 JEDI Code Library
 Release 2.4
-Build 4197
-28-August-2011
+Build 4571
+05-September-2012
 
 
 --------------------------------------------------------------------------------

Modified: branches/JCL_2.4/jcl/packages/c6/Jcl.RES
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/Jcl.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/Jcl.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/Jcl.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JEDI Code Library RTL package\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "Jcl\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclBaseExpert.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclBaseExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclBaseExpert.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Package containing common units for JCL Experts\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclBaseExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclBaseExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclBaseExpert.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclContainers.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclContainers.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclContainers.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JEDI Code Library Containers package\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclContainers\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclContainersC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclContainers.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclDebugExpert.RES
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclDebugExpert.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclDebugExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclDebugExpert.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug IDE extension\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclDebugExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclDebugExpertDLL.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclDebugExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclDebugExpertDLL.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug IDE extension\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclDebugExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclDebugExpertDLL.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclDeveloperTools.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclDeveloperTools.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclDeveloperTools.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JEDI Code Library Developer Tools package\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclDeveloperTools\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclDeveloperToolsC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclDeveloperTools.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpert.RES
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpert.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpert.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclFavoriteFoldersExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclFavoriteFoldersExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclFavoriteFoldersExpertDLL.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpert.RES
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpert.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpert.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Project Analyzer\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclProjectAnalysisExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Project Analyzer\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclProjectAnalysisExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclProjectAnalysisExpertDLL.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpert.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpert.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclRepositoryExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpert.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpertDLL.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpertDLL.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclRepositoryExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclRepositoryExpertDLL.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpert.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpert.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.4.1.4571\0"
               VALUE "InternalName", "JclSIMDViewExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.4 Build 4571\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpert.res
===================================================================
(Binary files differ)

Modified: branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpertDLL.rc
===================================================================
--- branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
+++ branches/JCL_2.4/jcl/packages/c6/JclSIMDViewExpertDLL.rc	2012-09-05 18:00:33 UTC (rev 3865)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,4,1,4571
+PRODUCTVERSION 2,4,1,4571
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug Wi...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3864] trunk

From: <ou...@us...> - 2012-09-05 17:42:29

Revision: 3864
          http://jcl.svn.sourceforge.net/jcl/?rev=3864&view=rev
Author:   outchy
Date:     2012-09-05 17:42:13 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
JCL 2.4 is branched, trunk is now for JCL 2.5.

Modified Paths:
--------------
    trunk/jcl/devtools/pgEdit.xml
    trunk/jcl/docs/Readme.html
    trunk/jcl/docs/Readme.txt
    trunk/jcl/packages/c6/Jcl.RES
    trunk/jcl/packages/c6/Jcl.rc
    trunk/jcl/packages/c6/JclBaseExpert.rc
    trunk/jcl/packages/c6/JclBaseExpert.res
    trunk/jcl/packages/c6/JclContainers.rc
    trunk/jcl/packages/c6/JclContainers.res
    trunk/jcl/packages/c6/JclDebugExpert.RES
    trunk/jcl/packages/c6/JclDebugExpert.rc
    trunk/jcl/packages/c6/JclDebugExpertDLL.rc
    trunk/jcl/packages/c6/JclDebugExpertDLL.res
    trunk/jcl/packages/c6/JclDeveloperTools.rc
    trunk/jcl/packages/c6/JclDeveloperTools.res
    trunk/jcl/packages/c6/JclFavoriteFoldersExpert.RES
    trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/c6/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/c6/JclRepositoryExpert.rc
    trunk/jcl/packages/c6/JclRepositoryExpert.res
    trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/c6/JclRepositoryExpertDLL.res
    trunk/jcl/packages/c6/JclSIMDViewExpert.rc
    trunk/jcl/packages/c6/JclSIMDViewExpert.res
    trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/c6/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/c6/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/c6/JclStackTraceViewerExpert.res
    trunk/jcl/packages/c6/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/c6/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/c6/JclThreadNameExpert.RES
    trunk/jcl/packages/c6/JclThreadNameExpert.rc
    trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/c6/JclThreadNameExpertDLL.res
    trunk/jcl/packages/c6/JclUsesExpert.RES
    trunk/jcl/packages/c6/JclUsesExpert.rc
    trunk/jcl/packages/c6/JclUsesExpertDLL.rc
    trunk/jcl/packages/c6/JclUsesExpertDLL.res
    trunk/jcl/packages/c6/JclVcl.RES
    trunk/jcl/packages/c6/JclVcl.rc
    trunk/jcl/packages/c6/JclVersionControlExpert.rc
    trunk/jcl/packages/c6/JclVersionControlExpert.res
    trunk/jcl/packages/c6/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/c6/JclVersionControlExpertDLL.res
    trunk/jcl/packages/cs1/Jcl.RES
    trunk/jcl/packages/cs1/Jcl.bdsproj
    trunk/jcl/packages/cs1/Jcl.rc
    trunk/jcl/packages/cs1/JclBaseExpert.RES
    trunk/jcl/packages/cs1/JclBaseExpert.bdsproj
    trunk/jcl/packages/cs1/JclBaseExpert.rc
    trunk/jcl/packages/cs1/JclContainers.bdsproj
    trunk/jcl/packages/cs1/JclContainers.rc
    trunk/jcl/packages/cs1/JclContainers.res
    trunk/jcl/packages/cs1/JclDeveloperTools.bdsproj
    trunk/jcl/packages/cs1/JclDeveloperTools.rc
    trunk/jcl/packages/cs1/JclDeveloperTools.res
    trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/cs1/JclVcl.bdsproj
    trunk/jcl/packages/cs1/JclVcl.rc
    trunk/jcl/packages/cs1/JclVcl.res
    trunk/jcl/packages/cs1/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/cs1/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/cs1/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d10/Jcl.bdsproj
    trunk/jcl/packages/d10/Jcl.rc
    trunk/jcl/packages/d10/Jcl.res
    trunk/jcl/packages/d10/JclBaseExpert.bdsproj
    trunk/jcl/packages/d10/JclBaseExpert.rc
    trunk/jcl/packages/d10/JclBaseExpert.res
    trunk/jcl/packages/d10/JclContainers.bdsproj
    trunk/jcl/packages/d10/JclContainers.rc
    trunk/jcl/packages/d10/JclContainers.res
    trunk/jcl/packages/d10/JclDebugExpert.bdsproj
    trunk/jcl/packages/d10/JclDebugExpert.rc
    trunk/jcl/packages/d10/JclDebugExpert.res
    trunk/jcl/packages/d10/JclDebugExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclDebugExpertDLL.rc
    trunk/jcl/packages/d10/JclDebugExpertDLL.res
    trunk/jcl/packages/d10/JclDeveloperTools.bdsproj
    trunk/jcl/packages/d10/JclDeveloperTools.rc
    trunk/jcl/packages/d10/JclDeveloperTools.res
    trunk/jcl/packages/d10/JclFavoriteFoldersExpert.bdsproj
    trunk/jcl/packages/d10/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d10/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d10/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d10/JclProjectAnalysisExpert.bdsproj
    trunk/jcl/packages/d10/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d10/JclRepositoryExpert.bdsproj
    trunk/jcl/packages/d10/JclRepositoryExpert.rc
    trunk/jcl/packages/d10/JclRepositoryExpert.res
    trunk/jcl/packages/d10/JclRepositoryExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d10/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d10/JclSIMDViewExpert.bdsproj
    trunk/jcl/packages/d10/JclSIMDViewExpert.rc
    trunk/jcl/packages/d10/JclSIMDViewExpert.res
    trunk/jcl/packages/d10/JclSIMDViewExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d10/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d10/JclStackTraceViewerExpert.bdsproj
    trunk/jcl/packages/d10/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d10/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d10/JclStackTraceViewerExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d10/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d10/JclVcl.bdsproj
    trunk/jcl/packages/d10/JclVcl.rc
    trunk/jcl/packages/d10/JclVcl.res
    trunk/jcl/packages/d10/JclVersionControlExpert.bdsproj
    trunk/jcl/packages/d10/JclVersionControlExpert.rc
    trunk/jcl/packages/d10/JclVersionControlExpert.res
    trunk/jcl/packages/d10/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d10/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d11/Jcl.dproj
    trunk/jcl/packages/d11/Jcl.rc
    trunk/jcl/packages/d11/Jcl.res
    trunk/jcl/packages/d11/JclBaseExpert.dproj
    trunk/jcl/packages/d11/JclBaseExpert.rc
    trunk/jcl/packages/d11/JclBaseExpert.res
    trunk/jcl/packages/d11/JclContainers.dproj
    trunk/jcl/packages/d11/JclContainers.rc
    trunk/jcl/packages/d11/JclContainers.res
    trunk/jcl/packages/d11/JclDebugExpert.dproj
    trunk/jcl/packages/d11/JclDebugExpert.rc
    trunk/jcl/packages/d11/JclDebugExpert.res
    trunk/jcl/packages/d11/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d11/JclDebugExpertDLL.rc
    trunk/jcl/packages/d11/JclDebugExpertDLL.res
    trunk/jcl/packages/d11/JclDeveloperTools.dproj
    trunk/jcl/packages/d11/JclDeveloperTools.rc
    trunk/jcl/packages/d11/JclDeveloperTools.res
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d11/JclRepositoryExpert.dproj
    trunk/jcl/packages/d11/JclRepositoryExpert.rc
    trunk/jcl/packages/d11/JclRepositoryExpert.res
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d11/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d11/JclSIMDViewExpert.rc
    trunk/jcl/packages/d11/JclSIMDViewExpert.res
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d11/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d11/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d11/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d11/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d11/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d11/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d11/JclVcl.dproj
    trunk/jcl/packages/d11/JclVcl.rc
    trunk/jcl/packages/d11/JclVcl.res
    trunk/jcl/packages/d11/JclVersionControlExpert.dproj
    trunk/jcl/packages/d11/JclVersionControlExpert.rc
    trunk/jcl/packages/d11/JclVersionControlExpert.res
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d12/Jcl.dproj
    trunk/jcl/packages/d12/Jcl.rc
    trunk/jcl/packages/d12/Jcl.res
    trunk/jcl/packages/d12/JclBaseExpert.dproj
    trunk/jcl/packages/d12/JclBaseExpert.rc
    trunk/jcl/packages/d12/JclBaseExpert.res
    trunk/jcl/packages/d12/JclContainers.dproj
    trunk/jcl/packages/d12/JclContainers.rc
    trunk/jcl/packages/d12/JclContainers.res
    trunk/jcl/packages/d12/JclDebugExpert.dproj
    trunk/jcl/packages/d12/JclDebugExpert.rc
    trunk/jcl/packages/d12/JclDebugExpert.res
    trunk/jcl/packages/d12/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d12/JclDebugExpertDLL.rc
    trunk/jcl/packages/d12/JclDebugExpertDLL.res
    trunk/jcl/packages/d12/JclDeveloperTools.dproj
    trunk/jcl/packages/d12/JclDeveloperTools.rc
    trunk/jcl/packages/d12/JclDeveloperTools.res
    trunk/jcl/packages/d12/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d12/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d12/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d12/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d12/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d12/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d12/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d12/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d12/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d12/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d12/JclRepositoryExpert.dproj
    trunk/jcl/packages/d12/JclRepositoryExpert.rc
    trunk/jcl/packages/d12/JclRepositoryExpert.res
    trunk/jcl/packages/d12/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d12/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d12/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d12/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d12/JclSIMDViewExpert.rc
    trunk/jcl/packages/d12/JclSIMDViewExpert.res
    trunk/jcl/packages/d12/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d12/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d12/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d12/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d12/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d12/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d12/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d12/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d12/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d12/JclVcl.dproj
    trunk/jcl/packages/d12/JclVcl.rc
    trunk/jcl/packages/d12/JclVcl.res
    trunk/jcl/packages/d12/JclVersionControlExpert.dproj
    trunk/jcl/packages/d12/JclVersionControlExpert.rc
    trunk/jcl/packages/d12/JclVersionControlExpert.res
    trunk/jcl/packages/d12/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d12/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d12/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d14/Jcl.dproj
    trunk/jcl/packages/d14/Jcl.rc
    trunk/jcl/packages/d14/Jcl.res
    trunk/jcl/packages/d14/JclBaseExpert.dproj
    trunk/jcl/packages/d14/JclBaseExpert.rc
    trunk/jcl/packages/d14/JclBaseExpert.res
    trunk/jcl/packages/d14/JclContainers.dproj
    trunk/jcl/packages/d14/JclContainers.rc
    trunk/jcl/packages/d14/JclContainers.res
    trunk/jcl/packages/d14/JclDebugExpert.dproj
    trunk/jcl/packages/d14/JclDebugExpert.rc
    trunk/jcl/packages/d14/JclDebugExpert.res
    trunk/jcl/packages/d14/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d14/JclDebugExpertDLL.rc
    trunk/jcl/packages/d14/JclDebugExpertDLL.res
    trunk/jcl/packages/d14/JclDeveloperTools.dproj
    trunk/jcl/packages/d14/JclDeveloperTools.rc
    trunk/jcl/packages/d14/JclDeveloperTools.res
    trunk/jcl/packages/d14/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d14/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d14/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d14/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d14/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d14/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d14/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d14/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d14/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d14/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d14/JclRepositoryExpert.dproj
    trunk/jcl/packages/d14/JclRepositoryExpert.rc
    trunk/jcl/packages/d14/JclRepositoryExpert.res
    trunk/jcl/packages/d14/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d14/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d14/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d14/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d14/JclSIMDViewExpert.rc
    trunk/jcl/packages/d14/JclSIMDViewExpert.res
    trunk/jcl/packages/d14/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d14/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d14/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d14/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d14/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d14/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d14/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d14/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d14/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d14/JclVcl.dproj
    trunk/jcl/packages/d14/JclVcl.rc
    trunk/jcl/packages/d14/JclVcl.res
    trunk/jcl/packages/d14/JclVersionControlExpert.dproj
    trunk/jcl/packages/d14/JclVersionControlExpert.rc
    trunk/jcl/packages/d14/JclVersionControlExpert.res
    trunk/jcl/packages/d14/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d14/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d14/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d15/Jcl.dproj
    trunk/jcl/packages/d15/Jcl.rc
    trunk/jcl/packages/d15/Jcl.res
    trunk/jcl/packages/d15/JclBaseExpert.dproj
    trunk/jcl/packages/d15/JclBaseExpert.rc
    trunk/jcl/packages/d15/JclBaseExpert.res
    trunk/jcl/packages/d15/JclContainers.dproj
    trunk/jcl/packages/d15/JclContainers.rc
    trunk/jcl/packages/d15/JclContainers.res
    trunk/jcl/packages/d15/JclDebugExpert.dproj
    trunk/jcl/packages/d15/JclDebugExpert.rc
    trunk/jcl/packages/d15/JclDebugExpert.res
    trunk/jcl/packages/d15/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d15/JclDebugExpertDLL.rc
    trunk/jcl/packages/d15/JclDebugExpertDLL.res
    trunk/jcl/packages/d15/JclDeveloperTools.dproj
    trunk/jcl/packages/d15/JclDeveloperTools.rc
    trunk/jcl/packages/d15/JclDeveloperTools.res
    trunk/jcl/packages/d15/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d15/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d15/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d15/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d15/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d15/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d15/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d15/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d15/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d15/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d15/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d15/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d15/JclRepositoryExpert.dproj
    trunk/jcl/packages/d15/JclRepositoryExpert.rc
    trunk/jcl/packages/d15/JclRepositoryExpert.res
    trunk/jcl/packages/d15/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d15/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d15/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d15/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d15/JclSIMDViewExpert.rc
    trunk/jcl/packages/d15/JclSIMDViewExpert.res
    trunk/jcl/packages/d15/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d15/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d15/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d15/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d15/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d15/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d15/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d15/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d15/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d15/JclVcl.dproj
    trunk/jcl/packages/d15/JclVcl.rc
    trunk/jcl/packages/d15/JclVcl.res
    trunk/jcl/packages/d15/JclVersionControlExpert.dproj
    trunk/jcl/packages/d15/JclVersionControlExpert.rc
    trunk/jcl/packages/d15/JclVersionControlExpert.res
    trunk/jcl/packages/d15/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d15/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d15/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d16/Jcl.dproj
    trunk/jcl/packages/d16/Jcl.rc
    trunk/jcl/packages/d16/Jcl.res
    trunk/jcl/packages/d16/JclBaseExpert.dproj
    trunk/jcl/packages/d16/JclBaseExpert.rc
    trunk/jcl/packages/d16/JclBaseExpert.res
    trunk/jcl/packages/d16/JclContainers.dproj
    trunk/jcl/packages/d16/JclContainers.rc
    trunk/jcl/packages/d16/JclContainers.res
    trunk/jcl/packages/d16/JclDebugExpert.dproj
    trunk/jcl/packages/d16/JclDebugExpert.rc
    trunk/jcl/packages/d16/JclDebugExpert.res
    trunk/jcl/packages/d16/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d16/JclDebugExpertDLL.rc
    trunk/jcl/packages/d16/JclDebugExpertDLL.res
    trunk/jcl/packages/d16/JclDeveloperTools.dproj
    trunk/jcl/packages/d16/JclDeveloperTools.rc
    trunk/jcl/packages/d16/JclDeveloperTools.res
    trunk/jcl/packages/d16/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d16/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d16/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d16/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d16/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d16/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d16/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d16/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d16/JclRepositoryExpert.dproj
    trunk/jcl/packages/d16/JclRepositoryExpert.rc
    trunk/jcl/packages/d16/JclRepositoryExpert.res
    trunk/jcl/packages/d16/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d16/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d16/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d16/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d16/JclSIMDViewExpert.rc
    trunk/jcl/packages/d16/JclSIMDViewExpert.res
    trunk/jcl/packages/d16/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d16/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d16/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d16/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d16/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d16/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d16/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d16/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d16/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d16/JclVcl.dproj
    trunk/jcl/packages/d16/JclVcl.rc
    trunk/jcl/packages/d16/JclVcl.res
    trunk/jcl/packages/d16/JclVersionControlExpert.dproj
    trunk/jcl/packages/d16/JclVersionControlExpert.rc
    trunk/jcl/packages/d16/JclVersionControlExpert.res
    trunk/jcl/packages/d16/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d16/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d16/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d17/Jcl.dproj
    trunk/jcl/packages/d17/Jcl.rc
    trunk/jcl/packages/d17/Jcl.res
    trunk/jcl/packages/d17/JclBaseExpert.dproj
    trunk/jcl/packages/d17/JclBaseExpert.rc
    trunk/jcl/packages/d17/JclBaseExpert.res
    trunk/jcl/packages/d17/JclContainers.dproj
    trunk/jcl/packages/d17/JclContainers.rc
    trunk/jcl/packages/d17/JclContainers.res
    trunk/jcl/packages/d17/JclDebugExpert.dproj
    trunk/jcl/packages/d17/JclDebugExpert.rc
    trunk/jcl/packages/d17/JclDebugExpert.res
    trunk/jcl/packages/d17/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d17/JclDebugExpertDLL.rc
    trunk/jcl/packages/d17/JclDebugExpertDLL.res
    trunk/jcl/packages/d17/JclDeveloperTools.dproj
    trunk/jcl/packages/d17/JclDeveloperTools.rc
    trunk/jcl/packages/d17/JclDeveloperTools.res
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d17/JclRepositoryExpert.dproj
    trunk/jcl/packages/d17/JclRepositoryExpert.rc
    trunk/jcl/packages/d17/JclRepositoryExpert.res
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d17/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d17/JclSIMDViewExpert.rc
    trunk/jcl/packages/d17/JclSIMDViewExpert.res
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d17/JclVcl.dproj
    trunk/jcl/packages/d17/JclVcl.rc
    trunk/jcl/packages/d17/JclVcl.res
    trunk/jcl/packages/d17/JclVersionControlExpert.dproj
    trunk/jcl/packages/d17/JclVersionControlExpert.rc
    trunk/jcl/packages/d17/JclVersionControlExpert.res
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d6/Jcl.rc
    trunk/jcl/packages/d6/Jcl.res
    trunk/jcl/packages/d6/JclBaseExpert.rc
    trunk/jcl/packages/d6/JclBaseExpert.res
    trunk/jcl/packages/d6/JclContainers.rc
    trunk/jcl/packages/d6/JclContainers.res
    trunk/jcl/packages/d6/JclDebugExpert.rc
    trunk/jcl/packages/d6/JclDebugExpert.res
    trunk/jcl/packages/d6/JclDebugExpertDLL.RES
    trunk/jcl/packages/d6/JclDebugExpertDLL.rc
    trunk/jcl/packages/d6/JclDeveloperTools.rc
    trunk/jcl/packages/d6/JclDeveloperTools.res
    trunk/jcl/packages/d6/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d6/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d6/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d6/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d6/JclProjectAnalysisExpertDLL.RES
    trunk/jcl/packages/d6/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d6/JclRepositoryExpert.rc
    trunk/jcl/packages/d6/JclRepositoryExpert.res
    trunk/jcl/packages/d6/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d6/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d6/JclSIMDViewExpert.rc
    trunk/jcl/packages/d6/JclSIMDViewExpert.res
    trunk/jcl/packages/d6/JclSIMDViewExpertDLL.RES
    trunk/jcl/packages/d6/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d6/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d6/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d6/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d6/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d6/JclThreadNameExpert.rc
    trunk/jcl/packages/d6/JclThreadNameExpert.res
    trunk/jcl/packages/d6/JclThreadNameExpertDLL.RES
    trunk/jcl/packages/d6/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/d6/JclUsesExpert.rc
    trunk/jcl/packages/d6/JclUsesExpert.res
    trunk/jcl/packages/d6/JclUsesExpertDLL.RES
    trunk/jcl/packages/d6/JclUsesExpertDLL.rc
    trunk/jcl/packages/d6/JclVcl.rc
    trunk/jcl/packages/d6/JclVcl.res
    trunk/jcl/packages/d6/JclVersionControlExpert.rc
    trunk/jcl/packages/d6/JclVersionControlExpert.res
    trunk/jcl/packages/d6/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d6/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d7/Jcl.rc
    trunk/jcl/packages/d7/Jcl.res
    trunk/jcl/packages/d7/JclBaseExpert.rc
    trunk/jcl/packages/d7/JclBaseExpert.res
    trunk/jcl/packages/d7/JclContainers.rc
    trunk/jcl/packages/d7/JclContainers.res
    trunk/jcl/packages/d7/JclDebugExpert.rc
    trunk/jcl/packages/d7/JclDebugExpert.res
    trunk/jcl/packages/d7/JclDebugExpertDLL.RES
    trunk/jcl/packages/d7/JclDebugExpertDLL.rc
    trunk/jcl/packages/d7/JclDeveloperTools.rc
    trunk/jcl/packages/d7/JclDeveloperTools.res
    trunk/jcl/packages/d7/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d7/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d7/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d7/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d7/JclProjectAnalysisExpertDLL.RES
    trunk/jcl/packages/d7/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d7/JclRepositoryExpert.rc
    trunk/jcl/packages/d7/JclRepositoryExpert.res
    trunk/jcl/packages/d7/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d7/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d7/JclSIMDViewExpert.rc
    trunk/jcl/packages/d7/JclSIMDViewExpert.res
    trunk/jcl/packages/d7/JclSIMDViewExpertDLL.RES
    trunk/jcl/packages/d7/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d7/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d7/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d7/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d7/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d7/JclUsesExpert.rc
    trunk/jcl/packages/d7/JclUsesExpert.res
    trunk/jcl/packages/d7/JclUsesExpertDLL.RES
    trunk/jcl/packages/d7/JclUsesExpertDLL.rc
    trunk/jcl/packages/d7/JclVcl.rc
    trunk/jcl/packages/d7/JclVcl.res
    trunk/jcl/packages/d7/JclVersionControlExpert.rc
    trunk/jcl/packages/d7/JclVersionControlExpert.res
    trunk/jcl/packages/d7/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d7/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d8/Jcl.RES
    trunk/jcl/packages/d8/Jcl.bdsproj
    trunk/jcl/packages/d8/Jcl.rc
    trunk/jcl/packages/d8/JclBaseExpert.RES
    trunk/jcl/packages/d8/JclBaseExpert.bdsproj
    trunk/jcl/packages/d8/JclBaseExpert.rc
    trunk/jcl/packages/d8/JclContainers.bdsproj
    trunk/jcl/packages/d8/JclContainers.rc
    trunk/jcl/packages/d8/JclContainers.res
    trunk/jcl/packages/d8/JclDeveloperTools.bdsproj
    trunk/jcl/packages/d8/JclDeveloperTools.rc
    trunk/jcl/packages/d8/JclDeveloperTools.res
    trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d8/JclVcl.bdsproj
    trunk/jcl/packages/d8/JclVcl.rc
    trunk/jcl/packages/d8/JclVcl.res
    trunk/jcl/packages/d8/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/d8/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d8/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d9/Jcl.RES
    trunk/jcl/packages/d9/Jcl.bdsproj
    trunk/jcl/packages/d9/Jcl.rc
    trunk/jcl/packages/d9/JclBaseExpert.bdsproj
    trunk/jcl/packages/d9/JclBaseExpert.rc
    trunk/jcl/packages/d9/JclBaseExpert.res
    trunk/jcl/packages/d9/JclContainers.bdsproj
    trunk/jcl/packages/d9/JclContainers.rc
    trunk/jcl/packages/d9/JclContainers.res
    trunk/jcl/packages/d9/JclDebugExpert.RES
    trunk/jcl/packages/d9/JclDebugExpert.bdsproj
    trunk/jcl/packages/d9/JclDebugExpert.rc
    trunk/jcl/packages/d9/JclDebugExpertDLL.RES
    trunk/jcl/packages/d9/JclDebugExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclDebugExpertDLL.rc
    trunk/jcl/packages/d9/JclDeveloperTools.bdsproj
    trunk/jcl/packages/d9/JclDeveloperTools.rc
    trunk/jcl/packages/d9/JclDeveloperTools.res
    trunk/jcl/packages/d9/JclFavoriteFoldersExpert.bdsproj
    trunk/jcl/packages/d9/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d9/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d9/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d9/JclProjectAnalysisExpert.bdsproj
    trunk/jcl/packages/d9/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.RES
    trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d9/JclRepositoryExpert.bdsproj
    trunk/jcl/packages/d9/JclRepositoryExpert.rc
    trunk/jcl/packages/d9/JclRepositoryExpert.res
    trunk/jcl/packages/d9/JclRepositoryExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d9/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d9/JclSIMDViewExpert.bdsproj
    trunk/jcl/packages/d9/JclSIMDViewExpert.rc
    trunk/jcl/packages/d9/JclSIMDViewExpertDLL.RES
    trunk/jcl/packages/d9/JclSIMDViewExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d9/JclSimdViewExpert.RES
    trunk/jcl/packages/d9/JclStackTraceViewerExpert.bdsproj
    trunk/jcl/packages/d9/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d9/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d9/JclStackTraceViewerExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d9/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d9/JclVcl.RES
    trunk/jcl/packages/d9/JclVcl.bdsproj
    trunk/jcl/packages/d9/JclVcl.rc
    trunk/jcl/packages/d9/JclVersionControlExpert.bdsproj
    trunk/jcl/packages/d9/JclVersionControlExpert.rc
    trunk/jcl/packages/d9/JclVersionControlExpert.res
    trunk/jcl/packages/d9/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d9/JclVersionControlExpertDLL.res
    trunk/jcl/packages/fpc/Jcl.lpk
    trunk/jcl/packages/fpc/JclContainers.lpk
    trunk/jcl/packages/fpc/JclDeveloperTools.lpk
    trunk/jcl/packages/fpc/JclVcl.lpk
    trunk/jcl/packages/help/Jcl.dox
    trunk/jcl/packages/help/JclContainers.dox
    trunk/jcl/packages/help/JclDeveloperTools.dox
    trunk/jcl/packages/help/JclVcl.dox
    trunk/jcl/source/common/JclBase.pas
    trunk/thirdparty/makedist/winscp-jcl-files.txt

Modified: trunk/jcl/devtools/pgEdit.xml
===================================================================
--- trunk/jcl/devtools/pgEdit.xml	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/devtools/pgEdit.xml	2012-09-05 17:42:13 UTC (rev 3864)
@@ -99,9 +99,9 @@
       </aliases>
       <ProjectProperties>
         <ProjectProperty name="VersionMajorNumber" value="2"/>
-        <ProjectProperty name="VersionMinorNumber" value="4"/>
+        <ProjectProperty name="VersionMinorNumber" value="5"/>
         <ProjectProperty name="ReleaseNumber" value="0"/>
-        <ProjectProperty name="BuildNumber" value="4198"/>
+        <ProjectProperty name="BuildNumber" value="4572"/>
         <ProjectProperty name="Copyright" value="Copyright (C) 1999, 2012 Project JEDI"/>
       </ProjectProperties>
     </Model>

Modified: trunk/jcl/docs/Readme.html
===================================================================
--- trunk/jcl/docs/Readme.html	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/docs/Readme.html	2012-09-05 17:42:13 UTC (rev 3864)
@@ -14,9 +14,9 @@
 
 <h1>JEDI Code Library</h1>
 
-<p>Release 2.4<br>
-Build 4197<br>
-28-August-2011</p>
+<p>Release 2.5<br>
+Build 4572<br>
+06-September-2012</p>
 
 <hr><br>
 

Modified: trunk/jcl/docs/Readme.txt
===================================================================
--- trunk/jcl/docs/Readme.txt	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/docs/Readme.txt	2012-09-05 17:42:13 UTC (rev 3864)
@@ -2,9 +2,9 @@
 
 
 JEDI Code Library
-Release 2.4
-Build 4197
-28-August-2011
+Release 2.5
+Build 4572
+06-September-2012
 
 
 --------------------------------------------------------------------------------

Modified: trunk/jcl/packages/c6/Jcl.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/Jcl.rc
===================================================================
--- trunk/jcl/packages/c6/Jcl.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/Jcl.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JEDI Code Library RTL package\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "Jcl\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclBaseExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclBaseExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclBaseExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Package containing common units for JCL Experts\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclBaseExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclBaseExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclBaseExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclContainers.rc
===================================================================
--- trunk/jcl/packages/c6/JclContainers.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclContainers.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JEDI Code Library Containers package\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclContainers\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclContainersC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclContainers.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclDebugExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclDebugExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclDebugExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclDebugExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug IDE extension\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclDebugExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclDebugExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclDebugExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclDebugExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug IDE extension\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclDebugExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclDebugExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclDeveloperTools.rc
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclDeveloperTools.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JEDI Code Library Developer Tools package\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclDeveloperTools\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclDeveloperToolsC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclDeveloperTools.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclFavoriteFoldersExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclFavoriteFoldersExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Project Analyzer\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclProjectAnalysisExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Project Analyzer\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclProjectAnalysisExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclRepositoryExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclRepositoryExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclRepositoryExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclRepositoryExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclSIMDViewExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclSIMDViewExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclSIMDViewExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclSIMDViewExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclSIMDViewExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclSIMDViewExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclSIMDViewExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclStackTraceViewerExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclStackTraceViewerExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclStackTraceViewerExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Stack Trace Viewer\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclStackTraceViewerExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclStackTraceViewerExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclStackTraceViewerExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclStackTraceViewerExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclStackTraceViewerExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclStackTraceViewerExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Stack Trace Viewer\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclStackTraceViewerExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclStackTraceViewerExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclStackTraceViewerExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclThreadNameExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclThreadNameExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclThreadNameExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclThreadNameExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Thread Name IDE expert\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclThreadNameExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclThreadNameExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Thread Name IDE expert\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclThreadNameExpertDLL\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclThreadNameExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclThreadNameExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclUsesExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclUsesExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclUsesExpert.rc	2012-09-05 16:26:01 UTC (rev 3863)
+++ trunk/jcl/packages/c6/JclUsesExpert.rc	2012-09-05 17:42:13 UTC (rev 3864)
@@ -1,6 +1,6 @@
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,4,0,4198
-PRODUCTVERSION 2,4,0,4198
+FILEVERSION 2,5,0,4572
+PRODUCTVERSION 2,5,0,4572
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -17,12 +17,12 @@
          BEGIN
               VALUE "CompanyName", "Project JEDI\0"
               VALUE "FileDescription", "JCL Uses Wizard\0"
-              VALUE "FileVersion", "2.4.0.4198\0"
+              VALUE "FileVersion", "2.5.0.4572\0"
               VALUE "InternalName", "JclUsesExpert\0"
               VALUE "LegalCopyright", "Copyright (C) 1999, 2012 Project JEDI\0"
               VALUE "OriginalFilename", "JclUsesExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
-              VALUE "ProductVersion", "2.4 Build 4198\0"
+              VALUE "ProductVersion", "2.5 Build 4572\0"
          END
     END
     BLOCK "VarFileInfo"

Modified: trunk/jcl/packages/c6/JclUsesExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclUsesExpertDLL....
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3863] branches/JCL_2.4/jcl/source/include/

From: <ou...@us...> - 2012-09-05 16:26:08

Revision: 3863
          http://jcl.svn.sourceforge.net/jcl/?rev=3863&view=rev
Author:   outchy
Date:     2012-09-05 16:26:01 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
TortoiseSVN auto commit: changed externals to fixed revision.

Property Changed:
----------------
    branches/JCL_2.4/jcl/source/include/


Property changes on: branches/JCL_2.4/jcl/source/include
___________________________________________________________________
Modified: svn:externals
   - jedi https://projectjedi.svn.sourceforge.net:443/svnroot/projectjedi/trunk/shared/include

   + -r 161 https://projectjedi.svn.sourceforge.net/svnroot/projectjedi/trunk/shared/include@161 jedi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3862] branches/JCL_2.4/

From: <ou...@us...> - 2012-09-05 16:25:54

Revision: 3862
          http://jcl.svn.sourceforge.net/jcl/?rev=3862&view=rev
Author:   outchy
Date:     2012-09-05 16:25:43 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
branch for JCL 2.4.

Added Paths:
-----------
    branches/JCL_2.4/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3861] trunk

From: <ou...@us...> - 2012-09-04 14:08:17

Revision: 3861
          http://jcl.svn.sourceforge.net/jcl/?rev=3861&view=rev
Author:   outchy
Date:     2012-09-04 14:08:04 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
support for RAD Studio XE3.

Modified Paths:
--------------
    trunk/jcl/Install.txt
    trunk/jcl/devtools/included_files.bat
    trunk/jcl/devtools/included_files.sh
    trunk/jcl/devtools/pgEdit.xml
    trunk/jcl/docs/Readme.html
    trunk/jcl/docs/Readme.txt
    trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas
    trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas
    trunk/jcl/install/JclInstall.pas
    trunk/jcl/install/VclGui/JediGUIInstall.pas
    trunk/jcl/install/VclGui/JediGUIMain.pas
    trunk/jcl/install/build/dcc32ex.dpr
    trunk/jcl/install/build/dcc32ex.exe
    trunk/jcl/packages/fpc/JclVcl.lpk
    trunk/jcl/packages/fpc/JclVcl.pas
    trunk/jcl/packages/resources.mak
    trunk/jcl/packages/xml/JclBaseExpert-D.xml
    trunk/jcl/packages/xml/JclStackTraceViewerExpert-D.xml
    trunk/jcl/packages/xml/JclStackTraceViewerExpertDLL-L.xml
    trunk/jcl/source/common/JclCompilerUtils.pas
    trunk/jcl/source/common/JclExprEval.pas
    trunk/jcl/source/common/JclFileUtils.pas
    trunk/jcl/source/common/JclIDEUtils.pas
    trunk/jcl/source/common/JclPCRE.pas
    trunk/jcl/source/common/JclSimpleXml.pas
    trunk/jcl/source/common/JclStreams.pas
    trunk/jcl/source/common/JclUnicode.pas
    trunk/jcl/source/common/JclUnitVersioning.pas
    trunk/jcl/source/include/jcl.inc
    trunk/jcl/source/windows/JclDebug.pas
    trunk/jcl/source/windows/JclDotNet.pas
    trunk/jcl/source/windows/JclHelpUtils.pas
    trunk/jcl/source/windows/JclHookExcept.pas
    trunk/jcl/source/windows/JclMultimedia.pas
    trunk/jcl/source/windows/JclPeImage.pas
    trunk/jcl/source/windows/JclRegistry.pas
    trunk/jcl/source/windows/JclSvcCtrl.pas
    trunk/thirdparty/svn_cleaner/SvnCleaner.xml

Added Paths:
-----------
    trunk/jcl/lib/d17/
    trunk/jcl/lib/d17/win32/
    trunk/jcl/lib/d17/win32/debug/
    trunk/jcl/lib/d17/win32/debug/dirinfo.txt
    trunk/jcl/lib/d17/win32/dirinfo.txt
    trunk/jcl/lib/d17/win64/
    trunk/jcl/lib/d17/win64/debug/
    trunk/jcl/lib/d17/win64/debug/dirinfo.txt
    trunk/jcl/lib/d17/win64/dirinfo.txt
    trunk/jcl/packages/JclPackagesD170.groupproj
    trunk/jcl/packages/d17/
    trunk/jcl/packages/d17/Jcl.dpk
    trunk/jcl/packages/d17/Jcl.dproj
    trunk/jcl/packages/d17/Jcl.rc
    trunk/jcl/packages/d17/Jcl.res
    trunk/jcl/packages/d17/JclBaseExpert.dpk
    trunk/jcl/packages/d17/JclBaseExpert.dproj
    trunk/jcl/packages/d17/JclBaseExpert.rc
    trunk/jcl/packages/d17/JclBaseExpert.res
    trunk/jcl/packages/d17/JclContainers.dpk
    trunk/jcl/packages/d17/JclContainers.dproj
    trunk/jcl/packages/d17/JclContainers.rc
    trunk/jcl/packages/d17/JclContainers.res
    trunk/jcl/packages/d17/JclDebugExpert.dpk
    trunk/jcl/packages/d17/JclDebugExpert.dproj
    trunk/jcl/packages/d17/JclDebugExpert.rc
    trunk/jcl/packages/d17/JclDebugExpert.res
    trunk/jcl/packages/d17/JclDebugExpertDLL.dpr
    trunk/jcl/packages/d17/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d17/JclDebugExpertDLL.rc
    trunk/jcl/packages/d17/JclDebugExpertDLL.res
    trunk/jcl/packages/d17/JclDeveloperTools.dpk
    trunk/jcl/packages/d17/JclDeveloperTools.dproj
    trunk/jcl/packages/d17/JclDeveloperTools.rc
    trunk/jcl/packages/d17/JclDeveloperTools.res
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.dpk
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d17/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.dpr
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d17/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.dpk
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d17/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.dpr
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d17/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d17/JclRepositoryExpert.dpk
    trunk/jcl/packages/d17/JclRepositoryExpert.dproj
    trunk/jcl/packages/d17/JclRepositoryExpert.rc
    trunk/jcl/packages/d17/JclRepositoryExpert.res
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.dpr
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d17/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d17/JclSIMDViewExpert.dpk
    trunk/jcl/packages/d17/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d17/JclSIMDViewExpert.rc
    trunk/jcl/packages/d17/JclSIMDViewExpert.res
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.dpr
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d17/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.dpk
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.dproj
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.rc
    trunk/jcl/packages/d17/JclStackTraceViewerExpert.res
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.dpr
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.dproj
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.rc
    trunk/jcl/packages/d17/JclStackTraceViewerExpertDLL.res
    trunk/jcl/packages/d17/JclVcl.dpk
    trunk/jcl/packages/d17/JclVcl.dproj
    trunk/jcl/packages/d17/JclVcl.rc
    trunk/jcl/packages/d17/JclVcl.res
    trunk/jcl/packages/d17/JclVersionControlExpert.dpk
    trunk/jcl/packages/d17/JclVersionControlExpert.dproj
    trunk/jcl/packages/d17/JclVersionControlExpert.rc
    trunk/jcl/packages/d17/JclVersionControlExpert.res
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.dpr
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d17/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d17/template.dpk
    trunk/jcl/packages/d17/template.dpr
    trunk/jcl/packages/d17/template.dproj
    trunk/jcl/packages/d17/template.rc

Property Changed:
----------------
    trunk/jcl/packages/fpc/JclVcl.lpk
    trunk/jcl/packages/fpc/JclVcl.pas
    trunk/jcl/source/include/

Modified: trunk/jcl/Install.txt
===================================================================
--- trunk/jcl/Install.txt	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/Install.txt	2012-09-04 14:08:04 UTC (rev 3861)
@@ -1,7 +1,8 @@
-JEDI Code Library v 2.3 Installation
+JEDI Code Library v 2.4 Installation
 
 Supported development tools versions:
 
+- Delphi XE3 (Win32 and Win64) and C++Builder XE3 (Win32 and Win64)
 - Delphi XE2 and C++Builder XE2;
 - Delphi XE and C++Builder XE;
 - Delphi 2010 and C++Builder 2010;
@@ -49,7 +50,7 @@
 
 To execute for
 
-1) Win32
+1) Win32 and Win64
 - click on "Install.bat" file in the JCL root directory.
 
   Note:	If you have Delphi 8 for Microsoft .NET installed, you probably will have 
@@ -63,4 +64,4 @@
         >install d6
 
 --------------------------------
-Document last updated 2010-08-13
+Document last updated 2012-08-31

Modified: trunk/jcl/devtools/included_files.bat
===================================================================
--- trunk/jcl/devtools/included_files.bat	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/devtools/included_files.bat	2012-09-04 14:08:04 UTC (rev 3861)
@@ -13,5 +13,7 @@
 copy ..\source\include\jcl.template.inc ..\source\include\jcld15.inc
 copy ..\source\include\jcl.template.inc ..\source\include\jcld16win32.inc
 copy ..\source\include\jcl.template.inc ..\source\include\jcld16win64.inc
+copy ..\source\include\jcl.template.inc ..\source\include\jcld17win32.inc
+copy ..\source\include\jcl.template.inc ..\source\include\jcld17win64.inc
 
 copy ..\source\include\jcl.template.inc ..\source\include\jclfpc.inc

Modified: trunk/jcl/devtools/included_files.sh
===================================================================
--- trunk/jcl/devtools/included_files.sh	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/devtools/included_files.sh	2012-09-04 14:08:04 UTC (rev 3861)
@@ -15,5 +15,7 @@
 cp ../source/include/jcl.template.inc ../source/include/jcld15.inc
 cp ../source/include/jcl.template.inc ../source/include/jcld16win32.inc
 cp ../source/include/jcl.template.inc ../source/include/jcld16win64.inc
+cp ../source/include/jcl.template.inc ../source/include/jcld17win32.inc
+cp ../source/include/jcl.template.inc ../source/include/jcld17win64.inc
 
 cp ../source/include/jcl.template.inc ../source/include/jclfpc.inc

Modified: trunk/jcl/devtools/pgEdit.xml
===================================================================
--- trunk/jcl/devtools/pgEdit.xml	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/devtools/pgEdit.xml	2012-09-04 14:08:04 UTC (rev 3861)
@@ -75,26 +75,27 @@
         <target name="d14" defines="BCB" IsBds="1"/>
         <target name="d15" defines="BCB" IsBds="1"/>
         <target name="d16" defines="BCB" IsBds="1"/>
+        <target name="d17" defines="BCB" IsBds="1"/>
       </targets>
       <aliases>
         <!-- language aliases -->
-        <alias name="Delphi" value="d6,d7,d9,d10,d11,d12,d14,d15,d16"/>
-        <alias name="Bcb" value="c6,d10,d11,d12,d14,d15,d16"/>
-        <alias name="Pascal" value="fpc,d6,d7,d9,d10,d11,d12,d14,d15,d16"/>
+        <alias name="Delphi" value="d6,d7,d9,d10,d11,d12,d14,d15,d16,d17"/>
+        <alias name="Bcb" value="c6,d10,d11,d12,d14,d15,d16,d17"/>
+        <alias name="Pascal" value="fpc,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17"/>
         <!-- platform aliases -->
-        <alias name="Windows" value="help,fpc,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16"/>
+        <alias name="Windows" value="help,fpc,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17"/>
         <alias name="Linux" value="help,fpc"/>
         <!-- package aliases -->
-        <alias name="allv11up" value="d11,d12,d14,d15,d16"/>
+        <alias name="allv11up" value="d11,d12,d14,d15,d16,d17"/>
         <!-- GUI aliases -->
         <alias name="Clx" value="help,c6,d6,d7"/>
-        <alias name="Vcl" value="help,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16"/>
+        <alias name="Vcl" value="help,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17"/>
         <!-- IDE aliases -->
-        <alias name="BDS" value="cs1,d8,d9,d10,d11,d12,d14,d15,d16"/>
-        <alias name="runtimeBDS" value="d9,d10,d11,d12,d14,d15,d16"/>
+        <alias name="BDS" value="cs1,d8,d9,d10,d11,d12,d14,d15,d16,d17"/>
+        <alias name="runtimeBDS" value="d9,d10,d11,d12,d14,d15,d16,d17"/>
         <alias name="OldStyleIDE" value="c6,d6,d7"/>
-        <alias name="runtimeIDE" value="c6,d6,d7,d9,d10,d11,d12,d14,d15,d16"/>
-        <alias name="designtimeIDE" value="c6,d6,d7,d8,d9,d10,cs1,d11,d12,d14,d15,d16"/>
+        <alias name="runtimeIDE" value="c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17"/>
+        <alias name="designtimeIDE" value="c6,d6,d7,d8,d9,d10,cs1,d11,d12,d14,d15,d16,d17"/>
       </aliases>
       <ProjectProperties>
         <ProjectProperty name="VersionMajorNumber" value="2"/>

Modified: trunk/jcl/docs/Readme.html
===================================================================
--- trunk/jcl/docs/Readme.html	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/docs/Readme.html	2012-09-04 14:08:04 UTC (rev 3861)
@@ -14,7 +14,7 @@
 
 <h1>JEDI Code Library</h1>
 
-<p>Release 2.3<br>
+<p>Release 2.4<br>
 Build 4197<br>
 28-August-2011</p>
 
@@ -49,8 +49,8 @@
 <hr><br>
 
 <h3><a name="about">About this release</a></h3>
-<p>JCL release 2.2 provides support for RAD Studio XE2 (including
-Delphi XE2 and C++Builder XE2) an updated support for all targets.</p>
+<p>JCL release 2.4 provides support for RAD Studio XE3 (including
+Delphi XE3 and C++Builder XE3) an updated support for all targets.</p>
 
 <p>Multiple bugs have been
 fixed; for detailed change logs, use the facilities of our Subversion repository
@@ -63,14 +63,24 @@
 
 <ul>
 
- <li>New unit JclMsBuild to query and update MsBuild files;</li>
- <li>New string index, prefix and suffix functions in JclAnsiStrings and JclStrings;</li>
- <li>Speed improvements in string conversion functions and in TJclSimpleXml;</li>
- <li>Improvement of JclSysUtils.Execute to add STD_ERROR callbacks and event to immediatly kill the nested application;</li>
- <li>New code to catch and report exceptions raised in C++ code (donation by Moritz Beutel);</li>
- <li>New wrapper for TortoiseGIT actions (donation by Jens Fudickar);</li>
- <li>Wrappers for new archive formats WIM, TED, UEFIc, UEFIs, SquashFS and CramFS introduced in 7zip 9.22.</li>
- <li>Application instances: new features to limit the number of instances on a per-user, per-session and per-machine scope.</li>
+ <li>Speed improvements in string conversion functions and in TJclSimpleXml; new option to enable case sensitivity</li>
+ <li>New function FileDateTime and FileHistory in JclFileUtils.pas</li>
+ <li>JclPeImage can now read string tables</li>
+ <li>Speed improvements in JclDebug when parsing MAP files and generating JCL Debug information</li>
+ <li>JclSysUtils.Execute: Custom priority for spawned processes</li>
+ <li>JclCompression: information about which file is being extracted or compressed</li>
+ <li>bzip2.pas, pcre.pas, zlibh.pas and sevenzip.pas: new option to customize the name of the DLL to load, full support for Win64</li>
+ <li>JclHashSets.pas reimplemented from scratch</li>
+ <li>JclPrint.pas: major update to prevent corruption of printer settings</li>
+ <li>Experts: various fixes to prevent access violations on invokes and on unloads</li>
+ <li>SVN 1.7 support in JCL Version control integration</li>
+ <li>zlibh.pas and JclCompression.pas: new option to use RTL zlib</li>
+ <li>JclUnicode.pas and others: the RTL Unicode database is now fully supported and does not require the JCL Unicode database anymore</li>
+ <li>JclUnicode.pas: update to Unicode Character Database (UCD) 6.0</li>
+ <li>pcre.pas: update to PCRE 8.31 with JIT and 16-bit character support</li>
+ <li>favorite combobox and custom open dialog: support with Vista new-style open dialogs</li>
+ <li>Exception dialog: 64-bit compatibility</li>
+ <li>Stack tracking now supports Win64</li>
 
 </ul>
 
@@ -81,6 +91,7 @@
 
   <li>
    <p>As of JCL 2.0, the library does not support Delphi 5, C++Builder 5, Kylix 3 and Delphi.net anymore;</p>
+   <p>Due to many internal failure, we do not provide full support for Delphi 2005: JCL for Delphi 2005 should compile, it may work or not.</p>
   </li>
 
 </ul>
@@ -98,7 +109,7 @@
 can be linked into binaries to become JCL debug data or be converted to .jdbg files.
 Once linked MAP files could be deleted. These options are subnodes of the "Packages" node.</p>
 
-<p>For BDS 2006, RAD Studio 2007, RAD Studio 2009, RAD Studio 2010, RAD Studio XE and RAD Studio XE2 the
+<p>For BDS 2006, RAD Studio 2007, RAD Studio 2009, RAD Studio 2010, RAD Studio XE, RAD Studio XE2 and RAD Studio XE3 the
 compiler introduced a new option to make the same packages available in C++,
 by checking the "Dual packages" option of the "Packages" node, you will be able
 to call functions of the JCL from C++ code.</p>
@@ -152,6 +163,8 @@
 
   <li>Delphi XE2 and C++Builder XE2.</li>
 
+  <li>Delphi XE3 and C++Builder XE3.</li>
+
 </ul>
 
 <hr><br>
@@ -251,6 +264,10 @@
 
     <li>For Delphi XE2 Win64: source\include\jcld16win64.inc</li>
 
+    <li>For Delphi XE3 and C++Builder XE3 Win32: source\include\jcld17win32.inc</li>
+
+    <li>For Delphi XE3 and C++Builder XE3 Win64: source\include\jcld17win64.inc</li>
+
     <li>For FreePascal: source\include\jclfpc.inc</li>
   </ul>
 

Modified: trunk/jcl/docs/Readme.txt
===================================================================
--- trunk/jcl/docs/Readme.txt	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/docs/Readme.txt	2012-09-04 14:08:04 UTC (rev 3861)
@@ -2,7 +2,7 @@
 
 
 JEDI Code Library
-Release 2.3
+Release 2.4
 Build 4197
 28-August-2011
 
@@ -26,27 +26,36 @@
 
 
 About this release
-JCL release 2.2 provides support for RAD Studio XE2 (including Delphi XE2 and C++Builder XE2) an updated support for all targets.
+JCL release 2.4 provides support for RAD Studio XE3 (including Delphi XE3 and C++Builder XE3) an updated support for all targets.
 
 Multiple bugs have been fixed; for detailed change logs, use the facilities of our Subversion repository at Sourceforge.net  http://sourceforge.net/projects/jcl/ , see below.
 
 Head changes: 
 
-New unit JclMsBuild to query and update MsBuild files;
-New string index, prefix and suffix functions in JclAnsiStrings and JclStrings;
-Speed improvements in string conversion functions and in TJclSimpleXml;
-Improvement of JclSysUtils.Execute to add STD_ERROR callbacks and event to immediatly kill the nested application;
-New code to catch and report exceptions raised in C++ code (donation by Moritz Beutel);
-New wrapper for TortoiseGIT actions (donation by Jens Fudickar);
-Wrappers for new archive formats WIM, TED, UEFIc, UEFIs, SquashFS and CramFS introduced in 7zip 9.22;
-Application instances: new features to limit the number of instances on a per-user, per-session and per-machine scope.
+Speed improvements in string conversion functions and in TJclSimpleXml; new option to enable case sensitivity 
+New function FileDateTime and FileHistory in JclFileUtils.pas 
+JclPeImage can now read string tables 
+Speed improvements in JclDebug when parsing MAP files and generating JCL Debug information 
+JclSysUtils.Execute: Custom priority for spawned processes 
+JclCompression: information about which file is being extracted or compressed 
+bzip2.pas, pcre.pas, zlibh.pas and sevenzip.pas: new option to customize the name of the DLL to load, full support for Win64 
+JclHashSets.pas reimplemented from scratch 
+JclPrint.pas: major update to prevent corruption of printer settings 
+Experts: various fixes to prevent access violations on invokes and on unloads 
+SVN 1.7 support in JCL Version control integration 
+zlibh.pas and JclCompression.pas: new option to use RTL zlib 
+JclUnicode.pas and others: the RTL Unicode database is now fully supported and does not require the JCL Unicode database anymore 
+JclUnicode.pas: update to Unicode Character Database (UCD) 6.0 
+pcre.pas: update to PCRE 8.31 with JIT and 16-bit character support 
+favorite combobox and custom open dialog: support with Vista new-style open dialogs 
+Exception dialog: 64-bit compatibility 
+Stack tracking now supports Win64 
+Important: 
 
+As of JCL 2.0, the library does not support Delphi 5, C++Builder 5, Kylix 3 and Delphi.net anymore;
 
---------------------------------------------------------------------------------
+Due to many internal failure, we do not provide full support for Delphi 2005: JCL for Delphi 2005 should compile, it may work or not.
 
-
-As of JCL 2.0, the library does not support Delphi 5, C++Builder 5, Kylix 3 and Delphi.net anymore;
-
 (Windows only) Installation options:
 
 Packages compiled by the JCL installer don't contain any debug informations to keep their size as small as possible.
@@ -55,7 +64,7 @@
 
 The installer can generate MAP informations for each package. These informations can be linked into binaries to become JCL debug data or be converted to .jdbg files. Once linked MAP files could be deleted. These options are subnodes of the "Packages" node.
 
-For BDS 2006, RAD Studio 2007, RAD Studio 2009, RAD Studio 2010, RAD Studio XE and RAD Studio XE2 the compiler introduced a new option to make the same packages available in C++, by checking the "Dual packages" option of the "Packages" node, you will be able to call functions of the JCL from C++ code.
+For BDS 2006, RAD Studio 2007, RAD Studio 2009, RAD Studio 2010, RAD Studio XE, RAD Studio XE2 and RAD Studio XE3 the compiler introduced a new option to make the same packages available in C++, by checking the "Dual packages" option of the "Packages" node, you will be able to call functions of the JCL from C++ code.
 
 
 --------------------------------------------------------------------------------
@@ -82,7 +91,8 @@
 Delphi 2009 and C++Builder 2009; 
 Delphi 2010 and C++Builder 2010. 
 Delphi XE and C++Builder XE. 
-Delphi XE2 and C++Builder XE2.
+Delphi XE2 and C++Builder XE2. 
+Delphi XE3 and C++Builder XE3. 
 
 --------------------------------------------------------------------------------
 
@@ -102,9 +112,7 @@
 These products cannot be used to build the JCL installer, you need an other supported product to install JCL experts on these products. 
 These products are not able to use the JCL library as a runtime library. You cannot write managed applications and managed packages based on the JCL. 
 These products are not shipped with their native compilers, you have to download it from codecentral (http://cc.codegear.com/). The item (http://codecentral.codegear.com/Download.aspx?id=21333)  contains the native compiler to be installed in Delphi 8. The item (http://codecentral.codegear.com/Download.aspx?id=21334)  contains the native compiler to be installed in C#Builder 1. These zip files have to be extracted in the products directory using the standard pattern: 
-		   Executable files (exe and dll)      - BDS\X.0\bin
-		   Compiler files (dcp and dcu)        - BDS\X.0\lib
-		   Toolsapi source files               - BDS\X.0\source\ToolsAPI
+		   Executable files (exe and dll)      - BDS\X.0\bin		   Compiler files (dcp and dcu)        - BDS\X.0\lib		   Toolsapi source files               - BDS\X.0\source\ToolsAPI
 Default installation
 
 For all others versions of Delphi, C++Builder and BDS, simply launch Install.bat and the installer window will let you configure options and install the library.
@@ -131,6 +139,8 @@
 For Delphi XE and C++Builder XE: source\include\jcld15.inc 
 For Delphi XE2 and C++Builder XE2 Win32: source\include\jcld16win32.inc 
 For Delphi XE2 Win64: source\include\jcld16win64.inc 
+For Delphi XE3 and C++Builder XE3 Win32: source\include\jcld17win32.inc 
+For Delphi XE3 and C++Builder XE3 Win64: source\include\jcld17win64.inc 
 For FreePascal: source\include\jclfpc.inc 
 In the IDE, open and compile package Jcl.dpk (or Jcl.bpk for C++Builder) located in a subdirectory of the "packages" directory matching your version of the IDE. This package doesn't have to be installed since it doesn't provide any components. 
 If you want to install experts, open package JclBaseExpert.dpk and compile it, then you can install all the experts you want (packages are located in the same directory). 

Modified: trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas
===================================================================
--- trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/experts/debug/converter/JclDebugIdeImpl.pas	2012-09-04 14:08:04 UTC (rev 3861)
@@ -242,6 +242,9 @@
 uses
   TypInfo,
   Variants,
+  {$IFDEF HAS_UNIT_SYSTEM_ACTIONS}
+  System.Actions,
+  {$ENDIF HAS_UNIT_SYSTEM_ACTIONS}
   {$IFDEF BDS8_UP}
   JclOtaAddinOptions,
   {$ENDIF BDS8_UP}

Modified: trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas
===================================================================
--- trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/experts/projectanalyzer/JclProjectAnalyzerImpl.pas	2012-09-04 14:08:04 UTC (rev 3861)
@@ -108,6 +108,9 @@
 {$R JclProjectAnalyzerIcon.res}
 
 uses
+  {$IFDEF HAS_UNIT_SYSTEM_ACTIONS}
+  System.Actions,
+  {$ENDIF HAS_UNIT_SYSTEM_ACTIONS}
   Variants,
   JclDebug, JclFileUtils, JclOtaConsts, 
   JclOtaResources;

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/install/JclInstall.pas	2012-09-04 14:08:04 UTC (rev 3861)
@@ -801,7 +801,8 @@
 
 function TJclInstallation.GetTargetSupportsCBuilder: Boolean;
 begin
-  Result := (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32);
+  Result := ((bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32)) or
+            ((bpBCBuilder64 in Target.Personalities) and (TargetPlatform = bpWin64));
 end;
 
 function TJclInstallation.GetTargetSupportsDelphi: Boolean;
@@ -3262,11 +3263,11 @@
         Result := Target.VersionNumber in [6];
       brBorlandDevStudio :
         Result := ((Target.VersionNumber in [1, 2]) and (bpDelphi32 in Target.Personalities))
-          or (Target.VersionNumber in [3, 4, 5, 6, 7, 8, 9]);
+          or (Target.VersionNumber in [3, 4, 5, 6, 7, 8, 9, 10]);
       else
         Result := False;
     end;
-    Result := Result and (Target.Personalities * [bpDelphi32, bpBCBuilder32, bpDelphi64] <> []);
+    Result := Result and (Target.Personalities * [bpDelphi32, bpDelphi64, bpBCBuilder32, bpBCBuilder64] <> []);
   end;
 var
   Inst: TJclInstallation;

Modified: trunk/jcl/install/VclGui/JediGUIInstall.pas
===================================================================
--- trunk/jcl/install/VclGui/JediGUIInstall.pas	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/install/VclGui/JediGUIInstall.pas	2012-09-04 14:08:04 UTC (rev 3861)
@@ -123,6 +123,9 @@
 {$R *.dfm}
 
 uses
+  {$IFDEF HAS_UNIT_TYPES}
+  Types, // inlining of Point
+  {$ENDIF HAS_UNIT_TYPES}
   Windows, Messages,
   FileCtrl,
   JclStrings,

Modified: trunk/jcl/install/VclGui/JediGUIMain.pas
===================================================================
--- trunk/jcl/install/VclGui/JediGUIMain.pas	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/install/VclGui/JediGUIMain.pas	2012-09-04 14:08:04 UTC (rev 3861)
@@ -128,6 +128,9 @@
 {$R *.dfm}
 
 uses
+  {$IFDEF HAS_UNIT_SYSTEM_UITYPES}
+  UITypes,
+  {$ENDIF HAS_UNIT_SYSTEM_UITYPES}
   FileCtrl,
   JclDebug, JclShell, JediGUIProfiles,
   JclBase, JclFileUtils, JclStrings, JclSysInfo, JclSysUtils, JclArrayLists,

Modified: trunk/jcl/install/build/dcc32ex.dpr
===================================================================
--- trunk/jcl/install/build/dcc32ex.dpr	2012-09-03 14:52:06 UTC (rev 3860)
+++ trunk/jcl/install/build/dcc32ex.dpr	2012-09-04 14:08:04 UTC (rev 3861)
@@ -559,6 +559,7 @@
           7: Result.Name := 'Embarcadero RAD Studio 2010';
           8: Result.Name := 'Embarcadero RAD Studio XE';
           9: Result.Name := 'Embarcadero RAD Studio XE2';
+         10: Result.Name := 'Embarcadero RAD Studio XE3';
         end;
     end;
 
@@ -1199,7 +1200,7 @@
   begin
     WriteLn;
     WriteLn('Additional options (must be specified before any dcc32 parameter):');
-    WriteLn('  --delphi-version=d16   Prefer this version, overrides environment variable');
+    WriteLn('  --delphi-version=d17   Prefer this version, overrides environment variable');
     WriteLn('  --verbose              Show warnings and errors during the compiler detection');
     WriteLn('  --use-search-paths     Use the IDE''s search paths');
     WriteLn('  --preserve-config      Keep the dcc32.cfg file and create a dcc32_command.cmd');
@@ -1211,8 +1212,8 @@
     WriteLn('  --runtime-package-vcl  Link the executable against the vcl package');
     WriteLn;
     WriteLn('Environment variables:');
-    WriteLn('  DELPHIVERSION = d16    Prefer this Delphi/BCB/BDS version');
-    WriteLn('                         (d6, d7, c6, d9, d10, d11, d12, d14, d15, d16, ...)');
+    WriteLn('  DELPHIVERSION = d17    Prefer this Delphi/BCB/BDS version');
+    WriteLn('                         (d6, d7, c6, d9, d10, d11, d12, d14, d15, d16, d17, ...)');
   end;
 
   ExitCode := Status;

Modified: trunk/jcl/install/build/dcc32ex.exe
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/lib/d17
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + *.dcu
*.ddp
*.dcp
*.lib
*.res
*.bpi
*.obj

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)


Property changes on: trunk/jcl/lib/d17/win32
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + *.dcu
*.ddp
*.dcp
*.lib
*.res
*.bpi
*.obj

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)


Property changes on: trunk/jcl/lib/d17/win32/debug
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + *.dcu
*.obj
*.res

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)

Added: trunk/jcl/lib/d17/win32/debug/dirinfo.txt
===================================================================
--- trunk/jcl/lib/d17/win32/debug/dirinfo.txt	                        (rev 0)
+++ trunk/jcl/lib/d17/win32/debug/dirinfo.txt	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1 @@
+This directory is intended as a common place for debug .dcu files of Delphi 17 Win32 packages.


Property changes on: trunk/jcl/lib/d17/win32/debug/dirinfo.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/jcl/lib/d17/win32/dirinfo.txt
===================================================================
--- trunk/jcl/lib/d17/win32/dirinfo.txt	                        (rev 0)
+++ trunk/jcl/lib/d17/win32/dirinfo.txt	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1 @@
+This directory is intended as a common place for .dcu files of Delphi 17 Win32 packages.
\ No newline at end of file


Property changes on: trunk/jcl/lib/d17/win32/dirinfo.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


Property changes on: trunk/jcl/lib/d17/win64
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + *.dcu
*.ddp
*.dcp
*.lib
*.res
*.bpi
*.obj

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)


Property changes on: trunk/jcl/lib/d17/win64/debug
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + *.dcu
*.obj
*.res

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)

Added: trunk/jcl/lib/d17/win64/debug/dirinfo.txt
===================================================================
--- trunk/jcl/lib/d17/win64/debug/dirinfo.txt	                        (rev 0)
+++ trunk/jcl/lib/d17/win64/debug/dirinfo.txt	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1 @@
+This directory is intended as a common place for debug .dcu files of Delphi 17 Win64 packages.


Property changes on: trunk/jcl/lib/d17/win64/debug/dirinfo.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/jcl/lib/d17/win64/dirinfo.txt
===================================================================
--- trunk/jcl/lib/d17/win64/dirinfo.txt	                        (rev 0)
+++ trunk/jcl/lib/d17/win64/dirinfo.txt	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1 @@
+This directory is intended as a common place for .dcu files of Delphi 17 Win64 packages.
\ No newline at end of file


Property changes on: trunk/jcl/lib/d17/win64/dirinfo.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/jcl/packages/JclPackagesD170.groupproj
===================================================================
--- trunk/jcl/packages/JclPackagesD170.groupproj	                        (rev 0)
+++ trunk/jcl/packages/JclPackagesD170.groupproj	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1,170 @@
+	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+		<PropertyGroup>
+			<ProjectGuid>{EA3B542E-39FD-4912-AF8A-8AA6C5EDCE8C}</ProjectGuid>
+		</PropertyGroup>
+		<ItemGroup>
+			<Projects Include="d17\Jcl.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclVcl.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclContainers.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclDeveloperTools.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclBaseExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclDebugExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclFavoriteFoldersExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclProjectAnalysisExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclRepositoryExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclSIMDViewExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclStackTraceViewerExpert.dproj">
+				<Dependencies/>
+			</Projects>
+			<Projects Include="d17\JclVersionControlExpert.dproj">
+				<Dependencies/>
+			</Projects>
+		</ItemGroup>
+		<ProjectExtensions>
+			<Borland.Personality>Default.Personality.12</Borland.Personality>
+			<Borland.ProjectType/>
+			<BorlandProject>
+				<BorlandProject>
+					<Default.Personality/>
+				</BorlandProject>
+			</BorlandProject>
+		</ProjectExtensions>
+		<Target Name="Jcl">
+			<MSBuild Projects="d17\Jcl.dproj"/>
+		</Target>
+		<Target Name="Jcl:Clean">
+			<MSBuild Projects="d17\Jcl.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="Jcl:Make">
+			<MSBuild Projects="d17\Jcl.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclVcl">
+			<MSBuild Projects="d17\JclVcl.dproj"/>
+		</Target>
+		<Target Name="JclVcl:Clean">
+			<MSBuild Projects="d17\JclVcl.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclVcl:Make">
+			<MSBuild Projects="d17\JclVcl.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclContainers">
+			<MSBuild Projects="d17\JclContainers.dproj"/>
+		</Target>
+		<Target Name="JclContainers:Clean">
+			<MSBuild Projects="d17\JclContainers.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclContainers:Make">
+			<MSBuild Projects="d17\JclContainers.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclDeveloperTools">
+			<MSBuild Projects="d17\JclDeveloperTools.dproj"/>
+		</Target>
+		<Target Name="JclDeveloperTools:Clean">
+			<MSBuild Projects="d17\JclDeveloperTools.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclDeveloperTools:Make">
+			<MSBuild Projects="d17\JclDeveloperTools.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclBaseExpert">
+			<MSBuild Projects="d17\JclBaseExpert.dproj"/>
+		</Target>
+		<Target Name="JclBaseExpert:Clean">
+			<MSBuild Projects="d17\JclBaseExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclBaseExpert:Make">
+			<MSBuild Projects="d17\JclBaseExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclDebugExpert">
+			<MSBuild Projects="d17\JclDebugExpert.dproj"/>
+		</Target>
+		<Target Name="JclDebugExpert:Clean">
+			<MSBuild Projects="d17\JclDebugExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclDebugExpert:Make">
+			<MSBuild Projects="d17\JclDebugExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclFavoriteFoldersExpert">
+			<MSBuild Projects="d17\JclFavoriteFoldersExpert.dproj"/>
+		</Target>
+		<Target Name="JclFavoriteFoldersExpert:Clean">
+			<MSBuild Projects="d17\JclFavoriteFoldersExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclFavoriteFoldersExpert:Make">
+			<MSBuild Projects="d17\JclFavoriteFoldersExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclProjectAnalysisExpert">
+			<MSBuild Projects="d17\JclProjectAnalysisExpert.dproj"/>
+		</Target>
+		<Target Name="JclProjectAnalysisExpert:Clean">
+			<MSBuild Projects="d17\JclProjectAnalysisExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclProjectAnalysisExpert:Make">
+			<MSBuild Projects="d17\JclProjectAnalysisExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclRepositoryExpert">
+			<MSBuild Projects="d17\JclRepositoryExpert.dproj"/>
+		</Target>
+		<Target Name="JclRepositoryExpert:Clean">
+			<MSBuild Projects="d17\JclRepositoryExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclRepositoryExpert:Make">
+			<MSBuild Projects="d17\JclRepositoryExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclSIMDViewExpert">
+			<MSBuild Projects="d17\JclSIMDViewExpert.dproj"/>
+		</Target>
+		<Target Name="JclSIMDViewExpert:Clean">
+			<MSBuild Projects="d17\JclSIMDViewExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclSIMDViewExpert:Make">
+			<MSBuild Projects="d17\JclSIMDViewExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclStackTraceViewerExpert">
+			<MSBuild Projects="d17\JclStackTraceViewerExpert.dproj"/>
+		</Target>
+		<Target Name="JclStackTraceViewerExpert:Clean">
+			<MSBuild Projects="d17\JclStackTraceViewerExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclStackTraceViewerExpert:Make">
+			<MSBuild Projects="d17\JclStackTraceViewerExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="JclVersionControlExpert">
+			<MSBuild Projects="d17\JclVersionControlExpert.dproj"/>
+		</Target>
+		<Target Name="JclVersionControlExpert:Clean">
+			<MSBuild Projects="d17\JclVersionControlExpert.dproj" Targets="Clean"/>
+		</Target>
+		<Target Name="JclVersionControlExpert:Make">
+			<MSBuild Projects="d17\JclVersionControlExpert.dproj" Targets="Make"/>
+		</Target>
+		<Target Name="Build">
+			<CallTarget Targets="Jcl;JclVcl;JclContainers;JclDeveloperTools;JclBaseExpert;JclDebugExpert;JclFavoriteFoldersExpert;JclProjectAnalysisExpert;JclRepositoryExpert;JclSIMDViewExpert;JclStackTraceViewerExpert;JclVersionControlExpert"/>
+		</Target>
+		<Target Name="Clean">
+			<CallTarget Targets="Jcl:Clean;JclVcl:Clean;JclContainers:Clean;JclDeveloperTools:Clean;JclBaseExpert:Clean;JclDebugExpert:Clean;JclFavoriteFoldersExpert:Clean;JclProjectAnalysisExpert:Clean;JclRepositoryExpert:Clean;JclSIMDViewExpert:Clean;JclStackTraceViewerExpert:Clean;JclVersionControlExpert:Clean"/>
+		</Target>
+		<Target Name="Make">
+			<CallTarget Targets="Jcl:Make;JclVcl:Make;JclContainers:Make;JclDeveloperTools:Make;JclBaseExpert:Make;JclDebugExpert:Make;JclFavoriteFoldersExpert:Make;JclProjectAnalysisExpert:Make;JclRepositoryExpert:Make;JclSIMDViewExpert:Make;JclStackTraceViewerExpert:Make;JclVersionControlExpert:Make"/>
+		</Target>
+		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/>
+	</Project>


Property changes on: trunk/jcl/packages/JclPackagesD170.groupproj
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:eol-style
   + native


Property changes on: trunk/jcl/packages/d17
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + *.local
*.drc
__history
*.~*
*.identcache
*.cfg
ModelSupport
*.hpp

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)

Added: trunk/jcl/packages/d17/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d17/Jcl.dpk	                        (rev 0)
+++ trunk/jcl/packages/d17/Jcl.dpk	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1,125 @@
+package Jcl;
+{
+-----------------------------------------------------------------------------
+     DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+            ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
+
+     Last generated: 14-08-2012  10:24: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 $48000000}
+{$DESCRIPTION 'JEDI Code Library RTL package'}
+{$LIBSUFFIX '170'}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+
+{$DEFINE BCB}
+{$DEFINE WIN32}
+{$DEFINE CONDITIONALEXPRESSIONS}
+{$DEFINE RELEASE}
+
+requires
+  rtl
+  ;
+  
+contains
+  bzip2 in '..\..\source\common\bzip2.pas' ,
+  Jcl8087 in '..\..\source\common\Jcl8087.pas' ,
+  JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
+  JclBase in '..\..\source\common\JclBase.pas' ,
+  JclCharsets in '..\..\source\common\JclCharsets.pas' ,
+  JclComplex in '..\..\source\common\JclComplex.pas' ,
+  JclCompression in '..\..\source\common\JclCompression.pas' ,
+  JclCounter in '..\..\source\common\JclCounter.pas' ,
+  JclDateTime in '..\..\source\common\JclDateTime.pas' ,
+  JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
+  JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
+  JclLogic in '..\..\source\common\JclLogic.pas' ,
+  JclMath in '..\..\source\common\JclMath.pas' ,
+  JclMIDI in '..\..\source\common\JclMIDI.pas' ,
+  JclMime in '..\..\source\common\JclMime.pas' ,
+  JclNotify in '..\..\source\common\JclNotify.pas' ,
+  JclPCRE in '..\..\source\common\JclPCRE.pas' ,
+  JclResources in '..\..\source\common\JclResources.pas' ,
+  JclRTTI in '..\..\source\common\JclRTTI.pas' ,
+  JclSchedule in '..\..\source\common\JclSchedule.pas' ,
+  JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
+  JclStatistics in '..\..\source\common\JclStatistics.pas' ,
+  JclStreams in '..\..\source\common\JclStreams.pas' ,
+  JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
+  JclStringLists in '..\..\source\common\JclStringLists.pas' ,
+  JclStrings in '..\..\source\common\JclStrings.pas' ,
+  JclSynch in '..\..\source\common\JclSynch.pas' ,
+  JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
+  JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+  JclUnicode in '..\..\source\common\JclUnicode.pas' ,
+  JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
+  JclUnitVersioning in '..\..\source\common\JclUnitVersioning.pas' ,
+  JclUnitVersioningProviders in '..\..\source\common\JclUnitVersioningProviders.pas' ,
+  JclValidation in '..\..\source\common\JclValidation.pas' ,
+  JclWideStrings in '..\..\source\common\JclWideStrings.pas' ,
+  pcre in '..\..\source\common\pcre.pas' ,
+  zlibh in '..\..\source\common\zlibh.pas' ,
+  Hardlinks in '..\..\source\windows\Hardlinks.pas' ,
+  JclAppInst in '..\..\source\windows\JclAppInst.pas' ,
+  JclCIL in '..\..\source\windows\JclCIL.pas' ,
+  JclCLR in '..\..\source\windows\JclCLR.pas' ,
+  JclCOM in '..\..\source\windows\JclCOM.pas' ,
+  JclConsole in '..\..\source\windows\JclConsole.pas' ,
+  JclCppException in '..\..\source\windows\JclCppException.pas' ,
+  JclDebug in '..\..\source\windows\JclDebug.pas' ,
+  JclDebugSerialization in '..\..\source\windows\JclDebugSerialization.pas' ,
+  JclDebugXMLDeserializer in '..\..\source\windows\JclDebugXMLDeserializer.pas' ,
+  JclDebugXMLSerializer in '..\..\source\windows\JclDebugXMLSerializer.pas' ,
+  JclDotNet in '..\..\source\windows\JclDotNet.pas' ,
+  JclHookExcept in '..\..\source\windows\JclHookExcept.pas' ,
+  JclLANMan in '..\..\source\windows\JclLANMan.pas' ,
+  JclLocales in '..\..\source\windows\JclLocales.pas' ,
+  JclMapi in '..\..\source\windows\JclMapi.pas' ,
+  JclMetadata in '..\..\source\windows\JclMetadata.pas' ,
+  JclMiscel in '..\..\source\windows\JclMiscel.pas' ,
+  JclMsdosSys in '..\..\source\windows\JclMsdosSys.pas' ,
+  JclMultimedia in '..\..\source\windows\JclMultimedia.pas' ,
+  JclNTFS in '..\..\source\windows\JclNTFS.pas' ,
+  JclPeImage in '..\..\source\windows\JclPeImage.pas' ,
+  JclRegistry in '..\..\source\windows\JclRegistry.pas' ,
+  JclSecurity in '..\..\source\windows\JclSecurity.pas' ,
+  JclShell in '..\..\source\windows\JclShell.pas' ,
+  JclStructStorage in '..\..\source\windows\JclStructStorage.pas' ,
+  JclSvcCtrl in '..\..\source\windows\JclSvcCtrl.pas' ,
+  JclTask in '..\..\source\windows\JclTask.pas' ,
+  JclTD32 in '..\..\source\windows\JclTD32.pas' ,
+  JclTimeZones in '..\..\source\windows\JclTimeZones.pas' ,
+  JclWin32 in '..\..\source\windows\JclWin32.pas' ,
+  JclWin32Ex in '..\..\source\windows\JclWin32Ex.pas' ,
+  JclWinMIDI in '..\..\source\windows\JclWinMIDI.pas' ,
+  mscoree_TLB in '..\..\source\windows\mscoree_TLB.pas' ,
+  mscorlib_TLB in '..\..\source\windows\mscorlib_TLB.pas' ,
+  MSTask in '..\..\source\windows\MSTask.pas' ,
+  sevenzip in '..\..\source\windows\sevenzip.pas' ,
+  Snmp in '..\..\source\windows\Snmp.pas' 
+  ;
+
+end.


Property changes on: trunk/jcl/packages/d17/Jcl.dpk
___________________________________________________________________
Added: svn:keywords
   + URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Added: svn:eol-style
   + native

Added: trunk/jcl/packages/d17/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d17/Jcl.dproj	                        (rev 0)
+++ trunk/jcl/packages/d17/Jcl.dproj	2012-09-04 14:08:04 UTC (rev 3861)
@@ -0,0 +1,296 @@
+	<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+		<PropertyGroup>
+			<ProjectGuid>{44DB645B-C167-410D-9334-38AF9F0C7913}</ProjectGuid>
+			<MainSource>Jcl.dpk</MainSource>
+			<ProjectVersion>14.3</ProjectVersion>
+			<Config Condition="'$(Config)'==''">Release</Config>
+			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+			<DCC_Define>BCB;WIN32;CONDITIONALEXPRESSIONS;RELEASE</DCC_Define>
+			<Base>True</Base>
+			<AppType>Package</AppType>
+			<FrameworkType>None</FrameworkType>
+			<Platform Condition="'$(Platform)'==''">Win32</Platform>
+			<TargetedPlatforms>3</TargetedPlatforms>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+			<Base_Win64>true</Base_Win64>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+			<Base_Win32>true</Base_Win32>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+			<Cfg_1>true</Cfg_1>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+			<Cfg_1_Win64>true</Cfg_1_Win64>
+			<CfgParent>Cfg_1</CfgParent>
+			<Cfg_1>true</Cfg_1>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+			<Cfg_1_Win32>true</Cfg_1_Win32>
+			<CfgParent>Cfg_1</CfgParent>
+			<Cfg_1>true</Cfg_1>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+			<Cfg_2>true</Cfg_2>
+			<CfgParent>Base</CfgParent>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+			<Cfg_2_Win64>true</Cfg_2_Win64>
+			<CfgParent>Cfg_2</CfgParent>
+			<Cfg_2>true</Cfg_2>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+			<Cfg_2_Win32>true</Cfg_2_Win32>
+			<CfgParent>Cfg_2</CfgParent>
+			<Cfg_2>true</Cfg_2>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Base)'!=''">
+			<VerInfo_MajorVer>2</VerInfo_MajorVer>
+			<VerInfo_Build>4198</VerInfo_Build>
+			<VerInfo_Release>0</VerInfo_Release>
+			<VerInfo_MinorVer>4</VerInfo_MinorVer>
+			<VerInfo_Keys>CompanyName=Project JEDI;FileDescription=JEDI Code Library RTL package;FileVersion=2.4.0.4198;InternalName=Jcl;LegalCopyright=Copyright (C) 1999, 2012 Project JEDI;OriginalFilename=Jcl170.bpl;ProductName=JEDI Code Library;ProductVersion=2.4.0.4198</VerInfo_Keys>
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+			<DCC_Namespace>System;System.Win;WinApi;Vcl;Vcl.Imaging;$(DCC_Namespace)</DCC_Namespace>
+			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
+			<DCC_DebugInformation>false</DCC_DebugInformation>
+			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+			<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+			<DCC_Description>JEDI Code Library RTL package</DCC_Description>
+			<DCC_Define>BCB;BCB;WIN32;CONDITIONALEXPRESSIONS;RELEASE;$(DCC_Define)</DCC_Define>
+			<DCC_WriteableConstants>true</DCC_WriteableConstants>
+			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
+			<DllSuffix>170</DllSuffix>
+			<GenDll>true</GenDll>
+			<GenPackage>true</GenPackage>
+			<DCC_ImageBase>$48000000</DCC_ImageBase>
+			<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Base_Win64)'!=''">
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+			<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Base_Win32)'!=''">
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+			<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1)'!=''">
+			<DCC_DebugInformation>True</DCC_DebugInformation>
+			<DCC_LocalDebugSymbols>True</DCC_LocalDebugSymbols>
+			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+			<DCC_DcuOutput>..\..\lib\d17\win64\debug</DCC_DcuOutput>
+			<DCC_ObjOutput>..\..\lib\d17\win64\debug</DCC_ObjOutput>
+			<DCC_HppOutput>..\..\lib\d17\win64\debug</DCC_HppOutput>
+			<DCC_DcpOutput>..\..\lib\d17\win64\debug</DCC_DcpOutput>
+			<DCC_UnitSearchPath>..\..\lib\d17\win64\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_ResourcePath>..\..\lib\d17\win64\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
+			<DCC_ObjPath>..\..\lib\d17\win64\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
+			<DCC_IncludePath>..\..\lib\d17\win64\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+			<DCC_DcuOutput>..\..\lib\d17\win32\debug</DCC_DcuOutput>
+			<DCC_ObjOutput>..\..\lib\d17\win32\debug</DCC_ObjOutput>
+			<DCC_HppOutput>..\..\lib\d17\win32\debug</DCC_HppOutput>
+			<DCC_DcpOutput>..\..\lib\d17\win32\debug</DCC_DcpOutput>
+			<DCC_UnitSearchPath>..\..\lib\d17\win32\debug;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_ResourcePath>..\..\lib\d17\win32\debug;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
+			<DCC_ObjPath>..\..\lib\d17\win32\debug;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
+			<DCC_IncludePath>..\..\lib\d17\win32\debug;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2)'!=''">
+			<DCC_AssertionsAtRuntime>false</DCC_AssertionsAtRuntime>
+			<DCC_DebugInformation>False</DCC_DebugInformation>
+			<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+			<DCC_DcuOutput>..\..\lib\d17\win64</DCC_DcuOutput>
+			<DCC_ObjOutput>..\..\lib\d17\win64</DCC_ObjOutput>
+			<DCC_HppOutput>..\..\lib\d17\win64</DCC_HppOutput>
+			<DCC_DcpOutput>..\..\lib\d17\win64</DCC_DcpOutput>
+			<DCC_UnitSearchPath>..\..\lib\d17\win64;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_ResourcePath>..\..\lib\d17\win64;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
+			<DCC_ObjPath>..\..\lib\d17\win64;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
+			<DCC_IncludePath>..\..\lib\d17\win64;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+			<DCC_DcuOutput>..\..\lib\d17\win32</DCC_DcuOutput>
+			<DCC_ObjOutput>..\..\lib\d17\win32</DCC_ObjOutput>
+			<DCC_HppOutput>..\..\lib\d17\win32</DCC_HppOutput>
+			<DCC_DcpOutput>..\..\lib\d17\win32</DCC_DcpOutput>
+			<DCC_UnitSearchPath>..\..\lib\d17\win32;..\..\source\include;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_ResourcePath>..\..\lib\d17\win32;..\..\source\include;$(DCC_ResourcePath)</DCC_ResourcePath>
+			<DCC_ObjPath>..\..\lib\d17\win32;..\..\source\include;$(DCC_ObjPath)</DCC_ObjPath>
+			<DCC_IncludePath>..\..\lib\d17\win32;..\..\source\include;$(DCC_IncludePath)</DCC_IncludePath>
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<ItemGroup>
+			<DelphiCompile Include="$(MainSource)">
+				<MainSource>MainSource</MainSource>
+			</DelphiCompile>
+			<DCCReference Include="rtl.dcp"/>
+			<DCCReference Include="..\..\source\common\bzip2.pas"/>
+			<DCCReference Include="..\..\source\common\Jcl8087.pas"/>
+			<DCCReference Include="..\..\source\common\JclAnsiStrings.pas"/>
+			<DCCReference Include="..\..\source\common\JclBase.pas"/>
+			<DCCReference Include="..\..\source\common\JclCharsets.pas"/>
+			<DCCReference Include="..\..\source\common\JclComplex.pas"/>
+			<DCCReference Include="..\..\source\common\JclCompression.pas"/>
+			<DCCReference Include="..\..\source\common\JclCounter.pas"/>
+			<DCCReference Include="..\..\source\common\JclDateTime.pas"/>
+			<DCCReference Include="..\..\source\common\JclFileUtils.pas"/>
+			<DCCReference Include="..\..\source\common\JclIniFiles.pas"/>
+			<DCCReference Include="..\..\source\common\JclLogic.pas"/>
+			<DCCReference Include="..\..\source\common\JclMath.pas"/>
+			<DCCReference Include="..\..\source\common\JclMIDI.pas"/>
+			<DCCReference Include="..\..\source\common\JclMime.pas"/>
+			<DCCReference Include="..\..\source\common\JclNotify.pas"/>
+			<DCCReference Include="..\..\source\common\JclPCRE.pas"/>
+			<DCCReference Include="..\..\source\common\JclResources.pas"/>
+			<DCCReference Include="..\..\source\common\JclRTTI.pas"/>
+			<DCCReference Include="..\..\source\common\JclSchedule.pas"/>
+			<DCCReference Include="..\..\source\common\JclSimpleXml.pas"/>
+			<DCCReference Include="..\..\source\common\JclStatistics.pas"/>
+			<DCCReference Include="..\..\source\common\JclStreams.pas"/>
+			<DCCReference Include="..\..\source\common\JclStringConversions.pas"/>
+			<DCCReference Include="..\..\source\common\JclStringLists.pas"/>
+			<DCCReference Include="..\..\source\common\JclStrings.pas"/>
+			<DCCReference Include="..\..\source\common\JclSynch.pas"/>
+			<DCCReference Include="..\..\source\common\JclSysInfo.pas"/>
+			<DCCReference Include="..\..\source\common\JclSysUtils.pas"/>
+			<DCCReference Include="..\..\source\common\JclUnicode.pas"/>
+			<DCCReference Include="..\..\source\common\JclUnitConv.pas"/>
+			<DCCReference Include="..\..\source\common\JclUnitVersioning.pas"/>
+			<DCCReference Include="..\..\source\common\JclUnitVersioningProviders.pas"/>
+			<DCCReference Include="..\..\source\common\JclValidation.pas"/>
+			<DCCReference Include="..\..\source\common\JclWideStrings.pas"/>
+			<DCCReference Include="..\..\source\common\pcre.pas"/>
+			<DCCReference Include="..\..\source\common\zlibh.pas"/>
+			<DCCReference Include="..\..\source\windows\Hardlinks.pas"/>
+			<DCCReference Include="..\..\source\windows\JclAppInst.pas"/>
+			<DCCReference Include="..\..\source\windows\JclCIL.pas"/>
+			<DCCReference Include="..\..\source\windows\JclCLR.pas"/>
+			<DCCReference Include="..\..\source\windows\JclCOM.pas"/>
+			<DCCReference Include="..\..\source\windows\JclConsole.pas"/>
+			<DCCReference Include="..\..\source\windows\JclCppException.pas"/>
+			<DCCReference Include="..\..\source\windows\JclDebug.pas"/>
+			<DCCReference Include="..\..\source\windows\JclDebugSerialization.pas"/>
+			<DCCReference Include="..\..\source\windows\JclDebugXMLDeserializer.pas"/>
+			<DCCReference Include="..\..\source\windows\JclDebugXMLSerializer.pas"/>
+			<DCCReference Include="..\..\source\windows\JclDotNet.pas"/>
+			<DCCReference Include="..\..\source\windows\JclHookExcept.pas"/>
+			<DCCReference Include="..\..\source\windows\JclLANMan.pas"/>
+			<DCCReference Include="..\..\source\windows\JclLocales.pas"/>
+			<DCCReference Include="..\..\source\windows\JclMapi.pas"/>
+			<DCCReference Include="..\..\source\windows\JclMetadata.pas"/>
+			<DCCReference Include="..\..\source\windows\JclMiscel.pas"/>
+			<DCCReference Include="..\..\source\windows\JclMsdosSys.pas"/>
+			<DCCReference Include="..\..\source\windows\JclMultimedia.pas"/>
+			<DCCReference Include="..\..\source\windows\JclNTFS.pas"/>
+			<DCCReference Include="..\..\source\windows\JclPeImage.pas"/>
+			<DCCReference Include="..\..\source\windows\JclRegistry.pas"/>
+			<DCCReference Include="..\..\source\windows\JclSecurity.pas"/>
+			<DCCReference Include="..\..\source\windows\JclShell.pas"/>
+			<DCCReference Include="..\..\source\windows\JclStructStorage.pas"/>
+			<DCCReference Include="..\..\source\windows\JclSvcCtrl.pas"/>
+			<DCCReference Include="..\..\source\windows\JclTask.pas"/>
+			<DCCReference Include="..\..\source\windows\JclTD32.pas"/>
+			<DCCReference Include="..\..\source\windows\JclTimeZones.pas"/>
+			<DCCReference Include="..\..\source\windows\JclWin32.pas"/>
+			<DCCReference Include="..\..\source\windows\JclWin32Ex.pas"/>
+			<DCCReference Include="..\..\source\windows\JclWinMIDI.pas"/>
+			<DCCReference Include="..\..\source\windows\mscoree_TLB.pas"/>
+			<DCCReference Include="..\..\source\windows\mscorlib_TLB.pas"/>
+			<DCCReference Include="..\..\source\windows\MSTask.pas"/>
+			<DCCReference Include="..\..\source\windows\sevenzip.pas"/>
+			<DCCReference Include="..\..\source\windows\Snmp.pas"/>
+			<BuildConfiguration Include="Release">
+				<Key>Cfg_2</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
+			<BuildConfiguration Include="Base">
+				<Key>Base</Key>
+			</BuildConfiguration>
+			<BuildConfiguration Include="Debug">
+				<Key>Cfg_1</Key>
+				<CfgParent>Base</CfgParent>
+			</BuildConfiguration>
+		</ItemGroup>
+		<ProjectExtensions>
+			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
+			<Borland.ProjectType>Package</Borland.ProjectType>
+			<BorlandProject>
+				<Delphi.Personality>
+					<Parameters/>
+					<VersionInfo>
+						<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
+						<VersionInfo Name="AutoIncBuild">False</VersionInfo>
+						<VersionInfo Name="MajorVer">2</VersionInfo>
+						<VersionInfo Name="MinorVer">4</VersionIn...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3860] trunk/jcl/source/common/JclSysUtils.pas

From: <ob...@us...> - 2012-09-03 14:52:17

Revision: 3860
          http://jcl.svn.sourceforge.net/jcl/?rev=3860&view=rev
Author:   obones
Date:     2012-09-03 14:52:06 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
In some (not so) rare instances there is a race condition where the counter is the same for two threads at the same  time. This makes the CreateNamedPipe call fail  because of the limit set to 1 in the call.
So, to be sure the call succeeds, we put both the process and thread id in the name of the pipe.
This was found to happen while simply starting 7 instances of the same exe file in parallel

Modified Paths:
--------------
    trunk/jcl/source/common/JclSysUtils.pas

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2012-09-03 14:47:08 UTC (rev 3859)
+++ trunk/jcl/source/common/JclSysUtils.pas	2012-09-03 14:52:06 UTC (rev 3860)
@@ -2842,7 +2842,15 @@
     nSize := 4096;
 
   InterlockedIncrement(AsyncPipeCounter);
-  PipeName := Format('\\.\Pipe\AsyncAnonPipe.%.8x.%.8x', [GetCurrentProcessId, AsyncPipeCounter]);
+  // In some (not so) rare instances there is a race condition
+  // where the counter is the same for two threads at the same 
+  // time. This makes the CreateNamedPipe call below fail 
+  // because of the limit set to 1 in the call.
+  // So, to be sure this call succeeds, we put both the process
+  // and thread id in the name of the pipe.
+  // This was found to happen while simply starting 7 instances
+  // of the same exe file in parallel.
+  PipeName := Format('\\.\Pipe\AsyncAnonPipe.%.8x.%.8x.%.8x', [GetCurrentProcessId, GetCurrentThreadId, AsyncPipeCounter]);
 
   PipeReadHandle := CreateNamedPipe(PChar(PipeName), PIPE_ACCESS_INBOUND or FILE_FLAG_OVERLAPPED,
       PIPE_TYPE_BYTE or PIPE_WAIT, 1, nSize, nSize, 120 * 1000, lpPipeAttributes);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3859] trunk/jcl/source/common/JclSysUtils.pas

From: <ob...@us...> - 2012-09-03 14:47:18

Revision: 3859
          http://jcl.svn.sourceforge.net/jcl/?rev=3859&view=rev
Author:   obones
Date:     2012-09-03 14:47:08 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
CreateNamedPipe returns INVALID_HANDLE_VALUE and not zero when there is a problem (see MSDN)
We must preserve LastError when doing our cleanup

Modified Paths:
--------------
    trunk/jcl/source/common/JclSysUtils.pas

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2012-09-03 10:25:41 UTC (rev 3858)
+++ trunk/jcl/source/common/JclSysUtils.pas	2012-09-03 14:47:08 UTC (rev 3859)
@@ -2846,7 +2846,7 @@
 
   PipeReadHandle := CreateNamedPipe(PChar(PipeName), PIPE_ACCESS_INBOUND or FILE_FLAG_OVERLAPPED,
       PIPE_TYPE_BYTE or PIPE_WAIT, 1, nSize, nSize, 120 * 1000, lpPipeAttributes);
-  if PipeReadHandle = 0 then
+  if PipeReadHandle = INVALID_HANDLE_VALUE then
     Exit;
 
   PipeWriteHandle := CreateFile(PChar(PipeName), GENERIC_WRITE, 0, lpPipeAttributes, OPEN_EXISTING,
@@ -2889,6 +2889,7 @@
   ProcessEvent: TJclDispatcherObject;
   WaitEvents: array of TJclDispatcherObject;
   InternalAbort: Boolean;
+  LastError: DWORD;
 begin
   // hack to pass a null reference to the parameter lpNumberOfBytesRead of ReadFile
   Result := $FFFFFFFF;
@@ -3046,23 +3047,28 @@
       end;
     end;
   finally
-    if OutPipeInfo.PipeRead <> 0 then
-      CloseHandle(OutPipeInfo.PipeRead);
-    if OutPipeInfo.PipeWrite <> 0 then
-      CloseHandle(OutPipeInfo.PipeWrite);
-    if ErrorPipeInfo.PipeRead <> 0 then
-      CloseHandle(ErrorPipeInfo.PipeRead);
-    if ErrorPipeInfo.PipeWrite <> 0 then
-      CloseHandle(ErrorPipeInfo.PipeWrite);
-    if ProcessInfo.hThread <> 0 then
-      CloseHandle(ProcessInfo.hThread);
+    LastError := GetLastError;
+    try
+      if OutPipeInfo.PipeRead <> 0 then
+        CloseHandle(OutPipeInfo.PipeRead);
+      if OutPipeInfo.PipeWrite <> 0 then
+        CloseHandle(OutPipeInfo.PipeWrite);
+      if ErrorPipeInfo.PipeRead <> 0 then
+        CloseHandle(ErrorPipeInfo.PipeRead);
+      if ErrorPipeInfo.PipeWrite <> 0 then
+        CloseHandle(ErrorPipeInfo.PipeWrite);
+      if ProcessInfo.hThread <> 0 then
+        CloseHandle(ProcessInfo.hThread);
 
-    if Assigned(ProcessEvent) then
-      ProcessEvent.Free // this calls CloseHandle(ProcessInfo.hProcess)
-    else if ProcessInfo.hProcess <> 0 then
-      CloseHandle(ProcessInfo.hProcess);
-    OutPipeInfo.Event.Free;
-    ErrorPipeInfo.Event.Free;
+      if Assigned(ProcessEvent) then
+        ProcessEvent.Free // this calls CloseHandle(ProcessInfo.hProcess)
+      else if ProcessInfo.hProcess <> 0 then
+        CloseHandle(ProcessInfo.hProcess);
+      OutPipeInfo.Event.Free;
+      ErrorPipeInfo.Event.Free;
+    finally
+      SetLastError(LastError);
+    end;
   end;
 {$ENDIF MSWINDOWS}
 {$IFDEF UNIX}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3858] trunk/jcl/examples/common/pcre/PCREDemoMain.pas

From: <ari...@us...> - 2012-09-03 10:25:47

Revision: 3858
          http://jcl.svn.sourceforge.net/jcl/?rev=3858&view=rev
Author:   arioch_bdv
Date:     2012-09-03 10:25:41 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
 * There is no "System.Actions" unit in Delphi XE2 Enterprise Update 4 HotFix 1
 * There is no Unit Scopes like Vcl.ExtCtrls in Delphi XE and prior

Modified Paths:
--------------
    trunk/jcl/examples/common/pcre/PCREDemoMain.pas

Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.pas	2012-09-03 05:14:31 UTC (rev 3857)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.pas	2012-09-03 10:25:41 UTC (rev 3858)
@@ -7,7 +7,7 @@
 uses
   Windows, Messages,
   SysUtils, Classes, Forms, Dialogs, ActnList, ComCtrls, StdCtrls, Controls,
-  JclPCRE, System.Actions, Vcl.ExtCtrls;
+  JclPCRE, {System.Actions, Vcl.}ExtCtrls;
 
 type
   TfrmMain = class(TForm)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3857] trunk/help/pcre.dtx

From: <ou...@us...> - 2012-09-03 05:14:37

Revision: 3857
          http://jcl.svn.sourceforge.net/jcl/?rev=3857&view=rev
Author:   outchy
Date:     2012-09-03 05:14:31 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Help update.

Modified Paths:
--------------
    trunk/help/pcre.dtx

Modified: trunk/help/pcre.dtx
===================================================================
--- trunk/help/pcre.dtx	2012-09-03 04:55:26 UTC (rev 3856)
+++ trunk/help/pcre.dtx	2012-09-03 05:14:31 UTC (rev 3857)
@@ -61,15 +61,15 @@
   cannot be located in the search path at run-time.
 
   EPCREError may also be raised when executing methods or accessing
-  properties in TJclRegEx that result in numeric return values from
+  properties in TJclRegExBase that result in numeric return values from
   PCRE.DLL representing an error.
 
 <table>
 Method                  Description
 ----------------------  -----------------------------------------------
-TJclRegEx.Compile       Raised when the regular expression argument is
+TJclRegExBase.Compile       Raised when the regular expression argument is
                         an empty string ('').
-TJclRegEx.Captures      Raised when the Capture at the requested index
+TJclRegExBase.Captures      Raised when the Capture at the requested index
                         cannot be accessed using PCRE.DLL.
 </table>
 
@@ -79,8 +79,8 @@
 See also:
   EPCREError.CreateRes
   EPCREError.ErrorCode
-  TJclRegEx.Compile
-  TJclRegEx.Captures
+  TJclRegExBase.Compile
+  TJclRegExBase.Captures
 --------------------------------------------------------------------------------
 @@EPCREError.ErrorCode
 Summary:
@@ -110,18 +110,18 @@
   Message
   EPCREError.ErrorCode
 --------------------------------------------------------------------------------
-@@TJclRegEx
+@@TJclRegExBase
 Summary:
   Implements a regular expression engine based on the Perl-compatible
   Regular Expression library.
 Description:
-  TJclRegEx implements a regular expression engine based on the
+  TJclRegExBase implements a regular expression engine based on the
   Perl-compatible Regular Expression library.
 
-  TJclRegEx requires the header conversions and import routines in
+  TJclRegExBase requires the header conversions and import routines in
   pcre.pas, and the PCRE.DLL dynamic link library.
 
-  TJclRegEx provides properties and methods that act as wrappers to
+  TJclRegExBase provides properties and methods that act as wrappers to
   routines in the PCRE.DLL library.
 
   Use Compile to examine, study, and localize a regular expression.
@@ -147,7 +147,7 @@
   Use Options read or write values that affect the configuration and
   behavior of the PCRE.DLL library.
 
-  For more information about using TJclRegEx, please refer to the topic:
+  For more information about using TJclRegExBase, please refer to the topic:
   Using the JCL PCRE Classes
 See also:
   Compile
@@ -160,7 +160,7 @@
   Options
   JclPCRE_Using
 --------------------------------------------------------------------------------
-@@TJclRegEx.Compile@string@Boolean@Boolean@Boolean
+@@TJclRegExBase.Compile@string@Boolean@Boolean@Boolean
 Summary
 Converts a regular expression into the form required for the
 PCRE.DLL library.
@@ -242,7 +242,7 @@
 \description of the values used in the Options property.
 
 The compiled regular expression representing Pattern is
-stored internally in TJclRegEx for subsequent use in the
+stored internally in TJclRegExBase for subsequent use in the
 Match method. An EPCREError exception is raised if Pattern
 contains an empty string ('').
 
@@ -274,7 +274,7 @@
 Options Match ErrorMessage ErrorOffset TJclRegExOption
 TJclRegExOptions EPCREError
 
-@@TJclRegEx.Destroy
+@@TJclRegExBase.Destroy
 Summary:
   Destructor for object instance.
 Description:
@@ -282,7 +282,7 @@
 See also:
   Create
 --------------------------------------------------------------------------------
-@@TJclRegEx.Match@string@Cardinal
+@@TJclRegExBase.Match@string@Cardinal
 Summary:
   Examines a text subject for values that match a compiled regular expression.
 Description:
@@ -332,7 +332,7 @@
   TJclRegExOption
   TJclRegExOptions
 --------------------------------------------------------------------------------
-@@TJclRegEx.CaptureCount
+@@TJclRegExBase.CaptureCount
 Summary:
   Number of strings in the result for a comparison performed using the
   Match method.
@@ -362,7 +362,7 @@
   Captures
   CaptureRanges
 --------------------------------------------------------------------------------
-@@TJclRegEx.CaptureRanges
+@@TJclRegExBase.CaptureRanges
 Summary:
   Indicates the location of a string in a text subject resulting from a
   call to the Match method.
@@ -388,7 +388,7 @@
   Compile
   TJclCaptureRange
 --------------------------------------------------------------------------------
-@@TJclRegEx.Captures
+@@TJclRegExBase.Captures
 Summary:
   Strings resulting from a call to the Match method.
 Description:
@@ -419,7 +419,7 @@
   Match
   EPCREError
 --------------------------------------------------------------------------------
-@@TJclRegEx.ErrorMessage
+@@TJclRegExBase.ErrorMessage
 Summary:
   Represents an error message generated when compiling a regular
   expression.
@@ -500,7 +500,7 @@
   ErrorOffset
   Compile
 --------------------------------------------------------------------------------
-@@TJclRegEx.ErrorOffset
+@@TJclRegExBase.ErrorOffset
 Summary:
   Represents the location of an error generated when compiling a regular
   expression.
@@ -520,7 +520,7 @@
   ErrorMessage
   Compile
 --------------------------------------------------------------------------------
-@@TJclRegEx.Options
+@@TJclRegExBase.Options
 Summary:
   Flags for configuring and controlling the run-time behavior of the
   regular expression engine.
@@ -545,14 +545,14 @@
 @@TJclCaptureRange
 Summary:
   Represents the starting and ending offsets for captured string results
-  in the TJclRegEx class.
+  in the TJclRegExBase class.
 Description:
   TJclCaptureRange is a record type with members that represent the
   starting and ending offsets for captured string results in the
-  TJclRegEx class.
+  TJclRegExBase class.
 
   TJclCaptureRange instances are allocated and updated when reading
-  the indexed values in the TJclRegEx.Captures property.
+  the indexed values in the TJclRegExBase.Captures property.
 
 Notes:
   At the present time, the values in TJclCaptureRange members
@@ -562,8 +562,8 @@
 See also:
   TJclCaptureRange.FirstPos
   TJclCaptureRange.LastPos
-  TJclRegEx
-  TJclRegEx.Captures
+  TJclRegExBase
+  TJclRegExBase.Captures
 --------------------------------------------------------------------------------
 @@TJclCaptureRange.FirstPos
 Summary:
@@ -572,8 +572,8 @@
   FirstPos represents the starting offset into a text subject for a
   captured result string.
 See also:
-  TJclRegEx.Captures
-  TJclRegEx.CaptureRanges
+  TJclRegExBase.Captures
+  TJclRegExBase.CaptureRanges
 --------------------------------------------------------------------------------
 @@TJclCaptureRange.LastPos
 Summary:
@@ -582,8 +582,8 @@
   LastPos represents the ending offset into a text subject for a
   captured result string.
 See also:
-  TJclRegEx.Captures
-  TJclRegEx.CaptureRanges
+  TJclRegExBase.Captures
+  TJclRegExBase.CaptureRanges
 --------------------------------------------------------------------------------
 @@TJclRegExOption
 Summary:
@@ -593,7 +593,7 @@
   TJclRegExOption is an enumerated type that represents bit flags
   that can be used to configure or modify the behavior of the PCRE
   regular expression engine.  Values in TJclRegExOption affect the
-  execution of the TJclRegEx.Compile and TJclRegEx.Match methods.
+  execution of the TJclRegExBase.Compile and TJclRegExBase.Match methods.
 
   TJclRegExOption include the following values (and their PCRE
   equivalents):
@@ -622,15 +622,15 @@
 </table>
 
   Values in TJclRegExOption can be assigned to the
-  TJclRegExOptions set type as used in the TJclRegEx.Options
+  TJclRegExOptions set type as used in the TJclRegExBase.Options
   property.
 
 Notes:
   PCRE must be built with UTF-8 support in order to use roUTF8.
 See also:
-  TJclRegEx.Compile
-  TJclRegEx.Match
-  TJclRegEx.Options
+  TJclRegExBase.Compile
+  TJclRegExBase.Match
+  TJclRegExBase.Options
 --------------------------------------------------------------------------------
 @@TPCREIntArray
 Summary:
@@ -651,13 +651,13 @@
 @@TJclRegExOptions
 Summary:
   Represents the set of bit flags to use for configuring and
-  controlling the TJclRegEx regular expression engine.
+  controlling the TJclRegExBase regular expression engine.
 Description:
   Represents the set of TJclRegExOption bit flags to use for
-  configuring and controlling the TJclRegEx regular expression
+  configuring and controlling the TJclRegExBase regular expression
   engine.
 See also:
-  TJclRegEx
+  TJclRegExBase
   TJclRegExOption
 --------------------------------------------------------------------------------
 @@JclPCRE_Intro
@@ -690,14 +690,14 @@
   Using the JCL PCRE Classes.
 Description:
   The JCL PCRE classes provide access to functions and structures in
-  pcre.dll through the use of TJclRegEx and TJclRegExOptions
+  pcre.dll through the use of TJclRegExBase and TJclRegExOptions
   classes.
 
-  TJclRegEx is a class that provides properties and methods
+  TJclRegExBase is a class that provides properties and methods
   that act as wrappers for routines and structures found in the
   pcre.dll dynamic link library.
 
-  TJclRegEx is a non-visual object; it cannot be used on
+  TJclRegExBase is a non-visual object; it cannot be used on
   the design surfaces of an IDE. It does not, however, require
   any installation other that being availble in the search path
   for the compiler. Simply add the pas unit to the
@@ -711,34 +711,34 @@
 </code>
 
   In your program, you would normally allocate an instance of
-  TJclRegEx and configure its' options in the
-  TJclRegEx.Options property.
+  TJclRegExBase and configure its' options in the
+  TJclRegExBase.Options property.
 
 <code>
   var
-    RE: TJclRegEx;
+    RE: TJclRegExBase;
     REO: JclRegExOptions;
   ...
 
-  RE := TJclRegEx.Create;
+  RE := TJclRegExBase.Create;
   REO := [roIgnoreCase, roMultiLine, roUnGreedy];
   RE.Options := REO;
 </code>
 
-  TJclRegEx.Options is used primarily to control the behavior of the
-  regular expression engine during calls to the TJclRegEx.Compile and
-  TJclRegEx.Match methods. Values in the JclRegExOptions set
+  TJclRegExBase.Options is used primarily to control the behavior of the
+  regular expression engine during calls to the TJclRegExBase.Compile and
+  TJclRegExBase.Match methods. Values in the JclRegExOptions set
   reflect the attributes passed or retrieved using routines in pcre.dll.
   See JclRegExOptions and JclRegExOption for a detailed
   description of values.
 
-  Use the TJclRegEx.Compile method to specify the
+  Use the TJclRegExBase.Compile method to specify the
   Perl-compatible regular expression to use when matching a
-  text subject. TJclRegEx.Compile is essentially a wrapper
+  text subject. TJclRegExBase.Compile is essentially a wrapper
   around the pcre_compile(), pcre_compile2(), pcre_study(), and
   pcre_maketables() functions in pcre.dll.
 
-  See the documentation for the TJclRegEx.Compile method
+  See the documentation for the TJclRegExBase.Compile method
   for more details about arguments to the method.
 
   Perl-compatible Regular Expressions are very flexible and
@@ -747,23 +747,23 @@
   a detailed description of the syntax and semantics of
   Perl-compatible Regular Expressions.
 
-  Use the TJclRegEx.ErrorMessage and
-  TJclRegEx.ErrorOffset properties to examine errors
+  Use the TJclRegExBase.ErrorMessage and
+  TJclRegExBase.ErrorOffset properties to examine errors
   detected when compiling the regular expression.
 
-  Use the TJclRegEx.Match method to compare the compiled
+  Use the TJclRegExBase.Match method to compare the compiled
   regular expression against a given subject string using a
   matching algorithm that is similar to Perl's. The
-  TJclRegEx.Match method is a wrapper around the
+  TJclRegExBase.Match method is a wrapper around the
   pcre_exec() function in pcre.dll.
 
-  TJclRegEx.Match returns a boolean value to indicate that
+  TJclRegExBase.Match returns a boolean value to indicate that
   elements of the regular expression exist in the subject text.
-  Use the TJclRegEx.CaptureCount property to find the
+  Use the TJclRegExBase.CaptureCount property to find the
   number of matching strings found for the regular expression.
-  Use the TJclRegEx.Captures property to access the string
+  Use the TJclRegExBase.Captures property to access the string
   values by their ordinal position. Use the
-  TJclRegEx.CaptureRanges property to access the offsets
+  TJclRegExBase.CaptureRanges property to access the offsets
   into the subject text where the string match was located.
 
 <code>
@@ -783,12 +783,12 @@
   end;
 </code>
 
-  TJclRegEx may raise exceptions when using its' properties
+  TJclRegExBase may raise exceptions when using its' properties
   and methods. These exceptions can normally be handled in your
   application code by responding to EPCREError exception
   instances.
 See also:
-  TJclRegEx
+  TJclRegExBase
   TJclRegExOptions
   TJclRegExOption
   EPCREError

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3856] trunk/jcl/source/common/JclPCRE.pas

From: <ou...@us...> - 2012-09-03 04:55:33

Revision: 3856
          http://jcl.svn.sourceforge.net/jcl/?rev=3856&view=rev
Author:   outchy
Date:     2012-09-03 04:55:26 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
For some reasons, revision 3853 was unwillingly reverted in revision 3855.

Revision Links:
--------------
    http://jcl.svn.sourceforge.net/jcl/?rev=3853&view=rev
    http://jcl.svn.sourceforge.net/jcl/?rev=3855&view=rev

Modified Paths:
--------------
    trunk/jcl/source/common/JclPCRE.pas

Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas	2012-09-02 22:25:26 UTC (rev 3855)
+++ trunk/jcl/source/common/JclPCRE.pas	2012-09-03 04:55:26 UTC (rev 3856)
@@ -557,19 +557,19 @@
     PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
     PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, 0, 0, PCRE_UCP);
   cRunOptions: array [TJclRegExOption] of Integer =
-   (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
-    0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
-    PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
+   (0, 0, 0, 0, PCRE_ANCHORED, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+    0, PCRE_NOTEMPTY, 0, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
+    0, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
     PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
-    PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
-    PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
+    0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
+    PCRE_NOTEMPTY_ATSTART, 0);
   cDFARunOptions: array [TJclRegExOption] of Integer =
-   (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
-    0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
-    PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR,
+   (0, 0, 0, 0, PCRE_ANCHORED, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+    0, PCRE_NOTEMPTY, 0, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
+    PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, 0, 0, PCRE_NEWLINE_CR,
     PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF,
     PCRE_BSR_UNICODE, 0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
-    PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
+    PCRE_NOTEMPTY_ATSTART, 0);
 var
   I: TJclRegExOption;
 begin

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3855] trunk/jcl

From: <ou...@us...> - 2012-09-02 22:25:35

Revision: 3855
          http://jcl.svn.sourceforge.net/jcl/?rev=3855&view=rev
Author:   outchy
Date:     2012-09-02 22:25:26 +0000 (Sun, 02 Sep 2012)
Log Message:
-----------
new installer option to disable 8-bit PCRE.

Modified Paths:
--------------
    trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
    trunk/jcl/examples/common/pcre/PCREDemoMain.pas
    trunk/jcl/install/JclInstall.pas
    trunk/jcl/install/JclInstallResources.pas
    trunk/jcl/source/common/JclPCRE.pas
    trunk/jcl/source/common/JclStringLists.pas
    trunk/jcl/source/common/pcre.pas
    trunk/jcl/source/include/jcl.inc
    trunk/jcl/source/include/jcl.template.inc

Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.dfm	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.dfm	2012-09-02 22:25:26 UTC (rev 3855)
@@ -72,8 +72,8 @@
     WordWrap = False
   end
   object btnOpen: TButton
-    Left = 370
-    Top = 318
+    Left = 373
+    Top = 263
     Width = 75
     Height = 25
     Action = acOpen
@@ -228,20 +228,53 @@
       TabOrder = 2
     end
   end
-  object RadioGroupSystemOptions: TRadioGroup
+  object GroupBoxSystemOptions: TGroupBox
     Left = 8
-    Top = 264
-    Width = 353
-    Height = 39
+    Top = 263
+    Width = 359
+    Height = 40
     Caption = 'System options:'
-    Columns = 4
-    ItemIndex = 0
-    Items.Strings = (
-      'ANSI'
-      'UTF-8'
-      'UCS-2'
-      'UTF-16')
     TabOrder = 8
+    object RadioButtonDefault: TRadioButton
+      Left = 11
+      Top = 20
+      Width = 65
+      Height = 16
+      Caption = 'Default'
+      TabOrder = 0
+    end
+    object RadioButtonANSI: TRadioButton
+      Left = 79
+      Top = 20
+      Width = 65
+      Height = 16
+      Caption = 'ANSI'
+      TabOrder = 4
+    end
+    object RadioButtonUTF8: TRadioButton
+      Left = 140
+      Top = 19
+      Width = 73
+      Height = 17
+      Caption = 'UTF-8'
+      TabOrder = 1
+    end
+    object RadioButtonUCS2: TRadioButton
+      Left = 220
+      Top = 19
+      Width = 73
+      Height = 17
+      Caption = 'UCS-2'
+      TabOrder = 2
+    end
+    object RadioButtonUTF16: TRadioButton
+      Left = 296
+      Top = 19
+      Width = 73
+      Height = 17
+      Caption = 'UTF-16'
+      TabOrder = 3
+    end
   end
   object alMain: TActionList
     Left = 144

Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.pas	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.pas	2012-09-02 22:25:26 UTC (rev 3855)
@@ -39,17 +39,23 @@
     chkStudy: TCheckBox;
     chkUserLocale: TCheckBox;
     chkJITCompile: TCheckBox;
-    RadioGroupSystemOptions: TRadioGroup;
+    GroupBoxSystemOptions: TGroupBox;
+    RadioButtonDefault: TRadioButton;
+    RadioButtonUTF8: TRadioButton;
+    RadioButtonUCS2: TRadioButton;
+    RadioButtonUTF16: TRadioButton;
+    RadioButtonANSI: TRadioButton;
     procedure acOpenExecute(Sender: TObject);
     procedure acFindExecute(Sender: TObject);
     procedure acFindNextExecute(Sender: TObject);
     procedure edRegExprChange(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-
-  private
+  public
     { Private declarations }
+    {$IFDEF JCL_PCRE}
     RE: TJclRegExBase;
+    {$ENDIF JCL_PCRE}
     FMatchIndex: integer;
     procedure SelectText(const Range: TJclCaptureRange);
     procedure Match;
@@ -79,25 +85,35 @@
 
 procedure TfrmMain.acFindExecute(Sender: TObject);
 begin
+  {$IFDEF JCL_PCRE}
   FreeAndNil(RE);
+  {$IFDEF PCRE_8}
+  if RadioButtonANSI.Checked or RadioButtonUTF8.Checked then
+    RE := TJclAnsiRegEx.Create
+  else
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
-  if RadioGroupSystemOptions.ItemIndex in [2,3] then
+  if RadioButtonUCS2.Checked or RadioButtonUTF16.Checked then
     RE := TJclWideRegEx.Create
   else
   {$ENDIF PCRE_16}
-    RE := TJclAnsiRegEx.Create;
+  if RadioButtonDefault.Checked then
+    RE := TJclRegEx.Create;
   RE.Options := GetUIOptions;
   RE.Compile(edRegExpr.Text, chkStudy.Checked, chkUserLocale.Checked, chkJITCompile.Checked);
   FMatchIndex := 1;
   Match;
+  {$ENDIF JCL_PCRE}
 end;
 
 procedure TfrmMain.acFindNextExecute(Sender: TObject);
 begin
+  {$IFDEF JCL_PCRE}
   if RE = nil then
     acFind.Execute
   else
     Match;
+  {$ENDIF JCL_PCRE}
 end;
 
 procedure TfrmMain.SelectText(const Range: TJclCaptureRange);
@@ -108,6 +124,7 @@
 
 procedure TfrmMain.Match;
 begin
+  {$IFDEF JCL_PCRE}
   RE.Options := GetUIOptions;
   if not RE.Match(reFile.Lines.Text, FMatchIndex) then
   begin
@@ -120,6 +137,7 @@
     FMatchIndex := RE.CaptureRanges[0].LastPos + 1;
   end;
   UpdateUIOptions;
+  {$ENDIF JCL_PCRE}
 end;
 
 function TfrmMain.GetUIOptions: TJclRegExOptions;
@@ -147,16 +165,19 @@
     Include(Result, roUnGreedy);
   if chkNotEmpty.Checked then
     Include(Result, roNotEmpty);
-  if RadioGroupSystemOptions.ItemIndex = 1 then
+  if RadioButtonUTF8.Checked then
     Include(Result, roUTF8);
-  if RadioGroupSystemOptions.ItemIndex = 3 then
+  if RadioButtonUTF16.Checked then
     Include(Result, roUTF16);
 end;
 
 procedure TfrmMain.UpdateUIOptions;
+{$IFDEF JCL_PCRE}
 var
   Options: TJclRegExOptions;
+{$ENDIF JCL_PCRE}
 begin
+  {$IFDEF JCL_PCRE}
   if RE = nil then Exit;
   Options := RE.Options;
   chkIgnoreCase.Checked := roIgnoreCase in Options;
@@ -170,28 +191,56 @@
   chkNotEOL.Checked := roNotEOL in Options;
   chkUngreedy.Checked := roUnGreedy in Options;
   chkNotEmpty.Checked := roNotEmpty in Options;
-  if (roUTF8 in Options) and (RadioGroupSystemOptions.ItemIndex = 0) then
-    RadioGroupSystemOptions.ItemIndex := 1;
-  if (roUTF16 in Options) and (RadioGroupSystemOptions.ItemIndex = 2) then
-    RadioGroupSystemOptions.ItemIndex := 3;
+  {$IFDEF PCRE_8}
+  if RE is TJclAnsiRegEx then
+  begin
+    if roUTF8 in Options then
+      RadioButtonUTF8.Checked := True
+    else
+      RadioButtonAnsi.Checked := True;
+  end;
+  {$ENDIF PCRE_8}
+  {$IFDEF PCRE_16}
+  if RE is TJclWideRegEx then
+  begin
+    if roUTF16 in Options then
+      RadioButtonUTF16.Checked := True
+    else
+      RadioButtonUCS2.Checked := True;
+  end;
+  {$ENDIF PCRE_16}
+  {$ENDIF JCL_PCRE}
 end;
 
 procedure TfrmMain.edRegExprChange(Sender: TObject);
 begin
+  {$IFDEF JCL_PCRE}
   FreeAndNil(RE);
+  {$ENDIF JCL_PCRE}
 end;
 
 procedure TfrmMain.FormDestroy(Sender: TObject);
 begin
+  {$IFDEF JCL_PCRE}
   FreeAndNil(RE);
+  {$ENDIF JCL_PCRE}
 end;
 
 procedure TfrmMain.FormCreate(Sender: TObject);
 begin
   DragAcceptFiles(Handle, True);
+  {$IFDEF JCL_PCRE}
+  RadioButtonDefault.Checked := True;
+  {$ELSE ~JCL_PCRE}
+  RadioButtonDefault.Enabled := False;
+  {$ENDIF ~JCL_PCRE}
+  {$IFNDEF PCRE_8}
+  RadioButtonANSI.Enabled := False;
+  RadioButtonUTF8.Enabled := False;
+  {$ENDIF ~PCRE_8}
   {$IFNDEF PCRE_16}
-  RadioGroupSystemOptions.Items.Delete(3);
-  RadioGroupSystemOptions.Items.Delete(2);
+  RadioButtonUCS2.Enabled := False;
+  RadioButtonUTF16.Enabled := False;
   {$ENDIF ~PCRE_16}
 end;
 

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/install/JclInstall.pas	2012-09-02 22:25:26 UTC (rev 3855)
@@ -69,7 +69,9 @@
         joJCLDefPCRELinkDLL,
         joJCLDefPCRELinkOnRequest,
         joJCLDefPCRERTL,
+        joJCLDefPCRE8,
         joJCLDefPCRE16,
+        joJCLDefPCREPrefer16,
         joJCLDefBZip2StaticLink,
         joJCLDefBZip2LinkDLL,
         joJCLDefBZip2LinkOnRequest,
@@ -135,8 +137,8 @@
       'MATH_EXT_EXTREMEVALUES',  'HOOK_DLL_EXCEPTIONS',
       'DEBUG_NO_BINARY', 'DEBUG_NO_TD32', 'DEBUG_NO_MAP', 'DEBUG_NO_EXPORTS',
       'DEBUG_NO_SYMBOLS', 'PCRE_STATICLINK', 'PCRE_LINKDLL',
-      'PCRE_LINKONREQUEST', 'PCRE_RTL', 'PCRE_16', 'BZIP2_STATICLINK',
-      'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'ZLIB_STATICLINK',
+      'PCRE_LINKONREQUEST', 'PCRE_RTL', 'PCRE_8', 'PCRE_16', 'PCRE_PREFER_16',
+      'BZIP2_STATICLINK', 'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'ZLIB_STATICLINK',
       'ZLIB_LINKDLL', 'ZLIB_LINKONREQUEST', 'ZLIB_RTL', 'UNICODE_RTL_DATABASE',
       'UNICODE_SILENT_FAILURE', 'UNICODE_RAW_DATA', 'UNICODE_ZLIB_DATA',
       'UNICODE_BZIP2_DATA', 'CONTAINER_ANSISTR', 'CONTAINER_WIDESTR',
@@ -414,7 +416,9 @@
       (Id: -1; Caption: @RsCaptionDefPCRELinkDLL;          Hint: @RsHintDefPCRELinkDLL), // joDefPCRELinkDLL
       (Id: -1; Caption: @RsCaptionDefPCRELinkOnRequest;    Hint: @RsHintDefPCRELinkOnRequest), // joDefPCRELinkOnRequest
       (Id: -1; Caption: @RsCaptionDefPCRERTL;              Hint: @RsHintDefPCRERTL), // joDefPCRERTL
+      (Id: -1; Caption: @RsCaptionDefPCRE8;                Hint: @RsHintDefPCRE8), // joDefPCRE8
       (Id: -1; Caption: @RsCaptionDefPCRE16;               Hint: @RsHintDefPCRE16), // joDefPCRE16
+      (Id: -1; Caption: @RsCaptionDefPCREPrefer16;         Hint: @RsHintDefPCREPrefer16), // joDefPCREPrefer16
       (Id: -1; Caption: @RsCaptionDefBZip2StaticLink;      Hint: @RsHintDefBZip2StaticLink), // joDefBZip2StaticLink
       (Id: -1; Caption: @RsCaptionDefBZip2LinkDLL;         Hint: @RsHintDefBZip2LinkDLL), // joDefBZip2LinkDLL
       (Id: -1; Caption: @RsCaptionDefBZip2LinkOnRequest;   Hint: @RsHintDefBZip2LinkOnRequest), // joDefBZip2LinkOnRequest
@@ -923,7 +927,9 @@
     if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber >= 8) then
       // Delphi XE and newer have a licensed version of JCL's pcre.pas named RegularExpressionsAPI
       AddOption(joJCLDefPCRERTL, [goRadioButton], joJCLDefPCRE);
-    AddOption(joJCLDefPCRE16, [goChecked], joJCLDefPCRE);
+    AddOption(joJCLDefPCRE8, [goChecked], joJCLDefPCRE);
+    AddOption(joJCLDefPCRE16, [goStandaloneParent], joJCLDefPCRE);
+    AddOption(joJCLDefPCREPrefer16, [], joJCLDefPCRE16);
     // BZip2 options
     AddOption(joJCLDefBZip2, [goChecked], Parent);
     AddOption(joJCLDefBZip2StaticLink, [goRadioButton, goChecked], joJCLDefBZip2);

Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/install/JclInstallResources.pas	2012-09-02 22:25:26 UTC (rev 3855)
@@ -79,7 +79,9 @@
   RsCaptionDefPCRELinkDLL       = 'Static bind to pcre.dll';
   RsCaptionDefPCRELinkOnRequest = 'Late bind to pcre.dll';
   RsCaptionDefPCRERTL           = 'Use RTL''s RegularExpressionAPI';
+  RsCaptionDefPCRE8             = 'Enable 8-bit PCRE';
   RsCaptionDefPCRE16            = 'Enable 16-bit PCRE';
+  RsCaptionDefPCREPrefer16      = 'Prefer 16-bit PCRE';
   // BZip2 options
   RsCaptionDefBZip2              = 'BZip2 options';
   RsCaptionDefBZip2StaticLink    = 'Static link to BZip2 code';
@@ -196,7 +198,9 @@
   RsHintDefPCRELinkDLL       = 'JCL binaries require pcre.dll to be present';
   RsHintDefPCRELinkOnRequest = 'JCL binaries require pcre.dll when calling PCRE functions';
   RsHintDefPCRERTL           = 'JCL relies on RTL''s RegularExpressionsAPI functions and declarations';
+  RsHintDefPCRE8             = 'ANSI and UTF-8 is the historical version of PCRE library';
   RsHintDefPCRE16            = 'Unicode-enabled (UCS-2 and UTF-16) was introduced as of PCRE 8.30';
+  RsHintDefPCREPrefer16      = 'Prefer Unicode-enabled PCRE when both versions are available';
   // BZip2 options
   RsHintDefBZip2              = 'BZip2 specific options (bzip2.pas)';
   RsHintDefBZip2StaticLink    = 'Code from BZip2 is linked into JCL binaries';

Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/source/common/JclPCRE.pas	2012-09-02 22:25:26 UTC (rev 3855)
@@ -173,7 +173,7 @@
     property OnCallout: TJclRegExCallout read FOnCallout write FOnCallout;
   end;
 
-
+  {$IFDEF PCRE_8}
   TJclAnsiRegEx = class(TJclRegExBase)
   private
     FCode: PPCRE;
@@ -200,6 +200,7 @@
   TJclAnsiRegExOptions = TJclRegExOptions;
   TJclAnsiCaptureRange = TJclCaptureRange;
   TJclAnsiRegExCallout = TJclRegExCallout;
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
   TJclWideRegEx = class(TJclRegExBase)
@@ -231,17 +232,28 @@
   TJclWideRegExCallout = TJclRegExCallout;
   {$ENDIF PCRE_16}
 
+  {$IFDEF JCL_PCRE_8}
+  TJclRegEx = TJclAnsiRegEx;
+  {$ENDIF JCL_PCRE_8}
+  {$IFDEF JCL_PCRE_16}
+  TJclRegEx = TJclWideRegEx;
+  {$ENDIF JCL_PCRE_16}
+
+{$IFDEF PCRE_8}
 procedure InitializeLocaleSupport;
 procedure TerminateLocaleSupport;
+{$ENDIF PCRE_8}
 
 {$IFDEF PCRE_16}
 procedure InitializeLocaleSupport16;
 procedure TerminateLocaleSupport16;
 {$ENDIF PCRE_16}
 
+{$IFDEF JCL_PCRE}
 // Args is an array of pairs (CaptureIndex, Value) or (CaptureName, Value).
 // For example: NewIp := StrReplaceRegEx(DirIP, '(\d+)\.(\d+)\.(\d+)\.(\d+)', [3, '128', 4, '254']);
 function StrReplaceRegEx(const Subject, Pattern: string; Args: array of const): string;
+{$ENDIF JCL_PCRE}
 
 {$IFDEF UNITVERSIONING}
 const
@@ -357,11 +369,15 @@
     Result := Index;
 end;
 
+{$IFDEF JCL_PCRE}
 var
+  {$IFDEF PCRE_8}
   GTables: PAnsiChar;
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   GTables16: PAnsiChar;
   {$ENDIF PCRE_16}
+{$ENDIF JCL_PCRE}
 
 {$IFDEF RTL230_UP}
   {$IFDEF PCRE_RTL}
@@ -396,10 +412,12 @@
   FreeMem(P);
 end;
 
+{$IFDEF PCRE_8}
 function JclPCRECallout(var callout_block: pcre_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
    Result := TJclAnsiRegEx(callout_block.callout_data).CalloutHandler(callout_block);
 end;
+{$ENDIF PCRE_8}
 
 {$IFDEF PCRE_16}
 function JclPCRE16Callout(var callout_block: pcre16_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
@@ -539,19 +557,19 @@
     PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
     PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, 0, 0, PCRE_UCP);
   cRunOptions: array [TJclRegExOption] of Integer =
-   (0, 0, 0, 0, PCRE_ANCHORED, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL,
-    0, PCRE_NOTEMPTY, 0, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
-    0, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
+   (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+    0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
+    PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
     PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
-    0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
-    PCRE_NOTEMPTY_ATSTART, 0);
+    PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
+    PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
   cDFARunOptions: array [TJclRegExOption] of Integer =
-   (0, 0, 0, 0, PCRE_ANCHORED, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL,
-    0, PCRE_NOTEMPTY, 0, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
-    PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, 0, 0, PCRE_NEWLINE_CR,
+   (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+    0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
+    PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR,
     PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF,
     PCRE_BSR_UNICODE, 0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
-    PCRE_NOTEMPTY_ATSTART, 0);
+    PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
 var
   I: TJclRegExOption;
 begin
@@ -632,6 +650,7 @@
   Result := False;
 end;
 
+{$IFDEF PCRE_8}
 procedure InitializeLocaleSupport;
 begin
   if not Assigned(GTables) then
@@ -646,6 +665,7 @@
     GTables := nil;
   end;
 end;
+{$ENDIF PCRE_8}
 
 {$IFDEF PCRE_16}
 procedure InitializeLocaleSupport16;
@@ -664,6 +684,7 @@
 end;
 {$ENDIF PCRE_16}
 
+{$IFDEF JCL_PCRE}
 // TODO: Better/specific error messages, show index when available.
 function StrReplaceRegEx(const Subject, Pattern: string; Args: array of const): string;
 
@@ -703,7 +724,7 @@
     raise EConvertError.Create(SArgumentMissing)
   else
   begin
-    Re := TJclAnsiRegEx.Create;
+    Re := TJclRegEx.Create;
     try
       if Re.Compile(Pattern, False) and Re.Match(Subject) then
       begin
@@ -727,6 +748,7 @@
     end;
   end;
 end;
+{$ENDIF JCL_PCRE}
 
 //=== { EPCREError } =========================================================
 
@@ -741,6 +763,8 @@
   raise EPCREError.CreateRes(@RsErrLibNotLoaded, 0);
 end;
 
+{$IFDEF PCRE_8}
+
 //=== { TJclAnsiRegEx } ======================================================
 
 destructor TJclAnsiRegEx.Destroy;
@@ -1003,6 +1027,8 @@
   SetCapture(Index, Value);
 end;
 
+{$ENDIF PCRE_8}
+
 {$IFDEF PCRE_16}
 
 //=== { TJclWideRegEx } ======================================================
@@ -1279,8 +1305,10 @@
   {$ENDIF ~PCRE_RTL}
   if LoadPCRE then
   begin
+    {$IFDEF PCRE_8}
     SetPCREMallocCallback(JclPCREGetMem);
     SetPCREFreeCallback(JclPCREFreeMem);
+    {$ENDIF PCRE_8}
     {$IFDEF PCRE_16}
     SetPCRE16MallocCallback(JclPCRE16GetMem);
     SetPCRE16FreeCallback(JclPCRE16FreeMem);
@@ -1291,7 +1319,9 @@
   {$ENDIF UNITVERSIONING}
 
 finalization
+  {$IFDEF PCRE_8}
   TerminateLocaleSupport;
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   TerminateLocaleSupport16;
   {$ENDIF PCRE_16}

Modified: trunk/jcl/source/common/JclStringLists.pas
===================================================================
--- trunk/jcl/source/common/JclStringLists.pas	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/source/common/JclStringLists.pas	2012-09-02 22:25:26 UTC (rev 3855)
@@ -179,10 +179,12 @@
     function First: string;
     function LastIndex: Integer;
     function Clear: IJclStringList;
+    {$IFDEF JCL_PCRE}
     function DeleteRegEx(const APattern: string): IJclStringList;
     function KeepRegEx(const APattern: string): IJclStringList;
     function Files(const APattern: string = '*'; ARecursive: Boolean = False; const ARegExPattern: string = ''): IJclStringList;
     function Directories(const APattern: string = '*'; ARecursive: Boolean = False; const ARegExPattern: string = ''): IJclStringList;
+    {$ENDIF JCL_PCRE}
     function GetStringsRef: TStrings;
     function ConfigAsSet: IJclStringList;
     function Delimit(const ADelimiter: string): IJclStringList;
@@ -228,11 +230,15 @@
   private
     FObjectsMode: TJclStringListObjectsMode;
     FSelfAsInterface: IJclStringList;
+    {$IFDEF JCL_PCRE}
     FLastRegExPattern: string;
-    FRegEx: TJclAnsiRegEx;
+    FRegEx: TJclRegEx;
+    {$ENDIF JCL_PCRE}
     FCompareFunction: TJclStringListSortCompare;
     function CanFreeObjects: Boolean;
+    {$IFDEF JCL_PCRE}
     function MatchRegEx(const S, APattern: string): Boolean;
+    {$ENDIF JCL_PCRE}
     procedure EnsureObjectsMode(AMode: TJclStringListObjectsMode);
   protected
     FRefCount: Integer;
@@ -348,10 +354,12 @@
     function First: string;
     function LastIndex: Integer;
     function Clear: IJclStringList; reintroduce;
+    {$IFDEF JCL_PCRE}
     function DeleteRegEx(const APattern: string): IJclStringList;
     function KeepRegEx(const APattern: string): IJclStringList;
     function Files(const APattern: string = '*'; ARecursive: Boolean = False; const ARegExPattern: string = ''): IJclStringList;
     function Directories(const APattern: string = '*'; ARecursive: Boolean = False; const ARegExPattern: string = ''): IJclStringList;
+    {$ENDIF JCL_PCRE}
     function GetStringsRef: TStrings;
     function ConfigAsSet: IJclStringList;
     function Delimit(const ADelimiter: string): IJclStringList;
@@ -678,6 +686,7 @@
     Destroy;
 end;
 
+{$IFDEF JCL_PCRE}
 function TJclStringList.DeleteRegEx(const APattern: string): IJclStringList;
 var
   I: Integer;
@@ -709,7 +718,7 @@
 function TJclStringList.MatchRegEx(const S, APattern: string): Boolean;
 begin
   if FRegEx = nil then
-    FRegEx := TJclAnsiRegEx.Create;
+    FRegEx := TJclRegEx.Create;
   if FLastRegExPattern <> APattern then
   begin
     if CaseSensitive then
@@ -721,15 +730,19 @@
   end;
   Result := FRegEx.Match(S);
 end;
+{$ENDIF JCL_PCRE}
 
 destructor TJclStringList.Destroy;
 begin
   if CanFreeObjects then
     FreeObjects(False);
+  {$IFDEF JCL_PCRE}
   FreeAndNil(FRegEx);
+  {$ENDIF JCL_PCRE}
   inherited Destroy;
 end;
 
+{$IFDEF JCL_PCRE}
 function TJclStringList.Directories(const APattern: string = '*';
   ARecursive: Boolean = False; const ARegExPattern: string = ''): IJclStringList;
 
@@ -815,6 +828,7 @@
     Result := EndUpdate;
   end;
 end;
+{$ENDIF JCL_PCRE}
 
 function TJclStringList.LastIndex: Integer;
 begin

Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas	2012-08-30 13:49:38 UTC (rev 3854)
+++ trunk/jcl/source/common/pcre.pas	2012-09-02 22:25:26 UTC (rev 3855)
@@ -353,6 +353,7 @@
   {$EXTERNALSYM PCRE_EXTRA_EXECUTABLE_JIT}
 
 type
+  {$IFDEF PCRE_8}
   real_pcre = packed record
     {magic_number: Longword;
     size: Integer;
@@ -366,6 +367,7 @@
   end;
   TPCRE = real_pcre;
   PPCRE = ^TPCRE;
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
   real_pcre16 = packed record
@@ -374,10 +376,12 @@
   PPCRE16 = ^TPCRE16;
   {$ENDIF PCRE_16}
 
+  {$IFDEF PCRE_8}
   real_pcre_jit_stack = packed record
   end;
   TPCREJITStack = real_pcre_jit_stack;
   PPCREJITStack = ^TPCREJITStack;
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
   real_pcre16_jit_stack = packed record
@@ -386,6 +390,7 @@
   PPCRE16JITStack = ^TPCRE16JITStack;
   {$ENDIF PCRE_16}
 
+  {$IFDEF PCRE_8}
   real_pcre_extra = packed record
     flags: Cardinal;        (* Bits for which fields are set *)
     study_data: Pointer;    (* Opaque data from pcre_study() *)
@@ -398,6 +403,7 @@
   end;
   TPCREExtra = real_pcre_extra;
   PPCREExtra = ^TPCREExtra;
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
   real_pcre16_extra = packed record
@@ -414,6 +420,7 @@
   PPCRE16Extra = ^TPCRE16Extra;
   {$ENDIF PCRE_16}
 
+  {$IFDEF PCRE_8}
   pcre_callout_block = packed record
     version: Integer;           (* Identifies version of block *)
   (* ------------------------ Version 0 ------------------------------- *)
@@ -433,6 +440,7 @@
     Mark: PCardinal;            (* Pointer to current mark or NULL *)
   (* ------------------------------------------------------------------ *)
   end;
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
   pcre16_callout_block = packed record
@@ -456,6 +464,7 @@
   end;
   {$ENDIF PCRE_16}
 
+  {$IFDEF PCRE_8}
   pcre_malloc_callback = function(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_malloc_callback}
   pcre_free_callback = procedure(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
@@ -468,15 +477,16 @@
   {$EXTERNALSYM pcre_callout_callback}
   pcre_jit_callback = function (P: Pointer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_callback}
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
-  pcre16_malloc_callback = pcre_malloc_callback;
+  pcre16_malloc_callback = function(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_malloc_callback}
-  pcre16_free_callback = pcre_free_callback;
+  pcre16_free_callback = procedure(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_callback}
-  pcre16_stack_malloc_callback = pcre_stack_malloc_callback;
+  pcre16_stack_malloc_callback = function(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_stack_malloc_callback}
-  pcre16_stack_free_callback = pcre_stack_free_callback;
+  pcre16_stack_free_callback = procedure(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_stack_free_callback}
   pcre16_callout_callback = function(var callout_block: pcre16_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_callout_callback}
@@ -485,6 +495,7 @@
   {$ENDIF PCRE_16}
 
 var
+  {$IFDEF PCRE_8}
   // renamed from "pcre_X" to "pcre_X_func" to allow functions with name "pcre_X" to be
   // declared in implementation when static linked
   pcre_malloc_func: ^pcre_malloc_callback = nil;
@@ -497,6 +508,7 @@
   {$EXTERNALSYM pcre_stack_free_func}
   pcre_callout_func: ^pcre_callout_callback = nil;
   {$EXTERNALSYM pcre_callout_func}
+  {$ENDIF PCRE_8}
 
   {$IFDEF PCRE_16}
   pcre16_malloc_func: ^pcre16_malloc_callback = nil;
@@ -511,6 +523,8 @@
   {$EXTERNALSYM pcre16_callout_func}
   {$ENDIF PCRE_16}
 
+{$IFDEF PCRE_8}
+
 procedure SetPCREMallocCallback(const Value: pcre_malloc_callback);
 {$EXTERNALSYM SetPCREMallocCallback}
 function GetPCREMallocCallback: pcre_malloc_callback;
@@ -546,6 +560,8 @@
 function CallPCRECallout(var callout_block: pcre_callout_block): Integer;
 {$EXTERNALSYM CallPCRECallout}
 
+{$ENDIF PCRE_8}
+
 {$IFDEF PCRE_16}
 
 procedure SetPCRE16MallocCallback(const Value: pcre16_malloc_callback);
@@ -598,21 +614,25 @@
 
 {$IFNDEF PCRE_LINKONREQUEST}
 // static link and static dll import
+{$IFDEF PCRE_8}
 function pcre_compile(const pattern: PAnsiChar; options: Integer;
   const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_compile}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_compile(const pattern: PWideChar; options: Integer;
   const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE16;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_compile}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_compile2(const pattern: PAnsiChar; options: Integer;
   const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
   const tables: PAnsiChar): PPCRE;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_compile2}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_compile2(const pattern: PWideChar; options: Integer;
   const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
@@ -620,19 +640,23 @@
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_compile2}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_config(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_config}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_config(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_config}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_copy_named_substring(const code: PPCRE; const subject: PAnsiChar;
   ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
   buffer: PAnsiChar; size: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_copy_named_substring}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_copy_named_substring(const code: PPCRE16; const subject: PWideChar;
   ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
@@ -640,22 +664,26 @@
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_copy_named_substring}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_copy_substring(const subject: PAnsiChar; ovector: PInteger;
   stringcount, stringnumber: Integer; buffer: PAnsiChar; buffersize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_copy_substring}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_copy_substring(const subject: PWideChar; ovector: PInteger;
   stringcount, stringnumber: Integer; buffer: PWideChar; buffersize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_copy_substring}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_dfa_exec(const argument_re: PPCRE; const extra_data: PPCREExtra;
   const subject: PAnsiChar; length: Integer; start_offset: Integer;
   options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
   wscount: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_dfa_exec}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_dfa_exec(const argument_re: PPCRE16; const extra_data: PPCRE16Extra;
   const subject: PWideChar; length: Integer; start_offset: Integer;
@@ -664,47 +692,57 @@
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_dfa_exec}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_exec(const code: PPCRE; const extra: PPCREExtra; const subject: PAnsiChar;
   length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_exec}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_exec(const code: PPCRE16; const extra: PPCRE16Extra; const subject: PWideChar;
   length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_exec}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 procedure pcre_free_substring(stringptr: PAnsiChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_substring}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 procedure pcre16_free_substring(stringptr: PWideChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_free_substring}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 procedure pcre_free_substring_list(stringlistptr: PPAnsiChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_substring_list}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 procedure pcre16_free_substring_list(stringlistptr: PPWideChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_free_substring_list}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_fullinfo(const code: PPCRE; const extra: PPCREExtra;
   what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_fullinfo}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_fullinfo(const code: PPCRE16; const extra: PPCRE16Extra;
   what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_fullinfo}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_get_named_substring(const code: PPCRE; const subject: PAnsiChar;
   ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
   const stringptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_named_substring}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_get_named_substring(const code: PPCRE16; const subject: PWideChar;
   ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
@@ -712,96 +750,120 @@
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_named_substring}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_get_stringnumber(const code: PPCRE; const stringname: PAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_stringnumber}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_get_stringnumber(const code: PPCRE16; const stringname: PWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_stringnumber}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_get_stringtable_entries(const code: PPCRE; const stringname: PAnsiChar;
   firstptr: PPAnsiChar; lastptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_stringtable_entries}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_get_stringtable_entries(const code: PPCRE16; const stringname: PWideChar;
   firstptr: PPWideChar; lastptr: PPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_stringtable_entries}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_get_substring(const subject: PAnsiChar; ovector: PInteger;
   stringcount, stringnumber: Integer; const stringptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_substring}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_get_substring(const subject: PWideChar; ovector: PInteger;
   stringcount, stringnumber: Integer; const stringptr: PPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_substring}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_get_substring_list(const subject: PAnsiChar; ovector: PInteger;
   stringcount: Integer; listptr: PPPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_substring_list}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_get_substring_list(const subject: PWideChar; ovector: PInteger;
   stringcount: Integer; listptr: PPPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_substring_list}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_maketables: PAnsiChar;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_maketables}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_maketables: PAnsiChar;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_maketables}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_refcount(argument_re: PPCRE; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_refcount}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_refcount(argument_re: PPCRE16; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_refcount}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_study(const code: PPCRE; options: Integer; const errptr: PPAnsiChar): PPCREExtra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_study}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_study(const code: PPCRE16; options: Integer; const errptr: PPAnsiChar): PPCRE16Extra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_study}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 procedure pcre_free_study(const extra: PPCREExtra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_study}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 procedure pcre16_free_study(const extra: PPCRE16Extra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_free_study}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_version: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_version}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_version: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_version}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 function pcre_jit_stack_alloc(startsize, maxsize: Integer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_jit_stack_alloc}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 function pcre16_jit_stack_alloc(startsize, maxsize: Integer): PPCRE16JITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_jit_stack_alloc}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 procedure pcre_jit_stack_free(stack: PPCREJITStack); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_jit_stack_free}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 procedure pcre16_jit_stack_free(stack: PPCRE16JITStack); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_jit_stack_free}
 {$ENDIF PCRE_16}
+{$IFDEF PCRE_8}
 procedure pcre_assign_jit_stack(extra: PPCREExtra; callback: pcre_jit_callback; userdata: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_assign_jit_stack}
+{$ENDIF PCRE_8}
 {$IFDEF PCRE_16}
 procedure pcre16_assign_jit_stack(extra: PPCRE16Extra; callback: pcre16_jit_callback; userdata: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_assign_jit_stack}
@@ -811,59 +873,71 @@
 
 // dynamic dll import
 type
+  {$IFDEF PCRE_8}
   pcre_compile_func = function(const pattern: PAnsiChar; options: Integer;
     const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_compile_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_compile_func = function(const pattern: PWideChar; options: Integer;
     const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE16;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_compile_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_compile2_func = function(const pattern: PAnsiChar; options: Integer;
     const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
     const tables: PAnsiChar): PPCRE; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_compile2_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_compile2_func = function(const pattern: PWideChar; options: Integer;
     const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
     const tables: PAnsiChar): PPCRE16; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_compile2_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_config_func = function(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_config_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_config_func = function(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_config_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_copy_named_substring_func = function(const code: PPCRE; const subject: PAnsiChar;
     ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
     buffer: PAnsiChar; size: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_copy_named_substring_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_copy_named_substring_func = function(const code: PPCRE16; const subject: PWideChar;
     ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
     buffer: PWideChar; size: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_copy_named_substring_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_copy_substring_func = function(const subject: PAnsiChar; ovector: PInteger;
     stringcount, stringnumber: Integer; buffer: PAnsiChar; buffersize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_copy_substring_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_copy_substring_func = function(const subject: PWideChar; ovector: PInteger;
     stringcount, stringnumber: Integer; buffer: PWideChar; buffersize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_copy_substring_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_dfa_exec_func = function(const argument_re: PPCRE; const extra_data: PPCREExtra;
     const subject: PAnsiChar; length: Integer; start_offset: Integer;
     options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
     wscount: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_dfa_exec_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_dfa_exec_func = function(const argument_re: PPCRE16; const extra_data: PPCRE16Extra;
     const subject: PWideChar; length: Integer; start_offset: Integer;
@@ -871,145 +945,179 @@
     wscount: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_dfa_exec_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_exec_func = function(const code: PPCRE; const extra: PPCREExtra; const subject: PAnsiChar;
     length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_exec_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_exec_func = function(const code: PPCRE16; const extra: PPCRE16Extra; const subject: PWideChar;
     length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_exec_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_free_substring_func = procedure(stringptr: PAnsiChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_free_substring_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_free_substring_func = procedure(stringptr: PWideChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_substring_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_free_substring_list_func = procedure(stringptr: PPAnsiChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_free_substring_list_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_free_substring_list_func = procedure(stringptr: PPWideChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_substring_list_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_fullinfo_func = function(const code: PPCRE; const extra: PPCREExtra;
     what: Integer; where: Pointer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_fullinfo_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_fullinfo_func = function(const code: PPCRE16; const extra: PPCRE16Extra;
     what: Integer; where: Pointer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_fullinfo_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_named_substring_func = function(const code: PPCRE; const subject: PAnsiChar;
     ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
     const stringptr: PPAnsiChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_named_substring_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_named_substring_func = function(const code: PPCRE16; const subject: PWideChar;
     ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
     const stringptr: PPWideChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_named_substring_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_stringnumber_func = function(const code: PPCRE;
     const stringname: PAnsiChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_stringnumber_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_stringnumber_func = function(const code: PPCRE16;
     const stringname: PWideChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_stringnumber_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_stringtable_entries_func = function(const code: PPCRE; const stringname: PAnsiChar;
     firstptr: PPAnsiChar; lastptr: PPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_stringtable_entries_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_stringtable_entries_func = function(const code: PPCRE16; const stringname: PWideChar;
     firstptr: PPWideChar; lastptr: PPWideChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_stringtable_entries_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_substring_func = function(const subject: PAnsiChar; ovector: PInteger;
     stringcount, stringnumber: Integer; const stringptr: PPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_substring_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_substring_func = function(const subject: PWideChar; ovector: PInteger;
     stringcount, stringnumber: Integer; const stringptr: PPWideChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_substring_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_substring_list_func = function(const subject: PAnsiChar; ovector: PInteger;
     stringcount: Integer; listptr: PPPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_substring_list_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_substring_list_func = function(const subject: PWideChar; ovector: PInteger;
     stringcount: Integer; listptr: PPPWideChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_substring_list_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_maketables_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_maketables_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_maketables_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_maketables_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_refcount_func = function(argument_re: PPCRE; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_refcount_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_refcount_func = function(argument_re: PPCRE16; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_refcount_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_study_func = function(const code: PPCRE; options: Integer; const errptr: PPAnsiChar): PPCREExtra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_study_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_study_func = function(const code: PPCRE16; options: Integer; const errptr: PPAnsiChar): PPCRE16Extra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_study_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_free_study_func = procedure (const extra: PPCREExtra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_free_study_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_free_study_func = procedure (const extra: PPCRE16Extra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_study_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_version_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_version_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_version_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_version_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_jit_stack_alloc_func = function (startsize, maxsize: Integer): PPCREJITStack;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_stack_alloc_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_jit_stack_alloc_func = function (startsize, maxsize: Integer): PPCRE16JITStack;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_jit_stack_alloc_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_jit_stack_free_func = procedure (stack: PPCREJITStack);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_stack_free_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_jit_stack_free_func = procedure (stack: PPCRE16JITStack);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_jit_stack_free_func}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_assign_jit_stack_func = procedure (extra: PPCREExtra; callback: pcre_jit_callback; userdata: Pointer);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_assign_jit_stack_func}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_assign_jit_stack_func = procedure (extra: PPCRE16Extra; callback: pcre16_jit_callback; userdata: Pointer);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
@@ -1017,140 +1125,186 @@
   {$ENDIF PCRE_16}
 
 var
+  {$IFDEF PCRE_8}
   pcre_compile: pcre_compile_func = nil;
   {$EXTERNALSYM pcre_compile}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_compile: pcre16_compile_func = nil;
   {$EXTERNALSYM pcre16_compile}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_compile2: pcre_compile2_func = nil;
   {$EXTERNALSYM pcre_compile2}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_compile2: pcre16_compile2_func = nil;
   {$EXTERNALSYM pcre16_compile2}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_config: pcre_config_func = nil;
   {$EXTERNALSYM pcre_config}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_config: pcre16_config_func = nil;
   {$EXTERNALSYM pcre16_config}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_copy_named_substring: pcre_copy_named_substring_func = nil;
   {$EXTERNALSYM pcre_copy_named_substring}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_copy_named_substring: pcre16_copy_named_substring_func = nil;
   {$EXTERNALSYM pcre16_copy_named_substring}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_copy_substring: pcre_copy_substring_func = nil;
   {$EXTERNALSYM pcre_copy_substring}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_copy_substring: pcre16_copy_substring_func = nil;
   {$EXTERNALSYM pcre16_copy_substring}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_dfa_exec: pcre_dfa_exec_func = nil;
   {$EXTERNALSYM pcre_dfa_exec}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_dfa_exec: pcre16_dfa_exec_func = nil;
   {$EXTERNALSYM pcre16_dfa_exec}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_exec: pcre_exec_func = nil;
   {$EXTERNALSYM pcre_exec}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_exec: pcre16_exec_func = nil;
   {$EXTERNALSYM pcre16_exec}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_free_substring: pcre_free_substring_func = nil;
   {$EXTERNALSYM pcre_free_substring}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_free_substring: pcre16_free_substring_func = nil;
   {$EXTERNALSYM pcre16_free_substring}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_free_substring_list: pcre_free_substring_list_func = nil;
   {$EXTERNALSYM pcre_free_substring_list}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_free_substring_list: pcre16_free_substring_list_func = nil;
   {$EXTERNALSYM pcre16_free_substring_list}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_fullinfo: pcre_fullinfo_func = nil;
   {$EXTERNALSYM pcre_fullinfo}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_fullinfo: pcre16_fullinfo_func = nil;
   {$EXTERNALSYM pcre16_fullinfo}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_named_substring: pcre_get_named_substring_func = nil;
   {$EXTERNALSYM pcre_get_named_substring}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_named_substring: pcre16_get_named_substring_func = nil;
   {$EXTERNALSYM pcre16_get_named_substring}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_stringnumber: pcre_get_stringnumber_func = nil;
   {$EXTERNALSYM pcre_get_stringnumber}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_stringnumber: pcre16_get_stringnumber_func = nil;
   {$EXTERNALSYM pcre16_get_stringnumber}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_stringtable_entries: pcre_get_stringtable_entries_func = nil;
   {$EXTERNALSYM pcre_get_stringtable_entries}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_stringtable_entries: pcre16_get_stringtable_entries_func = nil;
   {$EXTERNALSYM pcre16_get_stringtable_entries}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_substring: pcre_get_substring_func = nil;
   {$EXTERNALSYM pcre_get_substring}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_substring: pcre16_get_substring_func = nil;
   {$EXTERNALSYM pcre16_get_substring}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_get_substring_list: pcre_get_substring_list_func = nil;
   {$EXTERNALSYM pcre_get_substring_list}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_get_substring_list: pcre16_get_substring_list_func = nil;
   {$EXTERNALSYM pcre16_get_substring_list}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_maketables: pcre_maketables_func = nil;
   {$EXTERNALSYM pcre_maketables}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_maketables: pcre16_maketables_func = nil;
   {$EXTERNALSYM pcre16_maketables}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_refcount: pcre_refcount_func = nil;
   {$EXTERNALSYM pcre_refcount}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_refcount: pcre16_refcount_func = nil;
   {$EXTERNALSYM pcre16_refcount}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_study: pcre_study_func = nil;
   {$EXTERNALSYM pcre_study}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_study: pcre16_study_func = nil;
   {$EXTERNALSYM pcre16_study}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_free_study: pcre_free_study_func = nil;
   {$EXTERNALSYM pcre_free_study}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_free_study: pcre16_free_study_func = nil;
   {$EXTERNALSYM pcre16_free_study}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_version: pcre_version_func = nil;
   {$EXTERNALSYM pcre_version}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_version: pcre16_version_func = nil;
   {$EXTERNALSYM pcre16_version}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_jit_stack_alloc: pcre_jit_stack_alloc_func = nil;
   {$EXTERNALSYM pcre_jit_stack_alloc}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_jit_stack_alloc: pcre16_jit_stack_alloc_func = nil;
   {$EXTERNALSYM pcre16_jit_stack_alloc}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_jit_stack_free: pcre_jit_stack_free_func = nil;
   {$EXTERNALSYM pcre_jit_stack_free}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_jit_stack_free: pcre16_jit_stack_free_func = nil;
   {$EXTERNALSYM pcre16_jit_stack_free}
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   pcre_assign_jit_stack: pcre_assign_jit_stack_func = nil;
   {$EXTERNALSYM pcre_assign_jit_stack}
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   pcre16_assign_jit_stack: pcre16_assign_jit_stack_func = nil;
   {$EXTERNALSYM pcre16_assign_jit_stack}
@@ -1168,115 +1322,171 @@
   {$IFDEF UNIX}
   PCREDefaultLibraryName = 'libpcre.so.0';
   {$ENDIF UNIX}
+  {$IFDEF PCRE_8}
   PCRECompileDefaultExportName = 'pcre_compile';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16CompileDefaultExportName = 'pcre16_compile';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCRECompile2DefaultExportName = 'pcre_compile2';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16Compile2DefaultExportName = 'pcre16_compile2';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREConfigDefaultExportName = 'pcre_config';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16ConfigDefaultExportName = 'pcre16_config';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCRECopyNamedSubstringDefaultExportName = 'pcre_copy_named_substring';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16CopyNamedSubstringDefaultExportName = 'pcre16_copy_named_substring';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCRECopySubStringDefaultExportName = 'pcre_copy_substring';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16CopySubStringDefaultExportName = 'pcre16_copy_substring';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREDfaExecDefaultExportName = 'pcre_dfa_exec';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16DfaExecDefaultExportName = 'pcre16_dfa_exec';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREExecDefaultExportName = 'pcre_exec';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16ExecDefaultExportName = 'pcre16_exec';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREFreeSubStringDefaultExportName = 'pcre_free_substring';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16FreeSubStringDefaultExportName = 'pcre16_free_substring';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREFreeSubStringListDefaultExportName = 'pcre_free_substring_list';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16FreeSubStringListDefaultExportName = 'pcre16_free_substring_list';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREFullInfoDefaultExportName = 'pcre_fullinfo';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16FullInfoDefaultExportName = 'pcre16_fullinfo';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREGetNamedSubstringDefaultExportName = 'pcre_get_named_substring';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16GetNamedSubstringDefaultExportName = 'pcre16_get_named_substring';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREGetStringNumberDefaultExportName = 'pcre_get_stringnumber';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16GetStringNumberDefaultExportName = 'pcre16_get_stringnumber';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREGetStringTableEntriesDefaultExportName = 'pcre_get_stringtable_entries';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16GetStringTableEntriesDefaultExportName = 'pcre16_get_stringtable_entries';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREGetSubStringDefaultExportName = 'pcre_get_substring';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16GetSubStringDefaultExportName = 'pcre16_get_substring';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREGetSubStringListDefaultExportName = 'pcre_get_substring_list';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16GetSubStringListDefaultExportName = 'pcre16_get_substring_list';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREMakeTablesDefaultExportName = 'pcre_maketables';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16MakeTablesDefaultExportName = 'pcre16_maketables';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCRERefCountDefaultExportName = 'pcre_refcount';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16RefCountDefaultExportName = 'pcre16_refcount';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREStudyDefaultExportName = 'pcre_study';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16StudyDefaultExportName = 'pcre16_study';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREFreeStudyDefaultExportName = 'pcre_free_study';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16FreeStudyDefaultExportName = 'pcre16_free_study';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREVersionDefaultExportName = 'pcre_version';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16VersionDefaultExportName = 'pcre16_version';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREJITStackAllocDefaultExportName = 'pcre_jit_stack_alloc';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16JITStackAllocDefaultExportName = 'pcre16_jit_stack_alloc';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREJITStackFreeDefaultExportName = 'pcre_jit_stack_free';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16JITStackFreeDefaultExportName = 'pcre16_jit_stack_free';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREAssignJITStackDefaultExportName = 'pcre_assign_jit_stack';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16AssignJITStackDefaultExportName = 'pcre16_assign_jit_stack';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREMallocDefaultExportName = 'pcre_malloc';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16MallocDefaultExportName = 'pcre16_malloc';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREFreeDefaultExportName = 'pcre_free';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16FreeDefaultExportName = 'pcre16_free';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREStackMallocDefaultExportName = 'pcre_stack_malloc';
+  {$ENDIF PCRE_8}
   {$IFDEF PCRE_16}
   PCRE16StackMallocDefaultExportName = 'pcre16_stack_malloc';
   {$ENDIF PCRE_16}
+  {$IFDEF PCRE_8}
   PCREStackFreeDefaultExportName = 'pcre_stack_free';
+  {$ENDIF PCRE_8}...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3854] trunk/jcl/source/windows/JclMsBuild.pas

From: <ou...@us...> - 2012-08-30 13:49:48

Revision: 3854
          http://jcl.svn.sourceforge.net/jcl/?rev=3854&view=rev
Author:   outchy
Date:     2012-08-30 13:49:38 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Mantis 5809: create property getters and setters.

Modified Paths:
--------------
    trunk/jcl/source/windows/JclMsBuild.pas

Modified: trunk/jcl/source/windows/JclMsBuild.pas
===================================================================
--- trunk/jcl/source/windows/JclMsBuild.pas	2012-08-29 11:58:46 UTC (rev 3853)
+++ trunk/jcl/source/windows/JclMsBuild.pas	2012-08-30 13:49:38 UTC (rev 3854)
@@ -296,6 +296,9 @@
     procedure ParseUsingTask(XmlElem: TJclSimpleXmlElem);
     function ParseWhen(XmlElem: TJclSimpleXmlElem; Skip: Boolean): Boolean;
     procedure ParseXml(AXml: TJclSimpleXML);
+  protected
+    function GetPropertyValue(const Name: string): string; virtual;
+    procedure SetPropertyValue(const Name, Value: string); virtual;
   public
     // evaluate known MsBuild properties
     // http://msdn.microsoft.com/en-us/library/ms171458.aspx
@@ -997,7 +1000,7 @@
           Break;
         end;
         if Prop then
-          PropertyValue := Properties.Values[PropertyName]
+          PropertyValue := GetPropertyValue(PropertyName)
         else
         begin
           Reg := Copy(PropertyName, 1, 9) = 'registry:';
@@ -1338,6 +1341,11 @@
   Result := FItemDefinitions.Count;
 end;
 
+function TJclMsBuildParser.GetPropertyValue(const Name: string): string;
+begin
+  Result := Properties.Values[Name];
+end;
+
 function TJclMsBuildParser.GetTarget(Index: Integer): TJclMsBuildTarget;
 begin
   Result := TJclMsBuildTarget(FTargets.Items[Index]);
@@ -2356,7 +2364,7 @@
 
   if Condition then
   begin
-    Properties.Values[XmlElem.Name] := EvaluateString(XmlElem.Value);
+    SetPropertyValue(XmlElem.Name, EvaluateString(XmlElem.Value));
     // store the XML element for further modifications in the current file
     if CurrentFileName = ProjectFileName then
     begin
@@ -2670,6 +2678,11 @@
   Xml.SaveToFile(ProjectFileName);
 end;
 
+procedure TJclMsBuildParser.SetPropertyValue(const Name, Value: string);
+begin
+  Properties.Values[Name] := Value;
+end;
+
 procedure TJclMsBuildParser.XMLDecodeValue(Sender: TObject; var Value: string);
 begin
   Value := XMLDecode(Value);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3853] trunk/jcl/source

From: <ou...@us...> - 2012-08-29 11:58:53

Revision: 3853
          http://jcl.svn.sourceforge.net/jcl/?rev=3853&view=rev
Author:   outchy
Date:     2012-08-29 11:58:46 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
for some reasons, support for UTF-8 and UTF-16 was broken in previous revisions (apparently since few months):
- the PCRE library has now stricter checks when flags are passed to compile or exec functions;
- the flag to enable UTF8/UTF16 support in the library has changed with no notice.

Modified Paths:
--------------
    trunk/jcl/source/common/JclPCRE.pas
    trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_chartables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_config.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_get.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_newline.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_ord2utf16.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_string_utils.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_study.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_tables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_valid_utf16.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_version.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_xclass.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
    trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_chartables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_config.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_get.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_newline.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_ord2utf16.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_string_utils.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_study.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_tables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_valid_utf16.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_version.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_xclass.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_chartables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj

Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas	2012-08-28 19:39:21 UTC (rev 3852)
+++ trunk/jcl/source/common/JclPCRE.pas	2012-08-29 11:58:46 UTC (rev 3853)
@@ -539,19 +539,19 @@
     PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
     PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, 0, 0, PCRE_UCP);
   cRunOptions: array [TJclRegExOption] of Integer =
-   (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
-    0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
-    PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
+   (0, 0, 0, 0, PCRE_ANCHORED, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+    0, PCRE_NOTEMPTY, 0, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL, 0, 0,
+    0, 0, PCRE_NEWLINE_CR, PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF,
     PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF, PCRE_BSR_UNICODE,
-    PCRE_JAVASCRIPT_COMPAT, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
-    PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
+    0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
+    PCRE_NOTEMPTY_ATSTART, 0);
   cDFARunOptions: array [TJclRegExOption] of Integer =
-   (0, 0, 0, 0, PCRE_ANCHORED, PCRE_DOLLAR_ENDONLY, 0, PCRE_NOTBOL, PCRE_NOTEOL,
-    0, PCRE_NOTEMPTY, PCRE_UTF8, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
-    PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, PCRE_FIRSTLINE, 0, PCRE_NEWLINE_CR,
+   (0, 0, 0, 0, PCRE_ANCHORED, 0, 0, PCRE_NOTBOL, PCRE_NOTEOL,
+    0, PCRE_NOTEMPTY, 0, 0, PCRE_NO_UTF8_CHECK, 0, PCRE_PARTIAL,
+    PCRE_DFA_SHORTEST, PCRE_DFA_RESTART, 0, 0, PCRE_NEWLINE_CR,
     PCRE_NEWLINE_LF, PCRE_NEWLINE_CRLF, PCRE_NEWLINE_ANY, PCRE_BSR_ANYCRLF,
     PCRE_BSR_UNICODE, 0, PCRE_NO_START_OPTIMIZE, PCRE_PARTIAL_HARD,
-    PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
+    PCRE_NOTEMPTY_ATSTART, 0);
 var
   I: TJclRegExOption;
 begin

Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-28 19:39:21 UTC (rev 3852)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-29 11:58:46 UTC (rev 3853)
@@ -80,7 +80,7 @@
 # ---------------------------------------------------------------------------
 DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
-USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP;SUPPORT_JIT
+USERDEFINES = SUPPORT_UTF;SUPPORT_UCP;SUPPORT_JIT;SUPPORT_PCRE8;SUPPORT_PCRE16
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
 LIBPATH = $(BCB)\lib\obj;$(BCB)\lib

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_chartables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_config.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_dfa_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_fullinfo.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_get.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_jit_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_maketables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_newline.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_ord2utf16.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_refcount.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_string_utils.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_study.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_ucd.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_valid_utf16.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_version.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre16_xclass.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-28 19:39:21 UTC (rev 3852)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-29 11:58:46 UTC (rev 3853)
@@ -49,7 +49,7 @@
 OBJFILES = $(OBJ32FILES) $(OBJ64FILES)
 
 # ---------------------------------------------------------------------------
-USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP;SUPPORT_JIT
+USERDEFINES = SUPPORT_UTF;SUPPORT_UCP;SUPPORT_JIT;SUPPORT_PCRE8;SUPPORT_PCRE16
 SYSDEFINES = NO_STRICT;_NO_VCL;_RTLDLL
 INCLUDEPATH = $(pcresrc);$(BCC)\include;$(BCB)\include\vcl
 LIBPATH = $(BCB)\lib\obj;$(BCB)\lib

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_chartables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_config.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_dfa_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_fullinfo.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_get.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_jit_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_maketables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_newline.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_ord2utf16.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_refcount.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_string_utils.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_study.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_ucd.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_valid_utf16.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_version.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre16_xclass.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_chartables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3852] trunk/jcl/install/JclInstall.pas

From: <ou...@us...> - 2012-08-28 19:39:28

Revision: 3852
          http://jcl.svn.sourceforge.net/jcl/?rev=3852&view=rev
Author:   outchy
Date:     2012-08-28 19:39:21 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
installer cleanup: make target detection more easy.

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-28 19:31:26 UTC (rev 3851)
+++ trunk/jcl/install/JclInstall.pas	2012-08-28 19:39:21 UTC (rev 3852)
@@ -178,6 +178,8 @@
     function GetEnabled: Boolean;
     function GetIsProfileEnabled(Index: Integer): Boolean;
     function GetProfilesTarget(Index: Integer): TJclBorRADToolInstallation;
+    function GetTargetSupportsCBuilder: Boolean;
+    function GetTargetSupportsDelphi: Boolean;
   protected
     constructor Create(JclDistribution: TJclDistribution;
       InstallTarget: TJclBorRADToolInstallation; ATargetPlatform: TJclBDSPlatform;
@@ -211,6 +213,8 @@
 
     property Distribution: TJclDistribution read FDistribution;
     property Target: TJclBorRADToolInstallation read FTarget;
+    property TargetSupportsDelphi: Boolean read GetTargetSupportsDelphi;
+    property TargetSupportsCBuilder: Boolean read GetTargetSupportsCBuilder;
     property TargetName: string read FTargetName;
     property IncludeFileName: string read FIncludeFileName;
     property GUIPage: IJediInstallPage read FGUIPage;
@@ -664,7 +668,7 @@
 
   // exclude C#Builder 1 and Delphi 8 targets
   FRunTimeInstallation := (Target.RadToolKind <> brBorlandDevStudio)
-    or ((Target.VersionNumber >= 3) and (bpDelphi32 in Target.Personalities));
+    or ((Target.VersionNumber >= 3) and TargetSupportsDelphi);
 
   if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber >= 9) then
   begin
@@ -791,6 +795,17 @@
 end;
 {$ENDIF LINUX}
 
+function TJclInstallation.GetTargetSupportsCBuilder: Boolean;
+begin
+  Result := (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32);
+end;
+
+function TJclInstallation.GetTargetSupportsDelphi: Boolean;
+begin
+  Result := ((bpDelphi32 in Target.Personalities) and (TargetPlatform = bpWin32)) or
+            ((bpDelphi64 in Target.Personalities) and (TargetPlatform = bpWin64));
+end;
+
 procedure TJclInstallation.MarkOptionBegin(Id: Integer);
 begin
   if Assigned(GUIPage) then
@@ -946,7 +961,7 @@
     AddOption(joJCLEnvBrowsingPath, [goChecked], Parent);
     if not Target.IsTurboExplorer then
       AddOption(joJCLEnvDebugDCUPath, [goChecked], Parent);
-    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and TargetSupportsCBuilder then
       AddOption(joJCLEnvIncludePath, [goChecked], Parent);
   end;
 
@@ -957,7 +972,7 @@
     AddOption(joJCLMakeRelease, [goStandAloneParent, goExpandable, goChecked], Parent);
     AddOption(joJCLMakeDebug, [goStandAloneParent, goExpandable, goChecked], Parent);
 
-    if (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) then
+    if TargetSupportsCBuilder then
     begin
       if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) then
         HppDirectory := LoadResString(@RsCaptionHppDirectory)
@@ -1017,7 +1032,7 @@
   var
     HppDirectory: string;
   begin
-    if (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) and RunTimeInstallation then
+    if RunTimeInstallation and TargetSupportsCBuilder then
     begin
       if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) then
         HppDirectory := LoadResString(@RsCaptionHppDirectory)
@@ -1282,7 +1297,7 @@
     else
       FGUIDCPPathIndex := GUIPage.AddDirectory(LoadResString(@RsCaptionDCPPath));
 
-    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and TargetSupportsCBuilder then
       FGUIHPPPathIndex := GUIPage.AddDirectory(LoadResString(@RsCaptionHPPPath))
     else
       FGUIHPPPathIndex := -1;
@@ -1511,8 +1526,7 @@
         begin
           WriteLog(Format(LoadResString(@RsLogAddLibrarySearchPath2), [FLibReleaseDir, Distribution.JclIncludeDir]));
           {$IFDEF MSWINDOWS}
-          if (ATarget.RadToolKind = brBorlandDevStudio) and (bpBCBuilder32 in ATarget.Personalities) and (TargetPlatform = bpWin32)
-            and OptionChecked[joJCLDualPackages] then
+          if (ATarget.RadToolKind = brBorlandDevStudio) and OptionChecked[joJCLDualPackages] and TargetSupportsCBuilder then
             with TJclBDSInstallation(ATarget) do
           begin
             Result := AddToCppSearchPath(FLibReleaseDir, FTargetPlatform) and AddToCppSearchPath(Distribution.JclIncludeDir, FTargetPlatform) and
@@ -1545,8 +1559,7 @@
         begin
           WriteLog(Format(LoadResString(@RsLogAddLibraryBrowsingPath), [Distribution.JclSourcePath]));
           {$IFDEF MSWINDOWS}
-          if (ATarget.RadToolKind = brBorlandDevStudio) and (bpBCBuilder32 in ATarget.Personalities) and (TargetPlatform = bpWin32)
-            and OptionChecked[joJCLDualPackages] then
+          if (ATarget.RadToolKind = brBorlandDevStudio) and TargetSupportsCBuilder and OptionChecked[joJCLDualPackages] then
             with TJclBDSInstallation(ATarget) do
           begin
             Result := AddToCppBrowsingPath(Distribution.JclSourcePath, FTargetPlatform);
@@ -2135,7 +2148,7 @@
     else
       WriteLog(LoadResString(@RsLogFailedDelLibrarySearchPath));
     {$IFDEF MSWINDOWS}
-    if (ATarget.RadToolKind = brBorlandDevStudio) and (bpBCBuilder32 in ATarget.Personalities) and (TargetPlatform = bpWin32) then
+    if (ATarget.RadToolKind = brBorlandDevStudio) and TargetSupportsCBuilder then
       with TJclBDSInstallation(ATarget) do
     begin
       if RemoveFromCppSearchPath(FLibReleaseDir, FTargetPlatform) and
@@ -2157,7 +2170,7 @@
     else
       WriteLog(LoadResString(@RsLogFailedDelLibraryBrowsingPath));
     {$IFDEF MSWINDOWS}
-    if (ATarget.RadToolKind = brBorlandDevStudio) and (bpBCBuilder32 in ATarget.Personalities) and (TargetPlatform = bpWin32) then
+    if (ATarget.RadToolKind = brBorlandDevStudio) and TargetSupportsCBuilder then
       with TJclBDSInstallation(ATarget) do
     begin
       if RemoveFromCppBrowsingPath(Distribution.JclSourcePath, FTargetPlatform) then
@@ -2183,7 +2196,7 @@
     end;
 
     //joJclEnvIncludePath
-    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and TargetSupportsCBuilder then
     begin
       if (GetHppPath <> ATarget.VclIncludeDir[TargetPlatform]) then
       begin
@@ -2215,7 +2228,7 @@
   begin
     RemoveFileMask(FLibReleaseDir, '.dcu');
     RemoveFileMask(FLibDebugDir, '.dcu');
-    if (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) then
+    if TargetSupportsCBuilder then
     begin
       RemoveFileMask(FLibReleaseDir, '.obj'); // compatibility
       RemoveFileMask(FLibDebugDir, '.obj'); // compatibility
@@ -2533,7 +2546,7 @@
 var
   AConfiguration: IJediConfiguration;
 begin
-  if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+  if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and TargetSupportsCBuilder then
   begin
     if Assigned(GUIPage) then
       Result := GUIPage.Directories[FGUIHPPPathIndex]
@@ -2753,7 +2766,7 @@
     else
       Compiler.AddPathOption('N', UnitOutputDir); // .dcu files
 
-    if (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) then
+    if TargetSupportsCBuilder then
     begin
       Compiler.Options.Add('-D_RTLDLL' + DirSeparator + 'NO_STRICT' + DirSeparator + 'USEPACKAGES'); // $(SYSDEFINES)
 
@@ -2821,14 +2834,14 @@
   if Assigned(GUIPage) then
     GUIPage.CompilationStart(ExtractFileName(Name));
 
-  if IsDelphiPackage(PackageFileName) and (bpDelphi32 in Target.Personalities) then
+  if IsDelphiPackage(PackageFileName) and TargetSupportsDelphi then
   begin
     if Target.RadToolKind = brBorlandDevStudio then
       (Target as TJclBDSInstallation).CleanPackageCache(BinaryFileName(GetBplPath, PackageFileName));
     Result := Target.CompilePackage(PackageFileName, GetBplPath, GetDcpPath);
   end
   else
-  if IsBCBPackage(PackageFileName) and (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) then
+  if IsBCBPackage(PackageFileName) and TargetSupportsCBuilder then
   begin
     ConfigureBpr2Mak(PackageFileName);
     if Target.RadToolKind = brBorlandDevStudio then
@@ -2959,10 +2972,10 @@
   if Assigned(GUIPage) then
     GUIPage.CompilationStart(ExtractFileName(Name));
 
-  if IsDelphiProject(ProjectFileName) and (bpDelphi32 in Target.Personalities) then
+  if IsDelphiProject(ProjectFileName) and TargetSupportsDelphi then
     Result := Target.CompileProject(ProjectFileName, GetBplPath, GetDcpPath)
   else
-  if IsBCBProject(ProjectFileName) and (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) then
+  if IsBCBProject(ProjectFileName) and TargetSupportsCBuilder then
   begin
     ConfigureBpr2Mak(ProjectFileName);
     // the compilation is done in 2 steps:
@@ -3247,7 +3260,7 @@
       else
         Result := False;
     end;
-    Result := Result and (Target.Personalities * [bpDelphi32, bpBCBuilder32, bpDelphiNet32, bpDelphiNet64] <> []);
+    Result := Result and (Target.Personalities * [bpDelphi32, bpBCBuilder32, bpDelphi64] <> []);
   end;
 var
   Inst: TJclInstallation;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3851] trunk/jcl

From: <ou...@us...> - 2012-08-28 19:31:35

Revision: 3851
          http://jcl.svn.sourceforge.net/jcl/?rev=3851&view=rev
Author:   outchy
Date:     2012-08-28 19:31:26 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
PCRE16 ballooned the JCL package a little bit too much, introducing a new installer option to disable this feature.

Modified Paths:
--------------
    trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
    trunk/jcl/examples/common/pcre/PCREDemoMain.pas
    trunk/jcl/install/JclInstall.pas
    trunk/jcl/install/JclInstallResources.pas
    trunk/jcl/source/common/JclPCRE.pas
    trunk/jcl/source/common/pcre.pas
    trunk/jcl/source/include/jcl.inc
    trunk/jcl/source/include/jcl.template.inc

Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.dfm
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.dfm	2012-08-28 14:44:17 UTC (rev 3850)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.dfm	2012-08-28 19:31:26 UTC (rev 3851)
@@ -2,7 +2,7 @@
   Left = 300
   Top = 115
   Caption = 'JclPCRE Demo'
-  ClientHeight = 473
+  ClientHeight = 517
   ClientWidth = 462
   Color = clBtnFace
   Constraints.MinHeight = 361
@@ -56,7 +56,7 @@
     Left = 12
     Top = 54
     Width = 437
-    Height = 205
+    Height = 203
     Anchors = [akLeft, akTop, akRight, akBottom]
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -73,27 +73,26 @@
   end
   object btnOpen: TButton
     Left = 370
-    Top = 274
+    Top = 318
     Width = 75
     Height = 25
     Action = acOpen
-    Anchors = [akRight, akBottom]
+    Anchors = [akLeft, akBottom]
     TabOrder = 4
   end
   object sbMain: TStatusBar
     Left = 0
-    Top = 454
+    Top = 498
     Width = 462
     Height = 19
     Panels = <
       item
         Width = 50
       end>
-    ExplicitTop = 323
   end
   object GroupBoxMatchOptions: TGroupBox
     Left = 8
-    Top = 321
+    Top = 365
     Width = 359
     Height = 127
     Anchors = [akLeft, akBottom]
@@ -195,20 +194,13 @@
       State = cbChecked
       TabOrder = 10
     end
-    object chkUTF8: TCheckBox
-      Left = 256
-      Top = 98
-      Width = 97
-      Height = 17
-      Caption = 'UTF&8'
-      TabOrder = 11
-    end
   end
   object GroupBoxCompileOptions: TGroupBox
     Left = 8
-    Top = 265
+    Top = 309
     Width = 356
     Height = 50
+    Anchors = [akLeft, akBottom]
     Caption = 'Compile options:'
     TabOrder = 7
     object chkStudy: TCheckBox
@@ -236,6 +228,21 @@
       TabOrder = 2
     end
   end
+  object RadioGroupSystemOptions: TRadioGroup
+    Left = 8
+    Top = 264
+    Width = 353
+    Height = 39
+    Caption = 'System options:'
+    Columns = 4
+    ItemIndex = 0
+    Items.Strings = (
+      'ANSI'
+      'UTF-8'
+      'UCS-2'
+      'UTF-16')
+    TabOrder = 8
+  end
   object alMain: TActionList
     Left = 144
     Top = 102

Modified: trunk/jcl/examples/common/pcre/PCREDemoMain.pas
===================================================================
--- trunk/jcl/examples/common/pcre/PCREDemoMain.pas	2012-08-28 14:44:17 UTC (rev 3850)
+++ trunk/jcl/examples/common/pcre/PCREDemoMain.pas	2012-08-28 19:31:26 UTC (rev 3851)
@@ -1,11 +1,13 @@
 unit PCREDemoMain;
 
+{$I ..\..\..\source\include\jcl.inc}
+
 interface
 
 uses
   Windows, Messages,
   SysUtils, Classes, Forms, Dialogs, ActnList, ComCtrls, StdCtrls, Controls,
-  JclPCRE;
+  JclPCRE, System.Actions, Vcl.ExtCtrls;
 
 type
   TfrmMain = class(TForm)
@@ -33,11 +35,11 @@
     chkNotEOL: TCheckBox;
     chkUnGreedy: TCheckBox;
     chkNotEmpty: TCheckBox;
-    chkUTF8: TCheckBox;
     GroupBoxCompileOptions: TGroupBox;
     chkStudy: TCheckBox;
     chkUserLocale: TCheckBox;
     chkJITCompile: TCheckBox;
+    RadioGroupSystemOptions: TRadioGroup;
     procedure acOpenExecute(Sender: TObject);
     procedure acFindExecute(Sender: TObject);
     procedure acFindNextExecute(Sender: TObject);
@@ -47,11 +49,11 @@
 
   private
     { Private declarations }
-    RE: TJclAnsiRegEx;
+    RE: TJclRegExBase;
     FMatchIndex: integer;
-    procedure SelectText(const Range: TJclAnsiCaptureRange);
+    procedure SelectText(const Range: TJclCaptureRange);
     procedure Match;
-    function GetUIOptions: TJclAnsiRegExOptions;
+    function GetUIOptions: TJclRegExOptions;
     procedure UpdateUIOptions;
     procedure LoadFromFile(const Filename:string);
   protected
@@ -78,7 +80,12 @@
 procedure TfrmMain.acFindExecute(Sender: TObject);
 begin
   FreeAndNil(RE);
-  RE := TJclAnsiRegEx.Create;
+  {$IFDEF PCRE_16}
+  if RadioGroupSystemOptions.ItemIndex in [2,3] then
+    RE := TJclWideRegEx.Create
+  else
+  {$ENDIF PCRE_16}
+    RE := TJclAnsiRegEx.Create;
   RE.Options := GetUIOptions;
   RE.Compile(edRegExpr.Text, chkStudy.Checked, chkUserLocale.Checked, chkJITCompile.Checked);
   FMatchIndex := 1;
@@ -93,7 +100,7 @@
     Match;
 end;
 
-procedure TfrmMain.SelectText(const Range: TJclAnsiCaptureRange);
+procedure TfrmMain.SelectText(const Range: TJclCaptureRange);
 begin
   reFile.SelStart := Range.FirstPos - 1;
   reFile.SelLength := Range.LastPos - Range.FirstPos + 1;
@@ -115,7 +122,7 @@
   UpdateUIOptions;
 end;
 
-function TfrmMain.GetUIOptions: TJclAnsiRegExOptions;
+function TfrmMain.GetUIOptions: TJclRegExOptions;
 begin
   Result := [];
   if chkIgnoreCase.Checked then
@@ -140,13 +147,15 @@
     Include(Result, roUnGreedy);
   if chkNotEmpty.Checked then
     Include(Result, roNotEmpty);
-  if chkUTF8.Checked then
+  if RadioGroupSystemOptions.ItemIndex = 1 then
     Include(Result, roUTF8);
+  if RadioGroupSystemOptions.ItemIndex = 3 then
+    Include(Result, roUTF16);
 end;
 
 procedure TfrmMain.UpdateUIOptions;
 var
-  Options: TJclAnsiRegExOptions;
+  Options: TJclRegExOptions;
 begin
   if RE = nil then Exit;
   Options := RE.Options;
@@ -161,7 +170,10 @@
   chkNotEOL.Checked := roNotEOL in Options;
   chkUngreedy.Checked := roUnGreedy in Options;
   chkNotEmpty.Checked := roNotEmpty in Options;
-  chkUTF8.Checked := roUTF8 in Options;
+  if (roUTF8 in Options) and (RadioGroupSystemOptions.ItemIndex = 0) then
+    RadioGroupSystemOptions.ItemIndex := 1;
+  if (roUTF16 in Options) and (RadioGroupSystemOptions.ItemIndex = 2) then
+    RadioGroupSystemOptions.ItemIndex := 3;
 end;
 
 procedure TfrmMain.edRegExprChange(Sender: TObject);
@@ -177,6 +189,10 @@
 procedure TfrmMain.FormCreate(Sender: TObject);
 begin
   DragAcceptFiles(Handle, True);
+  {$IFNDEF PCRE_16}
+  RadioGroupSystemOptions.Items.Delete(3);
+  RadioGroupSystemOptions.Items.Delete(2);
+  {$ENDIF ~PCRE_16}
 end;
 
 procedure TfrmMain.WMDropFiles(var Message: TWMDropFiles);

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-28 14:44:17 UTC (rev 3850)
+++ trunk/jcl/install/JclInstall.pas	2012-08-28 19:31:26 UTC (rev 3851)
@@ -69,6 +69,7 @@
         joJCLDefPCRELinkDLL,
         joJCLDefPCRELinkOnRequest,
         joJCLDefPCRERTL,
+        joJCLDefPCRE16,
         joJCLDefBZip2StaticLink,
         joJCLDefBZip2LinkDLL,
         joJCLDefBZip2LinkOnRequest,
@@ -133,8 +134,8 @@
       'MATH_SINGLE_PRECISION', 'MATH_DOUBLE_PRECISION', 'MATH_EXTENDED_PRECISION',
       'MATH_EXT_EXTREMEVALUES',  'HOOK_DLL_EXCEPTIONS',
       'DEBUG_NO_BINARY', 'DEBUG_NO_TD32', 'DEBUG_NO_MAP', 'DEBUG_NO_EXPORTS',
-      'DEBUG_NO_SYMBOLS', 'PCRE_STATICLINK',
-      'PCRE_LINKDLL', 'PCRE_LINKONREQUEST', 'PCRE_RTL', 'BZIP2_STATICLINK',
+      'DEBUG_NO_SYMBOLS', 'PCRE_STATICLINK', 'PCRE_LINKDLL',
+      'PCRE_LINKONREQUEST', 'PCRE_RTL', 'PCRE_16', 'BZIP2_STATICLINK',
       'BZIP2_LINKDLL', 'BZIP2_LINKONREQUEST', 'ZLIB_STATICLINK',
       'ZLIB_LINKDLL', 'ZLIB_LINKONREQUEST', 'ZLIB_RTL', 'UNICODE_RTL_DATABASE',
       'UNICODE_SILENT_FAILURE', 'UNICODE_RAW_DATA', 'UNICODE_ZLIB_DATA',
@@ -409,6 +410,7 @@
       (Id: -1; Caption: @RsCaptionDefPCRELinkDLL;          Hint: @RsHintDefPCRELinkDLL), // joDefPCRELinkDLL
       (Id: -1; Caption: @RsCaptionDefPCRELinkOnRequest;    Hint: @RsHintDefPCRELinkOnRequest), // joDefPCRELinkOnRequest
       (Id: -1; Caption: @RsCaptionDefPCRERTL;              Hint: @RsHintDefPCRERTL), // joDefPCRERTL
+      (Id: -1; Caption: @RsCaptionDefPCRE16;               Hint: @RsHintDefPCRE16), // joDefPCRE16
       (Id: -1; Caption: @RsCaptionDefBZip2StaticLink;      Hint: @RsHintDefBZip2StaticLink), // joDefBZip2StaticLink
       (Id: -1; Caption: @RsCaptionDefBZip2LinkDLL;         Hint: @RsHintDefBZip2LinkDLL), // joDefBZip2LinkDLL
       (Id: -1; Caption: @RsCaptionDefBZip2LinkOnRequest;   Hint: @RsHintDefBZip2LinkOnRequest), // joDefBZip2LinkOnRequest
@@ -906,6 +908,7 @@
     if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber >= 8) then
       // Delphi XE and newer have a licensed version of JCL's pcre.pas named RegularExpressionsAPI
       AddOption(joJCLDefPCRERTL, [goRadioButton], joJCLDefPCRE);
+    AddOption(joJCLDefPCRE16, [goChecked], joJCLDefPCRE);
     // BZip2 options
     AddOption(joJCLDefBZip2, [goChecked], Parent);
     AddOption(joJCLDefBZip2StaticLink, [goRadioButton, goChecked], joJCLDefBZip2);

Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas	2012-08-28 14:44:17 UTC (rev 3850)
+++ trunk/jcl/install/JclInstallResources.pas	2012-08-28 19:31:26 UTC (rev 3851)
@@ -79,6 +79,7 @@
   RsCaptionDefPCRELinkDLL       = 'Static bind to pcre.dll';
   RsCaptionDefPCRELinkOnRequest = 'Late bind to pcre.dll';
   RsCaptionDefPCRERTL           = 'Use RTL''s RegularExpressionAPI';
+  RsCaptionDefPCRE16            = 'Enable 16-bit PCRE';
   // BZip2 options
   RsCaptionDefBZip2              = 'BZip2 options';
   RsCaptionDefBZip2StaticLink    = 'Static link to BZip2 code';
@@ -195,6 +196,7 @@
   RsHintDefPCRELinkDLL       = 'JCL binaries require pcre.dll to be present';
   RsHintDefPCRELinkOnRequest = 'JCL binaries require pcre.dll when calling PCRE functions';
   RsHintDefPCRERTL           = 'JCL relies on RTL''s RegularExpressionsAPI functions and declarations';
+  RsHintDefPCRE16            = 'Unicode-enabled (UCS-2 and UTF-16) was introduced as of PCRE 8.30';
   // BZip2 options
   RsHintDefBZip2              = 'BZip2 specific options (bzip2.pas)';
   RsHintDefBZip2StaticLink    = 'Code from BZip2 is linked into JCL binaries';

Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas	2012-08-28 14:44:17 UTC (rev 3850)
+++ trunk/jcl/source/common/JclPCRE.pas	2012-08-28 19:31:26 UTC (rev 3851)
@@ -201,7 +201,7 @@
   TJclAnsiCaptureRange = TJclCaptureRange;
   TJclAnsiRegExCallout = TJclRegExCallout;
 
-  {$IFNDEF PCRE_RTL}
+  {$IFDEF PCRE_16}
   TJclWideRegEx = class(TJclRegExBase)
   private
     FCode: PPCRE16;
@@ -229,15 +229,15 @@
   TJclWideRegExOptions = TJclRegExOptions;
   TJclWideCaptureRange = TJclCaptureRange;
   TJclWideRegExCallout = TJclRegExCallout;
-  {$ENDIF ~PCRE_RTL}
+  {$ENDIF PCRE_16}
 
 procedure InitializeLocaleSupport;
 procedure TerminateLocaleSupport;
 
-{$IFNDEF PCRE_RTL}
+{$IFDEF PCRE_16}
 procedure InitializeLocaleSupport16;
 procedure TerminateLocaleSupport16;
-{$ENDIF ~PCRE_RTL}
+{$ENDIF PCRE_16}
 
 // Args is an array of pairs (CaptureIndex, Value) or (CaptureName, Value).
 // For example: NewIp := StrReplaceRegEx(DirIP, '(\d+)\.(\d+)\.(\d+)\.(\d+)', [3, '128', 4, '254']);
@@ -359,9 +359,9 @@
 
 var
   GTables: PAnsiChar;
-  {$IFNDEF PCRE_RTL}
+  {$IFDEF PCRE_16}
   GTables16: PAnsiChar;
-  {$ENDIF ~PCRE_RTL}
+  {$ENDIF PCRE_16}
 
 {$IFDEF RTL230_UP}
   {$IFDEF PCRE_RTL}
@@ -401,12 +401,12 @@
    Result := TJclAnsiRegEx(callout_block.callout_data).CalloutHandler(callout_block);
 end;
 
-{$IFNDEF PCRE_RTL}
+{$IFDEF PCRE_16}
 function JclPCRE16Callout(var callout_block: pcre16_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
    Result := TJclWideRegEx(callout_block.callout_data).CalloutHandler(callout_block);
 end;
-{$ENDIF ~PCRE_RTL}
+{$ENDIF PCRE_16}
 
 function PCRECheck(Value: Integer; Wide: Boolean): Boolean;
 var
@@ -647,7 +647,7 @@
   end;
 end;
 
-{$IFNDEF PCRE_RTL}
+{$IFDEF PCRE_16}
 procedure InitializeLocaleSupport16;
 begin
   if not Assigned(GTables16) then
@@ -662,7 +662,7 @@
     GTables16 := nil;
   end;
 end;
-{$ENDIF ~PCRE_RTL}
+{$ENDIF PCRE_16}
 
 // TODO: Better/specific error messages, show index when available.
 function StrReplaceRegEx(const Subject, Pattern: string; Args: array of const): string;
@@ -1003,7 +1003,7 @@
   SetCapture(Index, Value);
 end;
 
-{$IFNDEF PCRE_RTL}
+{$IFDEF PCRE_16}
 
 //=== { TJclWideRegEx } ======================================================
 
@@ -1271,7 +1271,7 @@
 begin
   Result := True;
 end;
-{$ENDIF ~PCRE_RTL}
+{$ENDIF PCRE_16}
 
 initialization
   {$IFNDEF PCRE_RTL}
@@ -1281,10 +1281,10 @@
   begin
     SetPCREMallocCallback(JclPCREGetMem);
     SetPCREFreeCallback(JclPCREFreeMem);
-    {$IFNDEF PCRE_RTL}
+    {$IFDEF PCRE_16}
     SetPCRE16MallocCallback(JclPCRE16GetMem);
     SetPCRE16FreeCallback(JclPCRE16FreeMem);
-    {$ENDIF ~PCRE_RTL}
+    {$ENDIF PCRE_16}
   end;
   {$IFDEF UNITVERSIONING}
   RegisterUnitVersion(HInstance, UnitVersioning);
@@ -1292,9 +1292,9 @@
 
 finalization
   TerminateLocaleSupport;
-  {$IFNDEF PCRE_RTL}
+  {$IFDEF PCRE_16}
   TerminateLocaleSupport16;
-  {$ENDIF ~PCRE_RTL}
+  {$ENDIF PCRE_16}
   {$IFDEF UNITVERSIONING}
   UnregisterUnitVersion(HInstance);
   {$ENDIF UNITVERSIONING}

Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas	2012-08-28 14:44:17 UTC (rev 3850)
+++ trunk/jcl/source/common/pcre.pas	2012-08-28 19:31:26 UTC (rev 3851)
@@ -367,20 +367,24 @@
   TPCRE = real_pcre;
   PPCRE = ^TPCRE;
 
+  {$IFDEF PCRE_16}
   real_pcre16 = packed record
   end;
   TPCRE16 = real_pcre16;
   PPCRE16 = ^TPCRE16;
+  {$ENDIF PCRE_16}
 
   real_pcre_jit_stack = packed record
   end;
   TPCREJITStack = real_pcre_jit_stack;
   PPCREJITStack = ^TPCREJITStack;
 
+  {$IFDEF PCRE_16}
   real_pcre16_jit_stack = packed record
   end;
   TPCRE16JITStack = real_pcre16_jit_stack;
   PPCRE16JITStack = ^TPCRE16JITStack;
+  {$ENDIF PCRE_16}
 
   real_pcre_extra = packed record
     flags: Cardinal;        (* Bits for which fields are set *)
@@ -395,6 +399,7 @@
   TPCREExtra = real_pcre_extra;
   PPCREExtra = ^TPCREExtra;
 
+  {$IFDEF PCRE_16}
   real_pcre16_extra = packed record
     flags: Cardinal;        (* Bits for which fields are set *)
     study_data: Pointer;    (* Opaque data from pcre_study() *)
@@ -407,6 +412,7 @@
   end;
   TPCRE16Extra = real_pcre16_extra;
   PPCRE16Extra = ^TPCRE16Extra;
+  {$ENDIF PCRE_16}
 
   pcre_callout_block = packed record
     version: Integer;           (* Identifies version of block *)
@@ -428,6 +434,7 @@
   (* ------------------------------------------------------------------ *)
   end;
 
+  {$IFDEF PCRE_16}
   pcre16_callout_block = packed record
     version: Integer;           (* Identifies version of block *)
   (* ------------------------ Version 0 ------------------------------- *)
@@ -447,6 +454,7 @@
     Mark: PCardinal;            (* Pointer to current mark or NULL *)
   (* ------------------------------------------------------------------ *)
   end;
+  {$ENDIF PCRE_16}
 
   pcre_malloc_callback = function(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_malloc_callback}
@@ -460,6 +468,8 @@
   {$EXTERNALSYM pcre_callout_callback}
   pcre_jit_callback = function (P: Pointer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_callback}
+
+  {$IFDEF PCRE_16}
   pcre16_malloc_callback = pcre_malloc_callback;
   {$EXTERNALSYM pcre16_malloc_callback}
   pcre16_free_callback = pcre_free_callback;
@@ -472,6 +482,7 @@
   {$EXTERNALSYM pcre16_callout_callback}
   pcre16_jit_callback = function (P: Pointer): PPCRE16JITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_jit_callback}
+  {$ENDIF PCRE_16}
 
 var
   // renamed from "pcre_X" to "pcre_X_func" to allow functions with name "pcre_X" to be
@@ -486,6 +497,8 @@
   {$EXTERNALSYM pcre_stack_free_func}
   pcre_callout_func: ^pcre_callout_callback = nil;
   {$EXTERNALSYM pcre_callout_func}
+
+  {$IFDEF PCRE_16}
   pcre16_malloc_func: ^pcre16_malloc_callback = nil;
   {$EXTERNALSYM pcre16_malloc_func}
   pcre16_free_func: ^pcre16_free_callback = nil;
@@ -496,6 +509,7 @@
   {$EXTERNALSYM pcre16_stack_free_func}
   pcre16_callout_func: ^pcre16_callout_callback = nil;
   {$EXTERNALSYM pcre16_callout_func}
+  {$ENDIF PCRE_16}
 
 procedure SetPCREMallocCallback(const Value: pcre_malloc_callback);
 {$EXTERNALSYM SetPCREMallocCallback}
@@ -532,6 +546,8 @@
 function CallPCRECallout(var callout_block: pcre_callout_block): Integer;
 {$EXTERNALSYM CallPCRECallout}
 
+{$IFDEF PCRE_16}
+
 procedure SetPCRE16MallocCallback(const Value: pcre16_malloc_callback);
 {$EXTERNALSYM SetPCRE16MallocCallback}
 function GetPCRE16MallocCallback: pcre16_malloc_callback;
@@ -567,6 +583,8 @@
 function CallPCRE16Callout(var callout_block: pcre16_callout_block): Integer;
 {$EXTERNALSYM CallPCRE16Callout}
 
+{$ENDIF PCRE_16}
+
 type
   TPCRELibNotLoadedHandler = procedure; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   PPPWideChar = ^PPWideChar;
@@ -584,164 +602,210 @@
   const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_compile}
+{$IFDEF PCRE_16}
 function pcre16_compile(const pattern: PWideChar; options: Integer;
   const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE16;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_compile}
+{$ENDIF PCRE_16}
 function pcre_compile2(const pattern: PAnsiChar; options: Integer;
   const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
   const tables: PAnsiChar): PPCRE;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_compile2}
+{$IFDEF PCRE_16}
 function pcre16_compile2(const pattern: PWideChar; options: Integer;
   const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
   const tables: PAnsiChar): PPCRE16;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_compile2}
+{$ENDIF PCRE_16}
 function pcre_config(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_config}
+{$IFDEF PCRE_16}
 function pcre16_config(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_config}
+{$ENDIF PCRE_16}
 function pcre_copy_named_substring(const code: PPCRE; const subject: PAnsiChar;
   ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
   buffer: PAnsiChar; size: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_copy_named_substring}
+{$IFDEF PCRE_16}
 function pcre16_copy_named_substring(const code: PPCRE16; const subject: PWideChar;
   ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
   buffer: PWideChar; size: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_copy_named_substring}
+{$ENDIF PCRE_16}
 function pcre_copy_substring(const subject: PAnsiChar; ovector: PInteger;
   stringcount, stringnumber: Integer; buffer: PAnsiChar; buffersize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_copy_substring}
+{$IFDEF PCRE_16}
 function pcre16_copy_substring(const subject: PWideChar; ovector: PInteger;
   stringcount, stringnumber: Integer; buffer: PWideChar; buffersize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_copy_substring}
+{$ENDIF PCRE_16}
 function pcre_dfa_exec(const argument_re: PPCRE; const extra_data: PPCREExtra;
   const subject: PAnsiChar; length: Integer; start_offset: Integer;
   options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
   wscount: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_dfa_exec}
+{$IFDEF PCRE_16}
 function pcre16_dfa_exec(const argument_re: PPCRE16; const extra_data: PPCRE16Extra;
   const subject: PWideChar; length: Integer; start_offset: Integer;
   options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
   wscount: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_dfa_exec}
+{$ENDIF PCRE_16}
 function pcre_exec(const code: PPCRE; const extra: PPCREExtra; const subject: PAnsiChar;
   length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_exec}
+{$IFDEF PCRE_16}
 function pcre16_exec(const code: PPCRE16; const extra: PPCRE16Extra; const subject: PWideChar;
   length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_exec}
+{$ENDIF PCRE_16}
 procedure pcre_free_substring(stringptr: PAnsiChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_substring}
+{$IFDEF PCRE_16}
 procedure pcre16_free_substring(stringptr: PWideChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_free_substring}
+{$ENDIF PCRE_16}
 procedure pcre_free_substring_list(stringlistptr: PPAnsiChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_substring_list}
+{$IFDEF PCRE_16}
 procedure pcre16_free_substring_list(stringlistptr: PPWideChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_free_substring_list}
+{$ENDIF PCRE_16}
 function pcre_fullinfo(const code: PPCRE; const extra: PPCREExtra;
   what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_fullinfo}
+{$IFDEF PCRE_16}
 function pcre16_fullinfo(const code: PPCRE16; const extra: PPCRE16Extra;
   what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_fullinfo}
+{$ENDIF PCRE_16}
 function pcre_get_named_substring(const code: PPCRE; const subject: PAnsiChar;
   ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
   const stringptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_named_substring}
+{$IFDEF PCRE_16}
 function pcre16_get_named_substring(const code: PPCRE16; const subject: PWideChar;
   ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
   const stringptr: PPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_named_substring}
+{$ENDIF PCRE_16}
 function pcre_get_stringnumber(const code: PPCRE; const stringname: PAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_stringnumber}
+{$IFDEF PCRE_16}
 function pcre16_get_stringnumber(const code: PPCRE16; const stringname: PWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_stringnumber}
+{$ENDIF PCRE_16}
 function pcre_get_stringtable_entries(const code: PPCRE; const stringname: PAnsiChar;
   firstptr: PPAnsiChar; lastptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_stringtable_entries}
+{$IFDEF PCRE_16}
 function pcre16_get_stringtable_entries(const code: PPCRE16; const stringname: PWideChar;
   firstptr: PPWideChar; lastptr: PPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_stringtable_entries}
+{$ENDIF PCRE_16}
 function pcre_get_substring(const subject: PAnsiChar; ovector: PInteger;
   stringcount, stringnumber: Integer; const stringptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_substring}
+{$IFDEF PCRE_16}
 function pcre16_get_substring(const subject: PWideChar; ovector: PInteger;
   stringcount, stringnumber: Integer; const stringptr: PPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_substring}
+{$ENDIF PCRE_16}
 function pcre_get_substring_list(const subject: PAnsiChar; ovector: PInteger;
   stringcount: Integer; listptr: PPPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_substring_list}
+{$IFDEF PCRE_16}
 function pcre16_get_substring_list(const subject: PWideChar; ovector: PInteger;
   stringcount: Integer; listptr: PPPWideChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_get_substring_list}
+{$ENDIF PCRE_16}
 function pcre_maketables: PAnsiChar;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_maketables}
+{$IFDEF PCRE_16}
 function pcre16_maketables: PAnsiChar;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_maketables}
+{$ENDIF PCRE_16}
 function pcre_refcount(argument_re: PPCRE; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_refcount}
+{$IFDEF PCRE_16}
 function pcre16_refcount(argument_re: PPCRE16; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_refcount}
+{$ENDIF PCRE_16}
 function pcre_study(const code: PPCRE; options: Integer; const errptr: PPAnsiChar): PPCREExtra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_study}
+{$IFDEF PCRE_16}
 function pcre16_study(const code: PPCRE16; options: Integer; const errptr: PPAnsiChar): PPCRE16Extra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_study}
+{$ENDIF PCRE_16}
 procedure pcre_free_study(const extra: PPCREExtra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_study}
+{$IFDEF PCRE_16}
 procedure pcre16_free_study(const extra: PPCRE16Extra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_free_study}
+{$ENDIF PCRE_16}
 function pcre_version: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_version}
+{$IFDEF PCRE_16}
 function pcre16_version: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_version}
+{$ENDIF PCRE_16}
 function pcre_jit_stack_alloc(startsize, maxsize: Integer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_jit_stack_alloc}
+{$IFDEF PCRE_16}
 function pcre16_jit_stack_alloc(startsize, maxsize: Integer): PPCRE16JITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_jit_stack_alloc}
+{$ENDIF PCRE_16}
 procedure pcre_jit_stack_free(stack: PPCREJITStack); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_jit_stack_free}
+{$IFDEF PCRE_16}
 procedure pcre16_jit_stack_free(stack: PPCRE16JITStack); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_jit_stack_free}
+{$ENDIF PCRE_16}
 procedure pcre_assign_jit_stack(extra: PPCREExtra; callback: pcre_jit_callback; userdata: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_assign_jit_stack}
+{$IFDEF PCRE_16}
 procedure pcre16_assign_jit_stack(extra: PPCRE16Extra; callback: pcre16_jit_callback; userdata: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre16_assign_jit_stack}
+{$ENDIF PCRE_16}
 
 {$ELSE PCRE_LINKONREQUEST}
 
@@ -751,254 +815,346 @@
     const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_compile_func}
+  {$IFDEF PCRE_16}
   pcre16_compile_func = function(const pattern: PWideChar; options: Integer;
     const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE16;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_compile_func}
+  {$ENDIF PCRE_16}
   pcre_compile2_func = function(const pattern: PAnsiChar; options: Integer;
     const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
     const tables: PAnsiChar): PPCRE; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_compile2_func}
+  {$IFDEF PCRE_16}
   pcre16_compile2_func = function(const pattern: PWideChar; options: Integer;
     const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
     const tables: PAnsiChar): PPCRE16; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_compile2_func}
+  {$ENDIF PCRE_16}
   pcre_config_func = function(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_config_func}
+  {$IFDEF PCRE_16}
   pcre16_config_func = function(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_config_func}
+  {$ENDIF PCRE_16}
   pcre_copy_named_substring_func = function(const code: PPCRE; const subject: PAnsiChar;
     ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
     buffer: PAnsiChar; size: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_copy_named_substring_func}
+  {$IFDEF PCRE_16}
   pcre16_copy_named_substring_func = function(const code: PPCRE16; const subject: PWideChar;
     ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
     buffer: PWideChar; size: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_copy_named_substring_func}
+  {$ENDIF PCRE_16}
   pcre_copy_substring_func = function(const subject: PAnsiChar; ovector: PInteger;
     stringcount, stringnumber: Integer; buffer: PAnsiChar; buffersize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_copy_substring_func}
+  {$IFDEF PCRE_16}
   pcre16_copy_substring_func = function(const subject: PWideChar; ovector: PInteger;
     stringcount, stringnumber: Integer; buffer: PWideChar; buffersize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_copy_substring_func}
+  {$ENDIF PCRE_16}
   pcre_dfa_exec_func = function(const argument_re: PPCRE; const extra_data: PPCREExtra;
     const subject: PAnsiChar; length: Integer; start_offset: Integer;
     options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
     wscount: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_dfa_exec_func}
+  {$IFDEF PCRE_16}
   pcre16_dfa_exec_func = function(const argument_re: PPCRE16; const extra_data: PPCRE16Extra;
     const subject: PWideChar; length: Integer; start_offset: Integer;
     options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
     wscount: Integer): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_dfa_exec_func}
+  {$ENDIF PCRE_16}
   pcre_exec_func = function(const code: PPCRE; const extra: PPCREExtra; const subject: PAnsiChar;
     length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_exec_func}
+  {$IFDEF PCRE_16}
   pcre16_exec_func = function(const code: PPCRE16; const extra: PPCRE16Extra; const subject: PWideChar;
     length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_exec_func}
+  {$ENDIF PCRE_16}
   pcre_free_substring_func = procedure(stringptr: PAnsiChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_free_substring_func}
+  {$IFDEF PCRE_16}
   pcre16_free_substring_func = procedure(stringptr: PWideChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_substring_func}
+  {$ENDIF PCRE_16}
   pcre_free_substring_list_func = procedure(stringptr: PPAnsiChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_free_substring_list_func}
+  {$IFDEF PCRE_16}
   pcre16_free_substring_list_func = procedure(stringptr: PPWideChar);
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_substring_list_func}
+  {$ENDIF PCRE_16}
   pcre_fullinfo_func = function(const code: PPCRE; const extra: PPCREExtra;
     what: Integer; where: Pointer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_fullinfo_func}
+  {$IFDEF PCRE_16}
   pcre16_fullinfo_func = function(const code: PPCRE16; const extra: PPCRE16Extra;
     what: Integer; where: Pointer): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_fullinfo_func}
+  {$ENDIF PCRE_16}
   pcre_get_named_substring_func = function(const code: PPCRE; const subject: PAnsiChar;
     ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
     const stringptr: PPAnsiChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_named_substring_func}
+  {$IFDEF PCRE_16}
   pcre16_get_named_substring_func = function(const code: PPCRE16; const subject: PWideChar;
     ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
     const stringptr: PPWideChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_named_substring_func}
+  {$ENDIF PCRE_16}
   pcre_get_stringnumber_func = function(const code: PPCRE;
     const stringname: PAnsiChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_stringnumber_func}
+  {$IFDEF PCRE_16}
   pcre16_get_stringnumber_func = function(const code: PPCRE16;
     const stringname: PWideChar): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_stringnumber_func}
+  {$ENDIF PCRE_16}
   pcre_get_stringtable_entries_func = function(const code: PPCRE; const stringname: PAnsiChar;
     firstptr: PPAnsiChar; lastptr: PPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_stringtable_entries_func}
+  {$IFDEF PCRE_16}
   pcre16_get_stringtable_entries_func = function(const code: PPCRE16; const stringname: PWideChar;
     firstptr: PPWideChar; lastptr: PPWideChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_stringtable_entries_func}
+  {$ENDIF PCRE_16}
   pcre_get_substring_func = function(const subject: PAnsiChar; ovector: PInteger;
     stringcount, stringnumber: Integer; const stringptr: PPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_substring_func}
+  {$IFDEF PCRE_16}
   pcre16_get_substring_func = function(const subject: PWideChar; ovector: PInteger;
     stringcount, stringnumber: Integer; const stringptr: PPWideChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_substring_func}
+  {$ENDIF PCRE_16}
   pcre_get_substring_list_func = function(const subject: PAnsiChar; ovector: PInteger;
     stringcount: Integer; listptr: PPPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_substring_list_func}
+  {$IFDEF PCRE_16}
   pcre16_get_substring_list_func = function(const subject: PWideChar; ovector: PInteger;
     stringcount: Integer; listptr: PPPWideChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_get_substring_list_func}
+  {$ENDIF PCRE_16}
   pcre_maketables_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_maketables_func}
+  {$IFDEF PCRE_16}
   pcre16_maketables_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_maketables_func}
+  {$ENDIF PCRE_16}
   pcre_refcount_func = function(argument_re: PPCRE; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_refcount_func}
+  {$IFDEF PCRE_16}
   pcre16_refcount_func = function(argument_re: PPCRE16; adjust: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_refcount_func}
+  {$ENDIF PCRE_16}
   pcre_study_func = function(const code: PPCRE; options: Integer; const errptr: PPAnsiChar): PPCREExtra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_study_func}
+  {$IFDEF PCRE_16}
   pcre16_study_func = function(const code: PPCRE16; options: Integer; const errptr: PPAnsiChar): PPCRE16Extra;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_study_func}
+  {$ENDIF PCRE_16}
   pcre_free_study_func = procedure (const extra: PPCREExtra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_free_study_func}
+  {$IFDEF PCRE_16}
   pcre16_free_study_func = procedure (const extra: PPCRE16Extra);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_free_study_func}
+  {$ENDIF PCRE_16}
   pcre_version_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_version_func}
+  {$IFDEF PCRE_16}
   pcre16_version_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_version_func}
+  {$ENDIF PCRE_16}
   pcre_jit_stack_alloc_func = function (startsize, maxsize: Integer): PPCREJITStack;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_stack_alloc_func}
+  {$IFDEF PCRE_16}
   pcre16_jit_stack_alloc_func = function (startsize, maxsize: Integer): PPCRE16JITStack;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_jit_stack_alloc_func}
+  {$ENDIF PCRE_16}
   pcre_jit_stack_free_func = procedure (stack: PPCREJITStack);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_stack_free_func}
+  {$IFDEF PCRE_16}
   pcre16_jit_stack_free_func = procedure (stack: PPCRE16JITStack);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_jit_stack_free_func}
+  {$ENDIF PCRE_16}
   pcre_assign_jit_stack_func = procedure (extra: PPCREExtra; callback: pcre_jit_callback; userdata: Pointer);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_assign_jit_stack_func}
+  {$IFDEF PCRE_16}
   pcre16_assign_jit_stack_func = procedure (extra: PPCRE16Extra; callback: pcre16_jit_callback; userdata: Pointer);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre16_assign_jit_stack_func}
+  {$ENDIF PCRE_16}
 
 var
   pcre_compile: pcre_compile_func = nil;
   {$EXTERNALSYM pcre_compile}
+  {$IFDEF PCRE_16}
   pcre16_compile: pcre16_compile_func = nil;
   {$EXTERNALSYM pcre16_compile}
+  {$ENDIF PCRE_16}
   pcre_compile2: pcre_compile2_func = nil;
   {$EXTERNALSYM pcre_compile2}
+  {$IFDEF PCRE_16}
   pcre16_compile2: pcre16_compile2_func = nil;
   {$EXTERNALSYM pcre16_compile2}
+  {$ENDIF PCRE_16}
   pcre_config: pcre_config_func = nil;
   {$EXTERNALSYM pcre_config}
+  {$IFDEF PCRE_16}
   pcre16_config: pcre16_config_func = nil;
   {$EXTERNALSYM pcre16_config}
+  {$ENDIF PCRE_16}
   pcre_copy_named_substring: pcre_copy_named_substring_func = nil;
   {$EXTERNALSYM pcre_copy_named_substring}
+  {$IFDEF PCRE_16}
   pcre16_copy_named_substring: pcre16_copy_named_substring_func = nil;
   {$EXTERNALSYM pcre16_copy_named_substring}
+  {$ENDIF PCRE_16}
   pcre_copy_substring: pcre_copy_substring_func = nil;
   {$EXTERNALSYM pcre_copy_substring}
+  {$IFDEF PCRE_16}
   pcre16_copy_substring: pcre16_copy_substring_func = nil;
   {$EXTERNALSYM pcre16_copy_substring}
+  {$ENDIF PCRE_16}
   pcre_dfa_exec: pcre_dfa_exec_func = nil;
   {$EXTERNALSYM pcre_dfa_exec}
+  {$IFDEF PCRE_16}
   pcre16_dfa_exec: pcre16_dfa_exec_func = nil;
   {$EXTERNALSYM pcre16_dfa_exec}
+  {$ENDIF PCRE_16}
   pcre_exec: pcre_exec_func = nil;
   {$EXTERNALSYM pcre_exec}
+  {$IFDEF PCRE_16}
   pcre16_exec: pcre16_exec_func = nil;
   {$EXTERNALSYM pcre16_exec}
+  {$ENDIF PCRE_16}
   pcre_free_substring: pcre_free_substring_func = nil;
   {$EXTERNALSYM pcre_free_substring}
+  {$IFDEF PCRE_16}
   pcre16_free_substring: pcre16_free_substring_func = nil;
   {$EXTERNALSYM pcre16_free_substring}
+  {$ENDIF PCRE_16}
   pcre_free_substring_list: pcre_free_substring_list_func = nil;
   {$EXTERNALSYM pcre_free_substring_list}
+  {$IFDEF PCRE_16}
   pcre16_free_substring_list: pcre16_free_substring_list_func = nil;
   {$EXTERNALSYM pcre16_free_substring_list}
+  {$ENDIF PCRE_16}
   pcre_fullinfo: pcre_fullinfo_func = nil;
   {$EXTERNALSYM pcre_fullinfo}
+  {$IFDEF PCRE_16}
   pcre16_fullinfo: pcre16_fullinfo_func = nil;
   {$EXTERNALSYM pcre16_fullinfo}
+  {$ENDIF PCRE_16}
   pcre_get_named_substring: pcre_get_named_substring_func = nil;
   {$EXTERNALSYM pcre_get_named_substring}
+  {$IFDEF PCRE_16}
   pcre16_get_named_substring: pcre16_get_named_substring_func = nil;
   {$EXTERNALSYM pcre16_get_named_substring}
+  {$ENDIF PCRE_16}
   pcre_get_stringnumber: pcre_get_stringnumber_func = nil;
   {$EXTERNALSYM pcre_get_stringnumber}
+  {$IFDEF PCRE_16}
   pcre16_get_stringnumber: pcre16_get_stringnumber_func = nil;
   {$EXTERNALSYM pcre16_get_stringnumber}
+  {$ENDIF PCRE_16}
   pcre_get_stringtable_entries: pcre_get_stringtable_entries_func = nil;
   {$EXTERNALSYM pcre_get_stringtable_entries}
+  {$IFDEF PCRE_16}
   pcre16_get_stringtable_entries: pcre16_get_stringtable_entries_func = nil;
   {$EXTERNALSYM pcre16_get_stringtable_entries}
+  {$ENDIF PCRE_16}
   pcre_get_substring: pcre_get_substring_func = nil;
   {$EXTERNALSYM pcre_get_substring}
+  {$IFDEF PCRE_16}
   pcre16_get_substring: pcre16_get_substring_func = nil;
   {$EXTERNALSYM pcre16_get_substring}
+  {$ENDIF PCRE_16}
   pcre_get_substring_list: pcre_get_substring_list_func = nil;
   {$EXTERNALSYM pcre_get_substring_list}
+  {$IFDEF PCRE_16}
   pcre16_get_substring_list: pcre16_get_substring_list_func = nil;
   {$EXTERNALSYM pcre16_get_substring_list}
+  {$ENDIF PCRE_16}
   pcre_maketables: pcre_maketables_func = nil;
   {$EXTERNALSYM pcre_maketables}
+  {$IFDEF PCRE_16}
   pcre16_maketables: pcre16_maketables_func = nil;
   {$EXTERNALSYM pcre16_maketables}
+  {$ENDIF PCRE_16}
   pcre_refcount: pcre_refcount_func = nil;
   {$EXTERNALSYM pcre_refcount}
+  {$IFDEF PCRE_16}
   pcre16_refcount: pcre16_refcount_func = nil;
   {$EXTERNALSYM pcre16_refcount}
+  {$ENDIF PCRE_16}
   pcre_study: pcre_study_func = nil;
   {$EXTERNALSYM pcre_study}
+  {$IFDEF PCRE_16}
   pcre16_study: pcre16_study_func = nil;
   {$EXTERNALSYM pcre16_study}
+  {$ENDIF PCRE_16}
   pcre_free_study: pcre_free_study_func = nil;
   {$EXTERNALSYM pcre_free_study}
+  {$IFDEF PCRE_16}
   pcre16_free_study: pcre16_free_study_func = nil;
   {$EXTERNALSYM pcre16_free_study}
+  {$ENDIF PCRE_16}
   pcre_version: pcre_version_func = nil;
   {$EXTERNALSYM pcre_version}
+  {$IFDEF PCRE_16}
   pcre16_version: pcre16_version_func = nil;
   {$EXTERNALSYM pcre16_version}
+  {$ENDIF PCRE_16}
   pcre_jit_stack_alloc: pcre_jit_stack_alloc_func = nil;
   {$EXTERNALSYM pcre_jit_stack_alloc}
+  {$IFDEF PCRE_16}
   pcre16_jit_stack_alloc: pcre16_jit_stack_alloc_func = nil;
   {$EXTERNALSYM pcre16_jit_stack_alloc}
+  {$ENDIF PCRE_16}
   pcre_jit_stack_free: pcre_jit_stack_free_func = nil;
   {$EXTERNALSYM pcre_jit_stack_free}
+  {$IFDEF PCRE_16}
   pcre16_jit_stack_free: pcre16_jit_stack_free_func = nil;
   {$EXTERNALSYM pcre16_jit_stack_free}
+  {$ENDIF PCRE_16}
   pcre_assign_jit_stack: pcre_assign_jit_stack_func = nil;
   {$EXTERNALSYM pcre_assign_jit_stack}
+  {$IFDEF PCRE_16}
   pcre16_assign_jit_stack: pcre16_assign_jit_stack_func = nil;
   {$EXTERNALSYM pcre16_assign_jit_stack}
+  {$ENDIF PCRE_16}
 
 {$ENDIF PCRE_LINKONREQUEST}
 
@@ -1013,122 +1169,234 @@
   PCREDefaultLibraryName = 'libpcre.so.0';
   {$ENDIF UNIX}
   PCRECompileDefaultExportName = 'pcre_compile';
+  {$IFDEF PCRE_16}
   PCRE16CompileDefaultExportName = 'pcre16_compile';
+  {$ENDIF PCRE_16}
   PCRECompile2DefaultExportName = 'pcre_compile2';
+  {$IFDEF PCRE_16}
   PCRE16Compile2DefaultExportName = 'pcre16_compile2';
+  {$ENDIF PCRE_16}
   PCREConfigDefaultExportName = 'pcre_config';
+  {$IFDEF PCRE_16}
   PCRE16ConfigDefaultExportName = 'pcre16_config';
+  {$ENDIF PCRE_16}
   PCRECopyNamedSubstringDefaultExportName = 'pcre_copy_named_substring';
+  {$IFDEF PCRE_16}
   PCRE16CopyNamedSubstringDefaultExportName = 'pcre16_copy_named_substring';
+  {$ENDIF PCRE_16}
   PCRECopySubStringDefaultExportName = 'pcre_copy_substring';
+  {$IFDEF PCRE_16}
   PCRE16CopySubStringDefaultExportName = 'pcre16_copy_substring';
+  {$ENDIF PCRE_16}
   PCREDfaExecDefaultExportName = 'pcre_dfa_exec';
+  {$IFDEF PCRE_16}
   PCRE16DfaExecDefaultExportName = 'pcre16_dfa_exec';
+  {$ENDIF PCRE_16}
   PCREExecDefaultExportName = 'pcre_exec';
+  {$IFDEF PCRE_16}
   PCRE16ExecDefaultExportName = 'pcre16_exec';
+  {$ENDIF PCRE_16}
   PCREFreeSubStringDefaultExportName = 'pcre_free_substring';
+  {$IFDEF PCRE_16}
   PCRE16FreeSubStringDefaultExportName = 'pcre16_free_substring';
+  {$ENDIF PCRE_16}
   PCREFreeSubStringListDefaultExportName = 'pcre_free_substring_list';
+  {$IFDEF PCRE_16}
   PCRE16FreeSubStringListDefaultExportName = 'pcre16_free_substring_list';
+  {$ENDIF PCRE_16}
   PCREFullInfoDefaultExportName = 'pcre_fullinfo';
+  {$IFDEF PCRE_16}
   PCRE16FullInfoDefaultExportName = 'pcre16_fullinfo';
+  {$ENDIF PCRE_16}
   PCREGetNamedSubstringDefaultExportName = 'pcre_get_named_substring';
+  {$IFDEF PCRE_16}
   PCRE16GetNamedSubstringDefaultExportName = 'pcre16_get_named_substring';
+  {$ENDIF PCRE_16}
   PCREGetStringNumberDefaultExportName = 'pcre_get_stringnumber';
+  {$IFDEF PCRE_16}
   PCRE16GetStringNumberDefaultExportName = 'pcre16_get_stringnumber';
+  {$ENDIF PCRE_16}
   PCREGetStringTableEntriesDefaultExportName = 'pcre_get_stringtable_entries';
+  {$IFDEF PCRE_16}
   PCRE16GetStringTableEntriesDefaultExportName = 'pcre16_get_stringtable_entries';
+  {$ENDIF PCRE_16}
   PCREGetSubStringDefaultExportName = 'pcre_get_substring';
+  {$IFDEF PCRE_16}
   PCRE16GetSubStringDefaultExportName = 'pcre16_get_substring';
+  {$ENDIF PCRE_16}
   PCREGetSubStringListDefaultExportName = 'pcre_get_substring_list';
+  {$IFDEF PCRE_16}
   PCRE16GetSubStringListDefaultExportName = 'pcre16_get_substring_list';
+  {$ENDIF PCRE_16}
   PCREMakeTablesDefaultExportName = 'pcre_maketables';
+  {$IFDEF PCRE_16}
   PCRE16MakeTablesDefaultExportName = 'pcre16_maketables';
+  {$ENDIF PCRE_16}
   PCRERefCountDefaultExportName = 'pcre_refcount';
+  {$IFDEF PCRE_16}
   PCRE16RefCountDefaultExportName = 'pcre16_refcount';
+  {$ENDIF PCRE_16}
   PCREStudyDefaultExportName = 'pcre_study';
+  {$IFDEF PCRE_16}
   PCRE16StudyDefaultExportName = 'pcre16_study';
+  {$ENDIF PCRE_16}
   PCREFreeStudyDefaultExportName = 'pcre_free_study';
+  {$IFDEF PCRE_16}
   PCRE16FreeStudyDefaultExportName = 'pcre16_free_study';
+  {$ENDIF PCRE_16}
   PCREVersionDefaultExportName = 'pcre_version';
+  {$IFDEF PCRE_16}
   PCRE16VersionDefaultExportName = 'pcre16_version';
+  {$ENDIF PCRE_16}
   PCREJITStackAllocDefaultExportName = 'pcre_jit_stack_alloc';
+  {$IFDEF PCRE_16}
   PCRE16JITStackAllocDefaultExportName = 'pcre16_jit_stack_alloc';
+  {$ENDIF PCRE_16}
   PCREJITStackFreeDefaultExportName = 'pcre_jit_stack_free';
+  {$IFDEF PCRE_16}
   PCRE16JITStackFreeDefaultExportName = 'pcre16_jit_stack_free';
+  {$ENDIF PCRE_16}
   PCREAssignJITStackDefaultExportName = 'pcre_assign_jit_stack';
+  {$IFDEF PCRE_16}
   PCRE16AssignJITStackDefaultExportName = 'pcre16_assign_jit_stack';
+  {$ENDIF PCRE_16}
   PCREMallocDefaultExportName = 'pcre_malloc';
+  {$IFDEF PCRE_16}
   PCRE16MallocDefaultExportName = 'pcre16_malloc';
+  {$ENDIF PCRE_16}
   PCREFreeDefaultExportName = 'pcre_free';
+  {$IFDEF PCRE_16}
   PCRE16FreeDefaultExportName = 'pcre16_free';
+  {$ENDIF PCRE_16}
   PCREStackMallocDefaultExportName = 'pcre_stack_malloc';
+  {$IFDEF PCRE_16}
   PCRE16StackMallocDefaultExportName = 'pcre16_stack_malloc';
+  {$ENDIF PCRE_16}
   PCREStackFreeDefaultExportName = 'pcre_stack_free';
+  {$IFDEF PCRE_16}
   PCRE16StackFreeDefaultExportName = 'pcre16_stack_free';
+  {$ENDIF PCRE_16}
   PCRECalloutDefaultExportName = 'pcre_callout';
+  {$IFDEF PCRE_16}
   PCRE16CalloutDefaultExportName = 'pcre16_callout';
+  {$ENDIF PCRE_16}
 
 {$IFDEF PCRE_LINKONREQUEST}
 var
   PCRELibraryName: string = PCREDefaultLibraryName;
 
   PCRECompileExportName: string = PCRECompileDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16CompileExportName: string = PCRE16CompileDefaultExportName;
+  {$ENDIF PCRE_16}
   PCRECompile2ExportName: string = PCRECompile2DefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16Compile2ExportName: string = PCRE16Compile2DefaultExportName;
+  {$ENDIF PCRE_16}
   PCREConfigExportName: string = PCREConfigDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16ConfigExportName: string = PCRE16ConfigDefaultExportName;
+  {$ENDIF PCRE_16}
   PCRECopyNamedSubstringExportName: string = PCRECopyNamedSubstringDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16CopyNamedSubstringExportName: string = PCRE16CopyNamedSubstringDefaultExportName;
+  {$ENDIF PCRE_16}
   PCRECopySubStringExportName: string = PCRECopySubStringDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16CopySubStringExportName: string = PCRE16CopySubStringDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREDfaExecExportName: string = PCREDfaExecDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16DfaExecExportName: string = PCRE16DfaExecDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREExecExportName: string = PCREExecDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16ExecExportName: string = PCRE16ExecDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREFreeSubStringExportName: string = PCREFreeSubStringDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16FreeSubStringExportName: string = PCRE16FreeSubStringDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREFreeSubStringListExportName: string = PCREFreeSubStringListDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16FreeSubStringListExportName: string = PCRE16FreeSubStringListDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREFullInfoExportName: string = PCREFullInfoDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16FullInfoExportName: string = PCRE16FullInfoDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREGetNamedSubstringExportName: string = PCREGetNamedSubstringDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16GetNamedSubstringExportName: string = PCRE16GetNamedSubstringDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREGetStringNumberExportName: string = PCREGetStringNumberDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16GetStringNumberExportName: string = PCRE16GetStringNumberDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREGetStringTableEntriesExportName: string = PCREGetStringTableEntriesDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16GetStringTableEntriesExportName: string = PCRE16GetStringTableEntriesDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREGetSubStringExportName: string = PCREGetSubStringDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16GetSubStringExportName: string = PCRE16GetSubStringDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREGetSubStringListExportName: string = PCREGetSubStringListDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16GetSubStringListExportName: string = PCRE16GetSubStringListDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREMakeTablesExportName: string = PCREMakeTablesDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16MakeTablesExportName: string = PCRE16MakeTablesDefaultExportName;
+  {$ENDIF PCRE_16}
   PCRERefCountExportName: string = PCRERefCountDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16RefCountExportName: string = PCRE16RefCountDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREStudyExportName: string = PCREStudyDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16StudyExportName: string = PCRE16StudyDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREFreeStudyExportName: string = PCREFreeStudyDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16FreeStudyExportName: string = PCRE16FreeStudyDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREVersionExportName: string = PCREVersionDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16VersionExportName: string = PCRE16VersionDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREJITStackAllocExportName: string = PCREJITStackAllocDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16JITStackAllocExportName: string = PCRE16JITStackAllocDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREJITStackFreeExportName: string = PCREJITStackFreeDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16JITStackFreeExportName: string = PCRE16JITStackFreeDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREAssignJITStackExportName: string = PCREAssignJITStackDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16AssignJITStackExportName: string = PCRE16AssignJITStackDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREMallocExportName: string = PCREMallocDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16MallocExportName: string = PCRE16MallocDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREFreeExportName: string = PCREFreeDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16FreeExportName: string = PCRE16FreeDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREStackMallocExportName: string = PCREStackMallocDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16StackMallocExportName: string = PCRE16StackMallocDefaultExportName;
+  {$ENDIF PCRE_16}
   PCREStackFreeExportName: string = PCREStackFreeDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16StackFreeExportName: string = PCRE16StackFreeDefaultExportName;
+  {$ENDIF PCRE_16}
   PCRECalloutExportName: string = PCRECalloutDefaultExportName;
+  {$IFDEF PCRE_16}
   PCRE16CalloutExportName: string = PCRE16CalloutDefaultExportName;
+  {$ENDIF PCRE_16}
 {$ENDIF PCRE_LINKONREQUEST}
 
 var
@@ -1177,10 +1445,12 @@
 procedure _pcre_jit_compile; external;
 procedure _pcre_jit_free; external;
 
+{$IFDEF PCRE_16}
 // make the linker happy with PCRE 8.30
 procedure _pcre16_find_bracket; external;
 procedure _pcre16_jit_compile; external;
 procedure _pcre16_jit_free; external;
+{$ENDIF PCRE_16}
 
 {$IFDEF CPU32}
 {$LINK ..\windows\obj\pcre\win32\pcre_compile.obj}
@@ -1201,6 +1471,9 @@
 {$LINK ..\windows\obj\pcre\win32\pcre_version.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_xclass.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_chartables.obj}
+
+{$IFDEF PCRE_16}
+
 {$LINK ..\windows\obj\pcre\win32\pcre16_compile.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre16_config.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre16_dfa_exec.obj}
@@ -1220,6 +1493,8 @@
 {$LINK ..\windows\obj\pcre\win32\pcre16_xclass.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre16_chartables.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre16_string_utils.obj}
+{$ENDIF PCRE_16}
+
 {$ENDIF CPU32}
 {$IFDEF CPU64}
 {$LINK ..\windows\obj\pcre\win64\pcre_compile.obj}
@@ -1240,6 +1515,9 @@
 {$LINK ..\windows\obj\pcre\win64\pcre_version.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_xclass.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_chartables.obj}
+
+{$IFDEF PCRE_16}
+
 {$LINK ..\windows\obj\pcre\win64\pcre16_compile.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre16_config.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre16_dfa_exec.obj}
@@ -1259,20 +1537,25 @@
 {$LINK ..\windows\obj\pcre\win64\pcre16_xclass.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre16_chartables.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre16_string_utils.obj}
+
+{$ENDIF PCRE_16}
+
 {$ENDIF CPU64}
 
 // user's defined callbacks
 var
   pcre_malloc_user: pcre_malloc_callback;
+  pcre_free_user: pcre_free_callback;
+  pcre_stack_malloc_user: pcre_stack_malloc_callback;
+  pcre_stack_free_user: pcre_stack_free_callback;
+  pcre_callout_user: pcre_callout_callback;
+  {$IFDEF PCRE_16}
   pcre16_malloc_user: pcre16_malloc_callback;
-  pcre_free_user: pcre_free_callback;
   pcre16_free_user: pcre16_free_callback;
-  pcre_stack_malloc_user: pcre_stack_malloc_callback;
   pcre16_stack_malloc_user: pcre16_stack_malloc_callback;
-  pcre_stack_free_user: pcre_stack_free_callback;
   pcre16_stack_free_user: pcre16_stack_free_callback;
-  pcre_callout_user: pcre_callout_callback;
   pcre16_callout_user: pcre16_callout_callback;
+  {$ENDIF PCRE_16}
 
 function pcre_compile; external;
 function pcre_compile2; external;
@@ -1297,6 +1580,7 @@
 function pcre_jit_stack_alloc; external;
 procedure pcre_jit_stack_free; external;
 procedure pcre_assign_jit_stack; external;
+{$IFDEF PCRE_16}
 function pcre16_compile; external;
 function pcre16_compile2; external;
 function pcre16_config; external;
@@ -1320,6 +1604,7 @@
 function pcre16_jit_stack_alloc; external;
 procedure pcre16_jit_stack_free; external;
 procedure pcre16_assign_jit_stack; external;
+{$ENDIF PCRE_16}
 
 type
   size_t = Longint;
@@ -1398,6 +1683,7 @@
     Result := malloc(Size);
 end;
 
+{$IFDEF PCRE_16}
 function pcre16_malloc_jcl(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   if Assigned(pcre16_malloc_user) then
@@ -1405,6 +1691,7 @@
   else
     Result := malloc(Size);
 end;
+{$ENDIF PCRE_16}
 
 function pcre_stack_malloc_jcl(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
@@ -1414,6 +1701,7 @@
     Result := malloc(Size);
 end;
 
+{$IFDEF PCRE_16}
 function pcre16_stack_malloc_jcl(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   if Assigned(pcre16_stack_malloc_user) then
@@ -1421,6 +1709,7 @@
   else
     Result := malloc(Size);
 end;
+{$ENDIF PCRE_16}
 
 function _malloc(size: size_t): Pointer;
 begin
@@ -1437,6 +1726,7 @@
     free(P);
 end;
 
+{$IFDEF PCRE_16}
 procedure pcre16_free_jcl(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   if Assigned(pcre16_free_user) then
@@ -1444,6 +1734,7 @@
   else
     free(P);
 end;
+{$ENDIF PCRE_16}
 
 procedure pcre_stack_free_jcl(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
@@ -1453,6 +1744,7 @@
     free(P);
 end;
 
+{$IFDEF PCRE_16}
 procedure pcre16_stack_free_jcl(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   if Assigned(pcre16_stack_free_user) then
@@ -1460,6 +1752,7 @@
   else
     free(P);
 end;
+{$ENDIF PCRE_16}
 
 procedure _free(pBlock: Pointer);
 begin
@@ -1474,6 +1767,7 @@
     Result := 0;
 end;
 
+{$IFDEF PCRE_16}
 function pcre16_callout_jcl(var callout_block: pcre16_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   if Assigned(pcre16_callout_user) then
@@ -1481,32 +1775,37 @@
   else
     Result := 0;
 end;
+{$ENDIF PCRE_16}
 
 {$IFDEF CPU32}
 const
   _pcre_malloc: pcre_malloc_callback = pcre_malloc_jcl;
+  _pcre_free: pcre_free_callback = pcre_free_jcl;
+  _pcre_stack_malloc: pcre_stack_malloc_callback = pcre_stack_malloc_jcl;
+  _pcre_stack_free: pcre_stack_free_callback = pcre_stack_free_jcl;
+  _pcre_callout: pcre_callout_callback = pcre_callout_jcl;
+  {$IFDEF PCRE_16}
   _pcre16_malloc: pcre16_malloc_callback = pcre16_malloc_jcl;
-  _pcre_free: pcre_free_callback = pcre_free_jcl;
   _pcre16_free: pcre16_free_callback = pcre16_free_jcl;
-  _pcre_stack_malloc: pcre_stack_malloc_callback = pcre_stack_malloc_jcl;
   _pcre16_stack_malloc: pcre16_stack_malloc_callback = pcre16_stack_malloc_jcl;
-  _pcre_stack_free: pcre_stack_free_callback = pcre_stack_free_jcl;
   _pcre16_stack_free: p...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3850] trunk

From: <ou...@us...> - 2012-08-28 14:44:30

Revision: 3850
          http://jcl.svn.sourceforge.net/jcl/?rev=3850&view=rev
Author:   outchy
Date:     2012-08-28 14:44:17 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
add support for PCRE with native match on UCS2/UTF16 strings.

Modified Paths:
--------------
    trunk/jcl/source/common/JclPCRE.pas
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/common/pcre.pas
    trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win64/makefile.mak

Added Paths:
-----------
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_chartables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_config.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_get.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_newline.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_ord2utf16.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_string_utils.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_study.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_tables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_valid_utf16.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_version.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre16_xclass.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_chartables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_config.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_get.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_newline.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_ord2utf16.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_string_utils.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_study.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_tables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_valid_utf16.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_version.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre16_xclass.obj
    trunk/thirdparty/pcre/pcre-8.31/pcre16_byte_order.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_chartables.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_compile.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_config.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_dfa_exec.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_exec.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_fullinfo.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_get.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_globals.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_jit_compile.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_maketables.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_newline.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_ord2utf16.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_printint.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_refcount.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_string_utils.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_study.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_tables.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_ucd.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_utf16_utils.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_valid_utf16.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_version.c
    trunk/thirdparty/pcre/pcre-8.31/pcre16_xclass.c

Property Changed:
----------------
    trunk/thirdparty/pcre/pcre-8.31/

Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas	2012-08-28 08:03:01 UTC (rev 3849)
+++ trunk/jcl/source/common/JclPCRE.pas	2012-08-28 14:44:17 UTC (rev 3850)
@@ -65,12 +65,13 @@
   JCL_PCRE_CALLOUT_NOERROR      = 0;
   JCL_PCRE_CALLOUT_FAILCONTINUE = 1;
 
+  JCL_PCRE_ERROR_NOJIT          = -996;
+  JCL_PCRE_ERROR_NOUTF8         = -997;
+  JCL_PCRE_ERROR_NOUTF16        = -997;
   JCL_PCRE_ERROR_CALLOUTERROR   = -998;
   JCL_PCRE_ERROR_STUDYFAILED    = -999;
 
 type
-  TJclRegEx = class;
-
   EPCREError = class(EJclError)
   private
     FErrorCode: Integer;
@@ -90,20 +91,26 @@
     roBSRUnicode, roJavascriptCompat, roNoStartOptimize, roPartialHard,
     roNotEmptyAtStart, roUCP);
   TJclRegExOptions = set of TJclRegExOption;
+
+const
+  roUTF16 = roUTF8;
+  roNoUTF16Check = roNoUTF8Check;
+
+type
+  TJclRegExBase = class;
+
   TJclCaptureRange = record
     FirstPos: Integer;
     LastPos: Integer;
   end;
 
-  TJclRegExCallout = procedure (Sender: TJclRegEx;
+  TJclRegExCallout = procedure (Sender: TJclRegExBase;
     Index, MatchStart, SubjectPos, LastCapture, PatternPos, NextItemLength: Integer;
     var ErrorCode: Integer) of object;
   TPCRECalloutIndex = 0 .. 255;
 
-  TJclRegEx = class(TObject)
+  TJclRegExBase = class(TObject)
   private
-    FCode: PPCRE;
-    FExtra: PPCREExtra;
     FOptions: TJclRegExOptions;
     FPattern: string;
     FDfaMode: Boolean;
@@ -123,26 +130,27 @@
 
     FOnCallout: TJclRegExCallout;
 
-    function GetResult: string;
-    function GetCapture(Index: Integer): string;
-    procedure SetCapture(Index: Integer; const Value: string);
-    function GetCaptureRange(Index: Integer): TJclCaptureRange;
-    function GetNamedCapture(const Name: string): string;
-    procedure SetNamedCapture(const Name, Value: string);
-    function GetCaptureNameCount: Integer;
-    function GetCaptureName(Index: Integer): string;
-    function GetAPIOptions(RunTime, DFA: Boolean): Integer;
-    function CalloutHandler(var CalloutBlock: pcre_callout_block): Integer;
+  protected
+    function GetResult: string; virtual;
+    function GetCapture(Index: Integer): string; virtual; abstract;
+    procedure SetCapture(Index: Integer; const Value: string); virtual;
+    function GetCaptureRange(Index: Integer): TJclCaptureRange; virtual; abstract;
+    function GetNamedCapture(const Name: string): string; virtual; abstract;
+    procedure SetNamedCapture(const Name, Value: string); virtual; abstract;
+    function GetCaptureNameCount: Integer; virtual; abstract;
+    function GetCaptureName(Index: Integer): string; virtual; abstract;
+    function GetAPIOptions(RunTime, DFA: Boolean): Integer; virtual;
 
+    function SupportsWideChar: Boolean; virtual;
   public
     destructor Destroy; override;
 
     property Options: TJclRegExOptions read FOptions write FOptions;
     function Compile(const Pattern: string; Study: Boolean;
-      UserLocale: Boolean = False; JITCompile: Boolean = False): Boolean;
+      UserLocale: Boolean = False; JITCompile: Boolean = False): Boolean; virtual; abstract;
     property Pattern: string read FPattern;
     property DfaMode: Boolean read FDfaMode write FDfaMode;
-    function Match(const Subject: string; StartOffset: Cardinal = 1): Boolean;
+    function Match(const Subject: string; StartOffset: Cardinal = 1): Boolean; virtual; abstract;
     property Subject: string read FSubject;
     property Result: string read GetResult;
 
@@ -155,8 +163,8 @@
       read GetNamedCapture write SetNamedCapture;
     property CaptureNameCount: Integer read GetCaptureNameCount;
     property CaptureNames[Index: Integer]: string read GetCaptureName;
-    function IndexOfName(const Name: string): Integer;
-    function IsNameValid(const Name: string): Boolean;
+    function IndexOfName(const Name: string): Integer; virtual; abstract;
+    function IsNameValid(const Name: string): Boolean; virtual; abstract;
 
     property ErrorCode: Integer read FErrorCode;
     property ErrorMessage: string read FErrorMessage;
@@ -165,16 +173,72 @@
     property OnCallout: TJclRegExCallout read FOnCallout write FOnCallout;
   end;
 
-  TJclAnsiRegEx = TJclRegEx;
+
+  TJclAnsiRegEx = class(TJclRegExBase)
+  private
+    FCode: PPCRE;
+    FExtra: PPCREExtra;
+  protected
+    function CalloutHandler(var CalloutBlock: pcre_callout_block): Integer;
+    function GetAPIOptions(RunTime, DFA: Boolean): Integer; override;
+    function GetCapture(Index: Integer): string; override;
+    function GetCaptureName(Index: Integer): string; override;
+    function GetCaptureNameCount: Integer; override;
+    function GetCaptureRange(Index: Integer): TJclCaptureRange; override;
+    function GetNamedCapture(const Name: string): string; override;
+    procedure SetNamedCapture(const Name, Value: string); override;
+  public
+    destructor Destroy; override;
+    function Compile(const Pattern: string; Study: Boolean;
+      UserLocale: Boolean = False; JITCompile: Boolean = False): Boolean; override;
+    function Match(const Subject: string; StartOffset: Cardinal = 1): Boolean; override;
+    function IndexOfName(const Name: string): Integer; override;
+    function IsNameValid(const Name: string): Boolean; override;
+  end;
+
   TJclAnsiRegExOption = TJclRegExOption;
   TJclAnsiRegExOptions = TJclRegExOptions;
   TJclAnsiCaptureRange = TJclCaptureRange;
   TJclAnsiRegExCallout = TJclRegExCallout;
 
+  {$IFNDEF PCRE_RTL}
+  TJclWideRegEx = class(TJclRegExBase)
+  private
+    FCode: PPCRE16;
+    FExtra: PPCRE16Extra;
+  protected
+    function CalloutHandler(var CalloutBlock: pcre16_callout_block): Integer;
+    function GetAPIOptions(RunTime, DFA: Boolean): Integer; override;
+    function GetCapture(Index: Integer): string; override;
+    function GetCaptureName(Index: Integer): string; override;
+    function GetCaptureNameCount: Integer; override;
+    function GetCaptureRange(Index: Integer): TJclCaptureRange; override;
+    function GetNamedCapture(const Name: string): string; override;
+    procedure SetNamedCapture(const Name, Value: string); override;
+    function SupportsWideChar: Boolean; override;
+  public
+    destructor Destroy; override;
+    function Compile(const Pattern: string; Study: Boolean;
+      UserLocale: Boolean = False; JITCompile: Boolean = False): Boolean; override;
+    function Match(const Subject: string; StartOffset: Cardinal = 1): Boolean; override;
+    function IndexOfName(const Name: string): Integer; override;
+    function IsNameValid(const Name: string): Boolean; override;
+  end;
 
+  TJclWideRegExOption = TJclRegExOption;
+  TJclWideRegExOptions = TJclRegExOptions;
+  TJclWideCaptureRange = TJclCaptureRange;
+  TJclWideRegExCallout = TJclRegExCallout;
+  {$ENDIF ~PCRE_RTL}
+
 procedure InitializeLocaleSupport;
 procedure TerminateLocaleSupport;
 
+{$IFNDEF PCRE_RTL}
+procedure InitializeLocaleSupport16;
+procedure TerminateLocaleSupport16;
+{$ENDIF ~PCRE_RTL}
+
 // Args is an array of pairs (CaptureIndex, Value) or (CaptureName, Value).
 // For example: NewIp := StrReplaceRegEx(DirIP, '(\d+)\.(\d+)\.(\d+)\.(\d+)', [3, '128', 4, '254']);
 function StrReplaceRegEx(const Subject, Pattern: string; Args: array of const): string;
@@ -201,7 +265,7 @@
   {$ENDIF ~HAS_UNITSCOPE}
   JclResources;
 
-function EncodeString(const S: string; ToUTF8: Boolean): AnsiString; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function EncodeAnsiString(const S: string; ToUTF8: Boolean): AnsiString; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
 begin
   if ToUTF8 then
     Result := StringToUTF8(S)
@@ -209,15 +273,31 @@
     Result := AnsiString(S);
 end;
 
-function DecodeString(const S: AnsiString; IsUTF8: Boolean): string; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+function EncodeWideString(const S: string; ToUTF16: Boolean): WideString; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
 begin
+  if ToUTF16 then
+    Result := StringToUTF16(S)
+  else
+    Result := WideString(S);
+end;
+
+function DecodeAnsiString(const S: AnsiString; IsUTF8: Boolean): string; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+begin
   if IsUTF8 then
     Result := UTF8ToString(S)
   else
     Result := string(S);
 end;
 
-function TranslateIndex(const S: string; ToUTF8: Boolean; Index: SizeInt): SizeInt;
+function DecodeWideString(const S: WideString; IsUTF16: Boolean): string; {$IFDEF SUPPORTS_INLINE} inline; {$ENDIF SUPPORTS_INLINE}
+begin
+  if IsUTF16 then
+    Result := UTF16ToString(S)
+  else
+    Result := string(S);
+end;
+
+function TranslateAnsiIndex(const S: string; ToUTF8: Boolean; Index: SizeInt): SizeInt;
 var
   UTF8Buffer: TUTF8String;
   UTF8Pos, StrPos, StrLen: SizeInt;
@@ -247,8 +327,41 @@
     Result := Index;
 end;
 
+function TranslateWideIndex(const S: string; ToUTF16: Boolean; Index: SizeInt): SizeInt;
 var
+  UTF16Buffer: TUTF16String;
+  UTF16Pos, StrPos, StrLen: SizeInt;
+  Ch: UCS4;
+begin
+  if ToUTF16 then
+  begin
+    SetLength(UTF16Buffer, 2);
+    StrPos := 1;
+    StrLen := Length(S);
+    while (StrPos > 0) and (StrPos <= StrLen) and (Index > 1) do
+    begin
+      UTF16Pos := 1;
+      Ch := StringGetNextChar(S, StrPos);
+      if (StrPos > 0) and UTF16SetNextChar(UTF16Buffer, UTF16Pos, Ch) and (UTF16Pos > 0) then
+        Dec(Index, UTF16Pos - 1);
+    end;
+    if StrPos <= 0 then
+      raise EJclUnexpectedEOSequenceError.Create
+    else
+    if StrPos > StrLen then
+      Result := StrLen + 1
+    else
+      Result := StrPos;
+  end
+  else
+    Result := Index;
+end;
+
+var
   GTables: PAnsiChar;
+  {$IFNDEF PCRE_RTL}
+  GTables16: PAnsiChar;
+  {$ENDIF ~PCRE_RTL}
 
 {$IFDEF RTL230_UP}
   {$IFDEF PCRE_RTL}
@@ -268,17 +381,34 @@
   GetMem(Result, Size);
 end;
 
+function JclPCRE16GetMem(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+begin
+  GetMem(Result, Size);
+end;
+
 procedure JclPCREFreeMem(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   FreeMem(P);
 end;
 
+procedure JclPCRE16FreeMem(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+begin
+  FreeMem(P);
+end;
+
 function JclPCRECallout(var callout_block: pcre_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
-   Result := TJclRegEx(callout_block.callout_data).CalloutHandler(callout_block);
+   Result := TJclAnsiRegEx(callout_block.callout_data).CalloutHandler(callout_block);
 end;
 
-function PCRECheck(Value: Integer): Boolean;
+{$IFNDEF PCRE_RTL}
+function JclPCRE16Callout(var callout_block: pcre16_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+begin
+   Result := TJclWideRegEx(callout_block.callout_data).CalloutHandler(callout_block);
+end;
+{$ENDIF ~PCRE_RTL}
+
+function PCRECheck(Value: Integer; Wide: Boolean): Boolean;
 var
   PErr: PResStringRec;
 begin
@@ -305,9 +435,15 @@
     PCRE_ERROR_CALLOUT:
       PErr := @RsErrCallout;
     PCRE_ERROR_BADUTF8:
-      PErr := @RsErrBadUTF8;
+      if Wide then
+        PErr := @RsErrBadUTF16
+      else
+        PErr := @RsErrBadUTF8;
     PCRE_ERROR_BADUTF8_OFFSET:
-      PErr := @RsErrBadUTF8Offset;
+      if Wide then
+        PErr := @RsErrBadUTF16Offset
+      else
+        PErr := @RsErrBadUTF8Offset;
     PCRE_ERROR_PARTIAL:
       PErr := @RsErrPartial;
     PCRE_ERROR_BADPARTIAL:
@@ -336,16 +472,32 @@
     PCRE_ERROR_BADOFFSET:
       PErr := @RsErrBadOffset;
     PCRE_ERROR_SHORTUTF8:
-      PErr := @RsErrShortUTF8;
+      if Wide then
+        PErr := @RsErrShortUTF16
+      else
+        PErr := @RsErrShortUTF8;
     PCRE_ERROR_RECURSELOOP:
       PErr := @RsErrRecurseLoop;
     PCRE_ERROR_JITSTACKLIMIT:
       PErr := @RsErrJITStackLimit;
+    PCRE_ERROR_BADMODE:
+      PErr := @RsErrBadMode;
+    PCRE_ERROR_BADENDIANNESS:
+      PErr := @RsErrBadEndianness;
+    PCRE_ERROR_DFA_BADRESTART:
+      PErr := @RsErrBadRestart;
     {$ENDIF ~PCRE_RTL}
     JCL_PCRE_ERROR_STUDYFAILED:
       PErr := @RsErrStudyFailed;
     JCL_PCRE_ERROR_CALLOUTERROR:
       PErr := @RsErrCalloutError;
+    JCL_PCRE_ERROR_NOUTF8:
+      if Wide then
+        PErr := @RsErrNoUTF16Support
+      else
+        PErr := @RsErrNoUTF8Support;
+    JCL_PCRE_ERROR_NOJIT:
+      PErr := @RsErrNoJITSupport;
   else
     PErr := @RsErrUnknownError;
   end;
@@ -355,16 +507,8 @@
 
 //=== { TJclRegEx } ===========================================================
 
-destructor TJclRegEx.Destroy;
+destructor TJclRegExBase.Destroy;
 begin
-  if Assigned(FCode) then
-    CallPCREFree(FCode);
-  if Assigned(FExtra) then
-    {$IFDEF PCRE_RTL}
-    CallPCREFree(FExtra);
-    {$ELSE ~PCRE_RTL}
-    pcre_free_study(FExtra);
-    {$ENDIF ~PCRE_RTL}
   if Assigned(FVector) then
     FreeMem(FVector);
   if Assigned(FChangedCaptures) then
@@ -373,81 +517,7 @@
   inherited Destroy;
 end;
 
-function TJclRegEx.Compile(const Pattern: string; Study, UserLocale, JITCompile: Boolean): Boolean;
-var
-  ErrMsgPtr: PAnsiChar;
-  Tables: PAnsiChar;
-  StudyOptions: Integer;
-  {$IFNDEF PCRE_RTL}
-  ConfigJIT: Integer;
-  {$ENDIF ~PCRE_RTL}
-begin
-  if UserLocale then
-  begin
-    InitializeLocaleSupport;
-    Tables := GTables;
-  end
-  else
-    Tables := nil;
-
-  FPattern := Pattern;
-  if FPattern = '' then
-    raise EPCREError.CreateRes(@RsErrNull, PCRE_ERROR_NULL);
-
-  if Assigned(FCode) then
-  begin
-    CallPCREFree(FCode);
-    FCode := nil;
-  end;
-  FCode := pcre_compile2(PAnsiChar(EncodeString(FPattern, roUTF8 in Options)), GetAPIOptions(False, DfaMode),
-    @FErrorCode, @ErrMsgPtr, @FErrorOffset, Tables);
-  Inc(FErrorOffset);
-  FErrorMessage := string(AnsiString(ErrMsgPtr));
-  Result := Assigned(FCode);
-  if Result then
-  begin
-    if Study then
-    begin
-      {$IFDEF PCRE_RTL}
-      if Assigned(FExtra) then
-        CallPCREFree(FExtra);
-      if JITCompile then
-        raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
-      StudyOptions := 0;
-      {$ELSE ~PCRE_RTL}
-      if Assigned(FExtra) then
-        pcre_free_study(FExtra);
-      if JITCompile then
-      begin
-        PCRECheck(pcre_config(PCRE_CONFIG_JIT, @ConfigJIT));
-        if ConfigJIT = 0 then
-          raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
-        StudyOptions := PCRE_STUDY_JIT_COMPILE;
-      end
-      else
-        StudyOptions := 0;
-      {$ENDIF ~PCRE_RTL}
-      FExtra := pcre_study(FCode, StudyOptions, @ErrMsgPtr);
-      Result := Assigned(FExtra) or (not Assigned(ErrMsgPtr));
-      if not Result then
-      begin
-        FErrorCode := JCL_PCRE_ERROR_STUDYFAILED;
-        FErrorMessage := string(AnsiString(ErrMsgPtr));
-      end;
-    end;
-
-    if FDfaMode then
-      FVectorSize := FCaptureCount
-    else
-    begin
-      PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_CAPTURECOUNT, @FCaptureCount));
-      FVectorSize := (FCaptureCount + 1) * 3;
-    end;
-    ReAllocMem(FVector, FVectorSize * SizeOf(FVector[0]));
-  end;
-end;
-
-function TJclRegEx.GetAPIOptions(RunTime, DFA: Boolean): Integer;
+function TJclRegExBase.GetAPIOptions(RunTime, DFA: Boolean): Integer;
 const
   {$IFDEF PCRE_RTL}
   PCRE_PARTIAL_HARD     = $08000000;
@@ -484,12 +554,7 @@
     PCRE_NOTEMPTY_ATSTART, PCRE_UCP);
 var
   I: TJclRegExOption;
-  ConfigUTF8: Integer;
 begin
-  PCRECheck(pcre_config(PCRE_CONFIG_UTF8, @ConfigUTF8));
-  if (roUTF8 in Options) and (ConfigUTF8 = 0) then
-    raise EPCREError.CreateRes(@RsErrNoUTF8Support, 0);
-
   Result := 0;
   if RunTime and DFA then
   begin
@@ -512,7 +577,7 @@
   end;
 end;
 
-function TJclRegEx.GetResult: string;
+function TJclRegExBase.GetResult: string;
 var
   Index, CaptureIndex: Integer;
   Pos: Integer;
@@ -540,33 +605,12 @@
     Result := FSubject;
 end;
 
-function TJclRegEx.GetCapture(Index: Integer): string;
-var
-  FromPos, ToPos: SizeInt;
+procedure TJclRegExBase.SetCapture(Index: Integer; const Value: string);
 begin
   if (Index < 0) or (Index >= FCaptureCount) then
-    PCRECheck(PCRE_ERROR_NOSUBSTRING)
+    PCRECheck(PCRE_ERROR_NOSUBSTRING, SupportsWideChar)
   else
   begin
-    if FViewChanges and (FChangedCaptures.IndexOf(Pointer(SizeInt(Index))) >= 0) then
-    begin
-      Result := FResultValues[Index];
-      Exit;
-    end;
-
-    Index := Index * 2;
-    FromPos := TranslateIndex(FSubject, roUTF8 in Options, FVector^[Index] + 1);
-    ToPos := TranslateIndex(FSubject, roUTF8 in Options, FVector^[Index + 1] + 1) - 1;
-    Result := Copy(FSubject, FromPos, ToPos - FromPos + 1);
-  end;
-end;
-
-procedure TJclRegEx.SetCapture(Index: Integer; const Value: string);
-begin
-  if (Index < 0) or (Index >= FCaptureCount) then
-    PCRECheck(PCRE_ERROR_NOSUBSTRING)
-  else
-  begin
     if (not Assigned(FChangedCaptures)) or (FChangedCaptures.Count = 0) then
     begin
       if not Assigned(FChangedCaptures) then
@@ -583,56 +627,136 @@
   end;
 end;
 
-function TJclRegEx.GetCaptureRange(Index: Integer): TJclCaptureRange;
+function TJclRegExBase.SupportsWideChar: Boolean;
 begin
-  if (Index < 0) or (Index >= FCaptureCount) then
-    PCRECheck(PCRE_ERROR_NOSUBSTRING)
-  else
+  Result := False;
+end;
+
+procedure InitializeLocaleSupport;
+begin
+  if not Assigned(GTables) then
+    GTables := pcre_maketables;
+end;
+
+procedure TerminateLocaleSupport;
+begin
+  if Assigned(GTables) then
   begin
-    Index := Index * 2;
-    Result.FirstPos := TranslateIndex(FSubject, roUTF8 in Options, FVector^[Index] + 1);
-    Result.LastPos := TranslateIndex(FSubject, roUTF8 in Options, FVector^[Index + 1] + 1) - 1;
+    CallPCREFree(GTables);
+    GTables := nil;
   end;
 end;
 
-function TJclRegEx.GetNamedCapture(const Name: string): string;
-var
-  Index: Integer;
+{$IFNDEF PCRE_RTL}
+procedure InitializeLocaleSupport16;
 begin
-  Index := pcre_get_stringnumber(FCode, PAnsiChar(EncodeString(Name, roUTF8 in Options)));
-  PCRECheck(Index);
+  if not Assigned(GTables16) then
+    GTables16 := pcre16_maketables;
+end;
 
-  Result := GetCapture(Index);
+procedure TerminateLocaleSupport16;
+begin
+  if Assigned(GTables16) then
+  begin
+    CallPCRE16Free(GTables16);
+    GTables16 := nil;
+  end;
 end;
+{$ENDIF ~PCRE_RTL}
 
-procedure TJclRegEx.SetNamedCapture(const Name, Value: string);
+// TODO: Better/specific error messages, show index when available.
+function StrReplaceRegEx(const Subject, Pattern: string; Args: array of const): string;
+
+  function ArgToString(Index: Integer): string;
+  begin
+    // TODO: Any other type?
+    case TVarRec(Args[Index]).VType of
+      vtPChar:
+        Result := string(AnsiString(TVarRec(Args[Index]).VPChar));
+      vtPWideChar:
+        Result := string(WideString(TVarRec(Args[Index]).VPWideChar));
+      vtString:
+        Result := string(TVarRec(Args[Index]).VString^);
+      vtAnsiString:
+        Result := string(AnsiString(TVarRec(Args[Index]).VAnsiString));
+      vtWideString:
+        Result := string(WideString(TVarRec(Args[Index]).VWideString));
+      {$IFDEF SUPPORTS_UNICODE_STRING}
+      vtUnicodeString:
+        Result := string(UnicodeString(TVarRec(Args[Index]).VUnicodeString));
+      {$ENDIF SUPPORTS_UNICODE_STRING}
+      vtChar:
+        Result := string(AnsiString(TVarRec(Args[Index]).VChar));
+      vtWideChar:
+        Result := string(WideString(TVarRec(Args[Index]).VWideChar));
+    else
+      raise EConvertError.Create(SInvalidFormat);
+    end;
+  end;
+
 var
-  Index: Integer;
+  Re: TJclRegExBase;
+  Index, ArgIndex: Integer;
+  Value: string;
 begin
-  Index := pcre_get_stringnumber(FCode, PAnsiChar(EncodeString(Name, roUTF8 in Options)));
-  PCRECheck(Index);
+  if Odd(Length(Args)) then
+    raise EConvertError.Create(SArgumentMissing)
+  else
+  begin
+    Re := TJclAnsiRegEx.Create;
+    try
+      if Re.Compile(Pattern, False) and Re.Match(Subject) then
+      begin
+        for Index := 0 to Length(Args) div 2 - 1 do
+        begin
+          ArgIndex := Index * 2;
+          Value := ArgToString(ArgIndex + 1);
 
-  SetCapture(Index, Value);
+          if TVarRec(Args[ArgIndex]).VType = vtInteger then
+            Re.Captures[TVarRec(Args[ArgIndex]).VInteger] := Value
+          else
+            Re.NamedCaptures[ArgToString(ArgIndex)] := Value;
+        end;
+
+        Result := Re.Result;
+      end
+      else
+        raise EConvertError.Create(SInvalidFormat);
+    finally
+      Re.Free;
+    end;
+  end;
 end;
 
-function TJclRegEx.GetCaptureNameCount: Integer;
+//=== { EPCREError } =========================================================
+
+constructor EPCREError.CreateRes(ResStringRec: PResStringRec; ErrorCode: Integer);
 begin
-  PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_NAMECOUNT, @Result));
+  FErrorCode := ErrorCode;
+  inherited CreateRes(ResStringRec);
 end;
 
-function TJclRegEx.GetCaptureName(Index: Integer): string;
-var
-  NameTable: PAnsiChar;
-  EntrySize: Integer;
+procedure LibNotLoadedHandler; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
-  PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_NAMETABLE, @NameTable));
-  PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_NAMEENTRYSIZE, @EntrySize));
+  raise EPCREError.CreateRes(@RsErrLibNotLoaded, 0);
+end;
 
-  NameTable := NameTable + EntrySize * Index + 2;
-  Result := DecodeString(AnsiString(NameTable), roUTF8 in Options);
+//=== { TJclAnsiRegEx } ======================================================
+
+destructor TJclAnsiRegEx.Destroy;
+begin
+  if Assigned(FCode) then
+    CallPCREFree(FCode);
+  if Assigned(FExtra) then
+    {$IFDEF PCRE_RTL}
+    CallPCREFree(FExtra);
+    {$ELSE ~PCRE_RTL}
+    pcre_free_study(FExtra);
+    {$ENDIF ~PCRE_RTL}
+  inherited Destroy;
 end;
 
-function TJclRegEx.CalloutHandler(var CalloutBlock: pcre_callout_block): Integer;
+function TJclAnsiRegEx.CalloutHandler(var CalloutBlock: pcre_callout_block): Integer;
 begin
   try
     Result := JCL_PCRE_CALLOUT_NOERROR;
@@ -654,8 +778,163 @@
   end;
 end;
 
-function TJclRegEx.Match(const Subject: string; StartOffset: Cardinal = 1): Boolean;
+function TJclAnsiRegEx.Compile(const Pattern: string; Study, UserLocale, JITCompile: Boolean): Boolean;
 var
+  ErrMsgPtr: PAnsiChar;
+  Tables: PAnsiChar;
+  StudyOptions: Integer;
+  {$IFNDEF PCRE_RTL}
+  ConfigJIT: Integer;
+  {$ENDIF ~PCRE_RTL}
+begin
+  if UserLocale then
+  begin
+    InitializeLocaleSupport;
+    Tables := GTables;
+  end
+  else
+    Tables := nil;
+
+  FPattern := Pattern;
+  if FPattern = '' then
+    PCRECheck(PCRE_ERROR_NULL, SupportsWideChar);
+
+  if Assigned(FCode) then
+  begin
+    CallPCREFree(FCode);
+    FCode := nil;
+  end;
+  FCode := pcre_compile2(PAnsiChar(EncodeAnsiString(FPattern, roUTF8 in Options)), GetAPIOptions(False, DfaMode),
+    @FErrorCode, @ErrMsgPtr, @FErrorOffset, Tables);
+  Inc(FErrorOffset);
+  FErrorMessage := string(AnsiString(ErrMsgPtr));
+  Result := Assigned(FCode);
+  if Result then
+  begin
+    if Study then
+    begin
+      {$IFDEF PCRE_RTL}
+      if Assigned(FExtra) then
+        CallPCREFree(FExtra);
+      if JITCompile then
+        raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
+      StudyOptions := 0;
+      {$ELSE ~PCRE_RTL}
+      if Assigned(FExtra) then
+        pcre_free_study(FExtra);
+      if JITCompile then
+      begin
+        PCRECheck(pcre_config(PCRE_CONFIG_JIT, @ConfigJIT), SupportsWideChar);
+        if ConfigJIT = 0 then
+          raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
+        StudyOptions := PCRE_STUDY_JIT_COMPILE;
+      end
+      else
+        StudyOptions := 0;
+      {$ENDIF ~PCRE_RTL}
+      FExtra := pcre_study(FCode, StudyOptions, @ErrMsgPtr);
+      Result := Assigned(FExtra) or (not Assigned(ErrMsgPtr));
+      if not Result then
+      begin
+        FErrorCode := JCL_PCRE_ERROR_STUDYFAILED;
+        FErrorMessage := string(AnsiString(ErrMsgPtr));
+      end;
+    end;
+
+    if FDfaMode then
+      FVectorSize := FCaptureCount
+    else
+    begin
+      PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_CAPTURECOUNT, @FCaptureCount), SupportsWideChar);
+      FVectorSize := (FCaptureCount + 1) * 3;
+    end;
+    ReAllocMem(FVector, FVectorSize * SizeOf(FVector[0]));
+  end;
+end;
+
+function TJclAnsiRegEx.GetAPIOptions(RunTime, DFA: Boolean): Integer;
+var
+  ConfigUTF8: Integer;
+begin
+  PCRECheck(pcre_config(PCRE_CONFIG_UTF8, @ConfigUTF8), SupportsWideChar);
+  if (roUTF8 in Options) and (ConfigUTF8 = 0) then
+    PCRECheck(JCL_PCRE_ERROR_NOUTF8, SupportsWideChar);
+
+  Result := inherited GetAPIOptions(RunTime, DFA);
+end;
+
+function TJclAnsiRegEx.GetCapture(Index: Integer): string;
+var
+  FromPos, ToPos: SizeInt;
+begin
+  if (Index < 0) or (Index >= FCaptureCount) then
+    PCRECheck(PCRE_ERROR_NOSUBSTRING, SupportsWideChar)
+  else
+  begin
+    if FViewChanges and (FChangedCaptures.IndexOf(Pointer(SizeInt(Index))) >= 0) then
+    begin
+      Result := FResultValues[Index];
+      Exit;
+    end;
+
+    Index := Index * 2;
+    FromPos := TranslateAnsiIndex(FSubject, roUTF8 in Options, FVector^[Index] + 1);
+    ToPos := TranslateAnsiIndex(FSubject, roUTF8 in Options, FVector^[Index + 1] + 1) - 1;
+    Result := Copy(FSubject, FromPos, ToPos - FromPos + 1);
+  end;
+end;
+
+function TJclAnsiRegEx.GetCaptureNameCount: Integer;
+begin
+  PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_NAMECOUNT, @Result), SupportsWideChar);
+end;
+
+function TJclAnsiRegEx.GetCaptureName(Index: Integer): string;
+var
+  NameTable: PAnsiChar;
+  EntrySize: Integer;
+begin
+  PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_NAMETABLE, @NameTable), SupportsWideChar);
+  PCRECheck(pcre_fullinfo(FCode, FExtra, PCRE_INFO_NAMEENTRYSIZE, @EntrySize), SupportsWideChar);
+
+  NameTable := NameTable + EntrySize * Index + 2;
+  Result := DecodeAnsiString(AnsiString(NameTable), roUTF8 in Options);
+end;
+
+function TJclAnsiRegEx.GetCaptureRange(Index: Integer): TJclCaptureRange;
+begin
+  if (Index < 0) or (Index >= FCaptureCount) then
+    PCRECheck(PCRE_ERROR_NOSUBSTRING, SupportsWideChar)
+  else
+  begin
+    Index := Index * 2;
+    Result.FirstPos := TranslateAnsiIndex(FSubject, roUTF8 in Options, FVector^[Index] + 1);
+    Result.LastPos := TranslateAnsiIndex(FSubject, roUTF8 in Options, FVector^[Index + 1] + 1) - 1;
+  end;
+end;
+
+function TJclAnsiRegEx.GetNamedCapture(const Name: string): string;
+var
+  Index: Integer;
+begin
+  Index := pcre_get_stringnumber(FCode, PAnsiChar(EncodeAnsiString(Name, roUTF8 in Options)));
+  PCRECheck(Index, SupportsWideChar);
+
+  Result := GetCapture(Index);
+end;
+
+function TJclAnsiRegEx.IndexOfName(const Name: string): Integer;
+begin
+  Result := pcre_get_stringnumber(FCode, PAnsiChar(EncodeAnsiString(Name, roUTF8 in Options)));
+end;
+
+function TJclAnsiRegEx.IsNameValid(const Name: string): Boolean;
+begin
+  Result := pcre_get_stringnumber(FCode, PAnsiChar(EncodeAnsiString(Name, roUTF8 in Options))) >= 0;
+end;
+
+function TJclAnsiRegEx.Match(const Subject: string; StartOffset: Cardinal): Boolean;
+var
   LocalExtra: real_pcre_extra;
   Extra: Pointer;
   WorkSpace: array [0 .. 19] of Integer;
@@ -684,11 +963,11 @@
   FSubject := Subject;
   if Assigned(FChangedCaptures) then
     FChangedCaptures.Clear;
-  EncodedSubject := EncodeString(FSubject, roUTF8 in Options);
+  EncodedSubject := EncodeAnsiString(FSubject, roUTF8 in Options);
 
   // convert index
   if roUTF8 in Options then
-    StartOffset := Length(EncodeString(Copy(FSubject, 1, StartOffset - 1), True)) + 1;
+    StartOffset := Length(EncodeAnsiString(Copy(FSubject, 1, StartOffset - 1), True)) + 1;
 
   if FDfaMode then
   begin
@@ -710,112 +989,290 @@
   begin
     FErrorCode := ExecRslt;
     if FErrorCode <> PCRE_ERROR_NOMATCH then
-      PCRECheck(FErrorCode);
+      PCRECheck(FErrorCode, SupportsWideChar);
   end;
 end;
 
-function TJclRegEx.IndexOfName(const Name: string): Integer;
+procedure TJclAnsiRegEx.SetNamedCapture(const Name, Value: string);
+var
+  Index: Integer;
 begin
-  Result := pcre_get_stringnumber(FCode, PAnsiChar(EncodeString(Name, roUTF8 in Options)));
+  Index := pcre_get_stringnumber(FCode, PAnsiChar(EncodeAnsiString(Name, roUTF8 in Options)));
+  PCRECheck(Index, SupportsWideChar);
+
+  SetCapture(Index, Value);
 end;
 
-function TJclRegEx.IsNameValid(const Name: string): Boolean;
+{$IFNDEF PCRE_RTL}
+
+//=== { TJclWideRegEx } ======================================================
+
+destructor TJclWideRegEx.Destroy;
 begin
-  Result := pcre_get_stringnumber(FCode, PAnsiChar(EncodeString(Name, roUTF8 in Options))) >= 0;
+  if Assigned(FCode) then
+    CallPCRE16Free(FCode);
+  if Assigned(FExtra) then
+    {$IFDEF PCRE_RTL}
+    CallPCRE16Free(FExtra);
+    {$ELSE ~PCRE_RTL}
+    pcre16_free_study(FExtra);
+    {$ENDIF ~PCRE_RTL}
+  inherited Destroy;
 end;
 
-procedure InitializeLocaleSupport;
+function TJclWideRegEx.CalloutHandler(var CalloutBlock: pcre16_callout_block): Integer;
 begin
-  if not Assigned(GTables) then
-    GTables := pcre_maketables;
+  try
+    Result := JCL_PCRE_CALLOUT_NOERROR;
+    if Assigned(FOnCallout) then
+    begin
+      with CalloutBlock do
+      begin
+        FCaptureCount := capture_top;
+        FOnCallout(Self, callout_number, start_match + 1, current_position + 1,
+          capture_last, pattern_position + 1, next_item_length, Result);
+      end;
+    end;
+  except
+    on E: Exception do
+    begin
+      FErrorMessage := E.Message;
+      Result := JCL_PCRE_ERROR_CALLOUTERROR;
+    end;
+  end;
 end;
 
-procedure TerminateLocaleSupport;
+function TJclWideRegEx.Compile(const Pattern: string; Study, UserLocale, JITCompile: Boolean): Boolean;
+var
+  ErrMsgPtr: PAnsiChar;
+  Tables: PAnsiChar;
+  StudyOptions: Integer;
+  {$IFNDEF PCRE_RTL}
+  ConfigJIT: Integer;
+  {$ENDIF ~PCRE_RTL}
 begin
-  if Assigned(GTables) then
+  if UserLocale then
   begin
-    CallPCREFree(GTables);
-    GTables := nil;
-  end;
-end;
+    InitializeLocaleSupport16;
+    Tables := GTables16;
+  end
+  else
+    Tables := nil;
 
-// TODO: Better/specific error messages, show index when available.
-function StrReplaceRegEx(const Subject, Pattern: string; Args: array of const): string;
+  FPattern := Pattern;
+  if FPattern = '' then
+    PCRECheck(PCRE_ERROR_NULL, SupportsWideChar);
 
-  function ArgToString(Index: Integer): string;
+  if Assigned(FCode) then
   begin
-    // TODO: Any other type?
-    case TVarRec(Args[Index]).VType of
-      vtPChar:
-        Result := string(AnsiString(TVarRec(Args[Index]).VPChar));
-      vtPWideChar:
-        Result := string(WideString(TVarRec(Args[Index]).VPWideChar));
-      vtString:
-        Result := string(TVarRec(Args[Index]).VString^);
-      vtAnsiString:
-        Result := string(AnsiString(TVarRec(Args[Index]).VAnsiString));
-      vtWideString:
-        Result := string(WideString(TVarRec(Args[Index]).VWideString));
-      {$IFDEF SUPPORTS_UNICODE_STRING}
-      vtUnicodeString:
-        Result := string(UnicodeString(TVarRec(Args[Index]).VUnicodeString));
-      {$ENDIF SUPPORTS_UNICODE_STRING}
-      vtChar:
-        Result := string(AnsiString(TVarRec(Args[Index]).VChar));
-      vtWideChar:
-        Result := string(WideString(TVarRec(Args[Index]).VWideChar));
+    CallPCRE16Free(FCode);
+    FCode := nil;
+  end;
+  FCode := pcre16_compile2(PWideChar(EncodeWideString(FPattern, roUTF16 in Options)), GetAPIOptions(False, DfaMode),
+    @FErrorCode, @ErrMsgPtr, @FErrorOffset, Tables);
+  Inc(FErrorOffset);
+  FErrorMessage := string(AnsiString(ErrMsgPtr));
+  Result := Assigned(FCode);
+  if Result then
+  begin
+    if Study then
+    begin
+      {$IFDEF PCRE_RTL}
+      if Assigned(FExtra) then
+        CallPCRE16Free(FExtra);
+      if JITCompile then
+        raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
+      StudyOptions := 0;
+      {$ELSE ~PCRE_RTL}
+      if Assigned(FExtra) then
+        pcre16_free_study(FExtra);
+      if JITCompile then
+      begin
+        PCRECheck(pcre16_config(PCRE_CONFIG_JIT, @ConfigJIT), SupportsWideChar);
+        if ConfigJIT = 0 then
+          raise EPCREError.CreateRes(@RsErrNoJITSupport, 0);
+        StudyOptions := PCRE_STUDY_JIT_COMPILE;
+      end
+      else
+        StudyOptions := 0;
+      {$ENDIF ~PCRE_RTL}
+      FExtra := pcre16_study(FCode, StudyOptions, @ErrMsgPtr);
+      Result := Assigned(FExtra) or (not Assigned(ErrMsgPtr));
+      if not Result then
+      begin
+        FErrorCode := JCL_PCRE_ERROR_STUDYFAILED;
+        FErrorMessage := string(AnsiString(ErrMsgPtr));
+      end;
+    end;
+
+    if FDfaMode then
+      FVectorSize := FCaptureCount
     else
-      raise EConvertError.Create(SInvalidFormat);
+    begin
+      PCRECheck(pcre16_fullinfo(FCode, FExtra, PCRE_INFO_CAPTURECOUNT, @FCaptureCount), SupportsWideChar);
+      FVectorSize := (FCaptureCount + 1) * 3;
     end;
+    ReAllocMem(FVector, FVectorSize * SizeOf(FVector[0]));
   end;
+end;
 
+function TJclWideRegEx.GetAPIOptions(RunTime, DFA: Boolean): Integer;
 var
-  Re: TJclRegEx;
-  Index, ArgIndex: Integer;
-  Value: string;
+  ConfigUTF16: Integer;
 begin
-  if Odd(Length(Args)) then
-    raise EConvertError.Create(SArgumentMissing)
+  PCRECheck(pcre16_config(PCRE_CONFIG_UTF16, @ConfigUTF16), SupportsWideChar);
+  if (roUTF16 in Options) and (ConfigUTF16 = 0) then
+    PCRECheck(JCL_PCRE_ERROR_NOUTF16, SupportsWideChar);
+
+  Result := inherited GetAPIOptions(RunTime, DFA);
+end;
+
+function TJclWideRegEx.GetCapture(Index: Integer): string;
+var
+  FromPos, ToPos: SizeInt;
+begin
+  if (Index < 0) or (Index >= FCaptureCount) then
+    PCRECheck(PCRE_ERROR_NOSUBSTRING, SupportsWideChar)
   else
   begin
-    Re := TJclRegEx.Create;
-    try
-      if Re.Compile(Pattern, False) and Re.Match(Subject) then
-      begin
-        for Index := 0 to Length(Args) div 2 - 1 do
-        begin
-          ArgIndex := Index * 2;
-          Value := ArgToString(ArgIndex + 1);
+    if FViewChanges and (FChangedCaptures.IndexOf(Pointer(SizeInt(Index))) >= 0) then
+    begin
+      Result := FResultValues[Index];
+      Exit;
+    end;
 
-          if TVarRec(Args[ArgIndex]).VType = vtInteger then
-            Re.Captures[TVarRec(Args[ArgIndex]).VInteger] := Value
-          else
-            Re.NamedCaptures[ArgToString(ArgIndex)] := Value;
-        end;
+    Index := Index * 2;
+    FromPos := TranslateWideIndex(FSubject, roUTF16 in Options, FVector^[Index] + 1);
+    ToPos := TranslateWideIndex(FSubject, roUTF16 in Options, FVector^[Index + 1] + 1) - 1;
+    Result := Copy(FSubject, FromPos, ToPos - FromPos + 1);
+  end;
+end;
 
-        Result := Re.Result;
-      end
-      else
-        raise EConvertError.Create(SInvalidFormat);
-    finally
-      Re.Free;
-    end;
+function TJclWideRegEx.GetCaptureName(Index: Integer): string;
+var
+  NameTable: PWideChar;
+  EntrySize: Integer;
+begin
+  PCRECheck(pcre16_fullinfo(FCode, FExtra, PCRE_INFO_NAMETABLE, @NameTable), SupportsWideChar);
+  PCRECheck(pcre16_fullinfo(FCode, FExtra, PCRE_INFO_NAMEENTRYSIZE, @EntrySize), SupportsWideChar);
+
+  NameTable := NameTable + EntrySize * Index + 2;
+  Result := DecodeWideString(WideString(NameTable), roUTF16 in Options);
+end;
+
+function TJclWideRegEx.GetCaptureNameCount: Integer;
+begin
+  PCRECheck(pcre16_fullinfo(FCode, FExtra, PCRE_INFO_NAMECOUNT, @Result), SupportsWideChar);
+end;
+
+function TJclWideRegEx.GetCaptureRange(Index: Integer): TJclCaptureRange;
+begin
+  if (Index < 0) or (Index >= FCaptureCount) then
+    PCRECheck(PCRE_ERROR_NOSUBSTRING, SupportsWideChar)
+  else
+  begin
+    Index := Index * 2;
+    Result.FirstPos := TranslateWideIndex(FSubject, roUTF16 in Options, FVector^[Index] + 1);
+    Result.LastPos := TranslateWideIndex(FSubject, roUTF16 in Options, FVector^[Index + 1] + 1) - 1;
   end;
 end;
 
-//=== { EPCREError } =========================================================
+function TJclWideRegEx.GetNamedCapture(const Name: string): string;
+var
+  Index: Integer;
+begin
+  Index := pcre16_get_stringnumber(FCode, PWideChar(EncodeWideString(Name, roUTF16 in Options)));
+  PCRECheck(Index, SupportsWideChar);
 
-constructor EPCREError.CreateRes(ResStringRec: PResStringRec; ErrorCode: Integer);
+  Result := GetCapture(Index);
+end;
+
+function TJclWideRegEx.IndexOfName(const Name: string): Integer;
 begin
-  FErrorCode := ErrorCode;
-  inherited CreateRes(ResStringRec);
+  Result := pcre16_get_stringnumber(FCode, PWideChar(EncodeWideString(Name, roUTF16 in Options)));
 end;
 
-procedure LibNotLoadedHandler; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+function TJclWideRegEx.IsNameValid(const Name: string): Boolean;
 begin
-  raise EPCREError.CreateRes(@RsErrLibNotLoaded, 0);
+  Result := pcre16_get_stringnumber(FCode, PWideChar(EncodeWideString(Name, roUTF16 in Options))) >= 0;
 end;
 
+function TJclWideRegEx.Match(const Subject: string; StartOffset: Cardinal): Boolean;
+var
+  LocalExtra: real_pcre16_extra;
+  Extra: Pointer;
+  WorkSpace: array [0 .. 19] of Integer;
+  ExecRslt: Integer;
+  EncodedSubject: WideString;
+begin
+  if Assigned(FOnCallout) then
+  begin
+    if Assigned(FExtra) then
+    begin
+      LocalExtra.flags := PCRE_EXTRA_STUDY_DATA or PCRE_EXTRA_CALLOUT_DATA;
+      LocalExtra.study_data := FExtra;
+    end
+    else
+      LocalExtra.flags := PCRE_EXTRA_CALLOUT_DATA;
+    LocalExtra.callout_data := Self;
+    Extra := @LocalExtra;
+    SetPCRE16CalloutCallback(JclPCRE16Callout);
+  end
+  else
+  begin
+    Extra := FExtra;
+    SetPCRE16CalloutCallback(nil);
+  end;
+
+  FSubject := Subject;
+  if Assigned(FChangedCaptures) then
+    FChangedCaptures.Clear;
+  EncodedSubject := EncodeWideString(FSubject, roUTF16 in Options);
+
+  // convert index
+  if roUTF16 in Options then
+    StartOffset := Length(EncodeWideString(Copy(FSubject, 1, StartOffset - 1), True)) + 1;
+
+  if FDfaMode then
+  begin
+    ExecRslt := pcre16_dfa_exec(FCode, Extra, PWideChar(EncodedSubject), Length(EncodedSubject),
+      StartOffset - 1, GetAPIOptions(True, DfaMode), PInteger(FVector), FVectorSize, @Workspace, 20);
+  end
+  else
+  begin
+    ExecRslt := pcre16_exec(FCode, Extra, PWideChar(EncodedSubject), Length(EncodedSubject),
+      StartOffset - 1, GetAPIOptions(True, DfaMode), PInteger(FVector), FVectorSize);
+  end;
+  Result := ExecRslt >= 0;
+  if Result then
+  begin
+    FCaptureCount := ExecRslt;
+    FErrorCode := 0;
+  end
+  else
+  begin
+    FErrorCode := ExecRslt;
+    if FErrorCode <> PCRE_ERROR_NOMATCH then
+      PCRECheck(FErrorCode, SupportsWideChar);
+  end;
+end;
+
+procedure TJclWideRegEx.SetNamedCapture(const Name, Value: string);
+var
+  Index: Integer;
+begin
+  Index := pcre16_get_stringnumber(FCode, PWideChar(EncodeWideString(Name, roUTF16 in Options)));
+  PCRECheck(Index, SupportsWideChar);
+
+  SetCapture(Index, Value);
+end;
+
+function TJclWideRegEx.SupportsWideChar: Boolean;
+begin
+  Result := True;
+end;
+{$ENDIF ~PCRE_RTL}
+
 initialization
   {$IFNDEF PCRE_RTL}
   pcre.LibNotLoadedHandler := LibNotLoadedHandler;
@@ -824,6 +1281,10 @@
   begin
     SetPCREMallocCallback(JclPCREGetMem);
     SetPCREFreeCallback(JclPCREFreeMem);
+    {$IFNDEF PCRE_RTL}
+    SetPCRE16MallocCallback(JclPCRE16GetMem);
+    SetPCRE16FreeCallback(JclPCRE16FreeMem);
+    {$ENDIF ~PCRE_RTL}
   end;
   {$IFDEF UNITVERSIONING}
   RegisterUnitVersion(HInstance, UnitVersioning);
@@ -831,6 +1292,9 @@
 
 finalization
   TerminateLocaleSupport;
+  {$IFNDEF PCRE_RTL}
+  TerminateLocaleSupport16;
+  {$ENDIF ~PCRE_RTL}
   {$IFDEF UNITVERSIONING}
   UnregisterUnitVersion(HInstance);
   {$ENDIF UNITVERSIONING}

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas	2012-08-28 08:03:01 UTC (rev 3849)
+++ trunk/jcl/source/common/JclResources.pas	2012-08-28 14:44:17 UTC (rev 3850)
@@ -1451,7 +1451,9 @@
   RsErrMatchLimit    = 'Match limit';
   RsErrCallout       = 'Callout';
   RsErrBadUTF8       = 'Bad UTF-8';
+  RsErrBadUTF16      = 'Bad UTF-16';
   RsErrBadUTF8Offset = 'Bad UTF-8 offset';
+  RsErrBadUTF16Offset = 'Bad UTF-16 offset';
   RsErrPartial       = 'Partial';
   RsErrBadPartial    = 'Bad partial';
   RsErrInternal      = 'Internal';
@@ -1465,7 +1467,8 @@
   RsErrNullWsLimit   = 'Null WS limit';
   RsErrBadNewLine    = 'Bad new line';
   RsErrBadOffset     = 'Bad offset';
-  RsErrShortUTF8     = 'Short UTF8';
+  RsErrShortUTF8     = 'Short UTF-8';
+  RsErrShortUTF16    = 'Short UTF-16';
   RsErrRecurseLoop   = 'Recurse loop';
   RsErrJITStackLimit = 'JIT stack limit';
   RsErrLibNotLoaded  = 'PCRE library not loaded';
@@ -1473,8 +1476,12 @@
   RsErrStudyFailed   = 'Study failed';
   RsErrCalloutError  = 'Unhandled exception in callout';
   RsErrUnknownError  = 'Unknown error';
-  RsErrNoUTF8Support = 'No UTF8 support in this version of PCRE';
+  RsErrNoUTF8Support = 'No UTF-8 support in this version of PCRE';
+  RsErrNoUTF16Support = 'No UTF-16 support in this version of PCRE';
   RsErrNoJITSupport  = 'No JIT support in this version of PCRE';
+  RsErrBadMode       = 'Bad Mode';
+  RsErrBadEndianness = 'Bad endianness';
+  RsErrBadRestart    = 'Bad Restart';
 
 //=== JclPeImage =============================================================
 resourcestring

Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas	2012-08-28 08:03:01 UTC (rev 3849)
+++ trunk/jcl/source/common/pcre.pas	2012-08-28 14:44:17 UTC (rev 3850)
@@ -111,10 +111,14 @@
   {$EXTERNALSYM PCRE_NOTEMPTY}
   PCRE_UTF8 = $00000800;
   {$EXTERNALSYM PCRE_UTF8}
+  PCRE_UTF16 = $00000800;
+  {$EXTERNALSYM PCRE_UTF16}
   PCRE_NO_AUTO_CAPTURE = $00001000;
   {$EXTERNALSYM PCRE_NO_AUTO_CAPTURE}
   PCRE_NO_UTF8_CHECK = $00002000;
   {$EXTERNALSYM PCRE_NO_UTF8_CHECK}
+  PCRE_NO_UTF16_CHECK = $00002000;
+  {$EXTERNALSYM PCRE_NO_UTF16_CHECK}
   PCRE_AUTO_CALLOUT = $00004000;
   {$EXTERNALSYM PCRE_AUTO_CALLOUT}
   PCRE_PARTIAL_SOFT = $00008000;
@@ -178,8 +182,12 @@
   {$EXTERNALSYM PCRE_ERROR_CALLOUT}
   PCRE_ERROR_BADUTF8 = -10;
   {$EXTERNALSYM PCRE_ERROR_BADUTF8}
+  PCRE_ERROR_BADUTF16 = -10;
+  {$EXTERNALSYM PCRE_ERROR_BADUTF16}
   PCRE_ERROR_BADUTF8_OFFSET = -11;
   {$EXTERNALSYM PCRE_ERROR_BADUTF8_OFFSET}
+  PCRE_ERROR_BADUTF16_OFFSET = -11;
+  {$EXTERNALSYM PCRE_ERROR_BADUTF16_OFFSET}
   PCRE_ERROR_PARTIAL = -12;
   {$EXTERNALSYM PCRE_ERROR_PARTIAL}
   PCRE_ERROR_BADPARTIAL = -13;
@@ -208,10 +216,18 @@
   {$EXTERNALSYM PCRE_ERROR_BADOFFSET}
   PCRE_ERROR_SHORTUTF8 = -25;
   {$EXTERNALSYM PCRE_ERROR_SHORTUTF8}
+  PCRE_ERROR_SHORTUTF16 = -25;
+  {$EXTERNALSYM PCRE_ERROR_SHORTUTF16}
   PCRE_ERROR_RECURSELOOP = -26;
   {$EXTERNALSYM PCRE_ERROR_RECURSELOOP}
   PCRE_ERROR_JITSTACKLIMIT = -27;
   {$EXTERNALSYM PCRE_ERROR_JITSTACKLIMIT}
+  PCRE_ERROR_BADMODE = -28;
+  {$EXTERNALSYM PCRE_ERROR_BADMODE}
+  PCRE_ERROR_BADENDIANNESS = -29;
+  {$EXTERNALSYM PCRE_ERROR_BADENDIANNESS}
+  PCRE_ERROR_DFA_BADRESTART = -30;
+  {$EXTERNALSYM PCRE_ERROR_DFA_BADRESTART}
 
   (* Specific error codes for UTF-8 validity checks *)
 
@@ -238,6 +254,14 @@
   PCRE_UTF8_ERR20  = 20;
   PCRE_UTF8_ERR21  = 21;
 
+  (* Specific error codes for UTF-16 validity checks *)
+
+  PCRE_UTF16_ERR0 = 0;
+  PCRE_UTF16_ERR1 = 1;
+  PCRE_UTF16_ERR2 = 2;
+  PCRE_UTF16_ERR3 = 3;
+  PCRE_UTF16_ERR4 = 4;
+
   (* Request types for pcre_fullinfo() *)
 
   PCRE_INFO_OPTIONS = 0;
@@ -276,6 +300,8 @@
   {$EXTERNALSYM PCRE_INFO_JIT}
   PCRE_INFO_JITSIZE = 17;
   {$EXTERNALSYM PCRE_INFO_JITSIZE}
+  PCRE_INFO_MAXLOOKBEHIND = 18;
+  {$EXTERNALSYM PCRE_INFO_MAXLOOKBEHIND}
 
   (* Request types for pcre_config() *)
   PCRE_CONFIG_UTF8 = 0;
@@ -298,10 +324,16 @@
   {$EXTERNALSYM PCRE_CONFIG_BSR}
   PCRE_CONFIG_JIT = 9;
   {$EXTERNALSYM PCRE_CONFIG_JIT}
+  PCRE_CONFIG_UTF16 = 10;
+  {$EXTERNALSYM PCRE_CONFIG_UTF16}
+  PCRE_CONFIG_JITTARGET = 11;
+  {$EXTERNALSYM PCRE_CONFIG_JITTARGET}
 
   (* Request types for pcre_study() *)
 
   PCRE_STUDY_JIT_COMPILE = $0001;
+  PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE = $0002;
+  PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE = $0004;
 
   (* Bit flags for the pcre_extra structure *)
 
@@ -335,11 +367,21 @@
   TPCRE = real_pcre;
   PPCRE = ^TPCRE;
 
+  real_pcre16 = packed record
+  end;
+  TPCRE16 = real_pcre16;
+  PPCRE16 = ^TPCRE16;
+
   real_pcre_jit_stack = packed record
   end;
   TPCREJITStack = real_pcre_jit_stack;
   PPCREJITStack = ^TPCREJITStack;
 
+  real_pcre16_jit_stack = packed record
+  end;
+  TPCRE16JITStack = real_pcre16_jit_stack;
+  PPCRE16JITStack = ^TPCRE16JITStack;
+
   real_pcre_extra = packed record
     flags: Cardinal;        (* Bits for which fields are set *)
     study_data: Pointer;    (* Opaque data from pcre_study() *)
@@ -353,6 +395,19 @@
   TPCREExtra = real_pcre_extra;
   PPCREExtra = ^TPCREExtra;
 
+  real_pcre16_extra = packed record
+    flags: Cardinal;        (* Bits for which fields are set *)
+    study_data: Pointer;    (* Opaque data from pcre_study() *)
+    match_limit: Cardinal;  (* Maximum number of calls to match() *)
+    callout_data: Pointer;  (* Data passed back in callouts *)
+    tables: PAnsiChar;      (* Pointer to character tables *)
+    match_limit_recursion: Cardinal; (* Max recursive calls to match() *)
+    mark: PPWideChar;       (* For passing back a mark pointer *)
+    executable_jit: Pointer; (* Contains a pointer to a compiled jit code *)
+  end;
+  TPCRE16Extra = real_pcre16_extra;
+  PPCRE16Extra = ^TPCRE16Extra;
+
   pcre_callout_block = packed record
     version: Integer;           (* Identifies version of block *)
   (* ------------------------ Version 0 ------------------------------- *)
@@ -373,6 +428,26 @@
   (* ------------------------------------------------------------------ *)
   end;
 
+  pcre16_callout_block = packed record
+    version: Integer;           (* Identifies version of block *)
+  (* ------------------------ Version 0 ------------------------------- *)
+    callout_number: Integer;    (* Number compiled into pattern *)
+    offset_vector: PInteger;    (* The offset vector *)
+    subject: PWideChar;         (* The subject being matched *)
+    subject_length: Integer;    (* The length of the subject *)
+    start_match: Integer;       (* Offset to start of this match attempt *)
+    current_position: Integer;  (* Where we currently are in the subject *)
+    capture_top: Integer;       (* Max current capture *)
+    capture_last: Integer;      (* Most recently closed capture *)
+    callout_data: Pointer;      (* Data passed in with the call *)
+  (* ------------------- Added for Version 1 -------------------------- *)
+    pattern_position: Integer;  (* Offset to next item in the pattern *)
+    next_item_length: Integer;  (* Length of next item in the pattern *)
+  (* ------------------- Added for Version 2 -------------------------- *)
+    Mark: PCardinal;            (* Pointer to current mark or NULL *)
+  (* ------------------------------------------------------------------ *)
+  end;
+
   pcre_malloc_callback = function(Size: SizeInt): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_malloc_callback}
   pcre_free_callback = procedure(P: Pointer); {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
@@ -385,6 +460,18 @@
   {$EXTERNALSYM pcre_callout_callback}
   pcre_jit_callback = function (P: Pointer): PPCREJITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_jit_callback}
+  pcre16_malloc_callback = pcre_malloc_callback;
+  {$EXTERNALSYM pcre16_malloc_callback}
+  pcre16_free_callback = pcre_free_callback;
+  {$EXTERNALSYM pcre16_free_callback}
+  pcre16_stack_malloc_callback = pcre_stack_malloc_callback;
+  {$EXTERNALSYM pcre16_stack_malloc_callback}
+  pcre16_stack_free_callback = pcre_stack_free_callback;
+  {$EXTERNALSYM pcre16_stack_free_callback}
+  pcre16_callout_callback = function(var callout_block: pcre16_callout_block): Integer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+  {$EXTERNALSYM pcre16_callout_callback}
+  pcre16_jit_callback = function (P: Pointer): PPCRE16JITStack; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+  {$EXTERNALSYM pcre16_jit_callback}
 
 var
   // renamed from "pcre_X" to "pcre_X_func" to allow functions with name "pcre_X" to be
@@ -399,6 +486,16 @@
   {$EXTERNALSYM pcre_stack_free_func}
   pcre_callout_func: ^pcre_callout_callback = nil;
   {$EXTERNALSYM pcre_callout_func}
+  pcre16_malloc_func: ^pcre16_malloc_callback = nil;
+  {$EXTERNALSYM pcre16_malloc_func}
+  pcre16_free_func: ^pcre16_free_callback = nil;
+  {$EXTERNALSYM pcre16_free_func}
+  pcre16_stack_malloc_func: ^pcre16_stack_malloc_callback = nil;
+  {$EXTERNALSYM pcre16_stack_malloc_func}
+  pcre16_stack_free_func: ^pcre16_stack_free_callback = nil;
+  {$EXTERNALSYM pcre16_stack_free_func}
+  pcre16_callout_func: ^pcre16_callout_callback = nil;
+  {$EXTERNALSYM pcre16_callout_func}
 
 procedure SetPCREMallocCallback(const Value: pcre_malloc_callback);
 {$EXTERNALSYM SetPCREMallocCallback}
@@ -435,8 +532,44 @@
 function CallPCRECallout(var callout_block: pcre_callout_block): Integer;
 {$EXTERNALSYM CallPCRECallout}
 
+procedure SetPCRE16MallocCallback(const Value: pcre16_malloc_callback);
+{$EXTERNALSYM SetPCRE16MallocCallback}
+function GetPCRE16MallocCallback: pcre16_malloc_callback;
+{$EXTERNALSYM GetPCRE16MallocCallback}
+function CallPCRE16Malloc(Size: SizeInt): Pointer;
+{$EXTERNALSYM CallPCRE16Malloc}
+
+procedure SetPCRE16FreeCallback(const Value: pcre16_free_callback);
+{$EXTERNALSYM SetPCRE16FreeCallback}
+function GetPCRE16FreeCallback: pcre16_free_callback;
+{$EXTERNALSYM GetPCRE16FreeCallback}
+procedure CallPCRE16Free(P: Pointer);
+{$EXTERNALSYM CallPCRE16Free}
+
+procedure SetPCRE16StackMallocCallback(const Value: pcre16_stack_malloc_callback);
+{$EXTERNALSYM SetPCRE16StackMallocCallback}
+function GetPCRE16StackMallocCallback: pcre16_stack_malloc_callback;
+{$EXTERNALSYM GetPCRE16StackMallocCallback}
+function CallPCRE16StackMalloc(Size: SizeInt): Pointer;
+{$EXTERNALSYM CallPCRE16StackMalloc}
+
+procedure SetPCRE16StackFreeCallback(const Value: pcre16_stack_free_callback);
+{$EXTERNALSYM SetPCRE16StackFreeCallback}
+function GetPCRE16StackFreeCallback: pcre16_stack_free_callback;
+{$EXTERNALSYM GetPCRE16StackFreeCallback}
+procedure CallPCRE16StackFree(P: Pointer);
+{$EXTERNALSYM CallPCRE16StackFree}
+
+procedure SetPCRE16CalloutCallback(const Value: pcre16_callout_callback);
+{$EXTERNALSYM SetPCRE16CalloutCallback}
+function GetPCRE16CalloutCallback: pcre16_callout_callback;
+{$EXTERNALSYM GetPCRE16CalloutCallback}
+function CallPCRE16Callout(var callout_block: pcre16_callout_block): Integer;
+{$EXTERNALSYM CallPCRE16Callout}
+
 type
   TPCRELibNotLoadedHandler = procedure; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+  PPPWideChar = ^PPWideChar;
 
 var
   // Value to initialize function pointers below with, in case LoadPCRE fails
@@ -451,83 +584,164 @@
   const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_compile}
+function pcre16_compile(const pattern: PWideChar; options: Integer;
+  const errptr: PPAnsiChar; erroffset: PInteger; const tableptr: PAnsiChar): PPCRE16;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_compile}
 function pcre_compile2(const pattern: PAnsiChar; options: Integer;
   const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
   const tables: PAnsiChar): PPCRE;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_compile2}
+function pcre16_compile2(const pattern: PWideChar; options: Integer;
+  const errorcodeptr: PInteger; const errorptr: PPAnsiChar; erroroffset: PInteger;
+  const tables: PAnsiChar): PPCRE16;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_compile2}
 function pcre_config(what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_config}
+function pcre16_config(what: Integer; where: Pointer): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_config}
 function pcre_copy_named_substring(const code: PPCRE; const subject: PAnsiChar;
   ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
   buffer: PAnsiChar; size: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_copy_named_substring}
+function pcre16_copy_named_substring(const code: PPCRE16; const subject: PWideChar;
+  ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
+  buffer: PWideChar; size: Integer): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_copy_named_substring}
 function pcre_copy_substring(const subject: PAnsiChar; ovector: PInteger;
   stringcount, stringnumber: Integer; buffer: PAnsiChar; buffersize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_copy_substring}
+function pcre16_copy_substring(const subject: PWideChar; ovector: PInteger;
+  stringcount, stringnumber: Integer; buffer: PWideChar; buffersize: Integer): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_copy_substring}
 function pcre_dfa_exec(const argument_re: PPCRE; const extra_data: PPCREExtra;
   const subject: PAnsiChar; length: Integer; start_offset: Integer;
   options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
   wscount: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_dfa_exec}
+function pcre16_dfa_exec(const argument_re: PPCRE16; const extra_data: PPCRE16Extra;
+  const subject: PWideChar; length: Integer; start_offset: Integer;
+  options: Integer; offsets: PInteger; offsetcount: Integer; workspace: PInteger;
+  wscount: Integer): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_dfa_exec}
 function pcre_exec(const code: PPCRE; const extra: PPCREExtra; const subject: PAnsiChar;
   length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_exec}
+function pcre16_exec(const code: PPCRE16; const extra: PPCRE16Extra; const subject: PWideChar;
+  length, startoffset, options: Integer; ovector: PInteger; ovecsize: Integer): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_exec}
 procedure pcre_free_substring(stringptr: PAnsiChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_substring}
+procedure pcre16_free_substring(stringptr: PWideChar);
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_free_substring}
 procedure pcre_free_substring_list(stringlistptr: PPAnsiChar);
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_free_substring_list}
+procedure pcre16_free_substring_list(stringlistptr: PPWideChar);
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_free_substring_list}
 function pcre_fullinfo(const code: PPCRE; const extra: PPCREExtra;
   what: Integer; where: Pointer): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_fullinfo}
+function pcre16_fullinfo(const code: PPCRE16; const extra: PPCRE16Extra;
+  what: Integer; where: Pointer): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+{$EXTERNALSYM pcre16_fullinfo}
 function pcre_get_named_substring(const code: PPCRE; const subject: PAnsiChar;
   ovector: PInteger; stringcount: Integer; const stringname: PAnsiChar;
   const stringptr: PPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_named_substring}
+function pcre16_get_named_substring(const code: PPCRE16; const subject: PWideChar;
+  ovector: PInteger; stringcount: Integer; const stringname: PWideChar;
+  const stringptr: PPWideChar): Integer;
+  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF P...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3849] trunk/jcl/source

From: <ou...@us...> - 2012-08-28 08:03:13

Revision: 3849
          http://jcl.svn.sourceforge.net/jcl/?rev=3849&view=rev
Author:   outchy
Date:     2012-08-28 08:03:01 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
more simple way to generate PCRE default character tables.

Modified Paths:
--------------
    trunk/jcl/source/common/pcre.pas
    trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win64/makefile.mak

Added Paths:
-----------
    trunk/jcl/source/windows/obj/pcre/win32/pcre_chartables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_chartables.obj

Removed Paths:
-------------
    trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj

Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas	2012-08-27 20:35:38 UTC (rev 3848)
+++ trunk/jcl/source/common/pcre.pas	2012-08-28 08:03:01 UTC (rev 3849)
@@ -799,7 +799,7 @@
 {$LINK ..\windows\obj\pcre\win32\pcre_valid_utf8.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_version.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_xclass.obj}
-{$LINK ..\windows\obj\pcre\win32\pcre_default_tables.obj}
+{$LINK ..\windows\obj\pcre\win32\pcre_chartables.obj}
 {$ENDIF CPU32}
 {$IFDEF CPU64}
 {$LINK ..\windows\obj\pcre\win64\pcre_compile.obj}
@@ -819,7 +819,7 @@
 {$LINK ..\windows\obj\pcre\win64\pcre_valid_utf8.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_version.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_xclass.obj}
-{$LINK ..\windows\obj\pcre\win64\pcre_default_tables.obj}
+{$LINK ..\windows\obj\pcre\win64\pcre_chartables.obj}
 {$ENDIF CPU64}
 
 // user's defined callbacks

Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-27 20:35:38 UTC (rev 3848)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-28 08:03:01 UTC (rev 3849)
@@ -65,7 +65,7 @@
   .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
   .\pcre_tables.obj .\pcre_ucd.obj \
   .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \
-  .\pcre_default_tables.obj
+  .\pcre_chartables.obj
 
 # ---------------------------------------------------------------------------
 DEBUGLIBPATH = $(BCB)\lib\debug
@@ -80,7 +80,7 @@
 # PATHOBJ = .;$(LIBPATH)
 ALLLIB = import32.lib cw32i.lib
 INCLUDES = $(pcresrc)\pcre.h $(pcresrc)\config.h
-TABLES = pcre_default_tables.c
+TABLES = $(pcresrc)\pcre_chartables.c
 # ---------------------------------------------------------------------------
 CFLAG1 = -O2 -Ve -X- -a8 -$(CPU) -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
 
@@ -121,13 +121,9 @@
 $(pcresrc)\config.h: $(pcresrc)\config.h.generic
     copy /Y $? $@
 
-pcre_default_tables.c: $(pcresrc)\dftables.c
-    $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $?
-    $(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
-    del dftables.tds
-    del dftables.obj
-    dftables.exe $@
-    del dftables.exe
+$(pcresrc)\pcre_chartables.c: $(pcresrc)\pcre_chartables.c.dist
+    copy /Y $? $@
+
 # ---------------------------------------------------------------------------
 
 

Added: trunk/jcl/source/windows/obj/pcre/win32/pcre_chartables.obj
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/source/windows/obj/pcre/win32/pcre_chartables.obj
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-27 20:35:38 UTC (rev 3848)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-28 08:03:01 UTC (rev 3849)
@@ -36,7 +36,7 @@
   .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
   .\pcre_tables.obj .\pcre_ucd.obj \
   .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \
-  .\pcre_default_tables.obj
+  .\pcre_chartables.obj
 
 # ---------------------------------------------------------------------------
 USERDEFINES = SUPPORT_UTF8;SUPPORT_UCP;SUPPORT_JIT
@@ -46,7 +46,7 @@
 PATHC = .;$(pcresrc)
 ALLLIB = import32.lib cw32i.lib
 INCLUDES = $(pcresrc)\pcre.h $(pcresrc)\config.h
-TABLES = pcre_default_tables.c
+TABLES = $(pcresrc)\pcre_chartables.c
 # ---------------------------------------------------------------------------
 CFLAG1 = -O2 -Ve -X- -a8 -5 -b -d -k- -vi -tWM- -DHAVE_CONFIG_H
 
@@ -87,13 +87,9 @@
 $(pcresrc)\config.h: $(pcresrc)\config.h.generic
     copy /Y $? $@
 
-pcre_default_tables.c: $(pcresrc)\dftables.c
-    $(BCC)\BIN\$(BCC32) -c -tWC $(CFLAG1) $(WARNINGS) -I$(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -n.\ $?
-    $(BCC)\BIN\$(LINKER) $(LFLAGS) -L$(LIBPATH) c0x32.obj .\dftables.obj, .\dftables.exe,, $(ALLLIB),,
-    del dftables.tds
-    del dftables.obj
-    dftables.exe $@
-    del dftables.exe
+$(pcresrc)\pcre_chartables.c: $(pcresrc)\pcre_chartables.c.dist
+    copy /Y $? $@
+
 # ---------------------------------------------------------------------------
 
 

Added: trunk/jcl/source/windows/obj/pcre/win64/pcre_chartables.obj
===================================================================
(Binary files differ)


Property changes on: trunk/jcl/source/windows/obj/pcre/win64/pcre_chartables.obj
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3848] trunk/thirdparty/pcre/pcre-8.31

From: <ou...@us...> - 2012-08-27 20:35:45

Revision: 3848
          http://jcl.svn.sourceforge.net/jcl/?rev=3848&view=rev
Author:   outchy
Date:     2012-08-27 20:35:38 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
these files are not in PCRE 8.31 anymore.

Removed Paths:
-------------
    trunk/thirdparty/pcre/pcre-8.31/pcre_info.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_try_flipped.c

Deleted: trunk/thirdparty/pcre/pcre-8.31/pcre_info.c
===================================================================
--- trunk/thirdparty/pcre/pcre-8.31/pcre_info.c	2012-08-27 20:10:47 UTC (rev 3847)
+++ trunk/thirdparty/pcre/pcre-8.31/pcre_info.c	2012-08-27 20:35:38 UTC (rev 3848)
@@ -1,93 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2009 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains the external function pcre_info(), which gives some
-information about a compiled pattern. However, use of this function is now
-deprecated, as it has been superseded by pcre_fullinfo(). */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-* (Obsolete) Return info about compiled pattern  *
-*************************************************/
-
-/* This is the original "info" function. It picks potentially useful data out
-of the private structure, but its interface was too rigid. It remains for
-backwards compatibility. The public options are passed back in an int - though
-the re->options field has been expanded to a long int, all the public options
-at the low end of it, and so even on 16-bit systems this will still be OK.
-Therefore, I haven't changed the API for pcre_info().
-
-Arguments:
-  argument_re   points to compiled code
-  optptr        where to pass back the options
-  first_byte    where to pass back the first character,
-                or -1 if multiline and all branches start ^,
-                or -2 otherwise
-
-Returns:        number of capturing subpatterns
-                or negative values on error
-*/
-
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_info(const pcre *argument_re, int *optptr, int *first_byte)
-{
-real_pcre internal_re;
-const real_pcre *re = (const real_pcre *)argument_re;
-if (re == NULL) return PCRE_ERROR_NULL;
-if (re->magic_number != MAGIC_NUMBER)
-  {
-  re = _pcre_try_flipped(re, &internal_re, NULL, NULL);
-  if (re == NULL) return PCRE_ERROR_BADMAGIC;
-  }
-if (optptr != NULL) *optptr = (int)(re->options & PUBLIC_COMPILE_OPTIONS);
-if (first_byte != NULL)
-  *first_byte = ((re->flags & PCRE_FIRSTSET) != 0)? re->first_byte :
-     ((re->flags & PCRE_STARTLINE) != 0)? -1 : -2;
-return re->top_bracket;
-}
-
-/* End of pcre_info.c */

Deleted: trunk/thirdparty/pcre/pcre-8.31/pcre_try_flipped.c
===================================================================
--- trunk/thirdparty/pcre/pcre-8.31/pcre_try_flipped.c	2012-08-27 20:10:47 UTC (rev 3847)
+++ trunk/thirdparty/pcre/pcre-8.31/pcre_try_flipped.c	2012-08-27 20:35:38 UTC (rev 3848)
@@ -1,139 +0,0 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
-           Copyright (c) 1997-2009 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains an internal function that tests a compiled pattern to
-see if it was compiled with the opposite endianness. If so, it uses an
-auxiliary local function to flip the appropriate bytes. */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*         Flip bytes in an integer               *
-*************************************************/
-
-/* This function is called when the magic number in a regex doesn't match, in
-order to flip its bytes to see if we are dealing with a pattern that was
-compiled on a host of different endianness. If so, this function is used to
-flip other byte values.
-
-Arguments:
-  value        the number to flip
-  n            the number of bytes to flip (assumed to be 2 or 4)
-
-Returns:       the flipped value
-*/
-
-static unsigned long int
-byteflip(unsigned long int value, int n)
-{
-if (n == 2) return ((value & 0x00ff) << 8) | ((value & 0xff00) >> 8);
-return ((value & 0x000000ff) << 24) |
-       ((value & 0x0000ff00) <<  8) |
-       ((value & 0x00ff0000) >>  8) |
-       ((value & 0xff000000) >> 24);
-}
-
-
-
-/*************************************************
-*       Test for a byte-flipped compiled regex   *
-*************************************************/
-
-/* This function is called from pcre_exec(), pcre_dfa_exec(), and also from
-pcre_fullinfo(). Its job is to test whether the regex is byte-flipped - that
-is, it was compiled on a system of opposite endianness. The function is called
-only when the native MAGIC_NUMBER test fails. If the regex is indeed flipped,
-we flip all the relevant values into a different data block, and return it.
-
-Arguments:
-  re               points to the regex
-  study            points to study data, or NULL
-  internal_re      points to a new regex block
-  internal_study   points to a new study block
-
-Returns:           the new block if is is indeed a byte-flipped regex
-                   NULL if it is not
-*/
-
-real_pcre *
-_pcre_try_flipped(const real_pcre *re, real_pcre *internal_re,
-  const pcre_study_data *study, pcre_study_data *internal_study)
-{
-if (byteflip(re->magic_number, sizeof(re->magic_number)) != MAGIC_NUMBER)
-  return NULL;
-
-*internal_re = *re;           /* To copy other fields */
-internal_re->size = byteflip(re->size, sizeof(re->size));
-internal_re->options = byteflip(re->options, sizeof(re->options));
-internal_re->flags = (pcre_uint16)byteflip(re->flags, sizeof(re->flags));
-internal_re->top_bracket =
-  (pcre_uint16)byteflip(re->top_bracket, sizeof(re->top_bracket));
-internal_re->top_backref =
-  (pcre_uint16)byteflip(re->top_backref, sizeof(re->top_backref));
-internal_re->first_byte =
-  (pcre_uint16)byteflip(re->first_byte, sizeof(re->first_byte));
-internal_re->req_byte =
-  (pcre_uint16)byteflip(re->req_byte, sizeof(re->req_byte));
-internal_re->name_table_offset =
-  (pcre_uint16)byteflip(re->name_table_offset, sizeof(re->name_table_offset));
-internal_re->name_entry_size =
-  (pcre_uint16)byteflip(re->name_entry_size, sizeof(re->name_entry_size));
-internal_re->name_count =
-  (pcre_uint16)byteflip(re->name_count, sizeof(re->name_count));
-
-if (study != NULL)
-  {
-  *internal_study = *study;   /* To copy other fields */
-  internal_study->size = byteflip(study->size, sizeof(study->size));
-  internal_study->flags = byteflip(study->flags, sizeof(study->flags));
-  internal_study->minlength = byteflip(study->minlength,
-    sizeof(study->minlength));
-  }
-
-return internal_re;
-}
-
-/* End of pcre_tryflipped.c */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3847] trunk

From: <ou...@us...> - 2012-08-27 20:10:59

Revision: 3847
          http://jcl.svn.sourceforge.net/jcl/?rev=3847&view=rev
Author:   outchy
Date:     2012-08-27 20:10:47 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
update to PCRE 8.31.

Modified Paths:
--------------
    trunk/jcl/source/common/JclPCRE.pas
    trunk/jcl/source/common/pcre.pas
    trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
    trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
    trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
    trunk/thirdparty/pcre/pcre-8.31/AUTHORS
    trunk/thirdparty/pcre/pcre-8.31/LICENCE
    trunk/thirdparty/pcre/pcre-8.31/README
    trunk/thirdparty/pcre/pcre-8.31/config.h.generic
    trunk/thirdparty/pcre/pcre-8.31/dftables.c
    trunk/thirdparty/pcre/pcre-8.31/pcre.h.generic
    trunk/thirdparty/pcre/pcre-8.31/pcre_compile.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_config.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_dfa_exec.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_exec.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_fullinfo.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_get.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_globals.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_internal.h
    trunk/thirdparty/pcre/pcre-8.31/pcre_jit_compile.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_maketables.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_newline.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_ord2utf8.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_refcount.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_study.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_tables.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_ucd.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_valid_utf8.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_version.c
    trunk/thirdparty/pcre/pcre-8.31/pcre_xclass.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitConfig.h
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitConfigInternal.h
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitExecAllocator.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitLir.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitLir.h
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeARM_Thumb2.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeARM_v5.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeMIPS_32.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeMIPS_common.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativePPC_32.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativePPC_64.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativePPC_common.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeX86_32.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeX86_64.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitNativeX86_common.c
    trunk/thirdparty/pcre/pcre-8.31/sljit/sljitUtils.c
    trunk/thirdparty/pcre/pcre-8.31/ucp.h

Added Paths:
-----------
    trunk/thirdparty/pcre/pcre-8.31/

Removed Paths:
-------------
    trunk/jcl/source/windows/obj/pcre/win32/pcre_try_flipped.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
    trunk/thirdparty/pcre/pcre-8.21/

Modified: trunk/jcl/source/common/JclPCRE.pas
===================================================================
--- trunk/jcl/source/common/JclPCRE.pas	2012-08-27 19:59:40 UTC (rev 3846)
+++ trunk/jcl/source/common/JclPCRE.pas	2012-08-27 20:10:47 UTC (rev 3847)
@@ -256,7 +256,14 @@
   {$ENDIF PCRE_RTL}
 {$ENDIF RTL230_UP}
 
-function JclPCREGetMem(Size: {$IFDEF PCRE_RTL}Integer{$ELSE}SizeInt{$ENDIF}): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
+type
+  {$IFDEF PCRE_RTL}
+  TPCREGetMemInteger = Integer;
+  {$ELSE ~PCRE_RTL}
+  TPCREGetMemInteger = SizeInt;
+  {$ENDIF ~PCRE_RTL}
+
+function JclPCREGetMem(Size: TPCREGetMemInteger): Pointer; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 begin
   GetMem(Result, Size);
 end;

Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas	2012-08-27 19:59:40 UTC (rev 3846)
+++ trunk/jcl/source/common/pcre.pas	2012-08-27 20:10:47 UTC (rev 3847)
@@ -795,7 +795,6 @@
 {$LINK ..\windows\obj\pcre\win32\pcre_refcount.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_study.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_tables.obj}
-{$LINK ..\windows\obj\pcre\win32\pcre_try_flipped.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_ucd.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_valid_utf8.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_version.obj}
@@ -816,7 +815,6 @@
 {$LINK ..\windows\obj\pcre\win64\pcre_refcount.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_study.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_tables.obj}
-{$LINK ..\windows\obj\pcre\win64\pcre_try_flipped.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_ucd.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_valid_utf8.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_version.obj}

Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-27 19:59:40 UTC (rev 3846)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-27 20:10:47 UTC (rev 3847)
@@ -2,7 +2,7 @@
 # makefile to make pcre .obj files using Borland's C++ compiler bcc32
 # derived from a makefile generated by BCB6' bpr2mak
 #
-# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21, use
+# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.31, use
 # "make -Dpcresrc=<path to pcre sources>" to tell make where to find the 
 # source files
 #
@@ -42,7 +42,7 @@
 BCC = $(BCB)
 
 !if !$d(pcresrc)
-pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21
+pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.31
 !endif
 
 !if !$d(CPU)
@@ -63,7 +63,7 @@
   .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
   .\pcre_jit_compile.obj .\pcre_maketables.obj \
   .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
-  .\pcre_tables.obj .\pcre_try_flipped.obj .\pcre_ucd.obj \
+  .\pcre_tables.obj .\pcre_ucd.obj \
   .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \
   .\pcre_default_tables.obj
 

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_config.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_default_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_dfa_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_fullinfo.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_get.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_jit_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_maketables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_newline.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_ord2utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_refcount.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_study.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_tables.obj
===================================================================
(Binary files differ)

Deleted: trunk/jcl/source/windows/obj/pcre/win32/pcre_try_flipped.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_ucd.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_valid_utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_version.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win32/pcre_xclass.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-27 19:59:40 UTC (rev 3846)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-27 20:10:47 UTC (rev 3847)
@@ -1,7 +1,7 @@
 #
 # makefile to make pcre .obj files using Microsoft C++ compiler (cl.exe)
 #
-# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21, use
+# if pcre source directory is different from ..\..\..\..\..\..\thirdparty\pcre\pcre-8.31, use
 # "make -Dpcresrc=<path to pcre sources>" to tell make where to find the 
 # source files
 #
@@ -26,7 +26,7 @@
 BCC = $(BCB)
 
 !if !$d(pcresrc)
-pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.21
+pcresrc = ..\..\..\..\..\..\thirdparty\pcre\pcre-8.31
 !endif
 
 # ---------------------------------------------------------------------------
@@ -34,7 +34,7 @@
   .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
   .\pcre_jit_compile.obj .\pcre_maketables.obj \
   .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
-  .\pcre_tables.obj .\pcre_try_flipped.obj .\pcre_ucd.obj \
+  .\pcre_tables.obj .\pcre_ucd.obj \
   .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \
   .\pcre_default_tables.obj
 

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_config.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_default_tables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_dfa_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_exec.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_fullinfo.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_get.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_jit_compile.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_maketables.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_newline.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_ord2utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_refcount.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_study.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_tables.obj
===================================================================
(Binary files differ)

Deleted: trunk/jcl/source/windows/obj/pcre/win64/pcre_try_flipped.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_ucd.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_valid_utf8.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_version.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/pcre_xclass.obj
===================================================================
(Binary files differ)


Property changes on: trunk/thirdparty/pcre/pcre-8.31
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + cmake
pcrecpp.h
Makefile.in
Detrail
pcre_scanner_unittest.cc
pcre_scanner.cc
depcomp
makevp.bat
132html
ltmain.sh
pcregexp.pas
PrepareRelease
pcre-config.in
configure.ac
RunTest
doc
pcre_printint.src
COPYING
NEWS
pcrecpp_internal.h
pcrecpp.cc
pcrecpparg.h.in
CleanTxt
pcre.h.in
ChangeLog
pcre_scanner.h
pcreposix.c
config.h.in
pcreposix.h
makevp_c.txt
HACKING
NON-UNIX-USE
pcre_stringpiece_unittest.cc
testdata
makevp_l.txt
perltest.pl
config-cmake.h.in
pcredemo.c
m4
pcre_stringpiece.h.in
configure
libpcre.pc.in
config.guess
config.sub
INSTALL
libpcreposix.pc.in
pcre_stringpiece.cc
RunTest.bat
pcretest.c
CMakeLists.txt
pcrecpp_unittest.cc
RunGrepTest
pcregrep.c
libpcrecpp.pc.in
pcre_chartables.c.dist
missing
Makefile.am
aclocal.m4
install-sh
pcre.h
config.h
pcre_jit_test.c
CheckMan
libpcre16.pc.in
NON-AUTOTOOLS-BUILD
pcre16*.c
pcre_byte_order.c
pcre_printint.c
pcre_string_utils.c

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)

Modified: trunk/thirdparty/pcre/pcre-8.31/AUTHORS
===================================================================
--- trunk/thirdparty/pcre/pcre-8.21/AUTHORS	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/pcre/pcre-8.31/AUTHORS	2012-08-27 20:10:47 UTC (rev 3847)
@@ -8,7 +8,7 @@
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2011 University of Cambridge
+Copyright (c) 1997-2012 University of Cambridge
 All rights reserved
 
 
@@ -19,7 +19,7 @@
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2010-2011 Zoltan Herczeg
+Copyright(c) 2010-2012 Zoltan Herczeg
 All rights reserved.
 
 
@@ -30,7 +30,7 @@
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2009-2011 Zoltan Herczeg
+Copyright(c) 2009-2012 Zoltan Herczeg
 All rights reserved.
 
 
@@ -39,7 +39,7 @@
 
 Written by:       Google Inc.
 
-Copyright (c) 2007-2011 Google Inc
+Copyright (c) 2007-2012 Google Inc
 All rights reserved
 
 ####

Modified: trunk/thirdparty/pcre/pcre-8.31/LICENCE
===================================================================
--- trunk/thirdparty/pcre/pcre-8.21/LICENCE	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/pcre/pcre-8.31/LICENCE	2012-08-27 20:10:47 UTC (rev 3847)
@@ -24,7 +24,7 @@
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2011 University of Cambridge
+Copyright (c) 1997-2012 University of Cambridge
 All rights reserved.
 
 
@@ -35,7 +35,7 @@
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2010-2011 Zoltan Herczeg
+Copyright(c) 2010-2012 Zoltan Herczeg
 All rights reserved.
 
 
@@ -46,7 +46,7 @@
 Email local part: hzmester
 Emain domain:     freemail.hu
 
-Copyright(c) 2009-2011 Zoltan Herczeg
+Copyright(c) 2009-2012 Zoltan Herczeg
 All rights reserved.
 
 
@@ -55,7 +55,7 @@
 
 Contributed by:   Google Inc.
 
-Copyright (c) 2007-2011, Google Inc.
+Copyright (c) 2007-2012, Google Inc.
 All rights reserved.
 
 

Modified: trunk/thirdparty/pcre/pcre-8.31/README
===================================================================
--- trunk/thirdparty/pcre/pcre-8.21/README	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/pcre/pcre-8.31/README	2012-08-27 20:10:47 UTC (rev 3847)
@@ -18,11 +18,12 @@
   The PCRE APIs
   Documentation for PCRE
   Contributions by users of PCRE
-  Building PCRE on non-Unix systems
-  Building PCRE on Unix-like systems
-  Retrieving configuration information on Unix-like systems
-  Shared libraries on Unix-like systems
-  Cross-compiling on Unix-like systems
+  Building PCRE on non-Unix-like systems
+  Building PCRE without using autotools
+  Building PCRE using autotools
+  Retrieving configuration information
+  Shared libraries
+  Cross-compiling using autotools
   Using HP's ANSI C++ compiler (aCC)
   Using PCRE from MySQL
   Making new tarballs
@@ -34,16 +35,19 @@
 The PCRE APIs
 -------------
 
-PCRE is written in C, and it has its own API. The distribution also includes a
-set of C++ wrapper functions (see the pcrecpp man page for details), courtesy
-of Google Inc.
+PCRE is written in C, and it has its own API. There are two sets of functions,
+one for the 8-bit library, which processes strings of bytes, and one for the
+16-bit library, which processes strings of 16-bit values. The distribution also
+includes a set of C++ wrapper functions (see the pcrecpp man page for details),
+courtesy of Google Inc., which can be used to call the 8-bit PCRE library from
+C++.
 
-In addition, there is a set of C wrapper functions that are based on the POSIX
-regular expression API (see the pcreposix man page). These end up in the
-library called libpcreposix. Note that this just provides a POSIX calling
-interface to PCRE; the regular expressions themselves still follow Perl syntax
-and semantics. The POSIX API is restricted, and does not give full access to
-all of PCRE's facilities.
+In addition, there is a set of C wrapper functions (again, just for the 8-bit
+library) that are based on the POSIX regular expression API (see the pcreposix
+man page). These end up in the library called libpcreposix. Note that this just
+provides a POSIX calling interface to PCRE; the regular expressions themselves
+still follow Perl syntax and semantics. The POSIX API is restricted, and does
+not give full access to all of PCRE's facilities.
 
 The header file for the POSIX-style functions is called pcreposix.h. The
 official POSIX name is regex.h, but I did not want to risk possible problems
@@ -106,36 +110,45 @@
 in the standard distribution, so these contibutions have been archived.
 
 
-Building PCRE on non-Unix systems
----------------------------------
+Building PCRE on non-Unix-like systems
+--------------------------------------
 
-For a non-Unix system, please read the comments in the file NON-UNIX-USE,
-though if your system supports the use of "configure" and "make" you may be
-able to build PCRE in the same way as for Unix-like systems. PCRE can also be
-configured in many platform environments using the GUI facility provided by
-CMake's cmake-gui command. This creates Makefiles, solution files, etc.
+For a non-Unix-like system, please read the comments in the file
+NON-AUTOTOOLS-BUILD, though if your system supports the use of "configure" and
+"make" you may be able to build PCRE using autotools in the same way as for
+many Unix-like systems.
 
+PCRE can also be configured using the GUI facility provided by CMake's
+cmake-gui command. This creates Makefiles, solution files, etc. The file
+NON-AUTOTOOLS-BUILD has information about CMake.
+
 PCRE has been compiled on many different operating systems. It should be
 straightforward to build PCRE on any system that has a Standard C compiler and
 library, because it uses only Standard C functions.
 
 
-Building PCRE on Unix-like systems
-----------------------------------
+Building PCRE without using autotools
+-------------------------------------
 
+The use of autotools (in particular, libtool) is problematic in some
+environments, even some that are Unix or Unix-like. See the NON-AUTOTOOLS-BUILD
+file for ways of building PCRE without using autotools.
+
+
+Building PCRE using autotools
+-----------------------------
+
 If you are using HP's ANSI C++ compiler (aCC), please see the special note
 in the section entitled "Using HP's ANSI C++ compiler (aCC)" below.
 
-The following instructions assume the use of the widely used "configure, make,
-make install" process. There is also support for CMake in the PCRE
-distribution; there are some comments about using CMake in the NON-UNIX-USE
-file, though it can also be used in Unix-like systems.
+The following instructions assume the use of the widely used "configure; make;
+make install" (autotools) process.
 
-To build PCRE on a Unix-like system, first run the "configure" command from the
-PCRE distribution directory, with your current directory set to the directory
-where you want the files to be created. This command is a standard GNU
-"autoconf" configuration script, for which generic instructions are supplied in
-the file INSTALL.
+To build PCRE on system that supports autotools, first run the "configure"
+command from the PCRE distribution directory, with your current directory set
+to the directory where you want the files to be created. This command is a
+standard GNU "autoconf" configuration script, for which generic instructions
+are supplied in the file INSTALL.
 
 Most commonly, people build PCRE within its own distribution directory, and in
 this case, on many systems, just running "./configure" is sufficient. However,
@@ -143,9 +156,9 @@
 
 CFLAGS='-O2 -Wall' ./configure --prefix=/opt/local
 
-specifies that the C compiler should be run with the flags '-O2 -Wall' instead
-of the default, and that "make install" should install PCRE under /opt/local
-instead of the default /usr/local.
+This command specifies that the C compiler should be run with the flags '-O2
+-Wall' instead of the default, and that "make install" should install PCRE
+under /opt/local instead of the default /usr/local.
 
 If you want to build in a different directory, just run "configure" with that
 directory as current. For example, suppose you have unpacked the PCRE source
@@ -169,11 +182,16 @@
 
   (See also "Shared libraries on Unix-like systems" below.)
 
-. If you want to suppress the building of the C++ wrapper library, you can add
-  --disable-cpp to the "configure" command. Otherwise, when "configure" is run,
-  it will try to find a C++ compiler and C++ header files, and if it succeeds,
-  it will try to build the C++ wrapper.
+. By default, only the 8-bit library is built. If you add --enable-pcre16 to
+  the "configure" command, the 16-bit library is also built. If you want only
+  the 16-bit library, use "./configure --enable-pcre16 --disable-pcre8".
 
+. If you are building the 8-bit library and want to suppress the building of
+  the C++ wrapper library, you can add --disable-cpp to the "configure"
+  command. Otherwise, when "configure" is run without --disable-pcre8, it will
+  try to find a C++ compiler and C++ header files, and if it succeeds, it will
+  try to build the C++ wrapper.
+
 . If you want to include support for just-in-time compiling, which can give
   large performance improvements on certain platforms, add --enable-jit to the
   "configure" command. This support is available only for certain hardware
@@ -184,20 +202,30 @@
   you add --disable-pcregrep-jit to the "configure" command.
 
 . If you want to make use of the support for UTF-8 Unicode character strings in
-  PCRE, you must add --enable-utf8 to the "configure" command. Without it, the
-  code for handling UTF-8 is not included in the library. Even when included,
-  it still has to be enabled by an option at run time. When PCRE is compiled
-  with this option, its input can only either be ASCII or UTF-8, even when
-  running on EBCDIC platforms. It is not possible to use both --enable-utf8 and
-  --enable-ebcdic at the same time.
+  the 8-bit library, or UTF-16 Unicode character strings in the 16-bit library,
+  you must add --enable-utf to the "configure" command. Without it, the code
+  for handling UTF-8 and UTF-16 is not included in the relevant library. Even
+  when --enable-utf is included, the use of a UTF encoding still has to be
+  enabled by an option at run time. When PCRE is compiled with this option, its
+  input can only either be ASCII or UTF-8/16, even when running on EBCDIC
+  platforms. It is not possible to use both --enable-utf and --enable-ebcdic at
+  the same time.
 
-. If, in addition to support for UTF-8 character strings, you want to include
-  support for the \P, \p, and \X sequences that recognize Unicode character
-  properties, you must add --enable-unicode-properties to the "configure"
-  command. This adds about 30K to the size of the library (in the form of a
-  property table); only the basic two-letter properties such as Lu are
-  supported.
+. There are no separate options for enabling UTF-8 and UTF-16 independently
+  because that would allow ridiculous settings such as requesting UTF-16
+  support while building only the 8-bit library. However, the option
+  --enable-utf8 is retained for backwards compatibility with earlier releases
+  that did not support 16-bit character strings. It is synonymous with
+  --enable-utf. It is not possible to configure one library with UTF support
+  and the other without in the same configuration.
 
+. If, in addition to support for UTF-8/16 character strings, you want to
+  include support for the \P, \p, and \X sequences that recognize Unicode
+  character properties, you must add --enable-unicode-properties to the
+  "configure" command. This adds about 30K to the size of the library (in the
+  form of a property table); only the basic two-letter properties such as Lu
+  are supported.
+
 . You can build PCRE to recognize either CR or LF or the sequence CRLF or any
   of the preceding, or any of the Unicode newline sequences as indicating the
   end of a line. Whatever you specify at build time is the default; the caller
@@ -249,10 +277,11 @@
   sizes in the pcrestack man page.
 
 . The default maximum compiled pattern size is around 64K. You can increase
-  this by adding --with-link-size=3 to the "configure" command. You can
-  increase it even more by setting --with-link-size=4, but this is unlikely
-  ever to be necessary. Increasing the internal link size will reduce
-  performance.
+  this by adding --with-link-size=3 to the "configure" command. In the 8-bit
+  library, PCRE then uses three bytes instead of two for offsets to different
+  parts of the compiled pattern. In the 16-bit library, --with-link-size=3 is
+  the same as --with-link-size=4, which (in both libraries) uses four-byte
+  offsets. Increasing the internal link size reduces performance.
 
 . You can build PCRE so that its internal match() function that is called from
   pcre_exec() does not call itself recursively. Instead, it uses memory blocks
@@ -287,10 +316,12 @@
 
   This automatically implies --enable-rebuild-chartables (see above). However,
   when PCRE is built this way, it always operates in EBCDIC. It cannot support
-  both EBCDIC and UTF-8.
+  both EBCDIC and UTF-8/16.
 
-. It is possible to compile pcregrep to use libz and/or libbz2, in order to
-  read .gz and .bz2 files (respectively), by specifying one or both of
+. The pcregrep program currently supports only 8-bit data files, and so
+  requires the 8-bit PCRE library. It is possible to compile pcregrep to use
+  libz and/or libbz2, in order to read .gz and .bz2 files (respectively), by
+  specifying one or both of
 
   --enable-pcregrep-libz
   --enable-pcregrep-libbz2
@@ -305,16 +336,17 @@
   The default value is 20K.
 
 . It is possible to compile pcretest so that it links with the libreadline
-  library, by specifying
+  or libedit libraries, by specifying, respectively,
 
-  --enable-pcretest-libreadline
+  --enable-pcretest-libreadline or --enable-pcretest-libedit
 
   If this is done, when pcretest's input is from a terminal, it reads it using
   the readline() function. This provides line-editing and history facilities.
   Note that libreadline is GPL-licenced, so if you distribute a binary of
-  pcretest linked in this way, there may be licensing issues.
+  pcretest linked in this way, there may be licensing issues. These can be
+  avoided by linking with libedit (which has a BSD licence) instead.
 
-  Setting this option causes the -lreadline option to be added to the pcretest
+  Enabling libreadline causes the -lreadline option to be added to the pcretest
   build. In many operating environments with a sytem-installed readline
   library this is sufficient. However, in some environments (e.g. if an
   unmodified distribution version of readline is in use), it may be necessary
@@ -333,17 +365,17 @@
 . pcre-config          script that shows the building settings such as CFLAGS
                          that were set for "configure"
 . libpcre.pc         ) data for the pkg-config command
+. libpcre16.pc       )
 . libpcreposix.pc    )
 . libtool              script that builds shared and/or static libraries
-. RunTest              script for running tests on the basic C library
-. RunGrepTest          script for running tests on the pcregrep command
 
 Versions of config.h and pcre.h are distributed in the PCRE tarballs under the
 names config.h.generic and pcre.h.generic. These are provided for those who
 have to built PCRE without using "configure" or CMake. If you use "configure"
 or CMake, the .generic versions are not used.
 
-If a C++ compiler is found, the following files are also built:
+When building the 8-bit library, if a C++ compiler is found, the following
+files are also built:
 
 . libpcrecpp.pc        data for the pkg-config command
 . pcrecpparg.h         header file for calling PCRE via the C++ wrapper
@@ -353,14 +385,17 @@
 script that can be run to recreate the configuration, and config.log, which
 contains compiler output from tests that "configure" runs.
 
-Once "configure" has run, you can run "make". It builds two libraries, called
-libpcre and libpcreposix, a test program called pcretest, and the pcregrep
-command. If a C++ compiler was found on your system, and you did not disable it
-with --disable-cpp, "make" also builds the C++ wrapper library, which is called
-libpcrecpp, and some test programs called pcrecpp_unittest,
-pcre_scanner_unittest, and pcre_stringpiece_unittest. If you enabled JIT
-support with --enable-jit, a test program called pcre_jit_test is also built.
+Once "configure" has run, you can run "make". This builds either or both of the
+libraries libpcre and libpcre16, and a test program called pcretest. If you
+enabled JIT support with --enable-jit, a test program called pcre_jit_test is
+built as well.
 
+If the 8-bit library is built, libpcreposix and the pcregrep command are also
+built, and if a C++ compiler was found on your system, and you did not disable
+it with --disable-cpp, "make" builds the C++ wrapper library, which is called
+libpcrecpp, as well as some test programs called pcrecpp_unittest,
+pcre_scanner_unittest, and pcre_stringpiece_unittest.
+
 The command "make check" runs all the appropriate tests. Details of the PCRE
 tests are given below in a separate section of this document.
 
@@ -370,15 +405,17 @@
 
   Commands (bin):
     pcretest
-    pcregrep
+    pcregrep (if 8-bit support is enabled)
     pcre-config
 
   Libraries (lib):
-    libpcre
-    libpcreposix
-    libpcrecpp (if C++ support is enabled)
+    libpcre16     (if 16-bit support is enabled)
+    libpcre       (if 8-bit support is enabled)
+    libpcreposix  (if 8-bit support is enabled)
+    libpcrecpp    (if 8-bit and C++ support is enabled)
 
   Configuration information (lib/pkgconfig):
+    libpcre16.pc
     libpcre.pc
     libpcreposix.pc
     libpcrecpp.pc (if C++ support is enabled)
@@ -419,8 +456,8 @@
 remove any directories, because these are often shared with other programs.
 
 
-Retrieving configuration information on Unix-like systems
----------------------------------------------------------
+Retrieving configuration information
+------------------------------------
 
 Running "make install" installs the command pcre-config, which can be used to
 recall information about the PCRE configuration and installation. For example:
@@ -445,8 +482,8 @@
 <prefix>/lib/pkgconfig.
 
 
-Shared libraries on Unix-like systems
--------------------------------------
+Shared libraries
+----------------
 
 The default distribution builds PCRE as shared libraries and static libraries,
 as long as the operating system supports shared libraries. Shared library
@@ -471,8 +508,8 @@
 build only shared libraries.
 
 
-Cross-compiling on Unix-like systems
-------------------------------------
+Cross-compiling using autotools
+-------------------------------
 
 You can specify CC and CFLAGS in the normal way to the "configure" command, in
 order to cross-compile PCRE for some other host. However, you should NOT
@@ -544,22 +581,23 @@
 Testing PCRE
 ------------
 
-To test the basic PCRE library on a Unix system, run the RunTest script that is
-created by the configuring process. There is also a script called RunGrepTest
-that tests the options of the pcregrep command. If the C++ wrapper library is
-built, three test programs called pcrecpp_unittest, pcre_scanner_unittest, and
-pcre_stringpiece_unittest are also built. When JIT support is enabled, another
-test program called pcre_jit_test is built.
+To test the basic PCRE library on a Unix-like system, run the RunTest script.
+There is another script called RunGrepTest that tests the options of the
+pcregrep command. If the C++ wrapper library is built, three test programs
+called pcrecpp_unittest, pcre_scanner_unittest, and pcre_stringpiece_unittest
+are also built. When JIT support is enabled, another test program called
+pcre_jit_test is built.
 
 Both the scripts and all the program tests are run if you obey "make check" or
-"make test". For other systems, see the instructions in NON-UNIX-USE.
+"make test". For other environments, see the instructions in
+NON-AUTOTOOLS-BUILD.
 
 The RunTest script runs the pcretest test program (which is documented in its
 own man page) on each of the relevant testinput files in the testdata
 directory, and compares the output with the contents of the corresponding
 testoutput files. Some tests are relevant only when certain build-time options
-were selected. For example, the tests for UTF-8 support are run only if
---enable-utf8 was used. RunTest outputs a comment when it skips a test.
+were selected. For example, the tests for UTF-8/16 support are run only if
+--enable-utf was used. RunTest outputs a comment when it skips a test.
 
 Many of the tests that are not skipped are run up to three times. The second
 run forces pcre_study() to be called for all patterns except for a few in some
@@ -567,17 +605,25 @@
 done). If JIT support is available, the non-DFA tests are run a third time,
 this time with a forced pcre_study() with the PCRE_STUDY_JIT_COMPILE option.
 
-RunTest uses a file called testtry to hold the main output from pcretest
-(testsavedregex is also used as a working file). To run pcretest on just one of
-the test files, give its number as an argument to RunTest, for example:
+When both 8-bit and 16-bit support is enabled, the entire set of tests is run
+twice, once for each library. If you want to run just one set of tests, call
+RunTest with either the -8 or -16 option.
 
-  RunTest 2
+RunTest uses a file called testtry to hold the main output from pcretest.
+Other files whose names begin with "test" are used as working files in some
+tests. To run pcretest on just one or more specific test files, give their
+numbers as arguments to RunTest, for example:
 
+  RunTest 2 7 11
+
+You can also call RunTest with the single argument "list" to cause it to output
+a list of tests.
+
 The first test file can be fed directly into the perltest.pl script to check
 that Perl gives the same results. The only difference you should see is in the
 first few lines, where the Perl version is given instead of the PCRE version.
 
-The second set of tests check pcre_fullinfo(), pcre_info(), pcre_study(),
+The second set of tests check pcre_fullinfo(), pcre_study(),
 pcre_copy_substring(), pcre_get_substring(), pcre_get_substring_list(), error
 detection, and run-time flags that are specific to PCRE, as well as the POSIX
 wrapper API. It also uses the debugging flags to check some of the internals of
@@ -612,38 +658,34 @@
 Windows versions of test 2. More info on using RunTest.bat is included in the
 document entitled NON-UNIX-USE.]
 
-The fourth test checks the UTF-8 support. This file can be also fed directly to
-the perltest.pl script, provided you are running Perl 5.8 or higher.
+The fourth and fifth tests check the UTF-8/16 support and error handling and
+internal UTF features of PCRE that are not relevant to Perl, respectively. The
+sixth and seventh tests do the same for Unicode character properties support.
 
-The fifth test checks error handling with UTF-8 encoding, and internal UTF-8
-features of PCRE that are not relevant to Perl.
+The eighth, ninth, and tenth tests check the pcre_dfa_exec() alternative
+matching function, in non-UTF-8/16 mode, UTF-8/16 mode, and UTF-8/16 mode with
+Unicode property support, respectively.
 
-The sixth test (which is Perl-5.10 compatible) checks the support for Unicode
-character properties. This file can be also fed directly to the perltest.pl
-script, provided you are running Perl 5.10 or higher.
+The eleventh test checks some internal offsets and code size features; it is
+run only when the default "link size" of 2 is set (in other cases the sizes
+change) and when Unicode property support is enabled.
 
-The seventh, eighth, and ninth tests check the pcre_dfa_exec() alternative
-matching function, in non-UTF-8 mode, UTF-8 mode, and UTF-8 mode with Unicode
-property support, respectively.
+The twelfth test is run only when JIT support is available, and the thirteenth
+test is run only when JIT support is not available. They test some JIT-specific
+features such as information output from pcretest about JIT compilation.
 
-The tenth test checks some internal offsets and code size features; it is run
-only when the default "link size" of 2 is set (in other cases the sizes
-change) and when Unicode property support is enabled.
+The fourteenth, fifteenth, and sixteenth tests are run only in 8-bit mode, and
+the seventeenth, eighteenth, and nineteenth tests are run only in 16-bit mode.
+These are tests that generate different output in the two modes. They are for
+general cases, UTF-8/16 support, and Unicode property support, respectively.
 
-The eleventh and twelfth tests check out features that are new in Perl 5.10,
-without and with UTF-8 support, respectively. This file can be also fed
-directly to the perltest.pl script, provided you are running Perl 5.10 or
-higher.
+The twentieth test is run only in 16-bit mode. It tests some specific 16-bit
+features of the DFA matching engine.
 
-The thirteenth test checks a number internals and non-Perl features concerned
-with Unicode property support.
+The twenty-first and twenty-second tests are run only in 16-bit mode, when the
+link size is set to 2. They test reloading pre-compiled patterns.
 
-The fourteenth test is run only when JIT support is available, and the
-fifteenth test is run only when JIT support is not available. They test some
-JIT-specific features such as information output from pcretest about JIT
-compilation.
 
-
 Character tables
 ----------------
 
@@ -701,7 +743,9 @@
 File manifest
 -------------
 
-The distribution should contain the following files:
+The distribution should contain the files listed below. Where a file name is
+given as pcre[16]_xxx it means that there are two files, one with the name
+pcre_xxx and the other with the name pcre16_xxx.
 
 (A) Source files of the PCRE library functions and their headers:
 
@@ -710,31 +754,36 @@
 
   pcre_chartables.c.dist  a default set of character tables that assume ASCII
                             coding; used, unless --enable-rebuild-chartables is
-                            specified, by copying to pcre_chartables.c
+                            specified, by copying to pcre[16]_chartables.c
 
   pcreposix.c             )
-  pcre_compile.c          )
-  pcre_config.c           )
-  pcre_dfa_exec.c         )
-  pcre_exec.c             )
-  pcre_fullinfo.c         )
-  pcre_get.c              ) sources for the functions in the library,
-  pcre_globals.c          )   and some internal functions that they use
-  pcre_info.c             )
-  pcre_jit_compile.c      )
-  pcre_maketables.c       )
-  pcre_newline.c          )
+  pcre[16]_byte_order.c   )
+  pcre[16]_compile.c      )
+  pcre[16]_config.c       )
+  pcre[16]_dfa_exec.c     )
+  pcre[16]_exec.c         )
+  pcre[16]_fullinfo.c     )
+  pcre[16]_get.c          ) sources for the functions in the library,
+  pcre[16]_globals.c      )   and some internal functions that they use
+  pcre[16]_jit_compile.c  )
+  pcre[16]_maketables.c   )
+  pcre[16]_newline.c      )
+  pcre[16]_refcount.c     )
+  pcre[16]_string_utils.c )
+  pcre[16]_study.c        )
+  pcre[16]_tables.c       )
+  pcre[16]_ucd.c          )
+  pcre[16]_version.c      )
+  pcre[16]_xclass.c       )
   pcre_ord2utf8.c         )
-  pcre_refcount.c         )
-  pcre_study.c            )
-  pcre_tables.c           )
-  pcre_try_flipped.c      )
-  pcre_ucd.c              )
   pcre_valid_utf8.c       )
-  pcre_version.c          )
-  pcre_xclass.c           )
-  pcre_printint.src       ) debugging function that is #included in pcretest,
+  pcre16_ord2utf16.c      )
+  pcre16_utf16_utils.c    )
+  pcre16_valid_utf16.c    )
+
+  pcre[16]_printint.c     ) debugging function that is used by pcretest,
                           )   and can also be #included in pcre_compile()
+
   pcre.h.in               template for pcre.h when built by "configure"
   pcreposix.h             header for the external POSIX wrapper API
   pcre_internal.h         header for internal use
@@ -775,7 +824,8 @@
   Makefile.am             ) the automake input that was used to create
                           )   Makefile.in
   NEWS                    important changes in this release
-  NON-UNIX-USE            notes on building PCRE on non-Unix systems
+  NON-UNIX-USE            the previous name for NON-AUTOTOOLS-BUILD
+  NON-AUTOTOOLS-BUILD     notes on building PCRE without using autotools
   PrepareRelease          script to make preparations for "make dist"
   README                  this file
   RunTest                 a Unix shell script for running tests
@@ -796,6 +846,7 @@
   doc/pcretest.txt        plain text documentation of test program
   doc/perltest.txt        plain text documentation of Perl test program
   install-sh              a shell script for installing files
+  libpcre16.pc.in         template for libpcre16.pc for pkg-config
   libpcre.pc.in           template for libpcre.pc for pkg-config
   libpcreposix.pc.in      template for libpcreposix.pc for pkg-config
   libpcrecpp.pc.in        template for libpcrecpp.pc for pkg-config
@@ -812,11 +863,13 @@
   testdata/testinput*     test data for main library tests
   testdata/testoutput*    expected test results
   testdata/grep*          input and output for pcregrep tests
+  testdata/*              other supporting test files
 
 (D) Auxiliary files for cmake support
 
   cmake/COPYING-CMAKE-SCRIPTS
   cmake/FindPackageHandleStandardArgs.cmake
+  cmake/FindEditline.cmake
   cmake/FindReadline.cmake
   CMakeLists.txt
   config-cmake.h.in
@@ -842,4 +895,4 @@
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 06 September 2011
+Last updated: 18 June 2012

Modified: trunk/thirdparty/pcre/pcre-8.31/config.h.generic
===================================================================
--- trunk/thirdparty/pcre/pcre-8.21/config.h.generic	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/pcre/pcre-8.31/config.h.generic	2012-08-27 20:10:47 UTC (rev 3847)
@@ -31,8 +31,8 @@
    character codes, define this macro as 1. On systems that can use
    "configure", this can be done via --enable-ebcdic. PCRE will then assume
    that all input strings are in EBCDIC. If you do not define this macro, PCRE
-   will assume input strings are ASCII or UTF-8 Unicode. It is not possible to
-   build a version of PCRE that supports both EBCDIC and UTF-8. */
+   will assume input strings are ASCII or UTF-8/16 Unicode. It is not possible
+   to build a version of PCRE that supports both EBCDIC and UTF-8/16. */
 /* #undef EBCDIC */
 
 /* Define to 1 if you have the `bcopy' function. */
@@ -58,6 +58,12 @@
 #define HAVE_DLFCN_H 1
 #endif
 
+/* Define to 1 if you have the <editline/readline.h> header file. */
+/* #undef HAVE_EDITLINE_READLINE_H */
+
+/* Define to 1 if you have the <edit/readline/readline.h> header file. */
+/* #undef HAVE_EDIT_READLINE_READLINE_H */
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #ifndef HAVE_INTTYPES_H
 #define HAVE_INTTYPES_H 1
@@ -84,14 +90,10 @@
 #endif
 
 /* Define to 1 if you have the <readline/history.h> header file. */
-#ifndef HAVE_READLINE_HISTORY_H
-#define HAVE_READLINE_HISTORY_H 1
-#endif
+/* #undef HAVE_READLINE_HISTORY_H */
 
 /* Define to 1 if you have the <readline/readline.h> header file. */
-#ifndef HAVE_READLINE_READLINE_H
-#define HAVE_READLINE_READLINE_H 1
-#endif
+/* #undef HAVE_READLINE_READLINE_H */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #ifndef HAVE_STDINT_H
@@ -250,7 +252,7 @@
 #define PACKAGE_NAME "PCRE"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE 8.21"
+#define PACKAGE_STRING "PCRE 8.31"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pcre"
@@ -259,7 +261,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.21"
+#define PACKAGE_VERSION "8.31"
 
 /* The value of PCREGREP_BUFSIZE determines the size of buffer used by
    pcregrep to hold parts of the file it is searching. On systems that support
@@ -310,6 +312,9 @@
    handle .bz2 files. */
 /* #undef SUPPORT_LIBBZ2 */
 
+/* Define to allow pcretest to be linked with libedit. */
+/* #undef SUPPORT_LIBEDIT */
+
 /* Define to allow pcretest to be linked with libreadline. */
 /* #undef SUPPORT_LIBREADLINE */
 
@@ -317,21 +322,29 @@
    handle .gz files. */
 /* #undef SUPPORT_LIBZ */
 
+/* Define to enable the 16 bit PCRE library. */
+/* #undef SUPPORT_PCRE16 */
+
+/* Define to enable the 8 bit PCRE library. */
+#ifndef SUPPORT_PCRE8
+#define SUPPORT_PCRE8 /**/
+#endif
+
 /* Define to enable JIT support in pcregrep. */
 /* #undef SUPPORT_PCREGREP_JIT */
 
 /* Define to enable support for Unicode properties. */
 /* #undef SUPPORT_UCP */
 
-/* Define to enable support for the UTF-8 Unicode encoding. This will work
+/* Define to enable support for the UTF-8/16 Unicode encoding. This will work
    even in an EBCDIC environment, but it is incompatible with the EBCDIC
-   macro. That is, PCRE can support *either* EBCDIC code *or* ASCII/UTF-8, but
-   not both at once. */
-/* #undef SUPPORT_UTF8 */
+   macro. That is, PCRE can support *either* EBCDIC code *or* ASCII/UTF-8/16,
+   but not both at once. */
+/* #undef SUPPORT_UTF */
 
 /* Version number of package */
 #ifndef VERSION
-#define VERSION "8.21"
+#define VERSION "8.31"
 #endif
 
 /* Define to empty if `const' does not conform to ANSI C. */

Modified: trunk/thirdparty/pcre/pcre-8.31/dftables.c
===================================================================
--- trunk/thirdparty/pcre/pcre-8.21/dftables.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/pcre/pcre-8.31/dftables.c	2012-08-27 20:10:47 UTC (rev 3847)
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2008 University of Cambridge
+           Copyright (c) 1997-2012 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@
   "#endif\n\n"
   "#include \"pcre_internal.h\"\n\n");
 fprintf(f,
-  "const unsigned char _pcre_default_tables[] = {\n\n"
+  "const pcre_uint8 PRIV(default_tables)[] = {\n\n"
   "/* This table is a lower casing table. */\n\n");
 
 fprintf(f, "  ");

Modified: trunk/thirdparty/pcre/pcre-8.31/pcre.h.generic
===================================================================
--- trunk/thirdparty/pcre/pcre-8.21/pcre.h.generic	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/pcre/pcre-8.31/pcre.h.generic	2012-08-27 20:10:47 UTC (rev 3847)
@@ -5,7 +5,7 @@
 /* This is the public header file for the PCRE library, to be #included by
 applications that call the PCRE functions.
 
-           Copyright (c) 1997-2011 University of Cambridge
+           Copyright (c) 1997-2012 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -42,9 +42,9 @@
 /* The current PCRE version information. */
 
 #define PCRE_MAJOR          8
-#define PCRE_MINOR          21
+#define PCRE_MINOR          31
 #define PCRE_PRERELEASE     
-#define PCRE_DATE           2011-12-12
+#define PCRE_DATE           2012-07-06
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE, the appropriate
@@ -116,9 +116,13 @@
 #define PCRE_NOTEOL             0x00000100  /* Exec, DFA exec */
 #define PCRE_UNGREEDY           0x00000200  /* Compile */
 #define PCRE_NOTEMPTY           0x00000400  /* Exec, DFA exec */
-#define PCRE_UTF8               0x00000800  /* Compile, used in exec, DFA exec */
+/* The next two are also used in exec and DFA exec */
+#define PCRE_UTF8               0x00000800  /* Compile (same as PCRE_UTF16) */
+#define PCRE_UTF16              0x00000800  /* Compile (same as PCRE_UTF8) */
 #define PCRE_NO_AUTO_CAPTURE    0x00001000  /* Compile */
-#define PCRE_NO_UTF8_CHECK      0x00002000  /* Compile, exec, DFA exec */
+/* The next two are also used in exec and DFA exec */
+#define PCRE_NO_UTF8_CHECK      0x00002000  /* Compile (same as PCRE_NO_UTF16_CHECK) */
+#define PCRE_NO_UTF16_CHECK     0x00002000  /* Compile (same as PCRE_NO_UTF8_CHECK) */
 #define PCRE_AUTO_CALLOUT       0x00004000  /* Compile */
 #define PCRE_PARTIAL_SOFT       0x00008000  /* Exec, DFA exec */
 #define PCRE_PARTIAL            0x00008000  /* Backwards compatible synonym */
@@ -142,34 +146,40 @@
 
 /* Exec-time and get/set-time error codes */
 
-#define PCRE_ERROR_NOMATCH         (-1)
-#define PCRE_ERROR_NULL            (-2)
-#define PCRE_ERROR_BADOPTION       (-3)
-#define PCRE_ERROR_BADMAGIC        (-4)
-#define PCRE_ERROR_UNKNOWN_OPCODE  (-5)
-#define PCRE_ERROR_UNKNOWN_NODE    (-5)  /* For backward compatibility */
-#define PCRE_ERROR_NOMEMORY        (-6)
-#define PCRE_ERROR_NOSUBSTRING     (-7)
-#define PCRE_ERROR_MATCHLIMIT      (-8)
-#define PCRE_ERROR_CALLOUT         (-9)  /* Never used by PCRE itself */
-#define PCRE_ERROR_BADUTF8        (-10)
-#define PCRE_ERROR_BADUTF8_OFFSET (-11)
-#define PCRE_ERROR_PARTIAL        (-12)
-#define PCRE_ERROR_BADPARTIAL     (-13)
-#define PCRE_ERROR_INTERNAL       (-14)
-#define PCRE_ERROR_BADCOUNT       (-15)
-#define PCRE_ERROR_DFA_UITEM      (-16)
-#define PCRE_ERROR_DFA_UCOND      (-17)
-#define PCRE_ERROR_DFA_UMLIMIT    (-18)
-#define PCRE_ERROR_DFA_WSSIZE     (-19)
-#define PCRE_ERROR_DFA_RECURSE    (-20)
-#define PCRE_ERROR_RECURSIONLIMIT (-21)
-#define PCRE_ERROR_NULLWSLIMIT    (-22)  /* No longer actually used */
-#define PCRE_ERROR_BADNEWLINE     (-23)
-#define PCRE_ERROR_BADOFFSET      (-24)
-#define PCRE_ERROR_SHORTUTF8      (-25)
-#define PCRE_ERROR_RECURSELOOP    (-26)
-#define PCRE_ERROR_JIT_STACKLIMIT (-27)
+#define PCRE_ERROR_NOMATCH          (-1)
+#define PCRE_ERROR_NULL             (-2)
+#define PCRE_ERROR_BADOPTION        (-3)
+#define PCRE_ERROR_BADMAGIC         (-4)
+#define PCRE_ERROR_UNKNOWN_OPCODE   (-5)
+#define PCRE_ERROR_UNKNOWN_NODE     (-5)  /* For backward compatibility */
+#define PCRE_ERROR_NOMEMORY         (-6)
+#define PCRE_ERROR_NOSUBSTRING      (-7)
+#define PCRE_ERROR_MATCHLIMIT       (-8)
+#define PCRE_ERROR_CALLOUT          (-9)  /* Never used by PCRE itself */
+#define PCRE_ERROR_BADUTF8         (-10)  /* Same for 8/16 */
+#define PCRE_ERROR_BADUTF16        (-10)  /* Same for 8/16 */
+#define PCRE_ERROR_BADUTF8_OFFSET  (-11)  /* Same for 8/16 */
+#define PCRE_ERROR_BADUTF16_OFFSET (-11)  /* Same for 8/16 */
+#define PCRE_ERROR_PARTIAL         (-12)
+#define PCRE_ERROR_BADPARTIAL      (-13)
+#define PCRE_ERROR_INTERNAL        (-14)
+#define PCRE_ERROR_BADCOUNT        (-15)
+#define PCRE_ERROR_DFA_UITEM       (-16)
+#define PCRE_ERROR_DFA_UCOND       (-17)
+#define PCRE_ERROR_DFA_UMLIMIT     (-18)
+#define PCRE_ERROR_DFA_WSSIZE      (-19)
+#define PCRE_ERROR_DFA_RECURSE     (-20)
+#define PCRE_ERROR_RECURSIONLIMIT  (-21)
+#define PCRE_ERROR_NULLWSLIMIT     (-22)  /* No longer actually used */
+#define PCRE_ERROR_BADNEWLINE      (-23)
+#define PCRE_ERROR_BADOFFSET       (-24)
+#define PCRE_ERROR_SHORTUTF8       (-25)
+#define PCRE_ERROR_SHORTUTF16      (-25)  /* Same for 8/16 */
+#define PCRE_ERROR_RECURSELOOP     (-26)
+#define PCRE_ERROR_JIT_STACKLIMIT  (-27)
+#define PCRE_ERROR_BADMODE         (-28)
+#define PCRE_ERROR_BADENDIANNESS   (-29)
+#define PCRE_ERROR_DFA_BADRESTART  (-30)
 
 /* Specific error codes for UTF-8 validity checks */
 
@@ -196,6 +206,14 @@
 #define PCRE_UTF8_ERR20             20
 #define PCRE_UTF8_ERR21             21
 
+/* Specific error codes for UTF-16 validity checks */
+
+#define PCRE_UTF16_ERR0              0
+#define PCRE_UTF16_ERR1              1
+#define PCRE_UTF16_ERR2              2
+#define PCRE_UTF16_ERR3              3
+#define PCRE_UTF16_ERR4              4
+
 /* Request types for pcre_fullinfo() */
 
 #define PCRE_INFO_OPTIONS            0
@@ -217,6 +235,7 @@
 #define PCRE_INFO_MINLENGTH         15
 #define PCRE_INFO_JIT               16
 #define PCRE_INFO_JITSIZE           17
+#define PCRE_INFO_MAXLOOKBEHIND     18
 
 /* Request types for pcre_config(). Do not re-arrange, in order to remain
 compatible. */
@@ -231,13 +250,17 @@
 #define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
 #define PCRE_CONFIG_BSR                     8
 #define PCRE_CONFIG_JIT                     9
+#define PCRE_CONFIG_UTF16                  10
+#define PCRE_CONFIG_JITTARGET              11
 
 /* Request types for pcre_study(). Do not re-arrange, in order to remain
 compatible. */
 
-#define PCRE_STUDY_JIT_COMPILE            0x0001
+#define PCRE_STUDY_JIT_COMPILE                0x0001
+#define PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE   0x0002
+#define PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE   0x0004
 
-/* Bit flags for the pcre_extra structure. Do not re-arrange or redefine
+/* Bit flags for the pcre[16]_extra structure. Do not re-arrange or redefine
 these bits, just add new ones on the end, in order to remain compatible. */
 
 #define PCRE_EXTRA_STUDY_DATA             0x0001
@@ -253,9 +276,26 @@
 struct real_pcre;                 /* declaration; the definition is private  */
 typedef struct real_pcre pcre;
 
+struct real_pcre16;               /* declaration; the definition is private  */
+typedef struct real_pcre16 pcre16;
+
 struct real_pcre_jit_stack;       /* declaration; the definition is private  */
 typedef struct real_pcre_jit_stack pcre_jit_stack;
 
+struct real_pcre16_jit_stack;     /* declaration; the definition is private  */
+typedef struct real_pcre16_jit_stack pcre16_jit_stack;
+
+/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must contain
+a 16 bit wide signed data type. Otherwise it can be a dummy data type since
+pcre16 functions are not implemented. There is a check for this in pcre_internal.h. */
+#ifndef PCRE_UCHAR16
+#define PCRE_UCHAR16 unsigned short
+#endif
+
+#ifndef PCRE_SPTR16
+#define PCRE_SPTR16 const PCRE_UCHAR16 *
+#endif
+
 /* When PCRE is compiled as a C++ library, the subject pointer type can be
 replaced with a custom type. For conventional use, the public interface is a
 const char *. */
@@ -279,6 +319,19 @@
   void *executable_jit;           /* Contains a pointer to a compiled jit code */
 } pcre_extra;
 
+/* Same structure as above, but with 16 bit char pointers. */
+
+typedef struct pcre16_extra {
+  unsigned long int flags;        /* Bits for which fields are set */
+  void *study_data;               /* Opaque data from pcre_study() */
+  unsigned long int match_limit;  /* Maximum number of calls to match() */
+  void *callout_data;             /* Data passed back in callouts */
+  const unsigned char *tables;    /* Pointer to character tables */
+  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+  PCRE_UCHAR16 **mark;            /* For passing back a mark pointer */
+  void *executable_jit;           /* Contains a pointer to a compiled jit code */
+} pcre16_extra;
+
 /* The structure for passing out data via the pcre_callout_function. We use a
 structure so that new fields can be added on the end in future versions,
 without changing the API of the function, thereby allowing old clients to work
@@ -304,6 +357,28 @@
   /* ------------------------------------------------------------------ */
 } pc...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3846] trunk/jcl/source

From: <ou...@us...> - 2012-08-27 19:59:47

Revision: 3846
          http://jcl.svn.sourceforge.net/jcl/?rev=3846&view=rev
Author:   outchy
Date:     2012-08-27 19:59:40 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
pcre_info has been deprecated for a while in the PCRE library.

Modified Paths:
--------------
    trunk/jcl/source/common/pcre.pas
    trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
    trunk/jcl/source/windows/obj/pcre/win64/makefile.mak

Removed Paths:
-------------
    trunk/jcl/source/windows/obj/pcre/win32/pcre_info.obj
    trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj

Modified: trunk/jcl/source/common/pcre.pas
===================================================================
--- trunk/jcl/source/common/pcre.pas	2012-08-27 18:50:24 UTC (rev 3845)
+++ trunk/jcl/source/common/pcre.pas	2012-08-27 19:59:40 UTC (rev 3846)
@@ -508,9 +508,6 @@
   stringcount: Integer; listptr: PPPAnsiChar): Integer;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_get_substring_list}
-function pcre_info(const code: PPCRE; optptr, firstcharptr: PInteger): Integer;
-  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
-{$EXTERNALSYM pcre_info}
 function pcre_maketables: PAnsiChar;
   {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
 {$EXTERNALSYM pcre_maketables}
@@ -593,9 +590,6 @@
     stringcount: Integer; listptr: PPPAnsiChar): Integer;
     {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_get_substring_list_func}
-  pcre_info_func = function(const code: PPCRE; optptr, firstcharptr: PInteger): Integer;
-  {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
-  {$EXTERNALSYM pcre_info_func}
   pcre_maketables_func = function: PAnsiChar; {$IFDEF PCRE_EXPORT_CDECL} cdecl; {$ENDIF PCRE_EXPORT_CDECL}
   {$EXTERNALSYM pcre_maketables_func}
   pcre_refcount_func = function(argument_re: PPCRE; adjust: Integer): Integer;
@@ -650,8 +644,6 @@
   {$EXTERNALSYM pcre_get_substring}
   pcre_get_substring_list: pcre_get_substring_list_func = nil;
   {$EXTERNALSYM pcre_get_substring_list}
-  pcre_info: pcre_info_func = nil;
-  {$EXTERNALSYM pcre_info}
   pcre_maketables: pcre_maketables_func = nil;
   {$EXTERNALSYM pcre_maketables}
   pcre_refcount: pcre_refcount_func = nil;
@@ -696,7 +688,6 @@
   PCREGetStringTableEntriesDefaultExportName = 'pcre_get_stringtable_entries';
   PCREGetSubStringDefaultExportName = 'pcre_get_substring';
   PCREGetSubStringListDefaultExportName = 'pcre_get_substring_list';
-  PCREInfoDefaultExportName = 'pcre_info';
   PCREMakeTablesDefaultExportName = 'pcre_maketables';
   PCRERefCountDefaultExportName = 'pcre_refcount';
   PCREStudyDefaultExportName = 'pcre_study';
@@ -729,7 +720,6 @@
   PCREGetStringTableEntriesExportName: string = PCREGetStringTableEntriesDefaultExportName;
   PCREGetSubStringExportName: string = PCREGetSubStringDefaultExportName;
   PCREGetSubStringListExportName: string = PCREGetSubStringListDefaultExportName;
-  PCREInfoExportName: string = PCREInfoDefaultExportName;
   PCREMakeTablesExportName: string = PCREMakeTablesDefaultExportName;
   PCRERefCountExportName: string = PCRERefCountDefaultExportName;
   PCREStudyExportName: string = PCREStudyDefaultExportName;
@@ -798,7 +788,6 @@
 {$LINK ..\windows\obj\pcre\win32\pcre_exec.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_fullinfo.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_get.obj}
-{$LINK ..\windows\obj\pcre\win32\pcre_info.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_jit_compile.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_maketables.obj}
 {$LINK ..\windows\obj\pcre\win32\pcre_newline.obj}
@@ -820,7 +809,6 @@
 {$LINK ..\windows\obj\pcre\win64\pcre_exec.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_fullinfo.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_get.obj}
-{$LINK ..\windows\obj\pcre\win64\pcre_info.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_jit_compile.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_maketables.obj}
 {$LINK ..\windows\obj\pcre\win64\pcre_newline.obj}
@@ -859,7 +847,6 @@
 function pcre_get_stringtable_entries; external;
 function pcre_get_substring; external;
 function pcre_get_substring_list; external;
-function pcre_info; external;
 function pcre_maketables; external;
 function pcre_refcount; external;
 function pcre_study; external;
@@ -1243,7 +1230,6 @@
   @pcre_get_stringtable_entries := Value;
   @pcre_get_substring := Value;
   @pcre_get_substring_list := Value;
-  @pcre_info := Value;
   @pcre_maketables := Value;
   @pcre_refcount := Value;
   @pcre_study := Value;
@@ -1314,7 +1300,6 @@
     @pcre_get_stringtable_entries := GetModuleSymbol(PCRELib, PCREGetStringTableEntriesExportName);
     @pcre_get_substring := GetModuleSymbol(PCRELib, PCREGetSubStringExportName);
     @pcre_get_substring_list := GetModuleSymbol(PCRELib, PCREGetSubStringListExportName);
-    @pcre_info := GetModuleSymbol(PCRELib, PCREInfoExportName);
     @pcre_maketables := GetModuleSymbol(PCRELib, PCREMakeTablesExportName);
     @pcre_refcount := GetModuleSymbol(PCRELib, PCRERefCountExportName);
     @pcre_study := GetModuleSymbol(PCRELib, PCREStudyExportName);
@@ -1368,7 +1353,6 @@
 function pcre_get_stringtable_entries; external PCREDefaultLibraryName name PCREGetStringTableEntriesDefaultExportName;
 function pcre_get_substring; external PCREDefaultLibraryName name PCREGetSubStringDefaultExportName;
 function pcre_get_substring_list; external PCREDefaultLibraryName name PCREGetSubStringListDefaultExportName;
-function pcre_info; external PCREDefaultLibraryName name PCREInfoDefaultExportName;
 function pcre_maketables; external PCREDefaultLibraryName name PCREMakeTablesDefaultExportName;
 function pcre_refcount; external PCREDefaultLibraryName name PCRERefCountDefaultExportName;
 function pcre_study; external PCREDefaultLibraryName name PCREStudyDefaultExportName;

Modified: trunk/jcl/source/windows/obj/pcre/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-27 18:50:24 UTC (rev 3845)
+++ trunk/jcl/source/windows/obj/pcre/win32/makefile.mak	2012-08-27 19:59:40 UTC (rev 3846)
@@ -61,7 +61,7 @@
 # ---------------------------------------------------------------------------
 OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
   .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
-  .\pcre_info.obj .\pcre_jit_compile.obj .\pcre_maketables.obj \
+  .\pcre_jit_compile.obj .\pcre_maketables.obj \
   .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
   .\pcre_tables.obj .\pcre_try_flipped.obj .\pcre_ucd.obj \
   .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \

Deleted: trunk/jcl/source/windows/obj/pcre/win32/pcre_info.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/pcre/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-27 18:50:24 UTC (rev 3845)
+++ trunk/jcl/source/windows/obj/pcre/win64/makefile.mak	2012-08-27 19:59:40 UTC (rev 3846)
@@ -32,7 +32,7 @@
 # ---------------------------------------------------------------------------
 OBJFILES = .\pcre_compile.obj .\pcre_config.obj .\pcre_dfa_exec.obj \
   .\pcre_exec.obj .\pcre_fullinfo.obj .\pcre_get.obj \
-  .\pcre_info.obj .\pcre_jit_compile.obj .\pcre_maketables.obj \
+  .\pcre_jit_compile.obj .\pcre_maketables.obj \
   .\pcre_newline.obj .\pcre_ord2utf8.obj .\pcre_refcount.obj .\pcre_study.obj \
   .\pcre_tables.obj .\pcre_try_flipped.obj .\pcre_ucd.obj \
   .\pcre_valid_utf8.obj .\pcre_version.obj .\pcre_xclass.obj \

Deleted: trunk/jcl/source/windows/obj/pcre/win64/pcre_info.obj
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3845] trunk

From: <ou...@us...> - 2012-08-27 18:50:34

Revision: 3845
          http://jcl.svn.sourceforge.net/jcl/?rev=3845&view=rev
Author:   outchy
Date:     2012-08-27 18:50:24 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
update to zlib 1.2.7.

Modified Paths:
--------------
    trunk/jcl/source/common/zlibh.pas
    trunk/jcl/source/windows/obj/zlib/win32/adler32.obj
    trunk/jcl/source/windows/obj/zlib/win32/compress.obj
    trunk/jcl/source/windows/obj/zlib/win32/crc32.obj
    trunk/jcl/source/windows/obj/zlib/win32/deflate.obj
    trunk/jcl/source/windows/obj/zlib/win32/infback.obj
    trunk/jcl/source/windows/obj/zlib/win32/inffast.obj
    trunk/jcl/source/windows/obj/zlib/win32/inflate.obj
    trunk/jcl/source/windows/obj/zlib/win32/inftrees.obj
    trunk/jcl/source/windows/obj/zlib/win32/makefile.mak
    trunk/jcl/source/windows/obj/zlib/win32/trees.obj
    trunk/jcl/source/windows/obj/zlib/win32/uncompr.obj
    trunk/jcl/source/windows/obj/zlib/win32/zutil.obj
    trunk/jcl/source/windows/obj/zlib/win64/adler32.obj
    trunk/jcl/source/windows/obj/zlib/win64/compress.obj
    trunk/jcl/source/windows/obj/zlib/win64/crc32.obj
    trunk/jcl/source/windows/obj/zlib/win64/deflate.obj
    trunk/jcl/source/windows/obj/zlib/win64/infback.obj
    trunk/jcl/source/windows/obj/zlib/win64/inffast.obj
    trunk/jcl/source/windows/obj/zlib/win64/inflate.obj
    trunk/jcl/source/windows/obj/zlib/win64/inftrees.obj
    trunk/jcl/source/windows/obj/zlib/win64/makefile.mak
    trunk/jcl/source/windows/obj/zlib/win64/trees.obj
    trunk/jcl/source/windows/obj/zlib/win64/uncompr.obj
    trunk/jcl/source/windows/obj/zlib/win64/zutil.obj
    trunk/thirdparty/zlib/zlib-1.2.7/README
    trunk/thirdparty/zlib/zlib-1.2.7/adler32.c
    trunk/thirdparty/zlib/zlib-1.2.7/crc32.c
    trunk/thirdparty/zlib/zlib-1.2.7/crc32.h
    trunk/thirdparty/zlib/zlib-1.2.7/deflate.c
    trunk/thirdparty/zlib/zlib-1.2.7/deflate.h
    trunk/thirdparty/zlib/zlib-1.2.7/infback.c
    trunk/thirdparty/zlib/zlib-1.2.7/inffixed.h
    trunk/thirdparty/zlib/zlib-1.2.7/inflate.c
    trunk/thirdparty/zlib/zlib-1.2.7/inftrees.c
    trunk/thirdparty/zlib/zlib-1.2.7/trees.c
    trunk/thirdparty/zlib/zlib-1.2.7/zconf.h
    trunk/thirdparty/zlib/zlib-1.2.7/zlib.h
    trunk/thirdparty/zlib/zlib-1.2.7/zutil.c
    trunk/thirdparty/zlib/zlib-1.2.7/zutil.h

Added Paths:
-----------
    trunk/thirdparty/zlib/zlib-1.2.7/

Removed Paths:
-------------
    trunk/thirdparty/zlib/zlib-1.2.5/

Modified: trunk/jcl/source/common/zlibh.pas
===================================================================
--- trunk/jcl/source/common/zlibh.pas	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/jcl/source/common/zlibh.pas	2012-08-27 18:50:24 UTC (rev 3845)
@@ -182,7 +182,7 @@
 
 const
   {$EXTERNALSYM ZLIB_VERSION}
-  ZLIB_VERSION = '1.2.5';
+  ZLIB_VERSION = '1.2.7';
   {$EXTERNALSYM ZLIB_VERNUM}
   ZLIB_VERNUM = $1250;
   {$EXTERNALSYM ZLIB_VER_MAJOR}
@@ -190,7 +190,7 @@
   {$EXTERNALSYM ZLIB_VER_MINOR}
   ZLIB_VER_MINOR = 2;
   {$EXTERNALSYM ZLIB_VER_REVISION}
-  ZLIB_VER_REVISION = 5;
+  ZLIB_VER_REVISION = 7;
   {$EXTERNALSYM ZLIB_VER_SUBREVISION}
   ZLIB_VER_SUBREVISION = 0;
 
@@ -1071,6 +1071,40 @@
 {$IFDEF ZLIB_LINKONREQUEST}
 
 type
+  {$EXTERNALSYM TdeflatePending}
+  TdeflatePending = function (var strm: TZStreamRec;
+                              pending: PCardinal;
+                              bits: PInteger): Integer;
+    {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+var
+  {$EXTERNALSYM deflatePending}
+  deflatePending: TdeflatePending = nil;
+
+{$ELSE ~ZLIB_LINKONREQUEST}
+
+{$EXTERNALSYM deflatePending}
+function deflatePending(var strm: TZStreamRec;
+                        pending: PCardinal;
+                        bits: PInteger): Integer;
+  {$IFDEF ZLIB_EXPORT_CDECL} cdecl; {$ENDIF ZLIB_EXPORT_CDECL}
+
+{$ENDIF ~ZLIB_LINKONREQUEST}
+
+(*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*)
+
+{$IFDEF ZLIB_LINKONREQUEST}
+
+type
   {$EXTERNALSYM TdeflatePrime}
   TdeflatePrime = function (var strm: TZStreamRec;
                             bits: Integer;
@@ -2046,6 +2080,7 @@
   ZLibdeflateResetDefaultExportName = 'deflateReset';
   ZLibdeflateParamsDefaultExportName = 'deflateParams';
   ZLibdeflateBoundDefaultExportName = 'deflateBound';
+  ZLibdeflatePendingDefaultExportName = 'deflatePending';
   ZLibdeflatePrimeDefaultExportName = 'deflatePrime';
   ZLibinflateInit2_DefaultExportName = 'inflateInit2_';
   ZLibinflateSetDictionaryDefaultExportName = 'inflateSetDictionary';
@@ -2081,6 +2116,7 @@
   ZLibdeflateResetExportName: string = ZLibdeflateResetDefaultExportName;
   ZLibdeflateParamsExportName: string = ZLibdeflateParamsDefaultExportName;
   ZLibdeflateBoundExportName: string = ZLibdeflateBoundDefaultExportName;
+  ZLibdeflatePendingExportName: string = ZLibdeflatePendingDefaultExportName;
   ZLibdeflatePrimeExportName: string = ZLibdeflatePrimeDefaultExportName;
   ZLibinflateInit2_ExportName: string = ZLibinflateInit2_DefaultExportName;
   ZLibinflateSetDictionaryExportName: string = ZLibinflateSetDictionaryDefaultExportName;
@@ -2207,6 +2243,7 @@
 function deflateReset;         external;
 function deflateParams;        external;
 function deflateBound;         external;
+function deflatePending;       external;
 function deflatePrime;         external;
 function inflateInit2_;        external; // wrapped by inflateInit2()
 function inflateSetDictionary; external;
@@ -2334,6 +2371,14 @@
 end;
 
 {$ENDIF ~LINK_TO_MSVCRT}
+
+{$IFDEF CPU32}
+procedure __llmod; cdecl;
+asm
+  jmp System.@_llmod;
+end;
+{$ENDIF CPU32}
+
 {$ENDIF ZLIB_STATICLINK}
 {$ENDIF ~ZLIB_RTL}
 
@@ -2369,6 +2414,7 @@
     @deflateReset := GetModuleSymbol(ZLibModuleHandle, ZLIBdeflateResetExportName);
     @deflateParams := GetModuleSymbol(ZLibModuleHandle, ZLIBdeflateParamsExportName);
     @deflateBound := GetModuleSymbol(ZLibModuleHandle, ZLIBdeflateBoundExportName);
+    @deflatePending := GetModuleSymbol(ZLibModuleHandle, ZLIBdeflatePendingExportName);
     @deflatePrime := GetModuleSymbol(ZLibModuleHandle, ZLIBdeflatePrimeExportName);
     @inflateInit2_ := GetModuleSymbol(ZLibModuleHandle, ZLIBinflateInit2_ExportName);
     @inflateSetDictionary := GetModuleSymbol(ZLibModuleHandle, ZLIBinflateSetDictionaryExportName);
@@ -2419,6 +2465,7 @@
 function deflateReset;         external ZLibDefaultLibraryName name ZLibdeflateResetDefaultExportName;
 function deflateParams;        external ZLibDefaultLibraryName name ZLibdeflateParamsDefaultExportName;
 function deflateBound;         external ZLibDefaultLibraryName name ZLibdeflateBoundDefaultExportName;
+function deflatePending;       external ZLibDefaultLibraryName name ZLibdeflatePendingDefaultExportName;
 function deflatePrime;         external ZLibDefaultLibraryName name ZLibdeflatePrimeDefaultExportName;
 function inflateInit2_;        external ZLibDefaultLibraryName name ZLibinflateInit2_DefaultExportName;
 function inflateSetDictionary; external ZLibDefaultLibraryName name ZLibinflateSetDictionaryDefaultExportName;

Modified: trunk/jcl/source/windows/obj/zlib/win32/adler32.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/compress.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/crc32.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/deflate.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/infback.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/inffast.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/inflate.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/inftrees.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win32/makefile.mak	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/jcl/source/windows/obj/zlib/win32/makefile.mak	2012-08-27 18:50:24 UTC (rev 3845)
@@ -2,7 +2,7 @@
 # makefile to make zlib .obj files using Borland's C++ compiler bcc32
 # derived from a makefile generated by BCB6' bpr2mak
 #
-# if zlib source directory is different from ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
+# if zlib source directory is different from ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.7, use
 # "make -Dzlibsrc=<path to zlib sources>" to tell make where to find the 
 # source files
 #
@@ -44,7 +44,7 @@
 BCC = $(BCB)
 
 !if !$d(zlibsrc)
-zlibsrc = ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
+zlibsrc = ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.7
 !endif
 
 !if !$d(CPU)

Modified: trunk/jcl/source/windows/obj/zlib/win32/trees.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/uncompr.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win32/zutil.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/adler32.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/compress.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/crc32.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/deflate.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/infback.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/inffast.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/inflate.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/inftrees.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/makefile.mak
===================================================================
--- trunk/jcl/source/windows/obj/zlib/win64/makefile.mak	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/jcl/source/windows/obj/zlib/win64/makefile.mak	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,7 +1,7 @@
 #
 # makefile to make zlib .obj files using Microsoft C++ compiler (cl.exe)
 #
-# if zlib source directory is different from ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5, use
+# if zlib source directory is different from ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.7, use
 # "make -Dzlibsrc=<path to zlib sources>" to tell make where to find the
 # source files
 #
@@ -20,7 +20,7 @@
 # >C:\Program files\Borland\BDS\4.0\bin\make
 
 !if !$d(zlibsrc)
-zlibsrc = ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.5
+zlibsrc = ..\..\..\..\..\..\thirdparty\zlib\zlib-1.2.7
 !endif
 
 # ---------------------------------------------------------------------------

Modified: trunk/jcl/source/windows/obj/zlib/win64/trees.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/uncompr.obj
===================================================================
(Binary files differ)

Modified: trunk/jcl/source/windows/obj/zlib/win64/zutil.obj
===================================================================
(Binary files differ)


Property changes on: trunk/thirdparty/zlib/zlib-1.2.7
___________________________________________________________________
Added: tsvn:projectlanguage
   + 0x0409
Added: bugtraq:url
   + http://issuetracker.delphi-jedi.org/view.php?id=%BUGID%
Added: bugtraq:message
   + (Mantis #%BUGID%)
Added: svn:ignore
   + CMakeLists.txt
ChangeLog
FAQ
INDEX
Makefile
Makefile.in
amiga
as400
configure
contrib
doc
example.c
examples
gzclose.c
gzguts.h
gzlib.c
gzread.c
gzwrite.c
make_vms.com
minigzip.c
msdos
nintendods
old
qnx
test
treebuild.xml
watcom
win32
zconf.h.cmakein
zconf.h.in
zlib.3
zlib.3.pdf
zlib.map
zlib.pc.in
zlib2ansi
*.cmakein

Added: bugtraq:logregex
   + [Mm]antis #?(\d+)(,? ?#?(\d+))+
(\d+)

Modified: trunk/thirdparty/zlib/zlib-1.2.7/README
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/README	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/README	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,22 +1,22 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.5 is a general purpose data compression library.  All the code is
+zlib 1.2.7 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format).
+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+rfc1952 (gzip format).
 
 All functions of the compression library are documented in the file zlib.h
 (volunteer to write man pages welcome, contact zl...@gz...).  A usage example
-of the library is given in the file example.c which also tests that the library
-is working correctly.  Another example is given in the file minigzip.c.  The
-compression library itself is composed of all source files except example.c and
-minigzip.c.
+of the library is given in the file test/example.c which also tests that
+the library is working correctly.  Another example is given in the file
+test/minigzip.c.  The compression library itself is composed of all source
+files in the root directory.
 
 To compile all files and run the test program, follow the instructions given at
 the top of Makefile.in.  In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix.  For Windows, use one
-of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+well, "make install" should work for most flavors of Unix.  For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
 make_vms.com.
 
 Questions about zlib should be sent to <zl...@gz...>, or to Gilles Vollant
@@ -31,7 +31,7 @@
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.5 are documented in the file ChangeLog.
+The changes made in version 1.2.7 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -44,7 +44,7 @@
 
 A Python interface to zlib written by A.M. Kuchling <am...@am...> is
 available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html .
+http://docs.python.org/library/zlib.html .
 
 zlib is built into tcl: http://wiki.tcl.tk/4610 .
 
@@ -84,7 +84,7 @@
 
 Copyright notice:
 
- (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ (C) 1995-2012 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

Modified: trunk/thirdparty/zlib/zlib-1.2.7/adler32.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/adler32.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/adler32.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2007 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,9 +9,9 @@
 
 #define local static
 
-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
-#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define BASE 65521      /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -21,39 +21,44 @@
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
-/* use NO_DIVIDE if your processor does not do division in hardware */
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
 #ifdef NO_DIVIDE
-#  define MOD(a) \
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
     do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
         if (a >= BASE) a -= BASE; \
     } while (0)
-#  define MOD4(a) \
+#  define MOD(a) \
     do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
         if (a >= BASE) a -= BASE; \
     } while (0)
 #else
 #  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
 #endif
 
 /* ========================================================================= */
@@ -92,7 +97,7 @@
         }
         if (adler >= BASE)
             adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
+        MOD28(sum2);            /* only added so many BASE's */
         return adler | (sum2 << 16);
     }
 
@@ -137,8 +142,13 @@
     unsigned long sum2;
     unsigned rem;
 
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
     /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
     sum1 = adler1 & 0xffff;
     sum2 = rem * sum1;
     MOD(sum2);

Modified: trunk/thirdparty/zlib/zlib-1.2.7/crc32.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/crc32.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/crc32.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbr...@cs...> for his contribution of faster
@@ -17,6 +17,8 @@
   of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
 
 #ifdef MAKECRCH
@@ -30,31 +32,11 @@
 
 #define local static
 
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
 /* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
 #ifdef BYFOUR
-#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
    local unsigned long crc32_big OF((unsigned long,
@@ -68,16 +50,16 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
 
 
 #ifdef DYNAMIC_CRC_TABLE
 
 local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
+local z_crc_t FAR crc_table[TBLS][256];
 local void make_crc_table OF((void));
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
+   local void write_table OF((FILE *, const z_crc_t FAR *));
 #endif /* MAKECRCH */
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -107,9 +89,9 @@
 */
 local void make_crc_table()
 {
-    unsigned long c;
+    z_crc_t c;
     int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
     /* terms of polynomial defining this crc (except x^32): */
     static volatile int first = 1;      /* flag to limit concurrent making */
     static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@ -121,13 +103,13 @@
         first = 0;
 
         /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
 
         /* generate a crc for every 8-bit value */
         for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
+            c = (z_crc_t)n;
             for (k = 0; k < 8; k++)
                 c = c & 1 ? poly ^ (c >> 1) : c >> 1;
             crc_table[0][n] = c;
@@ -138,11 +120,11 @@
            and then the byte reversal of those as well as the first table */
         for (n = 0; n < 256; n++) {
             c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
+            crc_table[4][n] = ZSWAP32(c);
             for (k = 1; k < 4; k++) {
                 c = crc_table[0][c & 0xff] ^ (c >> 8);
                 crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
+                crc_table[k + 4][n] = ZSWAP32(c);
             }
         }
 #endif /* BYFOUR */
@@ -164,7 +146,7 @@
         if (out == NULL) return;
         fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
         fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "local const z_crc_t FAR ");
         fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
         write_table(out, crc_table[0]);
 #  ifdef BYFOUR
@@ -184,12 +166,13 @@
 #ifdef MAKECRCH
 local void write_table(out, table)
     FILE *out;
-    const unsigned long FAR *table;
+    const z_crc_t FAR *table;
 {
     int n;
 
     for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -204,13 +187,13 @@
 /* =========================================================================
  * This function can be used by asm versions of crc32()
  */
-const unsigned long FAR * ZEXPORT get_crc_table()
+const z_crc_t FAR * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
+    return (const z_crc_t FAR *)crc_table;
 }
 
 /* ========================================================================= */
@@ -232,7 +215,7 @@
 
 #ifdef BYFOUR
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
+        z_crc_t endian;
 
         endian = 1;
         if (*((unsigned char *)(&endian)))
@@ -266,17 +249,17 @@
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = (u4)crc;
+    c = (z_crc_t)crc;
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     while (len >= 32) {
         DOLIT32;
         len -= 32;
@@ -306,17 +289,17 @@
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = REV((u4)crc);
+    c = ZSWAP32((z_crc_t)crc);
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     buf4--;
     while (len >= 32) {
         DOBIG32;
@@ -333,7 +316,7 @@
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(REV(c));
+    return (unsigned long)(ZSWAP32(c));
 }
 
 #endif /* BYFOUR */

Modified: trunk/thirdparty/zlib/zlib-1.2.7/crc32.h
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/crc32.h	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/crc32.h	2012-08-27 18:50:24 UTC (rev 3845)
@@ -2,7 +2,7 @@
  * Generated automatically by crc32.c
  */
 
-local const unsigned long FAR crc_table[TBLS][256] =
+local const z_crc_t FAR crc_table[TBLS][256] =
 {
   {
     0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,

Modified: trunk/thirdparty/zlib/zlib-1.2.7/deflate.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/deflate.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/deflate.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -37,7 +37,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *      Available in http://tools.ietf.org/html/rfc1951
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -155,6 +155,9 @@
 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #endif
 
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
 /* ===========================================================================
  * Update a hash value with the given input byte
  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
@@ -235,10 +238,19 @@
 
     strm->msg = Z_NULL;
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
 
 #ifdef FASTEST
     if (level != 0) level = 1;
@@ -314,43 +326,70 @@
     uInt  dictLength;
 {
     deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    unsigned char *next;
 
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
         return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
 
-    s = strm->state;
-    if (s->wrap)
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
         strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
 
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > s->w_size) {
-        length = s->w_size;
-        dictionary += dictLength - length; /* use the tail of the dictionary */
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
     }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
 
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
     }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
     return Z_OK;
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
+int ZEXPORT deflateResetKeep (strm)
     z_streamp strm;
 {
     deflate_state *s;
@@ -380,12 +419,23 @@
     s->last_flush = Z_NO_FLUSH;
 
     _tr_init(s);
-    lm_init(s);
 
     return Z_OK;
 }
 
 /* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
+/* ========================================================================= */
 int ZEXPORT deflateSetHeader (strm, head)
     z_streamp strm;
     gz_headerp head;
@@ -397,14 +447,42 @@
 }
 
 /* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
+/* ========================================================================= */
 int ZEXPORT deflatePrime (strm, bits, value)
     z_streamp strm;
     int bits;
     int value;
 {
+    deflate_state *s;
+    int put;
+
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
     return Z_OK;
 }
 
@@ -562,19 +640,22 @@
 local void flush_pending(strm)
     z_streamp strm;
 {
-    unsigned len = strm->state->pending;
+    unsigned len;
+    deflate_state *s = strm->state;
 
+    _tr_flush_bits(s);
+    len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
 
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    zmemcpy(strm->next_out, s->pending_out, len);
     strm->next_out  += len;
-    strm->state->pending_out  += len;
+    s->pending_out  += len;
     strm->total_out += len;
     strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
+    s->pending -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
     }
 }
 
@@ -801,7 +882,7 @@
      * flushes. For repeated and useless calls with Z_FINISH, we keep
      * returning Z_STREAM_END instead of Z_BUF_ERROR.
      */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
                flush != Z_FINISH) {
         ERR_RETURN(strm, Z_BUF_ERROR);
     }
@@ -850,6 +931,7 @@
                     if (s->lookahead == 0) {
                         s->strstart = 0;
                         s->block_start = 0L;
+                        s->insert = 0;
                     }
                 }
             }
@@ -945,12 +1027,12 @@
 
     ss = source->state;
 
-    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
     dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -966,8 +1048,8 @@
     }
     /* following zmemcpy do not work for 16-bit MSDOS */
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
@@ -1001,15 +1083,15 @@
 
     strm->avail_in  -= len;
 
+    zmemcpy(buf, strm->next_in, len);
     if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
+        strm->adler = adler32(strm->adler, buf, len);
     }
 #ifdef GZIP
     else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
+        strm->adler = crc32(strm->adler, buf, len);
     }
 #endif
-    zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
 
@@ -1036,6 +1118,7 @@
     s->strstart = 0;
     s->block_start = 0L;
     s->lookahead = 0;
+    s->insert = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
@@ -1310,6 +1393,8 @@
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
@@ -1362,7 +1447,7 @@
 #endif
             more += wsize;
         }
-        if (s->strm->avail_in == 0) return;
+        if (s->strm->avail_in == 0) break;
 
         /* If there was no sliding:
          *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
@@ -1381,12 +1466,24 @@
         s->lookahead += n;
 
         /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
             Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
@@ -1427,6 +1524,9 @@
             s->high_water += init;
         }
     }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
 }
 
 /* ===========================================================================
@@ -1506,8 +1606,14 @@
             FLUSH_BLOCK(s, 0);
         }
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if ((long)s->strstart > s->block_start)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1603,8 +1709,14 @@
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 #ifndef FASTEST
@@ -1728,8 +1840,14 @@
         _tr_tally_lit(s, s->window[s->strstart-1], bflush);
         s->match_available = 0;
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 #endif /* FASTEST */
 
@@ -1749,11 +1867,11 @@
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
+         * for the longest run, plus one for the unrolled loop.
          */
-        if (s->lookahead < MAX_MATCH) {
+        if (s->lookahead <= MAX_MATCH) {
             fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
                 return need_more;
             }
             if (s->lookahead == 0) break; /* flush the current block */
@@ -1776,6 +1894,7 @@
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -1796,8 +1915,14 @@
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1829,6 +1954,12 @@
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }

Modified: trunk/thirdparty/zlib/zlib-1.2.7/deflate.h
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/deflate.h	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/deflate.h	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -48,6 +48,9 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
 #define INIT_STATE    42
 #define EXTRA_STATE   69
 #define NAME_STATE    73
@@ -188,7 +191,7 @@
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
     struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
@@ -244,7 +247,7 @@
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
     uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
+    uInt insert;        /* bytes at end of window left to insert */
 
 #ifdef DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
@@ -294,6 +297,7 @@
 int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
 void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));

Modified: trunk/thirdparty/zlib/zlib-1.2.7/infback.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/infback.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/infback.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,10 +42,19 @@
         return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -394,7 +403,6 @@
                     PULLBYTE();
                 }
                 if (here.val < 16) {
-                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }

Modified: trunk/thirdparty/zlib/zlib-1.2.7/inffixed.h
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/inffixed.h	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/inffixed.h	2012-08-27 18:50:24 UTC (rev 3845)
@@ -2,9 +2,9 @@
      * Generated automatically by makefixed().
      */
 
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
      */
 
     static const code lenfix[512] = {

Modified: trunk/thirdparty/zlib/zlib-1.2.7/inflate.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/inflate.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/inflate.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -100,7 +100,7 @@
 local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
                               unsigned len));
 
-int ZEXPORT inflateReset(strm)
+int ZEXPORT inflateResetKeep(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
@@ -109,15 +109,13 @@
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
     state->dmax = 32768U;
     state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
@@ -127,6 +125,19 @@
     return Z_OK;
 }
 
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
 int ZEXPORT inflateReset2(strm, windowBits)
 z_streamp strm;
 int windowBits;
@@ -180,10 +191,19 @@
     if (strm == Z_NULL) return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -321,8 +341,8 @@
     low = 0;
     for (;;) {
         if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
         if (++low == size) break;
         putchar(',');
     }
@@ -499,11 +519,6 @@
         bits -= bits & 7; \
     } while (0)
 
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
 /*
    inflate() uses a state machine to process as much input data and generate as
    much output data as possible before returning.  The state machine is
@@ -797,7 +812,7 @@
 #endif
         case DICTID:
             NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
+            strm->adler = state->check = ZSWAP32(hold);
             INITBITS();
             state->mode = DICT;
         case DICT:
@@ -925,7 +940,6 @@
                     PULLBYTE();
                 }
                 if (here.val < 16) {
-                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }
@@ -1170,7 +1184,7 @@
 #ifdef GUNZIP
                      state->flags ? hold :
 #endif
-                     REVERSE(hold)) != state->check) {
+                     ZSWAP32(hold)) != state->check) {
                     strm->msg = (char *)"incorrect data check";
                     state->mode = BAD;
                     break;
@@ -1214,7 +1228,8 @@
      */
   inf_leave:
     RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
         if (updatewindow(strm, out)) {
             state->mode = MEM;
             return Z_MEM_ERROR;
@@ -1255,7 +1270,10 @@
 uInt dictLength;
 {
     struct inflate_state FAR *state;
-    unsigned long id;
+    unsigned long dictid;
+    unsigned char *next;
+    unsigned avail;
+    int ret;
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
@@ -1263,29 +1281,27 @@
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
-    /* check for correct dictionary id */
+    /* check for correct dictionary identifier */
     if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
             return Z_DATA_ERROR;
     }
 
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    next = strm->next_out;
+    avail = strm->avail_out;
+    strm->next_out = (Bytef *)dictionary + dictLength;
+    strm->avail_out = 0;
+    ret = updatewindow(strm, dictLength);
+    strm->avail_out = avail;
+    strm->next_out = next;
+    if (ret) {
         state->mode = MEM;
         return Z_MEM_ERROR;
     }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
     state->havedict = 1;
     Tracev((stderr, "inflate:   dictionary set\n"));
     return Z_OK;
@@ -1433,8 +1449,8 @@
     }
 
     /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);

Modified: trunk/thirdparty/zlib/zlib-1.2.7/inftrees.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/inftrees.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/inftrees.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -289,38 +289,14 @@
         }
     }
 
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    here.op = (unsigned char)64;                /* invalid code marker */
-    here.bits = (unsigned char)(len - drop);
-    here.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            here.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = here;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
     }
 
     /* set return parameters */

Modified: trunk/thirdparty/zlib/zlib-1.2.7/trees.c
===================================================================
--- trunk/thirdparty/zlib/zlib-1.2.5/trees.c	2012-08-23 09:00:28 UTC (rev 3844)
+++ trunk/thirdparty/zlib/zlib-1.2.7/trees.c	2012-08-27 18:50:24 UTC (rev 3845)
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -74,11 +74,6 @@
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
 
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -399,7 +394,6 @@
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
@@ -883,15 +877,17 @@
 }
 
 /* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
+/* ===========================================================================
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes f...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl:[3844] trunk/jcl/source/common/JclIDEUtils.pas

From: <ou...@us...> - 2012-08-23 09:00:34

Revision: 3844
          http://jcl.svn.sourceforge.net/jcl/?rev=3844&view=rev
Author:   outchy
Date:     2012-08-23 09:00:28 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
only return the IDE obj folder when it exists: '' flags inexistent folders.

Modified Paths:
--------------
    trunk/jcl/source/common/JclIDEUtils.pas

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-22 15:40:33 UTC (rev 3843)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-23 09:00:28 UTC (rev 3844)
@@ -2207,12 +2207,9 @@
 
 function TJclBorRADToolInstallation.GetObjFolderName(APlatform: TJclBDSPlatform): string;
 begin
-  if RadToolKind = brCppBuilder then
-  begin
-    CheckCBuilderPlatform(APlatform);
-    Result := LibFolderName[APlatform] + PathAddSeparator('obj');
-  end
-  else
+  CheckPlatform(APlatform);
+  Result := LibFolderName[APlatform] + PathAddSeparator('obj');
+  if not DirectoryExists(Result) then
     Result := '';
 end;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl:[3843] trunk/jcl/source/common

From: <ou...@us...> - 2012-08-22 15:40:44

Revision: 3843
          http://jcl.svn.sourceforge.net/jcl/?rev=3843&view=rev
Author:   outchy
Date:     2012-08-22 15:40:33 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
support for Windows 8.

Modified Paths:
--------------
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/common/JclSysInfo.pas

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas	2012-08-22 10:34:07 UTC (rev 3842)
+++ trunk/jcl/source/common/JclResources.pas	2012-08-22 15:40:33 UTC (rev 3843)
@@ -1923,6 +1923,8 @@
   RsOSVersionWinServer2008      = 'Windows Server 2008';
   RsOSVersionWin7               = 'Windows 7';
   RsOSVersionWinServer2008R2    = 'Windows Server 2008 R2';
+  RsOSVersionWin8               = 'Windows 8';
+  RsOSVersionWinServer2012      = 'Windows Server 2012';
 
   RsEditionWinXPHome            = 'Home Edition';
   RsEditionWinXPPro             = 'Professional';

Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas	2012-08-22 10:34:07 UTC (rev 3842)
+++ trunk/jcl/source/common/JclSysInfo.pas	2012-08-22 15:40:33 UTC (rev 3843)
@@ -251,14 +251,15 @@
    (wvUnknown, wvWin95, wvWin95OSR2, wvWin98, wvWin98SE, wvWinME,
     wvWinNT31, wvWinNT35, wvWinNT351, wvWinNT4, wvWin2000, wvWinXP,
     wvWin2003, wvWinXP64, wvWin2003R2, wvWinVista, wvWinServer2008,
-    wvWin7, wvWinServer2008R2);
+    wvWin7, wvWinServer2008R2, wvWin8, wvWinServer2012);
   TWindowsEdition =
    (weUnknown, weWinXPHome, weWinXPPro, weWinXPHomeN, weWinXPProN, weWinXPHomeK,
     weWinXPProK, weWinXPHomeKN, weWinXPProKN, weWinXPStarter, weWinXPMediaCenter,
     weWinXPTablet, weWinVistaStarter, weWinVistaHomeBasic, weWinVistaHomeBasicN,
     weWinVistaHomePremium, weWinVistaBusiness, weWinVistaBusinessN,
     weWinVistaEnterprise, weWinVistaUltimate, weWin7Starter, weWin7HomeBasic,
-    weWin7HomePremium, weWin7Professional, weWin7Enterprise, weWin7Ultimate);
+    weWin7HomePremium, weWin7Professional, weWin7Enterprise, weWin7Ultimate,
+    weWin8, weWin8Pro, weWin8Enterprise, weWin8Ultimate, weWin8RT);
   TNtProductType =
    (ptUnknown, ptWorkStation, ptServer, ptAdvancedServer,
     ptPersonal, ptProfessional, ptDatacenterServer, ptEnterprise, ptWebEdition);
@@ -290,6 +291,8 @@
   IsWinServer2008: Boolean = False;
   IsWin7: Boolean = False;
   IsWinServer2008R2: Boolean = False;
+  IsWin8: Boolean = False;
+  IsWinServer2012: Boolean = False;
 
 const
   PROCESSOR_ARCHITECTURE_INTEL = 0;
@@ -3322,6 +3325,14 @@
                 else
                   Result := wvWinServer2008R2;
               end;
+            2:
+              begin
+                OSVersionInfoEx.dwOSVersionInfoSize := SizeOf(OSVersionInfoEx);
+                if GetVersionEx(OSVersionInfoEx) and (OSVersionInfoEx.wProductType = VER_NT_WORKSTATION) then
+                  Result := wvWin8
+                else
+                  Result := wvWinServer2012;
+              end;
           end;
       end;
   end;
@@ -3420,7 +3431,25 @@
    else
    if (pos('Ultimate', Edition) > 0) then
       Result := weWin7Ultimate;
-  end;
+  end
+  else
+  if (pos('Windows 8', Edition) = 1) then
+  begin
+   // Windows 8 Editions
+   if (pos('Pro', Edition) > 0) then
+      Result := weWin8Pro
+   else
+   if (pos('Enterprise', Edition) > 0) then
+      Result := weWin8Enterprise
+   else
+   if (pos('Ultimate', Edition) > 0) then
+      Result := weWin8Ultimate
+   else
+      Result := weWin8;
+  end
+  else
+  if (pos('Windows RT', Edition) = 1) then
+    Result := weWin8RT;
 end;
 
 function NtProductType: TNtProductType;
@@ -3574,6 +3603,10 @@
       Result := LoadResString(@RsOSVersionWin7);
     wvWinServer2008R2:
       Result := LoadResString(@RsOSVersionWinServer2008R2);
+    wvWin8:
+      Result := LoadResString(@RsOSVersionWin8);
+    wvWinServer2012:
+      Result := LoadResString(@RsOSVersionWinServer2012);
   else
     Result := '';
   end;
@@ -5784,6 +5817,10 @@
       IsWin7 := True;
     wvWinServer2008R2:
       IsWinServer2008R2 := True;
+    wvWin8:
+      IsWin8 := True;
+    wvWinServer2012:
+      IsWinServer2012 := 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.

Flat | Threaded

<< < 1 2 3 4 .. 92 > >> (Page 2 of 92)