Skip to content

Commit 31c135c

Browse files
jimmckeethjimmckeeth
committed
10.2.3 Tokyo / VER320 / PKG 250
Support added for 10.2.3 Tokyo (Compiler 32.0 / VER320 / Product version 25 / Package Version 250) Previously at https://github.com/TurboPack-Tokyo/
1 parent 07da189 commit 31c135c

File tree

16 files changed

+351
-150
lines changed

16 files changed

+351
-150
lines changed

‎Packages/CBuilder/DOSCommandCD.cbproj‎

Lines changed: 116 additions & 48 deletions
Large diffs are not rendered by default.

‎Packages/CBuilder/DOSCommandCR.cbproj‎

Lines changed: 110 additions & 52 deletions
Large diffs are not rendered by default.

‎Packages/Delphi/DOSCommandDD.dpk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ package DOSCommandDD;
2626
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
2828
{$DESCRIPTION 'TurboPack DOSCommand Designtime Package for Delphi'}
29-
{$LIBSUFFIX '240'}
29+
{$LIBSUFFIX '250'}
3030
{$DESIGNONLY}
3131
{$IMPLICITBUILD OFF}
3232

‎Packages/Delphi/DOSCommandDD.dproj‎

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{9949A787-61E1-4E03-BE90-AE9C24A1A276}</ProjectGuid>
44
<MainSource>DOSCommandDD.dpk</MainSource>
5-
<ProjectVersion>18.1</ProjectVersion>
5+
<ProjectVersion>18.2</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Release</Config>
@@ -75,7 +75,7 @@
7575
<DesignOnlyPackage>true</DesignOnlyPackage>
7676
<SanitizedProjectName>DOSCommandDD</SanitizedProjectName>
7777
<VerInfo_Locale>1031</VerInfo_Locale>
78-
<DllSuffix>240</DllSuffix>
78+
<DllSuffix>250</DllSuffix>
7979
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
8080
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
8181
<GenPackage>true</GenPackage>
@@ -113,7 +113,7 @@
113113
<DCC_UsePackage>rtl;DOSCommandDR;$(DCC_UsePackage)</DCC_UsePackage>
114114
<VerInfo_Locale>1033</VerInfo_Locale>
115115
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
116-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
116+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
117117
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
118118
</PropertyGroup>
119119
<PropertyGroup Condition="'$(Base_Win64)'!=''">
@@ -139,6 +139,7 @@
139139
<DCC_DebugInformation>0</DCC_DebugInformation>
140140
</PropertyGroup>
141141
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
142+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
142143
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
143144
<VerInfo_Locale>1033</VerInfo_Locale>
144145
</PropertyGroup>
@@ -170,11 +171,10 @@
170171
<Source Name="MainSource">DOSCommandDD.dpk</Source>
171172
</Source>
172173
<Excluded_Packages>
173-
<Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
174-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
175-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
176-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
177-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
174+
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
175+
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
176+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
177+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
178178
</Excluded_Packages>
179179
</Delphi.Personality>
180180
<Deployment Version="3">
@@ -204,7 +204,16 @@
204204
<Overwrite>true</Overwrite>
205205
</Platform>
206206
</DeployFile>
207-
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
207+
<DeployClass Name="DependencyModule">
208+
<Platform Name="Win32">
209+
<Operation>0</Operation>
210+
<Extensions>.dll;.bpl</Extensions>
211+
</Platform>
212+
<Platform Name="OSX32">
213+
<Operation>1</Operation>
214+
<Extensions>.dylib</Extensions>
215+
</Platform>
216+
</DeployClass>
208217
<DeployClass Name="ProjectOSXResource">
209218
<Platform Name="OSX32">
210219
<RemoteDir>Contents\Resources</RemoteDir>
@@ -282,6 +291,14 @@
282291
<Extensions>.framework</Extensions>
283292
</Platform>
284293
</DeployClass>
294+
<DeployClass Name="ProjectUWPManifest">
295+
<Platform Name="Win32">
296+
<Operation>1</Operation>
297+
</Platform>
298+
<Platform Name="Win64">
299+
<Operation>1</Operation>
300+
</Platform>
301+
</DeployClass>
285302
<DeployClass Name="iPhone_Launch640">
286303
<Platform Name="iOSSimulator">
287304
<Operation>1</Operation>
@@ -384,6 +401,16 @@
384401
<Operation>1</Operation>
385402
</Platform>
386403
</DeployClass>
404+
<DeployClass Name="UWP_DelphiLogo44">
405+
<Platform Name="Win32">
406+
<RemoteDir>Assets</RemoteDir>
407+
<Operation>1</Operation>
408+
</Platform>
409+
<Platform Name="Win64">
410+
<RemoteDir>Assets</RemoteDir>
411+
<Operation>1</Operation>
412+
</Platform>
413+
</DeployClass>
387414
<DeployClass Name="ProjectiOSEntitlements"/>
388415
<DeployClass Name="AndroidGDBServer">
389416
<Platform Name="Android">
@@ -399,6 +426,16 @@
399426
</DeployClass>
400427
<DeployClass Name="ProjectOSXInfoPList"/>
401428
<DeployClass Name="ProjectOSXEntitlements"/>
429+
<DeployClass Name="UWP_DelphiLogo150">
430+
<Platform Name="Win32">
431+
<RemoteDir>Assets</RemoteDir>
432+
<Operation>1</Operation>
433+
</Platform>
434+
<Platform Name="Win64">
435+
<RemoteDir>Assets</RemoteDir>
436+
<Operation>1</Operation>
437+
</Platform>
438+
</DeployClass>
402439
<DeployClass Name="iPad_Launch2048">
403440
<Platform Name="iOSSimulator">
404441
<Operation>1</Operation>
@@ -516,16 +553,7 @@
516553
<Operation>1</Operation>
517554
</Platform>
518555
</DeployClass>
519-
<DeployClass Name="DependencyModule">
520-
<Platform Name="Win32">
521-
<Operation>0</Operation>
522-
<Extensions>.dll;.bpl</Extensions>
523-
</Platform>
524-
<Platform Name="OSX32">
525-
<Operation>1</Operation>
526-
<Extensions>.dylib</Extensions>
527-
</Platform>
528-
</DeployClass>
556+
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
529557
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
530558
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
531559
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

