Skip to content

Commit 9946b72

Browse files
errorcalcerrorcalc
committed
fix packages
1 parent 6054430 commit 9946b72

17 files changed

Lines changed: 282 additions & 49 deletions

‎EsVclComponents.dpk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ requires
3333
rtl,
3434
EsVclCore,
3535
EsCore,
36-
vclwinx,
36+
{$IF not(Defined(VER210) or Defined(VER220) or Defined(VER230) or Defined(VER240) or Defined(VER250) or Defined(VER260) or Defined(VER270) or Defined(VER280) or Defined(VER290) or Defined(VER300) or Defined(VER310) or Defined(VER320) or Defined(VER330))}vclwinx,{$IFEND}
3737
vclimg;
3838

3939
contains

‎EsVclComponents.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
<DCCReference Include="rtl.dcp"/>
106106
<DCCReference Include="EsVclCore.dcp"/>
107107
<DCCReference Include="EsCore.dcp"/>
108-
<DCCReference Include="vclwinx.dcp"/>
109108
<DCCReference Include="vclimg.dcp"/>
110109
<DCCReference Include="Source\ES.ControlListControls.pas"/>
111110
<DCCReference Include="Source\ES.Hints.pas"/>

‎Packages/FileFix.dpr‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
program FileFix;
2+
3+
{$APPTYPE CONSOLE}
4+
5+
{$R *.res}
6+
7+
uses
8+
System.SysUtils, System.Classes;
9+
10+
var
11+
Path: string;
12+
Lines: TStringList;
13+
Text, NewText: string;
14+
Number, I: Integer;
15+
begin
16+
try
17+
if not FindCmdLineSwitch('path', Path) then
18+
halt(1);
19+
20+
Lines := TStringList.Create();
21+
try
22+
Lines.LoadFromFile(Path);
23+
24+
if FindCmdLineSwitch('delete-with', Text) then
25+
begin
26+
Text := Text.Replace('^^', '"');
27+
while True do
28+
begin
29+
Number := -1;
30+
for I := 0 to Lines.Count - 1 do
31+
begin
32+
if Lines[I].Contains(Text) then
33+
begin
34+
Number := I;
35+
break;
36+
end;
37+
end;
38+
39+
if Number = -1 then
40+
break;
41+
Lines.Delete(Number);
42+
end;
43+
end;
44+
45+
if FindCmdLineSwitch('replace-with', Text) then
46+
begin
47+
if not FindCmdLineSwitch('to', NewText) then
48+
halt(1);
49+
Text := Text.Replace('^^', '"');
50+
NewText := NewText.Replace('^^', '"');
51+
while True do
52+
begin
53+
Number := -1;
54+
for I := 0 to Lines.Count - 1 do
55+
begin
56+
if Lines[I].Contains(Text) then
57+
begin
58+
Number := I;
59+
break;
60+
end;
61+
end;
62+
63+
if Number = -1 then
64+
break;
65+
66+
Lines[Number] := Lines[Number].Substring(0, Lines[I].IndexOf(Text)) + NewText;
67+
end;
68+
end;
69+
70+
if FindCmdLineSwitch('insert-after', Text) then
71+
begin
72+
if not FindCmdLineSwitch('line', NewText) then
73+
halt(1);
74+
Text := Text.Replace('^^', '"');
75+
NewText := NewText.Replace('^^', '"');
76+
Number := 0;
77+
while Number <= Lines.Count - 1 do
78+
begin
79+
if Lines[Number].Contains(Text) then
80+
begin
81+
Lines.Insert(Number + 1, Lines[Number].Substring(0, Lines[Number].IndexOf(Text)) + NewText);
82+
Number := Number + 1;
83+
end;
84+
Number := Number + 1;
85+
end;
86+
end;
87+
88+
Lines.SaveToFile(Path);
89+
finally
90+
Lines.Free();
91+
end;
92+
93+
except
94+
on E: Exception do
95+
Writeln(E.ClassName, ': ', E.Message);
96+
end;
97+
end.

