Skip to content

Commit 47c03bf

Browse files
snakeicesnakeice
committed
Adjusted requires
1 parent 688eafd commit 47c03bf

File tree

3 files changed

+35
-31
lines changed

3 files changed

+35
-31
lines changed

‎DelphiDocker.dpk

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ package DelphiDocker;
3131

3232
requires
3333
rtl,
34-
designide;
34+
designide,
35+
DOSCommandDD{BOSS},
36+
DOSCommandDR{BOSS};
3537

3638
contains
3739
OpenToolApi.Register in 'Src\OpenToolApi\OpenToolApi.Register.pas',

‎DelphiDocker.dproj

+31-29
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<VerInfo_Locale>1046</VerInfo_Locale>
6868
<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>
6969
<DCC_BplOutput>.\$(Platform)\$(Config)</DCC_BplOutput>
70-
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);$(DCC_UnitSearchPath);$(DCC_UnitSearchPath);modules\DOSCommand\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
70+
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);modules\DOSCommand\Source</DCC_UnitSearchPath>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
7373
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -112,16 +112,18 @@
112112
<DelphiCompile Include="$(MainSource)">
113113
<MainSource>MainSource</MainSource>
114114
</DelphiCompile>
115-
<DCCReference Include="rtl.dcp"/>
116-
<DCCReference Include="designide.dcp"/>
117-
<DCCReference Include="Src\OpenToolApi\OpenToolApi.Register.pas"/>
118-
<DCCReference Include="Src\Command\Command.Runner.pas"/>
119-
<DCCReference Include="Src\OpenToolApi\OpenToolApi.CommandMessage.pas"/>
120-
<DCCReference Include="Src\OpenToolApi\OpenToolApi.LocalMenuItem.pas"/>
121-
<DCCReference Include="Src\OpenToolApi\OpenToolApi.Tools.pas"/>
122-
<DCCReference Include="Src\Docker\Docker.RunWithDocker.pas"/>
123-
<DCCReference Include="Src\Constants\Constants.Version.pas"/>
124-
<DCCReference Include="Src\OpenToolApi\OpenToolApi.MenuItem.pas"/>
115+
<DCCReference Include="rtl.dcp"></DCCReference>
116+
<DCCReference Include="designide.dcp"></DCCReference>
117+
<DCCReference Include="DOSCommandDD.dcp"></DCCReference>
118+
<DCCReference Include="DOSCommandDR.dcp"></DCCReference>
119+
<DCCReference Include="Src\OpenToolApi\OpenToolApi.Register.pas"></DCCReference>
120+
<DCCReference Include="Src\Command\Command.Runner.pas"></DCCReference>
121+
<DCCReference Include="Src\OpenToolApi\OpenToolApi.CommandMessage.pas"></DCCReference>
122+
<DCCReference Include="Src\OpenToolApi\OpenToolApi.LocalMenuItem.pas"></DCCReference>
123+
<DCCReference Include="Src\OpenToolApi\OpenToolApi.Tools.pas"></DCCReference>
124+
<DCCReference Include="Src\Docker\Docker.RunWithDocker.pas"></DCCReference>
125+
<DCCReference Include="Src\Constants\Constants.Version.pas"></DCCReference>
126+
<DCCReference Include="Src\OpenToolApi\OpenToolApi.MenuItem.pas"></DCCReference>
125127
<BuildConfiguration Include="Release">
126128
<Key>Cfg_2</Key>
127129
<CfgParent>Base</CfgParent>
@@ -482,9 +484,9 @@
482484
<Operation>1</Operation>
483485
</Platform>
484486
</DeployClass>
485-
<DeployClass Name="ProjectiOSDeviceResourceRules"/>
486-
<DeployClass Name="ProjectiOSEntitlements"/>
487-
<DeployClass Name="ProjectiOSInfoPList"/>
487+
<DeployClass Name="ProjectiOSDeviceResourceRules"></DeployClass>
488+
<DeployClass Name="ProjectiOSEntitlements"></DeployClass>
489+
<DeployClass Name="ProjectiOSInfoPList"></DeployClass>
488490
<DeployClass Name="ProjectiOSResource">
489491
<Platform Name="iOSDevice32">
490492
<Operation>1</Operation>
@@ -496,9 +498,9 @@
496498
<Operation>1</Operation>
497499
</Platform>
498500
</DeployClass>
499-
<DeployClass Name="ProjectOSXDebug"/>
500-
<DeployClass Name="ProjectOSXEntitlements"/>
501-
<DeployClass Name="ProjectOSXInfoPList"/>
501+
<DeployClass Name="ProjectOSXDebug"></DeployClass>
502+
<DeployClass Name="ProjectOSXEntitlements"></DeployClass>
503+
<DeployClass Name="ProjectOSXInfoPList"></DeployClass>
502504
<DeployClass Name="ProjectOSXResource">
503505
<Platform Name="OSX32">
504506
<RemoteDir>Contents\Resources</RemoteDir>
@@ -564,15 +566,15 @@
564566
<Operation>1</Operation>
565567
</Platform>
566568
</DeployClass>
567-
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
568-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
569-
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
570-
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
571-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
572-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
573-
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
574-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
575-
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
569+
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"></ProjectRoot>
570+
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"></ProjectRoot>
571+
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"></ProjectRoot>
572+
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"></ProjectRoot>
573+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"></ProjectRoot>
574+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"></ProjectRoot>
575+
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"></ProjectRoot>
576+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"></ProjectRoot>
577+
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"></ProjectRoot>
576578
</Deployment>
577579
<Platforms>
578580
<Platform value="Linux64">False</Platform>
@@ -582,7 +584,7 @@
582584
</BorlandProject>
583585
<ProjectFileVersion>12</ProjectFileVersion>
584586
</ProjectExtensions>
585-
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
586-
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
587-
<Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
587+
<Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"></Import>
588+
<Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"></Import>
589+
<Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"></Import>
588590
</Project>

‎boss.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"dependencies": {
1111
"github.com/HashLoad/DOSCommand": "^v1.0.0"
1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)