‎Packages/Delphi/DOSCommandDR.dpk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ package DOSCommandDR;
2626
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
2828
{$DESCRIPTION 'TurboPack DOSCommand Runtime Package for Delphi'}
29-
{$LIBSUFFIX '240'}
29+
{$LIBSUFFIX '250'}
3030
{$RUNONLY}
3131
{$IMPLICITBUILD OFF}
3232

‎Packages/Delphi/DOSCommandDR.dproj‎

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{1CE6207D-4376-4E12-9ADF-1B0E73FCDE72}</ProjectGuid>
44
<MainSource>DOSCommandDR.dpk</MainSource>
5-
<ProjectVersion>18.1</ProjectVersion>
5+
<ProjectVersion>18.2</ProjectVersion>
66
<FrameworkType>None</FrameworkType>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Release</Config>
@@ -77,7 +77,7 @@
7777
<SanitizedProjectName>DOSCommandDR</SanitizedProjectName>
7878
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
7979
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
80-
<DllSuffix>240</DllSuffix>
80+
<DllSuffix>250</DllSuffix>
8181
<GenDll>true</GenDll>
8282
<DCC_Description>TurboPack DOSCommand Runtime Package for Delphi</DCC_Description>
8383
<GenPackage>true</GenPackage>
@@ -107,7 +107,7 @@
107107
<PropertyGroup Condition="'$(Base_Win32)'!=''">
108108
<VerInfo_Locale>1033</VerInfo_Locale>
109109
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
110-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
110+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
111111
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
112112
</PropertyGroup>
113113
<PropertyGroup Condition="'$(Base_Win64)'!=''">
@@ -139,6 +139,7 @@
139139
<DCC_DebugInformation>0</DCC_DebugInformation>
140140
</PropertyGroup>
141141
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
142+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
142143
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
143144
<VerInfo_Locale>1033</VerInfo_Locale>
144145
</PropertyGroup>
@@ -169,11 +170,10 @@
169170
<Source Name="MainSource">DOSCommandDR.dpk</Source>
170171
</Source>
171172
<Excluded_Packages>
172-
<Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
173-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
174-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
175-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
176-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
173+
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
174+
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
175+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
176+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
177177
</Excluded_Packages>
178178
</Delphi.Personality>
179179
<Deployment Version="3">
@@ -203,7 +203,16 @@
203203
<Overwrite>true</Overwrite>
204204
</Platform>
205205
</DeployFile>
206-
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
206+
<DeployClass Name="DependencyModule">
207+
<Platform Name="Win32">
208+
<Operation>0</Operation>
209+
<Extensions>.dll;.bpl</Extensions>
210+
</Platform>
211+
<Platform Name="OSX32">
212+
<Operation>1</Operation>
213+
<Extensions>.dylib</Extensions>
214+
</Platform>
215+
</DeployClass>
207216
<DeployClass Name="ProjectOSXResource">
208217
<Platform Name="OSX32">
209218
<RemoteDir>Contents\Resources</RemoteDir>
@@ -281,6 +290,14 @@
281290
<Extensions>.framework</Extensions>
282291
</Platform>
283292
</DeployClass>
293+
<DeployClass Name="ProjectUWPManifest">
294+
<Platform Name="Win32">
295+
<Operation>1</Operation>
296+
</Platform>
297+
<Platform Name="Win64">
298+
<Operation>1</Operation>
299+
</Platform>
300+
</DeployClass>
284301
<DeployClass Name="iPhone_Launch640">
285302
<Platform Name="iOSSimulator">
286303
<Operation>1</Operation>
@@ -383,6 +400,16 @@
383400
<Operation>1</Operation>
384401
</Platform>
385402
</DeployClass>
403+
<DeployClass Name="UWP_DelphiLogo44">
404+
<Platform Name="Win32">
405+
<RemoteDir>Assets</RemoteDir>
406+
<Operation>1</Operation>
407+
</Platform>
408+
<Platform Name="Win64">
409+
<RemoteDir>Assets</RemoteDir>
410+
<Operation>1</Operation>
411+
</Platform>
412+
</DeployClass>
386413
<DeployClass Name="ProjectiOSEntitlements"/>
387414
<DeployClass Name="AndroidGDBServer">
388415
<Platform Name="Android">
@@ -398,6 +425,16 @@
398425
</DeployClass>
399426
<DeployClass Name="ProjectOSXInfoPList"/>
400427
<DeployClass Name="ProjectOSXEntitlements"/>
428+
<DeployClass Name="UWP_DelphiLogo150">
429+
<Platform Name="Win32">
430+
<RemoteDir>Assets</RemoteDir>
431+
<Operation>1</Operation>
432+
</Platform>
433+
<Platform Name="Win64">
434+
<RemoteDir>Assets</RemoteDir>
435+
<Operation>1</Operation>
436+
</Platform>
437+
</DeployClass>
401438
<DeployClass Name="iPad_Launch2048">
402439
<Platform Name="iOSSimulator">
403440
<Operation>1</Operation>
@@ -515,16 +552,7 @@
515552
<Operation>1</Operation>
516553
</Platform>
517554
</DeployClass>
518-
<DeployClass Name="DependencyModule">
519-
<Platform Name="Win32">
520-
<Operation>0</Operation>
521-
<Extensions>.dll;.bpl</Extensions>
522-
</Platform>
523-
<Platform Name="OSX32">
524-
<Operation>1</Operation>
525-
<Extensions>.dylib</Extensions>
526-
</Platform>
527-
</DeployClass>
555+
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
528556
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
529557
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
530558
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

