Skip to content

Commit 4f378ac

Browse files
fanquakefanquake
committed
Merge #16308: [MSVC] Copy build output to src/ automatically after build
08c721d [MSVC] Copy build output to src/ automatically after build (nicolas.dorier) Pull request description: I got frustrated many time that I run functional tests on an outdated binary. This make sure that files are properly copied (and debuggable) for functional tests after a build. This PR add a `common.vcxproj` which can be used to extend the build steps. I can't move it in `common.init`, because build step customization must always come at the end of a project file. ACKs for top commit: sipsorcery: tACK 08c721d. fanquake: ACK 08c721d Tree-SHA512: 7c033552a7bbbd3bb51a72d13bf4254e3b779c59ec93629c85f17745a1b17a8c1d6c87bb5e50eb5f4e5486e767929c0126e555b185608fd666aa39729b5068e1
2 parents 1088b90 + 08c721d commit 4f378ac

File tree

23 files changed

+32
-3
lines changed

23 files changed

+32
-3
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ build_script:
3737
after_build:
3838
- ps: fsutil behavior set disablelastaccess 1 # Disable Access time feature on Windows (better performance)
3939
- ps: clcache -z
40-
before_test:
41-
- ps: move "build_msvc\${env:PLATFORM}\${env:CONFIGURATION}\*.exe" src
4240
test_script:
4341
- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL
4442
- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.tar.gz
22

33
*.exe
4+
*.pdb
45
src/bitcoin
56
src/bitcoind
67
src/bitcoin-cli

‎build_msvc/bench_bitcoin/bench_bitcoin.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,5 @@
7474
<Import Label="hexdumpTarget" Project="..\msbuild\tasks\hexdump.targets" />
7575
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7676
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
77+
<Import Project="..\common.vcxproj" />
7778
</Project>

‎build_msvc/bitcoin-cli/bitcoin-cli.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
</ItemGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
30+
<Import Project="..\common.vcxproj" />
3031
</Project>

‎build_msvc/bitcoin-tx/bitcoin-tx.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@
3333
</ItemGroup>
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
36+
<Import Project="..\common.vcxproj" />
3637
</Project>

‎build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@
5151
</ItemGroup>
5252
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
54+
<Import Project="..\common.vcxproj" />
5455
</Project>

‎build_msvc/bitcoind/bitcoind.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,5 @@
7171
<ReplaceInFile FilePath="$(ConfigIniOut)"
7272
Replace="@ENABLE_ZMQ_TRUE@" By=""></ReplaceInFile>
7373
</Target>
74+
<Import Project="..\common.vcxproj" />
7475
</Project>

‎build_msvc/common.init.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
88
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
99
</PropertyGroup>
10-
1110
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and !Exists('$(WindowsSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.props')">
1211
<WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
1312
<WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>

‎build_msvc/common.vcxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup><BuildDependsOn>$(BuildDependsOn);CopyBuildArtifacts</BuildDependsOn></PropertyGroup>
4+
<Target Name="CopyBuildArtifacts" Condition="'$(ConfigurationType)' != 'StaticLibrary'">
5+
<ItemGroup>
6+
<BuildArtifacts Include="$(OutDir)$(TargetName)$(TargetExt)"></BuildArtifacts>
7+
<BuildArtifacts Include="$(OutDir)$(TargetName).pdb"></BuildArtifacts>
8+
</ItemGroup>
9+
<Copy SourceFiles="@(BuildArtifacts)" SkipUnchangedFiles="true" DestinationFolder="..\..\src\" Condition="'$(OutDir)' != ''"></Copy>
10+
</Target>
11+
<Import Project="common.vcxproj.user" Condition="Exists('common.vcxproj.user')" />
12+
</Project>

‎build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
</ItemGroup>
1313
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
1414
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
15+
<Import Project="..\common.vcxproj" />
1516
</Project>

0 commit comments

Comments
 (0)