Skip to content

Commit

Permalink
last fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Makhaon
Makhaon committed Apr 29, 2019
1 parent 201b074 commit 7ffd812
Show file tree
Hide file tree
Showing 107 changed files with 6,380 additions and 29 deletions.
3 changes: 2 additions & 1 deletion jcl/Install.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ JEDI Code Library v 2.7 Installation

Supported development tools versions:

- Delphi 10.3 (Win32 and Win64) and C++Builder 10.3 (Win32 and Win64)
- Delphi 10.2 (Win32 and Win64) and C++Builder 10.2 (Win32 and Win64)
- Delphi 10.1 (Win32 and Win64) and C++Builder 10.1 (Win32 and Win64)
- Delphi 10 (Win32 and Win64) and C++Builder 10 (Win32 and Win64)
Expand Down Expand Up @@ -72,4 +73,4 @@ To execute for
>install d6

--------------------------------
Document last updated 2017-03-31
Document last updated 2018-10-31
2 changes: 2 additions & 0 deletions jcl/devtools/included_files.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ copy ..\source\include\jcl.template.inc ..\source\include\jcld24win32.inc
copy ..\source\include\jcl.template.inc ..\source\include\jcld24win64.inc
copy ..\source\include\jcl.template.inc ..\source\include\jcld25win32.inc
copy ..\source\include\jcl.template.inc ..\source\include\jcld25win64.inc
copy ..\source\include\jcl.template.inc ..\source\include\jcld26win32.inc
copy ..\source\include\jcl.template.inc ..\source\include\jcld26win64.inc


copy ..\source\include\jcl.template.inc ..\source\include\jclfpc.inc
2 changes: 2 additions & 0 deletions jcl/devtools/included_files.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ cp ../source/include/jcl.template.inc ../source/include/jcld24win32.inc
cp ../source/include/jcl.template.inc ../source/include/jcld24win64.inc
cp ../source/include/jcl.template.inc ../source/include/jcld25win32.inc
cp ../source/include/jcl.template.inc ../source/include/jcld25win64.inc
cp ../source/include/jcl.template.inc ../source/include/jcld26win32.inc
cp ../source/include/jcl.template.inc ../source/include/jcld26win64.inc


cp ../source/include/jcl.template.inc ../source/include/jclfpc.inc
25 changes: 13 additions & 12 deletions jcl/devtools/pgEdit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,29 @@
<target name="d23" defines="BCB" IsBds="1"/>
<target name="d24" defines="BCB" IsBds="1"/>
<target name="d25" defines="BCB" IsBds="1"/>
<target name="d26" defines="BCB" IsBds="1"/>
</targets>
<aliases>
<!-- language aliases -->
<alias name="Delphi" value="d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="Bcb" value="c6,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="Pascal" value="fpc,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="Delphi" value="d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="Bcb" value="c6,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="Pascal" value="fpc,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<!-- platform aliases -->
<alias name="Windows" value="help,fpc,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="Windows" value="help,fpc,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="Linux" value="help,fpc"/>
<!-- package aliases -->
<alias name="allv11up" value="d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="allv14up" value="d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="allv15up" value="d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="allv11up" value="d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="allv14up" value="d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="allv15up" value="d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<!-- 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,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="Vcl" value="help,c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<!-- IDE aliases -->
<alias name="BDS" value="cs1,d8,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="runtimeBDS" value="d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="BDS" value="cs1,d8,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="runtimeBDS" value="d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="OldStyleIDE" value="c6,d6,d7"/>
<alias name="runtimeIDE" value="c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="designtimeIDE" value="c6,d6,d7,d8,d9,d10,cs1,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25"/>
<alias name="runtimeIDE" value="c6,d6,d7,d9,d10,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
<alias name="designtimeIDE" value="c6,d6,d7,d8,d9,d10,cs1,d11,d12,d14,d15,d16,d17,d18,d19,d20,d21,d22,d23,d24,d25,d26"/>
</aliases>
<ProjectProperties>
<ProjectProperty name="VersionMajorNumber" value="2"/>
Expand Down
8 changes: 7 additions & 1 deletion jcl/docs/Readme.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <h3><a name="about">About this release</a></h3>

<p>For BDS 2006, RAD Studio 2007, RAD Studio 2009, RAD Studio 2010, RAD Studio XE, RAD Studio XE2,
RAD Studio XE3, RAD Studio XE4, RAD Studio XE5, RAD Studio XE6, RAD Studio XE7, RAD Studio XE8,
RAD Studio 10, RAD Studio 10.1, and RAD Studio 10.2 the
RAD Studio 10, RAD Studio 10.1, RAD Studio 10.2, and RAD Studio 10.3 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>
Expand Down Expand Up @@ -183,6 +183,8 @@ <h3><a name="targets">Supported Tools</a></h3>