‎Packages/FileFix.dproj‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<Base>True</Base>
4+
<AppType>Console</AppType>
5+
<Config Condition="'$(Config)'==''">Release</Config>
6+
<FrameworkType>None</FrameworkType>
7+
<MainSource>FileFix.dpr</MainSource>
8+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<ProjectGuid>{A3A24B0B-FABF-4BA6-8909-49D40B4B556B}</ProjectGuid>
10+
<ProjectName Condition="'$(ProjectName)'==''">FileFix</ProjectName>
11+
<ProjectVersion>20.1</ProjectVersion>
12+
<TargetedPlatforms>1</TargetedPlatforms>
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15+
<Base>true</Base>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
18+
<Base_Win32>true</Base_Win32>
19+
<CfgParent>Base</CfgParent>
20+
<Base>true</Base>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
23+
<Cfg_1>true</Cfg_1>
24+
<CfgParent>Base</CfgParent>
25+
<Base>true</Base>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
28+
<Cfg_1_Win32>true</Cfg_1_Win32>
29+
<CfgParent>Cfg_1</CfgParent>
30+
<Cfg_1>true</Cfg_1>
31+
<Base>true</Base>
32+
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
34+
<Cfg_2>true</Cfg_2>
35+
<CfgParent>Base</CfgParent>
36+
<Base>true</Base>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
39+
<Cfg_2_Win32>true</Cfg_2_Win32>
40+
<CfgParent>Cfg_2</CfgParent>
41+
<Cfg_2>true</Cfg_2>
42+
<Base>true</Base>
43+
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Base)'!=''">
45+
<SanitizedProjectName>FileFix</SanitizedProjectName>
46+
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
47+
<DCC_ExeOutput>.\</DCC_ExeOutput>
48+
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
49+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
50+
<VerInfo_Locale>1049</VerInfo_Locale>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Base_Win32)'!=''">
53+
<BT_BuildType>Debug</BT_BuildType>
54+
<DCC_ConsoleTarget>true</DCC_ConsoleTarget>
55+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
56+
<DCC_UsePackage>vclwinx;DataSnapServer;fmx;emshosting;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;DBXMSSQLDriver;FireDACCommonODBC;emsclient;FireDACCommonDriver;appanalytics;IndyProtocols;vclx;Skia.Package.RTL;IndyIPClient;dbxcds;vcledge;bindcompvclwinx;FmxTeeUI;EsVclComponents;emsedge;bindcompfmx;DBXFirebirdDriver;inetdb;FireDACSqliteDriver;DbxClientDriver;FireDACASADriver;Tee;soapmidas;vclactnband;TeeUI;fmxFireDAC;dbexpress;FireDACInfxDriver;DBXMySQLDriver;EsCore;VclSmp;inet;DataSnapCommon;vcltouch;fmxase;DBXOdbcDriver;dbrtl;FireDACDBXDriver;Skia.Package.FMX;FireDACOracleDriver;fmxdae;TeeDB;FireDACMSAccDriver;CustomIPTransport;FireDACMSSQLDriver;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;IndySystem;FireDACTDataDriver;Skia.Package.VCL;vcldb;EsVclCore;vclFireDAC;bindcomp;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;IndyCore;RESTBackendComponents;bindcompdbx;rtl;FireDACMySQLDriver;FireDACADSDriver;RESTComponents;DBXSqliteDriver;vcl;IndyIPServer;dsnapxml;dsnapcon;DataSnapClient;DataSnapProviderClient;adortl;DBXSybaseASEDriver;DBXDb2Driver;vclimg;DataSnapFireDAC;emsclientfiredac;FireDACPgDriver;FireDAC;FireDACDSDriver;inetdbxpress;xmlrtl;tethering;bindcompvcl;dsnap;CloudService;DBXSybaseASADriver;DBXOracleDriver;FireDACDb2Driver;DBXInformixDriver;fmxobj;bindcompvclsmp;FMXTee;DataSnapNativeClient;DatasnapConnectorsFreePascal;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
57+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
58+
<VerInfo_Locale>1033</VerInfo_Locale>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Cfg_1)'!=''">
61+
<DCC_DebugDCUs>true</DCC_DebugDCUs>
62+
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
63+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
64+
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
65+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
66+
<DCC_Optimize>false</DCC_Optimize>
67+
<DCC_RangeChecking>true</DCC_RangeChecking>
68+
<DCC_RemoteDebug>true</DCC_RemoteDebug>
69+
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
71+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
72+
<DCC_RemoteDebug>false</DCC_RemoteDebug>
73+
<Manifest_File>(None)</Manifest_File>
74+
<VerInfo_Locale>1033</VerInfo_Locale>
75+
</PropertyGroup>
76+
<PropertyGroup Condition="'$(Cfg_2)'!=''">
77+
<DCC_DebugInformation>0</DCC_DebugInformation>
78+
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
79+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
80+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
83+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
84+
<Manifest_File>(None)</Manifest_File>
85+
<VerInfo_Locale>1033</VerInfo_Locale>
86+
</PropertyGroup>
87+
<ItemGroup>
88+
<DelphiCompile Include="$(MainSource)">
89+
<MainSource>MainSource</MainSource>
90+
</DelphiCompile>
91+
<BuildConfiguration Include="Base">
92+
<Key>Base</Key>
93+
</BuildConfiguration>
94+
<BuildConfiguration Include="Debug">
95+
<Key>Cfg_1</Key>
96+
<CfgParent>Base</CfgParent>
97+
</BuildConfiguration>
98+
<BuildConfiguration Include="Release">
99+
<Key>Cfg_2</Key>
100+
<CfgParent>Base</CfgParent>
101+
</BuildConfiguration>
102+
</ItemGroup>
103+
<ProjectExtensions>
104+
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
105+
<Borland.ProjectType>Application</Borland.ProjectType>
106+
<BorlandProject>
107+
<Delphi.Personality>
108+
<Source>
109+
<Source Name="MainSource">FileFix.dpr</Source>
110+
</Source>
111+
<Excluded_Packages/>
112+
</Delphi.Personality>
113+
<Platforms>
114+
<Platform value="Android">False</Platform>
115+
<Platform value="Android64">False</Platform>
116+
<Platform value="Win32">True</Platform>
117+
<Platform value="Win64">False</Platform>
118+
</Platforms>
119+
</BorlandProject>
120+
<ProjectFileVersion>12</ProjectFileVersion>
121+
</ProjectExtensions>
122+
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
123+
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
124+
<Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
125+
</Project>

