Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit aa480d5

Browse files
committed
BuildEvents shouldn't assume windows CMD. Add unix equivalents.
1 parent 6890700 commit aa480d5

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

project/CCTray/CCTray.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,11 @@
182182
</ItemGroup>
183183
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
184184
<PropertyGroup>
185-
<PreBuildEvent>
186-
</PreBuildEvent>
187-
<PostBuildEvent>copy "$(ProjectDir)..\..\tools\cm17a\cm17a.exe" "$(TargetDir)"</PostBuildEvent>
185+
<PostBuildEvent Condition=" '$(OS)' != 'Unix' ">
186+
copy "$(ProjectDir)..\..\tools\cm17a\cm17a.exe" "$(TargetDir)"
187+
</PostBuildEvent>
188+
<PostBuildEvent Condition=" '$(OS)' == 'Unix' ">
189+
cp "$(ProjectDir)../../tools/cm17a/cm17a.exe" "$(TargetDir)"
190+
</PostBuildEvent>
188191
</PropertyGroup>
189192
</Project>

project/Core.Extensions/Core.Extensions.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,13 @@
133133
</Target>
134134
-->
135135
<PropertyGroup>
136-
<PostBuildEvent>if not "$(ConfigurationName)" == "Build" xcopy /Y "$(TargetPath)" "$(SolutionDir)console\bin\$(ConfigurationName)\"</PostBuildEvent>
136+
<PostBuildEvent Condition=" '$(OS)' != 'Unix' ">
137+
if not "$(ConfigurationName)" == "Build" xcopy /Y "$(TargetPath)" "$(SolutionDir)console/bin/$(ConfigurationName)/"
138+
</PostBuildEvent>
139+
<PostBuildEvent Condition=" '$(OS)' == 'Unix' ">
140+
if [ "$(ConfigurationName)" != "Build" ]; then
141+
cp "$(TargetPath)" "$(SolutionDir)console/bin/$(ConfigurationName)/"
142+
fi
143+
</PostBuildEvent>
137144
</PropertyGroup>
138145
</Project>

project/UnitTests/UnitTests.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,12 +1455,17 @@
14551455
</ItemGroup>
14561456
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
14571457
<PropertyGroup>
1458-
<PreBuildEvent>mkdir "$(TargetDir)xsl"
1458+
<PreBuildEvent Condition=" '$(OS)' != 'Unix' ">mkdir "$(TargetDir)xsl"
14591459
copy "$(ProjectDir)test.config" "$(TargetPath).config"
14601460
xcopy /y/q "$(SolutionDir)\xsl\*.*" "$(TargetDir)xsl"
14611461
xcopy "$(ProjectDir)\resources\*.*" "$(TargetDir)" /S /Y /Q
14621462
copy "$(ProjectDir)..\..\tools\sleeper.exe" "$(TargetDir)"</PreBuildEvent>
1463+
<PreBuildEvent Condition=" '$(OS)' == 'Unix' ">mkdir -p "$(TargetDir)xsl"
1464+
cp "$(ProjectDir)test.config" "$(TargetPath).config"
1465+
cp "$(SolutionDir)xsl"/* "$(TargetDir)xsl"
1466+
cp -R "$(ProjectDir)resources"/* "$(TargetDir)"
1467+
cp "$(ProjectDir)../../Tools/sleeper.exe" "$(TargetDir)"</PreBuildEvent>
14631468
<PostBuildEvent>
14641469
</PostBuildEvent>
14651470
</PropertyGroup>
1466-
</Project>
1471+
</Project>

project/WebDashboard/WebDashboard.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,10 @@
933933
<PropertyGroup>
934934
<PreBuildEvent>
935935
</PreBuildEvent>
936-
<PostBuildEvent>mkdir "$(ProjectDir)\xsl"
936+
<PostBuildEvent Condition=" '$(OS)' != 'Unix' ">mkdir "$(ProjectDir)\xsl"
937937
xcopy/y/q "$(SolutionDir)\xsl\*.xsl" "$(ProjectDir)\xsl"</PostBuildEvent>
938+
<PostBuildEvent Condition=" '$(OS)' == 'Unix' ">mkdir -p "$(ProjectDir)xsl"
939+
cp "$(SolutionDir)xsl"/* "$(ProjectDir)xsl"</PostBuildEvent>
938940
</PropertyGroup>
939941
<ProjectExtensions>
940942
<VisualStudio>

project/core/core.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,9 @@
12151215
<PropertyGroup>
12161216
<PreBuildEvent>
12171217
</PreBuildEvent>
1218-
<PostBuildEvent>mkdir "$(TargetDir)xsl"
1218+
<PostBuildEvent Condition=" '$(OS)' != 'Unix' ">mkdir "$(TargetDir)xsl"
12191219
xcopy /q /y "$(SolutionDir)\xsl\*.*" "$(TargetDir)xsl"</PostBuildEvent>
1220+
<PostBuildEvent Condition=" '$(OS)' == 'Unix' ">mkdir -p "$(TargetDir)xsl"
1221+
cp "$(SolutionDir)xsl"/* "$(TargetDir)xsl"</PostBuildEvent>
12201222
</PropertyGroup>
12211223
</Project>

0 commit comments

Comments
 (0)