<li>Delphi 10.2 and C++Builder 10.2.</li>

<li>Delphi 10.3 and C++Builder 10.3.</li>

</ul>

<hr><br>
Expand Down Expand Up @@ -318,6 +320,10 @@ <h3><a name="manual">Manual Installation</a></h3>

<li>For Delphi 10.2 and C++Builder 10.2 Win64: source\include\jcld25win64.inc</li>

<li>For Delphi 10.3 and C++Builder 10.3 Win32: source\include\jcld26win32.inc</li>

<li>For Delphi 10.3 and C++Builder 10.3 Win64: source\include\jcld26win64.inc</li>

<li>For FreePascal: source\include\jclfpc.inc</li>
</ul>

Expand Down
5 changes: 4 additions & 1 deletion jcl/docs/Readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ The JEDI Code Library packages are required by some 3rd party packages (includin

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, 2009, 2010, XE, XE2, XE3, XE4, XE5, XE6, XE7, XE8, 10, 10.1 and 10.2 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, 2009, 2010, XE, XE2, XE3, XE4, XE5, XE6, XE7, XE8, 10, 10.1, 10.2 and 10.3 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.


--------------------------------------------------------------------------------
Expand Down Expand Up @@ -101,6 +101,7 @@ Delphi XE8 and C++Builder XE8.
Delphi 10 and C++Builder 10.
Delphi 10.1 and C++Builder 10.1.
Delphi 10.2 and C++Builder 10.2.
Delphi 10.3 and C++Builder 10.3.

--------------------------------------------------------------------------------

Expand Down Expand Up @@ -165,6 +166,8 @@ For Delphi 10.1 and C++Builder 10.1 Win32: source\include\jcld24win32.inc
For Delphi 10.1 and C++Builder 10.1 Win64: source\include\jcld24win64.inc
For Delphi 10.2 and C++Builder 10.2 Win32: source\include\jcld25win32.inc
For Delphi 10.2 and C++Builder 10.2 Win64: source\include\jcld25win64.inc
For Delphi 10.3 and C++Builder 10.3 Win32: source\include\jcld26win32.inc
For Delphi 10.3 and C++Builder 10.3 Win64: source\include\jcld26win64.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).
Expand Down
1 change: 1 addition & 0 deletions jcl/lib/d26/win32/debug/dirinfo.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory is intended as a common place for debug .dcu files of Delphi 26 Win32 packages.
1 change: 1 addition & 0 deletions jcl/lib/d26/win32/dirinfo.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory is intended as a common place for .dcu files of Delphi 26 Win32 packages.
1 change: 1 addition & 0 deletions jcl/lib/d26/win64/debug/dirinfo.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory is intended as a common place for debug .dcu files of Delphi 26 Win64 packages.
1 change: 1 addition & 0 deletions jcl/lib/d26/win64/dirinfo.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory is intended as a common place for .dcu files of Delphi 26 Win64 packages.
3 changes: 2 additions & 1 deletion jcl/make.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32220.dll') ">d22</EditionDirVersion> <!-- XE8 -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32230.dll') ">d23</EditionDirVersion> <!-- 10 Seattle -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32240.dll') ">d24</EditionDirVersion> <!-- 10.1 Berlin -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32250.dll') ">d25</EditionDirVersion> <!-- 10.2 ? -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32250.dll') ">d25</EditionDirVersion> <!-- 10.2 Tokyo -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32260.dll') ">d26</EditionDirVersion> <!-- 10.3 ? -->

