Skip to content

Commit

Permalink
10.2.3 Tokyo / VER320 / PKG 250
Browse files Browse the repository at this point in the history 
Support added for 10.2.3 Tokyo (Compiler 32.0 / VER320 / Product version 25 / Package Version 250)
Previously at https://github.com/TurboPack-Tokyo/
  • Loading branch information
@jimmckeeth
jimmckeeth committed Jan 16, 2019
1 parent 07da189 commit 31c135c
Show file tree
Hide file tree
Showing 16 changed files with 351 additions and 150 deletions.
164 changes: 116 additions & 48 deletions Packages/CBuilder/DOSCommandCD.cbproj
View file

Large diffs are not rendered by default.

162 changes: 110 additions & 52 deletions Packages/CBuilder/DOSCommandCR.cbproj
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Packages/Delphi/DOSCommandDD.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package DOSCommandDD;
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'TurboPack DOSCommand Designtime Package for Delphi'}
{$LIBSUFFIX '240'}
{$LIBSUFFIX '250'}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

Expand Down
66 changes: 47 additions & 19 deletions Packages/Delphi/DOSCommandDD.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{9949A787-61E1-4E03-BE90-AE9C24A1A276}</ProjectGuid>
<MainSource>DOSCommandDD.dpk</MainSource>
<ProjectVersion>18.1</ProjectVersion>
<ProjectVersion>18.2</ProjectVersion>
<FrameworkType>None</FrameworkType>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
Expand Down Expand Up @@ -75,7 +75,7 @@
<DesignOnlyPackage>true</DesignOnlyPackage>
<SanitizedProjectName>DOSCommandDD</SanitizedProjectName>
<VerInfo_Locale>1031</VerInfo_Locale>
<DllSuffix>240</DllSuffix>
<DllSuffix>250</DllSuffix>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
<GenPackage>true</GenPackage>
Expand Down Expand Up @@ -113,7 +113,7 @@
<DCC_UsePackage>rtl;DOSCommandDR;$(DCC_UsePackage)</DCC_UsePackage>
<VerInfo_Locale>1033</VerInfo_Locale>
<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_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>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
Expand All @@ -139,6 +139,7 @@
<DCC_DebugInformation>0</DCC_DebugInformation>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<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>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale>
</PropertyGroup>
Expand Down Expand Up @@ -170,11 +171,10 @@
<Source Name="MainSource">DOSCommandDD.dpk</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
Expand Down Expand Up @@ -204,7 +204,16 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
Expand Down Expand Up @@ -282,6 +291,14 @@
<Extensions>.framework</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectUWPManifest">
<Platform Name="Win32">
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch640">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
Expand Down Expand Up @@ -384,6 +401,16 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo44">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSEntitlements"/>
<DeployClass Name="AndroidGDBServer">
<Platform Name="Android">
Expand All @@ -399,6 +426,16 @@
</DeployClass>
<DeployClass Name="ProjectOSXInfoPList"/>
<DeployClass Name="ProjectOSXEntitlements"/>
<DeployClass Name="UWP_DelphiLogo150">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
Expand Down Expand Up @@ -516,16 +553,7 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
Expand Down
2 changes: 1 addition & 1 deletion Packages/Delphi/DOSCommandDR.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package DOSCommandDR;
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'TurboPack DOSCommand Runtime Package for Delphi'}
{$LIBSUFFIX '240'}
{$LIBSUFFIX '250'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

Expand Down
66 changes: 47 additions & 19 deletions Packages/Delphi/DOSCommandDR.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ProjectGuid>{1CE6207D-4376-4E12-9ADF-1B0E73FCDE72}</ProjectGuid>
<MainSource>DOSCommandDR.dpk</MainSource>
<ProjectVersion>18.1</ProjectVersion>
<ProjectVersion>18.2</ProjectVersion>
<FrameworkType>None</FrameworkType>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
Expand Down Expand Up @@ -77,7 +77,7 @@
<SanitizedProjectName>DOSCommandDR</SanitizedProjectName>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DllSuffix>240</DllSuffix>
<DllSuffix>250</DllSuffix>
<GenDll>true</GenDll>
<DCC_Description>TurboPack DOSCommand Runtime Package for Delphi</DCC_Description>
<GenPackage>true</GenPackage>
Expand Down Expand Up @@ -107,7 +107,7 @@
<PropertyGroup Condition="'$(Base_Win32)'!=''">
<VerInfo_Locale>1033</VerInfo_Locale>
<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_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>
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win64)'!=''">
Expand Down Expand Up @@ -139,6 +139,7 @@
<DCC_DebugInformation>0</DCC_DebugInformation>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<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>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Locale>1033</VerInfo_Locale>
</PropertyGroup>
Expand Down Expand Up @@ -169,11 +170,10 @@
<Source Name="MainSource">DOSCommandDR.dpk</Source>
</Source>
<Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclIntraweb_140_240.bpl">IntraWeb 14.0 Design Package for RAD Studio XE6</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k250.bpl">Embarcadero C++Builder-Package für Office 2000-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp250.bpl">Embarcadero C++Builder-Package für Office XP-Server</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k250.bpl">Microsoft Office 2000 Beispiele für gekapselte Komponenten für Automatisierungsserver</Excluded_Packages>
<Excluded_Packages Name="$(BDSBIN)\dclofficexp250.bpl">Microsoft Office XP Beispiele für gekapselte Komponenten für Automation Server</Excluded_Packages>
</Excluded_Packages>
</Delphi.Personality>
<Deployment Version="3">
Expand Down Expand Up @@ -203,7 +203,16 @@
<Overwrite>true</Overwrite>
</Platform>
</DeployFile>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXResource">
<Platform Name="OSX32">
<RemoteDir>Contents\Resources</RemoteDir>
Expand Down Expand Up @@ -281,6 +290,14 @@
<Extensions>.framework</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectUWPManifest">
<Platform Name="Win32">
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch640">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
Expand Down Expand Up @@ -383,6 +400,16 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="UWP_DelphiLogo44">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSEntitlements"/>
<DeployClass Name="AndroidGDBServer">
<Platform Name="Android">
Expand All @@ -398,6 +425,16 @@
</DeployClass>
<DeployClass Name="ProjectOSXInfoPList"/>
<DeployClass Name="ProjectOSXEntitlements"/>
<DeployClass Name="UWP_DelphiLogo150">
<Platform Name="Win32">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="Win64">
<RemoteDir>Assets</RemoteDir>
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSSimulator">
<Operation>1</Operation>
Expand Down Expand Up @@ -515,16 +552,7 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="DependencyModule">
<Platform Name="Win32">
<Operation>0</Operation>
<Extensions>.dll;.bpl</Extensions>
</Platform>
<Platform Name="OSX32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
Expand Down
1 change: 0 additions & 1 deletion Source/DosCommand.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ constructor TDosThread.Create(AOwner: TDosCommand; ACl, ACurrDir: string; ALines
FMaxTimeAfterLastOutput := AMtalo;
FPriority := Ap;
FTerminateEvent := TEvent.Create(nil, True, False, '');
FreeOnTerminate := False;
end;

destructor TDosThread.Destroy;
Expand Down
7 changes: 6 additions & 1 deletion Source/hpp/Win32/Debug/DOSCommandDR.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

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

#ifndef DoscommanddrHPP
#define DoscommanddrHPP
Expand All @@ -29,6 +29,11 @@
#include <System.Classes.hpp> // (rtl)
#include <System.TimeSpan.hpp> // (rtl)
#include <System.SyncObjs.hpp> // (rtl)
// SO_SFX: 250
// PRG_EXT: .bpl
// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
// OBJ_EXT: .obj

//-- user supplied -----------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Source/hpp/Win32/Debug/DosCommand.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

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

#ifndef DoscommandHPP
#define DoscommandHPP
Expand Down
7 changes: 6 additions & 1 deletion Source/hpp/Win32/Release/DOSCommandDR.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

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

#ifndef DoscommanddrHPP
#define DoscommanddrHPP
Expand All @@ -29,6 +29,11 @@
#include <System.Classes.hpp> // (rtl)
#include <System.TimeSpan.hpp> // (rtl)
#include <System.SyncObjs.hpp> // (rtl)
// SO_SFX: 250
// PRG_EXT: .bpl
// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp
// OBJ_EXT: .obj

//-- user supplied -----------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Source/hpp/Win32/Release/DosCommand.Register.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

// (DO NOT EDIT: machine generated header) 'DosCommand.Register.pas' rev: 31.00 (Windows)
// (DO NOT EDIT: machine generated header) 'DosCommand.Register.pas' rev: 32.00 (Windows)

#ifndef Doscommand_RegisterHPP
#define Doscommand_RegisterHPP
Expand Down
2 changes: 1 addition & 1 deletion Source/hpp/Win32/Release/DosCommand.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

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

#ifndef DoscommandHPP
#define DoscommandHPP
Expand Down
7 changes: 6 additions & 1 deletion Source/hpp/Win64/Debug/DOSCommandDR.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 1995, 2016 by Embarcadero Technologies, Inc.
// All rights reserved

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

#ifndef DoscommanddrHPP
#define DoscommanddrHPP
Expand Down Expand Up @@ -40,6 +40,11 @@
#include <System.TimeSpan.hpp> // (rtl)
#include <System.Diagnostics.hpp> // (rtl)
#include <System.SyncObjs.hpp> // (rtl)
// SO_SFX: 250
// PRG_EXT: .bpl
// BPI_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64
// OBJ_DIR: C:\Users\Public\Documents\Embarcadero\Studio\19.0\Dcp\Win64
// OBJ_EXT: .o

//-- user supplied -----------------------------------------------------------

Expand Down

0 comments on commit 31c135c

Please sign in to comment.