‎Packages/Gen.bat‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1 @@
1-
PackagesGenerator -config PackagesGenerator.ini -hide -skip
2-
3-
rem fix vclwinx package requires (need before Sydney)
4-
set package=XE2
5-
call :vclwinx_fix
6-
set package=XE3
7-
call :vclwinx_fix
8-
set package=XE4
9-
call :vclwinx_fix
10-
set package=XE5
11-
call :vclwinx_fix
12-
set package=XE6
13-
call :vclwinx_fix
14-
set package=XE7
15-
call :vclwinx_fix
16-
set package=XE8
17-
call :vclwinx_fix
18-
set package=RX10Seattle
19-
call :vclwinx_fix
20-
set package=RX10Berlin
21-
call :vclwinx_fix
22-
set package=RX10Tokyo
23-
call :vclwinx_fix
24-
set package=RX10Rio
25-
call :vclwinx_fix
26-
27-
goto :end
28-
29-
:vclwinx_fix
30-
rem set %package% var!
31-
type %package%\EsVclComponents.dpk | findstr /v vclwinx > %package%\temp.dpk
32-
del %package%\EsVclComponents.dpk
33-
rename %package%\temp.dpk EsVclComponents.dpk
34-
exit /b
35-
36-
:end
1+
PackagesGenerator -config PackagesGenerator.ini -hide -skip

‎Packages/RX10Berlin/EsVclComponents.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<DCCReference Include="rtl.dcp"/>
107107
<DCCReference Include="EsVclCore.dcp"/>
108108
<DCCReference Include="EsCore.dcp"/>
109-
<DCCReference Include="vclwinx.dcp"/>
110109
<DCCReference Include="vclimg.dcp"/>
111110
<DCCReference Include="..\..\Source\ES.ControlListControls.pas"/>
112111
<DCCReference Include="..\..\Source\ES.Hints.pas"/>

‎Packages/RX10Rio/EsVclComponents.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<DCCReference Include="rtl.dcp"/>
107107
<DCCReference Include="EsVclCore.dcp"/>
108108
<DCCReference Include="EsCore.dcp"/>
109-
<DCCReference Include="vclwinx.dcp"/>
110109
<DCCReference Include="vclimg.dcp"/>
111110
<DCCReference Include="..\..\Source\ES.ControlListControls.pas"/>
112111
<DCCReference Include="..\..\Source\ES.Hints.pas"/>

‎Packages/RX10Seattle/EsVclComponents.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<DCCReference Include="rtl.dcp"/>
107107
<DCCReference Include="EsVclCore.dcp"/>
108108
<DCCReference Include="EsCore.dcp"/>
109-
<DCCReference Include="vclwinx.dcp"/>
110109
<DCCReference Include="vclimg.dcp"/>
111110
<DCCReference Include="..\..\Source\ES.ControlListControls.pas"/>
112111
<DCCReference Include="..\..\Source\ES.Hints.pas"/>