<LibDirVersion>$(EditionDirVersion)\$(Platform)</LibDirVersion>
<LibDirVersion Condition=" '$(EditionDirVersion)' == 'd12' or '$(EditionDirVersion)' == 'd14' or '$(EditionDirVersion)' == 'd15' ">$(EditionDirVersion)</LibDirVersion>
Expand Down
170 changes: 170 additions & 0 deletions jcl/packages/JclPackagesD260.groupproj
View file
Original file line number Diff line number Diff line change
@@ -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="d26\Jcl.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclVcl.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclContainers.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclDeveloperTools.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclBaseExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclDebugExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclFavoriteFoldersExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclProjectAnalysisExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclRepositoryExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclSIMDViewExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\JclStackTraceViewerExpert.dproj">
<Dependencies/>
</Projects>
<Projects Include="d26\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="d26\Jcl.dproj"/>
</Target>
<Target Name="Jcl:Clean">
<MSBuild Projects="d26\Jcl.dproj" Targets="Clean"/>
</Target>
<Target Name="Jcl:Make">
<MSBuild Projects="d26\Jcl.dproj" Targets="Make"/>
</Target>
<Target Name="JclVcl">
<MSBuild Projects="d26\JclVcl.dproj"/>
</Target>
<Target Name="JclVcl:Clean">
<MSBuild Projects="d26\JclVcl.dproj" Targets="Clean"/>
</Target>
<Target Name="JclVcl:Make">
<MSBuild Projects="d26\JclVcl.dproj" Targets="Make"/>
</Target>
<Target Name="JclContainers">
<MSBuild Projects="d26\JclContainers.dproj"/>
</Target>
<Target Name="JclContainers:Clean">
<MSBuild Projects="d26\JclContainers.dproj" Targets="Clean"/>
</Target>
<Target Name="JclContainers:Make">
<MSBuild Projects="d26\JclContainers.dproj" Targets="Make"/>
</Target>
<Target Name="JclDeveloperTools">
<MSBuild Projects="d26\JclDeveloperTools.dproj"/>
</Target>
<Target Name="JclDeveloperTools:Clean">
<MSBuild Projects="d26\JclDeveloperTools.dproj" Targets="Clean"/>
</Target>
<Target Name="JclDeveloperTools:Make">
<MSBuild Projects="d26\JclDeveloperTools.dproj" Targets="Make"/>
</Target>
<Target Name="JclBaseExpert">
<MSBuild Projects="d26\JclBaseExpert.dproj"/>
</Target>
<Target Name="JclBaseExpert:Clean">
<MSBuild Projects="d26\JclBaseExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclBaseExpert:Make">
<MSBuild Projects="d26\JclBaseExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclDebugExpert">
<MSBuild Projects="d26\JclDebugExpert.dproj"/>
</Target>
<Target Name="JclDebugExpert:Clean">
<MSBuild Projects="d26\JclDebugExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclDebugExpert:Make">
<MSBuild Projects="d26\JclDebugExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclFavoriteFoldersExpert">
<MSBuild Projects="d26\JclFavoriteFoldersExpert.dproj"/>
</Target>
<Target Name="JclFavoriteFoldersExpert:Clean">
<MSBuild Projects="d26\JclFavoriteFoldersExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclFavoriteFoldersExpert:Make">
<MSBuild Projects="d26\JclFavoriteFoldersExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclProjectAnalysisExpert">
<MSBuild Projects="d26\JclProjectAnalysisExpert.dproj"/>
</Target>
<Target Name="JclProjectAnalysisExpert:Clean">
<MSBuild Projects="d26\JclProjectAnalysisExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclProjectAnalysisExpert:Make">
<MSBuild Projects="d26\JclProjectAnalysisExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclRepositoryExpert">
<MSBuild Projects="d26\JclRepositoryExpert.dproj"/>
</Target>
<Target Name="JclRepositoryExpert:Clean">
<MSBuild Projects="d26\JclRepositoryExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclRepositoryExpert:Make">
<MSBuild Projects="d26\JclRepositoryExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclSIMDViewExpert">
<MSBuild Projects="d26\JclSIMDViewExpert.dproj"/>
</Target>
<Target Name="JclSIMDViewExpert:Clean">
<MSBuild Projects="d26\JclSIMDViewExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclSIMDViewExpert:Make">
<MSBuild Projects="d26\JclSIMDViewExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclStackTraceViewerExpert">
<MSBuild Projects="d26\JclStackTraceViewerExpert.dproj"/>
</Target>
<Target Name="JclStackTraceViewerExpert:Clean">
<MSBuild Projects="d26\JclStackTraceViewerExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclStackTraceViewerExpert:Make">
<MSBuild Projects="d26\JclStackTraceViewerExpert.dproj" Targets="Make"/>
</Target>
<Target Name="JclVersionControlExpert">
<MSBuild Projects="d26\JclVersionControlExpert.dproj"/>
</Target>
<Target Name="JclVersionControlExpert:Clean">
<MSBuild Projects="d26\JclVersionControlExpert.dproj" Targets="Clean"/>
</Target>
<Target Name="JclVersionControlExpert:Make">
<MSBuild Projects="d26\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>
Loading

0 comments on commit 7ffd812

Please sign in to comment.