‎Source/DosCommand.pas‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,6 @@ constructor TDosThread.Create(AOwner: TDosCommand; ACl, ACurrDir: string; ALines
569569
FMaxTimeAfterLastOutput := AMtalo;
570570
FPriority := Ap;
571571
FTerminateEvent := TEvent.Create(nil, True, False, '');
572-
FreeOnTerminate := False;
573572
end;
574573

575574
destructor TDosThread.Destroy;

‎Source/hpp/Win32/Debug/DOSCommandDR.hpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
33
// All rights reserved
44

5-
// (DO NOT EDIT: machine generated header) 'DOSCommandDR.dpk' rev: 31.00 (Windows)
5+
// (DO NOT EDIT: machine generated header) 'DOSCommandDR.dpk' rev: 32.00 (Windows)
66

77
#ifndef DoscommanddrHPP
88
#define DoscommanddrHPP
@@ -29,6 +29,11 @@
2929
#include <System.Classes.hpp>// (rtl)
3030
#include <System.TimeSpan.hpp>// (rtl)
3131
#include <System.SyncObjs.hpp>// (rtl)
32+
// SO_SFX: 250
33+
// PRG_EXT: .bpl
34+
// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
35+
// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
36+
// OBJ_EXT: .obj
3237

3338
//-- user supplied -----------------------------------------------------------
3439

‎Source/hpp/Win32/Debug/DosCommand.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
33
// All rights reserved
44

5-
// (DO NOT EDIT: machine generated header) 'DosCommand.pas' rev: 31.00 (Windows)
5+
// (DO NOT EDIT: machine generated header) 'DosCommand.pas' rev: 32.00 (Windows)
66

77
#ifndef DoscommandHPP
88
#define DoscommandHPP

‎Source/hpp/Win32/Release/DOSCommandDR.hpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
33
// All rights reserved
44

5-
// (DO NOT EDIT: machine generated header) 'DOSCommandDR.dpk' rev: 31.00 (Windows)
5+
// (DO NOT EDIT: machine generated header) 'DOSCommandDR.dpk' rev: 32.00 (Windows)
66

77
#ifndef DoscommanddrHPP
88
#define DoscommanddrHPP
@@ -29,6 +29,11 @@
2929
#include <System.Classes.hpp>// (rtl)
3030
#include <System.TimeSpan.hpp>// (rtl)
3131
#include <System.SyncObjs.hpp>// (rtl)
32+
// SO_SFX: 250
33+
// PRG_EXT: .bpl
34+
// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
35+
// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
36+
// OBJ_EXT: .obj
3237

3338
//-- user supplied -----------------------------------------------------------
3439

0 commit comments

Comments
 (0)