‎Packages/RX10Tokyo/EsVclComponents.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<DCCReference Include="rtl.dcp"/>
107107
<DCCReference Include="EsVclCore.dcp"/>
108108
<DCCReference Include="EsCore.dcp"/>
109-
<DCCReference Include="vclwinx.dcp"/>
110109
<DCCReference Include="vclimg.dcp"/>
111110
<DCCReference Include="..\..\Source\ES.ControlListControls.pas"/>
112111
<DCCReference Include="..\..\Source\ES.Hints.pas"/>

‎Packages/ReleaseGen.bat‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
call Gen.bat
2+
3+
rem fix vclwinx package requires (need before Sydney)
4+
set package=XE2
5+
call :vclwinx_before_fix
6+
set package=XE3
7+
call :vclwinx_before_fix
8+
set package=XE4
9+
call :vclwinx_before_fix
10+
set package=XE5
11+
call :vclwinx_before_fix
12+
set package=XE6
13+
call :vclwinx_before_fix
14+
set package=XE7
15+
call :vclwinx_before_fix
16+
set package=XE8
17+
call :vclwinx_before_fix
18+
set package=RX10Seattle
19+
call :vclwinx_before_fix
20+
set package=RX10Berlin
21+
call :vclwinx_before_fix
22+
set package=RX10Tokyo
23+
call :vclwinx_before_fix
24+
set package=RX10Rio
25+
call :vclwinx_before_fix
26+
27+
rem fix vclwinx package requires (need after Sydney)
28+
set package=RX10Sydney
29+
call :vclwinx_after_fix
30+
set package=RX11Alexandria
31+
call :vclwinx_after_fix
32+
set package=RX12Athens
33+
call :vclwinx_after_fix
34+
35+
goto :end
36+
37+
:vclwinx_before_fix
38+
FileFix -path %package%/EsVclComponents.dpk -delete-with "{$IF not(Defined(VER210) or Defined(VER220) or Defined(VER230) or Defined(VER240) or Defined(VER250) or Defined(VER260) or Defined(VER270) or Defined(VER280) or Defined(VER290) or Defined(VER300) or Defined(VER310) or Defined(VER320) or Defined(VER330))}vclwinx,{$IFEND}"
39+
exit /b
40+
41+
rem set %package% var!
42+
type %package%\EsVclComponents.dpk | findstr /v vclwinx > %package%\temp.dpk
43+
del %package%\EsVclComponents.dpk
44+
rename %package%\temp.dpk EsVclComponents.dpk
45+
exit /b
46+
47+
:vclwinx_after_fix
48+
FileFix -path %package%/EsVclComponents.dpk -replace-with "{$IF not(Defined(VER210) or Defined(VER220) or Defined(VER230) or Defined(VER240) or Defined(VER250) or Defined(VER260) or Defined(VER270) or Defined(VER280) or Defined(VER290) or Defined(VER300) or Defined(VER310) or Defined(VER320) or Defined(VER330))}vclwinx,{$IFEND}" -to "vclwinx,"
49+
set lineto=/"RX10Sydney/"
50+
FileFix -path %package%/EsVclComponents.dproj -insert-after "<DCCReference Include=^^EsCore.dcp^^/>" -line "<DCCReference Include=^^vclwinx.dcp^^/>"
51+
exit /b
52+
53+
rem set %package% var!
54+
powershell -executionpolicy bypass -command "(Get-Content -Path %package%\EsVclComponents.dpk) -replace [regex]::Escape('{$IF not(Defined(VER210) or Defined(VER220) or Defined(VER230) or Defined(VER240) or Defined(VER250) or Defined(VER260) or Defined(VER270) or Defined(VER280) or Defined(VER290) or Defined(VER300) or Defined(VER310) or Defined(VER320) or Defined(VER330))}vclwinx,{$IFEND}'), 'vclwinx,' | Set-Content -Path %package%\EsVclComponents.dpk -Encoding UTF8"
55+
powershell -executionpolicy bypass -command "(Get-Content -Path %package%\EsVclComponents.dproj) -replace [regex]::Escape(' <DCCReference Include=\"EsCore.dcp\"/>'), (' <DCCReference Include=\"EsCore.dcp\"/>' + \"`r`n\" + ' <DCCReference Include=\"vclwinx.dcp\"/>') | Set-Content -Path %package%\EsVclComponents.dproj -Encoding UTF8"
56+
exit /b
57+
58+
:end

0 commit comments

Comments
 (0)