Skip to content

Commit 3b07ef2

Browse files
committed
removed erros
1 parent 496eb87 commit 3b07ef2

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

DelphiDocker.dpk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ contains
4040
OpenToolApi.LocalMenuItem in 'Src\OpenToolApi\OpenToolApi.LocalMenuItem.pas',
4141
OpenToolApi.Events in 'Src\OpenToolApi\OpenToolApi.Events.pas',
4242
UtilityFunctions in 'Src\OpenToolApi\UtilityFunctions.pas',
43-
Wrapper.Docker in 'Src\wrapper\Wrapper.Docker.pas',
44-
Wrapper.DockerCompose in 'Src\wrapper\Wrapper.DockerCompose.pas',
4543
Command.Cmd in 'Src\Command\Command.Cmd.pas',
4644
Command.Message in 'Src\Command\Command.Message.pas',
47-
Docker.Utils in 'Src\Docker\Docker.Utils.pas';
45+
Docker.Utils in 'Src\Docker\Docker.Utils.pas',
46+
Wrapper.Docker in 'Src\Wrapper\Wrapper.Docker.pas',
47+
Wrapper.DockerCompose in 'Src\Wrapper\Wrapper.DockerCompose.pas';
4848

4949
end.

DelphiDocker.dproj

Lines changed: 5 additions & 5 deletions
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);modules\DOSCommand\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
70+
<DCC_UnitSearchPath>$(DCC_UnitSearchPath);$(DCC_UnitSearchPath);$(DCC_UnitSearchPath);modules\DOSCommand\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Base_Linux64)'!=''">
7373
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -77,8 +77,8 @@
7777
<BT_BuildType>Debug</BT_BuildType>
7878
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7979
<VerInfo_Locale>1033</VerInfo_Locale>
80-
<Debugger_RunParams>-debug</Debugger_RunParams>
8180
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
81+
<Debugger_HostApplication>$(BDS)\bin\bds.exe</Debugger_HostApplication>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Base_Win64)'!=''">
8484
<DCC_UsePackage>rtl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -95,7 +95,7 @@
9595
<DCC_RemoteDebug>false</DCC_RemoteDebug>
9696
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
9797
<VerInfo_Locale>1033</VerInfo_Locale>
98-
<Debugger_HostApplication>E:\tools\Embarcadero\Studio\19.0\bin\bds.exe</Debugger_HostApplication>
98+
<Debugger_HostApplication>$(BDS)\bin\bds.exe</Debugger_HostApplication>
9999
</PropertyGroup>
100100
<PropertyGroup Condition="'$(Cfg_2)'!=''">
101101
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -124,11 +124,11 @@
124124
<DCCReference Include="Src\OpenToolApi\OpenToolApi.LocalMenuItem.pas"/>
125125
<DCCReference Include="Src\OpenToolApi\OpenToolApi.Events.pas"/>
126126
<DCCReference Include="Src\OpenToolApi\UtilityFunctions.pas"/>
127-
<DCCReference Include="Src\wrapper\Wrapper.Docker.pas"/>
128-
<DCCReference Include="Src\wrapper\Wrapper.DockerCompose.pas"/>
129127
<DCCReference Include="Src\Command\Command.Cmd.pas"/>
130128
<DCCReference Include="Src\Command\Command.Message.pas"/>
131129
<DCCReference Include="Src\Docker\Docker.Utils.pas"/>
130+
<DCCReference Include="Src\Wrapper\Wrapper.Docker.pas"/>
131+
<DCCReference Include="Src\Wrapper\Wrapper.DockerCompose.pas"/>
132132
<BuildConfiguration Include="Release">
133133
<Key>Cfg_2</Key>
134134
<CfgParent>Base</CfgParent>

Src/wrapper/Wrapper.Docker.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ implementation
1919

2020
function DockerIsRunning: Boolean;
2121
begin
22-
Result := Runner(DOCKER_PS) = 0;
22+
// Result := Runner(DOCKER_PS) = 0;
2323
end;
2424

2525
function DockerIsInstalled: Boolean;
2626
begin
27-
Result := Runner(WHERE_DOCKER) = 0;
27+
// Result := Runner(WHERE_DOCKER) = 0;
2828
end;
2929

3030
function DoDockerPreFlight: Boolean;

0 commit comments

Comments
 (0)