Skip to content

Commit 427253c

Browse files
author
MarcoFalke
committed
Merge #14062: build: generate MSVC project files via python script
0b16f67 auto generate MSVC project files (Chun Kuan Lee) Pull request description: The reason that I move from original `*.vcxproj` to template `*.vcxproj.in` file: - There are many developers does not know how to edit .vcxproj file - To keep consistency, don't need to edit file at two different places Now the devs do not have to update two seperate files. Tree-SHA512: ab06dbec588cab57f16c1993ea80ed25a49b0b129884634512a8bcd8a21a1a55d38636922489bcf9120d504cfc2cbe4d2b888a217c4e65a50555b41fcd3b7004
2 parents c775dc4 + 0b16f67 commit 427253c

File tree

11 files changed

+80
-131
lines changed

11 files changed

+80
-131
lines changed

‎appveyor.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ platform: x64
66
environment:
77
APPVEYOR_SAVE_CACHE_ON_ERROR: true
88
cache: C:\tools\vcpkg\installed\
9+
init:
10+
- cmd: set PATH=C:\Python36-x64;%PATH%
911
before_build:
1012
- ps: >-
1113
$packages = @(
@@ -28,6 +30,7 @@ before_build:
2830
git -C C:\Tools\vcpkg pull # This is a temporary fix, can be removed after appveyor update its image to include Microsoft/vcpkg#4046
2931
3032
Invoke-Expression -Command "vcpkg install $all_packages"
33+
- cmd: python build_msvc\msvc-autogen.py
3134
build:
3235
project: build_msvc\bitcoin.sln
3336
parallel: true

‎build_msvc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ packages/*
88
*/Release
99
*/x64
1010
*.vcxproj.user
11+
*.vcxproj

‎build_msvc/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,10 @@ The instructions below use vcpkg to install the dependencies.
4747
leveldb:x64-windows-static
4848
```
4949

50+
- Use Python to generate *.vcxproj from Makefile
51+
52+
```
53+
PS >python msvc-autogen.py
54+
```
55+
5056
- Build in Visual Studio.

‎build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj renamed to ‎build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</ProjectConfiguration>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ClCompile Include="..\..\src\rpc\client.cpp" />
23+
@SOURCE_FILES@
2424
</ItemGroup>
2525
<ItemGroup>
2626
<None Include="packages.config" />

‎build_msvc/libbitcoin_common/libbitcoin_common.vcxproj renamed to ‎build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -165,43 +165,7 @@
165165
</Link>
166166
</ItemDefinitionGroup>
167167
<ItemGroup>
168-
<ClInclude Include="..\..\src\base58.h" />
169-
<ClInclude Include="..\..\src\bech32.h" />
170-
<ClInclude Include="..\..\src\chainparams.h" />
171-
<ClInclude Include="..\..\src\coins.h" />
172-
<ClInclude Include="..\..\src\compressor.h" />
173-
<ClInclude Include="..\..\src\key.h" />
174-
<ClInclude Include="..\..\src\keystore.h" />
175-
<ClInclude Include="..\..\src\netaddress.h" />
176-
<ClInclude Include="..\..\src\netbase.h" />
177-
<ClInclude Include="..\..\src\policy\feerate.h" />
178-
<ClInclude Include="..\..\src\protocol.h" />
179-
<ClInclude Include="..\..\src\scheduler.h" />
180-
<ClInclude Include="..\..\src\script\sign.h" />
181-
<ClInclude Include="..\..\src\script\standard.h" />
182-
<ClInclude Include="..\..\src\warnings.h" />
183-
</ItemGroup>
184-
<ItemGroup>
185-
<ClCompile Include="..\..\src\base58.cpp" />
186-
<ClCompile Include="..\..\src\bech32.cpp" />
187-
<ClCompile Include="..\..\src\chainparams.cpp" />
188-
<ClCompile Include="..\..\src\coins.cpp" />
189-
<ClCompile Include="..\..\src\compressor.cpp" />
190-
<ClCompile Include="..\..\src\core_read.cpp" />
191-
<ClCompile Include="..\..\src\core_write.cpp" />
192-
<ClCompile Include="..\..\src\key.cpp" />
193-
<ClCompile Include="..\..\src\key_io.cpp" />
194-
<ClCompile Include="..\..\src\keystore.cpp" />
195-
<ClCompile Include="..\..\src\netaddress.cpp" />
196-
<ClCompile Include="..\..\src\netbase.cpp" />
197-
<ClCompile Include="..\..\src\policy\feerate.cpp" />
198-
<ClCompile Include="..\..\src\protocol.cpp" />
199-
<ClCompile Include="..\..\src\scheduler.cpp" />
200-
<ClCompile Include="..\..\src\script\descriptor.cpp" />
201-
<ClCompile Include="..\..\src\script\sign.cpp" />
202-
<ClCompile Include="..\..\src\script\ismine.cpp" />
203-
<ClCompile Include="..\..\src\script\standard.cpp" />
204-
<ClCompile Include="..\..\src\warnings.cpp" />
168+
@SOURCE_FILES@
205169
</ItemGroup>
206170
<ItemGroup>
207171
<None Include="packages.config" />

‎build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj renamed to ‎build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj.in

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -151,25 +151,7 @@
151151
</Link>
152152
</ItemDefinitionGroup>
153153
<ItemGroup>
154-
<ClInclude Include="..\..\src\crypto\aes.h" />
155-
<ClInclude Include="..\..\src\crypto\chacha20.h" />
156-
<ClInclude Include="..\..\src\crypto\common.h" />
157-
<ClInclude Include="..\..\src\crypto\hmac_sha256.h" />
158-
<ClInclude Include="..\..\src\crypto\hmac_sha512.h" />
159-
<ClInclude Include="..\..\src\crypto\ripemd160.h" />
160-
<ClInclude Include="..\..\src\crypto\sha1.h" />
161-
<ClInclude Include="..\..\src\crypto\sha256.h" />
162-
<ClInclude Include="..\..\src\crypto\sha512.h" />
163-
</ItemGroup>
164-
<ItemGroup>
165-
<ClCompile Include="..\..\src\crypto\aes.cpp" />
166-
<ClCompile Include="..\..\src\crypto\chacha20.cpp" />
167-
<ClCompile Include="..\..\src\crypto\hmac_sha256.cpp" />
168-
<ClCompile Include="..\..\src\crypto\hmac_sha512.cpp" />
169-
<ClCompile Include="..\..\src\crypto\ripemd160.cpp" />
170-
<ClCompile Include="..\..\src\crypto\sha1.cpp" />
171-
<ClCompile Include="..\..\src\crypto\sha256.cpp" />
172-
<ClCompile Include="..\..\src\crypto\sha512.cpp" />
154+
@SOURCE_FILES@
173155
</ItemGroup>
174156
<Import Label="configTarget" Project="..\common.vcxproj" />
175157
</Project>

‎build_msvc/libbitcoin_server/libbitcoin_server.vcxproj renamed to ‎build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -154,53 +154,13 @@
154154
</Link>
155155
</ItemDefinitionGroup>
156156
<ItemGroup>
157-
<ClCompile Include="..\..\src\addrdb.cpp" />
158-
<ClCompile Include="..\..\src\addrman.cpp" />
159-
<ClCompile Include="..\..\src\blockencodings.cpp" />
160-
<ClCompile Include="..\..\src\bloom.cpp" />
161-
<ClCompile Include="..\..\src\chain.cpp" />
162-
<ClCompile Include="..\..\src\checkpoints.cpp" />
163-
<ClCompile Include="..\..\src\consensus\tx_verify.cpp" />
164-
<ClCompile Include="..\..\src\dbwrapper.cpp" />
165-
<ClCompile Include="..\..\src\httprpc.cpp" />
166-
<ClCompile Include="..\..\src\httpserver.cpp" />
167-
<ClCompile Include="..\..\src\index\base.cpp" />
168-
<ClCompile Include="..\..\src\init.cpp" />
169-
<ClCompile Include="..\..\src\merkleblock.cpp" />
170-
<ClCompile Include="..\..\src\miner.cpp" />
171-
<ClCompile Include="..\..\src\net.cpp" />
172-
<ClCompile Include="..\..\src\net_processing.cpp" />
173-
<ClCompile Include="..\..\src\noui.cpp" />
174-
<ClCompile Include="..\..\src\outputtype.cpp" />
175-
<ClCompile Include="..\..\src\policy\fees.cpp" />
176-
<ClCompile Include="..\..\src\policy\policy.cpp" />
177-
<ClCompile Include="..\..\src\policy\rbf.cpp" />
178-
<ClCompile Include="..\..\src\pow.cpp" />
179-
<ClCompile Include="..\..\src\rest.cpp" />
180-
<ClCompile Include="..\..\src\shutdown.cpp" />
181-
<ClCompile Include="..\..\src\rpc\blockchain.cpp" />
182-
<ClCompile Include="..\..\src\rpc\mining.cpp" />
183-
<ClCompile Include="..\..\src\rpc\misc.cpp" />
184157
<ClCompile Include="..\..\src\rpc\net.cpp">
185158
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\netrpc.obj</ObjectFileName>
186159
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\netrpc.obj</ObjectFileName>
187160
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\netrpc.obj</ObjectFileName>
188161
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\netrpc.obj</ObjectFileName>
189162
</ClCompile>
190-
<ClCompile Include="..\..\src\rpc\rawtransaction.cpp" />
191-
<ClCompile Include="..\..\src\rpc\server.cpp" />
192-
<ClCompile Include="..\..\src\rpc\util.cpp" />
193-
<ClCompile Include="..\..\src\script\ismine.cpp" />
194-
<ClCompile Include="..\..\src\script\sigcache.cpp" />
195-
<ClCompile Include="..\..\src\timedata.cpp" />
196-
<ClCompile Include="..\..\src\torcontrol.cpp" />
197-
<ClCompile Include="..\..\src\txdb.cpp" />
198-
<ClCompile Include="..\..\src\txmempool.cpp" />
199-
<ClCompile Include="..\..\src\ui_interface.cpp" />
200-
<ClCompile Include="..\..\src\validation.cpp" />
201-
<ClCompile Include="..\..\src\validationinterface.cpp" />
202-
<ClCompile Include="..\..\src\versionbits.cpp" />
203-
<ClCompile Include="..\..\src\index\txindex.cpp" />
163+
@SOURCE_FILES@
204164
</ItemGroup>
205165
<ItemGroup>
206166
<None Include="packages.config" />

‎build_msvc/libbitcoin_util/libbitcoin_util.vcxproj renamed to ‎build_msvc/libbitcoin_util/libbitcoin_util.vcxproj.in

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -174,23 +174,7 @@
174174
</ProjectReference>
175175
</ItemDefinitionGroup>
176176
<ItemGroup>
177-
<ClCompile Include="..\..\src\chainparamsbase.cpp" />
178-
<ClCompile Include="..\..\src\clientversion.cpp" />
179-
<ClCompile Include="..\..\src\compat\glibcxx_sanity.cpp" />
180-
<ClCompile Include="..\..\src\compat\glibc_sanity.cpp" />
181-
<ClCompile Include="..\..\src\compat\strnlen.cpp" />
182-
<ClCompile Include="..\..\src\fs.cpp" />
183-
<ClCompile Include="..\..\src\logging.cpp" />
184-
<ClCompile Include="..\..\src\random.cpp" />
185-
<ClCompile Include="..\..\src\rpc\protocol.cpp" />
186-
<ClCompile Include="..\..\src\support\cleanse.cpp" />
187-
<ClCompile Include="..\..\src\support\lockedpool.cpp" />
188-
<ClCompile Include="..\..\src\sync.cpp" />
189-
<ClCompile Include="..\..\src\threadinterrupt.cpp" />
190-
<ClCompile Include="..\..\src\util.cpp" />
191-
<ClCompile Include="..\..\src\utilmoneystr.cpp" />
192-
<ClCompile Include="..\..\src\utilstrencodings.cpp" />
193-
<ClCompile Include="..\..\src\utiltime.cpp" />
177+
@SOURCE_FILES@
194178
</ItemGroup>
195179
<Import Label="configTarget" Project="..\common.vcxproj" />
196180
</Project>

‎build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj renamed to ‎build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,7 @@
2020
</ProjectConfiguration>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ClCompile Include="..\..\src\wallet\coinselection.cpp" />
24-
<ClCompile Include="..\..\src\wallet\coincontrol.cpp" />
25-
<ClCompile Include="..\..\src\wallet\crypter.cpp" />
26-
<ClCompile Include="..\..\src\wallet\db.cpp" />
27-
<ClCompile Include="..\..\src\wallet\feebumper.cpp" />
28-
<ClCompile Include="..\..\src\wallet\fees.cpp" />
29-
<ClCompile Include="..\..\src\wallet\init.cpp" />
30-
<ClCompile Include="..\..\src\wallet\rpcdump.cpp" />
31-
<ClCompile Include="..\..\src\wallet\rpcwallet.cpp" />
32-
<ClCompile Include="..\..\src\wallet\wallet.cpp" />
33-
<ClCompile Include="..\..\src\wallet\walletdb.cpp" />
34-
<ClCompile Include="..\..\src\wallet\walletutil.cpp" />
23+
@SOURCE_FILES@
3524
</ItemGroup>
3625
<ItemGroup>
3726
<None Include="packages.config" />

‎build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj renamed to ‎build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
</ProjectConfiguration>
2121
</ItemGroup>
2222
<ItemGroup>
23-
<ClCompile Include="..\..\src\zmq\zmqabstractnotifier.cpp" />
24-
<ClCompile Include="..\..\src\zmq\zmqnotificationinterface.cpp" />
25-
<ClCompile Include="..\..\src\zmq\zmqpublishnotifier.cpp" />
26-
<ClCompile Include="..\..\src\zmq\zmqrpc.cpp" />
23+
@SOURCE_FILES@
2724
</ItemGroup>
2825
<ItemGroup>
2926
<None Include="packages.config" />

0 commit comments

Comments
 (0)