Skip to content

Commit d2d34e3

Browse files
author
Frank Semmling
committed
Compiler-Pfade für ExternKomponenten\AllLibraryGroup.groupproj
1 parent 41d0f5f commit d2d34e3

File tree

4 files changed

+44
-55
lines changed

4 files changed

+44
-55
lines changed

Packages/Delphi/Delphi 10.4+/Python.dproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,19 @@
3939
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
4040
<VerInfo_Locale>1033</VerInfo_Locale>
4141
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
42+
<DCC_DcuOutput>$(_dcu)</DCC_DcuOutput>
43+
<DCC_DcpOutput>$(_dcp)</DCC_DcpOutput>
44+
<DCC_BplOutput>$(_bpl)</DCC_BplOutput>
45+
<DCC_BpiOutput>$(_dcp)</DCC_BpiOutput>
46+
<DCC_HppOutput>$(_dcu)</DCC_HppOutput>
47+
<DCC_ObjOutput>$(_dcu)</DCC_ObjOutput>
4248
</PropertyGroup>
4349
<PropertyGroup Condition="'$(Base_Win32)'!=''">
4450
<BT_BuildType>Debug</BT_BuildType>
45-
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
51+
<DCC_Namespace>$(CimNamespace);Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
52+
<DCC_Define>$(CimDefines_Extern);$(DCC_Define)</DCC_Define>
53+
<DCC_UnitSearchPath>$(CimSearchPath);$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
54+
<DCC_UnitAlias>$(CimUnitAliases);$(DCC_UnitAlias)</DCC_UnitAlias>
4655
</PropertyGroup>
4756
<PropertyGroup Condition="'$(Cfg_1)'!=''">
4857
<DCC_DebugInformation>0</DCC_DebugInformation>
@@ -85,12 +94,7 @@
8594
<Source>
8695
<Source Name="MainSource">Python.dpk</Source>
8796
</Source>
88-
<Excluded_Packages>
89-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
90-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
91-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
92-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
93-
</Excluded_Packages>
97+
<Excluded_Packages/>
9498
</Delphi.Personality>
9599
<Platforms>
96100
<Platform value="Win32">True</Platform>

Packages/Delphi/Delphi 10.4+/PythonVcl.dproj

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@
2323
<CfgParent>Base</CfgParent>
2424
<Base>true</Base>
2525
</PropertyGroup>
26-
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
27-
<Base_iOSDevice64>true</Base_iOSDevice64>
28-
<CfgParent>Base</CfgParent>
29-
<Base>true</Base>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''">
32-
<Base_iOSSimulator>true</Base_iOSSimulator>
33-
<CfgParent>Base</CfgParent>
34-
<Base>true</Base>
35-
</PropertyGroup>
3626
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
3727
<Base_Win32>true</Base_Win32>
3828
<CfgParent>Base</CfgParent>
@@ -55,7 +45,7 @@
5545
<Base>true</Base>
5646
</PropertyGroup>
5747
<PropertyGroup Condition="'$(Base)'!=''">
58-
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
48+
<DCC_DcuOutput>$(_dcu)</DCC_DcuOutput>
5949
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
6050
<DCC_E>false</DCC_E>
6151
<DCC_N>false</DCC_N>
@@ -72,6 +62,11 @@
7262
<DCC_Description>Python4Delphi - Run-time Engine Package for VCL</DCC_Description>
7363
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
7464
<DllSuffix>$(Auto)</DllSuffix>
65+
<DCC_DcpOutput>$(_dcp)</DCC_DcpOutput>
66+
<DCC_BplOutput>$(_bpl)</DCC_BplOutput>
67+
<DCC_BpiOutput>$(_dcp)</DCC_BpiOutput>
68+
<DCC_HppOutput>$(_dcu)</DCC_HppOutput>
69+
<DCC_ObjOutput>$(_dcu)</DCC_ObjOutput>
7570
</PropertyGroup>
7671
<PropertyGroup Condition="'$(Base_Android)'!=''">
7772
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
@@ -81,18 +76,13 @@
8176
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
8277
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
8378
</PropertyGroup>
84-
<PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
85-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
86-
</PropertyGroup>
87-
<PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
88-
<DCC_CBuilderOutput>None</DCC_CBuilderOutput>
89-
</PropertyGroup>
9079
<PropertyGroup Condition="'$(Base_Win32)'!=''">
91-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
80+
<DCC_Namespace>$(CimNamespace);Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
9281
<BT_BuildType>Debug</BT_BuildType>
9382
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
94-
<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>
95-
<VerInfo_Locale>1033</VerInfo_Locale>
83+
<DCC_Define>$(CimDefines_Extern);$(DCC_Define)</DCC_Define>
84+
<DCC_UnitSearchPath>$(CimSearchPath);$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
85+
<DCC_UnitAlias>$(CimUnitAliases);$(DCC_UnitAlias)</DCC_UnitAlias>
9686
</PropertyGroup>
9787
<PropertyGroup Condition="'$(Cfg_1)'!=''">
9888
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -105,7 +95,6 @@
10595
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
10696
<DCC_RemoteDebug>false</DCC_RemoteDebug>
10797
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
108-
<VerInfo_Locale>1033</VerInfo_Locale>
10998
</PropertyGroup>
11099
<PropertyGroup Condition="'$(Cfg_2)'!=''">
111100
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -141,12 +130,7 @@
141130
<Source>
142131
<Source Name="MainSource">PythonVcl.dpk</Source>
143132
</Source>
144-
<Excluded_Packages>
145-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
146-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
147-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
148-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
149-
</Excluded_Packages>
133+
<Excluded_Packages/>
150134
</Delphi.Personality>
151135
<Deployment Version="3">
152136
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">

Packages/Delphi/Delphi 10.4+/dclPython.dproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Base>true</Base>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Base)'!=''">
43-
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
43+
<DCC_DcuOutput>$(_dcu)</DCC_DcuOutput>
4444
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
4545
<DCC_E>false</DCC_E>
4646
<DCC_N>false</DCC_N>
@@ -57,14 +57,20 @@
5757
<DCC_Description>Python4Delphi - Design-time Engine Package</DCC_Description>
5858
<DesignOnlyPackage>true</DesignOnlyPackage>
5959
<DllSuffix>$(Auto)</DllSuffix>
60+
<DCC_DcpOutput>$(_dcp)</DCC_DcpOutput>
61+
<DCC_BplOutput>$(_bpl)</DCC_BplOutput>
62+
<DCC_BpiOutput>$(_dcp)</DCC_BpiOutput>
63+
<DCC_HppOutput>$(_dcu)</DCC_HppOutput>
64+
<DCC_ObjOutput>$(_dcu)</DCC_ObjOutput>
6065
</PropertyGroup>
6166
<PropertyGroup Condition="'$(Base_Win32)'!=''">
62-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
67+
<DCC_Namespace>$(CimNamespace);Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
6368
<BT_BuildType>Debug</BT_BuildType>
6469
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
65-
<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>
66-
<VerInfo_Locale>1033</VerInfo_Locale>
6770
<DCC_UsePackage>rtl;Python;$(DCC_UsePackage)</DCC_UsePackage>
71+
<DCC_Define>$(CimDefines_Extern);$(DCC_Define)</DCC_Define>
72+
<DCC_UnitSearchPath>$(CimSearchPath);$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
73+
<DCC_UnitAlias>$(CimUnitAliases);$(DCC_UnitAlias)</DCC_UnitAlias>
6874
</PropertyGroup>
6975
<PropertyGroup Condition="'$(Base_Win64)'!=''">
7076
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -140,12 +146,7 @@
140146
<Borland.ProjectType>Package</Borland.ProjectType>
141147
<BorlandProject>
142148
<Delphi.Personality>
143-
<Excluded_Packages>
144-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
145-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
146-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
147-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
148-
</Excluded_Packages>
149+
<Excluded_Packages/>
149150
<Source>
150151
<Source Name="MainSource">dclPython.dpk</Source>
151152
</Source>

Packages/Delphi/Delphi 10.4+/dclPythonVcl.dproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<Base>true</Base>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Base)'!=''">
43-
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
43+
<DCC_DcuOutput>$(_dcu)</DCC_DcuOutput>
4444
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
4545
<DCC_E>false</DCC_E>
4646
<DCC_N>false</DCC_N>
@@ -57,14 +57,20 @@
5757
<DCC_Description>Python4Delphi - Design-Time Engine Package for VCL</DCC_Description>
5858
<DesignOnlyPackage>true</DesignOnlyPackage>
5959
<DllSuffix>$(Auto)</DllSuffix>
60+
<DCC_DcpOutput>$(_dcp)</DCC_DcpOutput>
61+
<DCC_BplOutput>$(_bpl)</DCC_BplOutput>
62+
<DCC_BpiOutput>$(_dcp)</DCC_BpiOutput>
63+
<DCC_HppOutput>$(_dcu)</DCC_HppOutput>
64+
<DCC_ObjOutput>$(_dcu)</DCC_ObjOutput>
6065
</PropertyGroup>
6166
<PropertyGroup Condition="'$(Base_Win32)'!=''">
62-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
67+
<DCC_Namespace>$(CimNamespace);Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
6368
<BT_BuildType>Debug</BT_BuildType>
6469
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
65-
<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>
66-
<VerInfo_Locale>1033</VerInfo_Locale>
6770
<DCC_UsePackage>rtl;vcl;PythonVcl;$(DCC_UsePackage)</DCC_UsePackage>
71+
<DCC_Define>$(CimDefines_Extern);$(DCC_Define)</DCC_Define>
72+
<DCC_UnitSearchPath>$(CimSearchPath);$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
73+
<DCC_UnitAlias>$(CimUnitAliases);$(DCC_UnitAlias)</DCC_UnitAlias>
6874
</PropertyGroup>
6975
<PropertyGroup Condition="'$(Base_Win64)'!=''">
7076
<DCC_UsePackage>rtl;vcl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -80,7 +86,6 @@
8086
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
8187
<DCC_RemoteDebug>false</DCC_RemoteDebug>
8288
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
83-
<VerInfo_Locale>1033</VerInfo_Locale>
8489
<DCC_MapFile>3</DCC_MapFile>
8590
</PropertyGroup>
8691
<PropertyGroup Condition="'$(Cfg_2)'!=''">
@@ -121,12 +126,7 @@
121126
<Source>
122127
<Source Name="MainSource">dclPythonVcl.dpk</Source>
123128
</Source>
124-
<Excluded_Packages>
125-
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
126-
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
127-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
128-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
129-
</Excluded_Packages>
129+
<Excluded_Packages/>
130130
</Delphi.Personality>
131131
<Deployment Version="3">
132132
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\21.0\Bpl\dclPythonVcl270.bpl" Configuration="Debug" Class="ProjectOutput">

0 commit comments

Comments
 (0)