commits from bitcoin/master

appveyor.yml

@@ -0,0 +1,40 @@
+version: '{branch}.{build}'
+skip_tags: true
+image: Visual Studio 2017
+configuration: Release
+platform: x64
+environment:
+  APPVEYOR_SAVE_CACHE_ON_ERROR: true
+cache: C:\tools\vcpkg\installed\
+init:
+- cmd: set PATH=C:\Python36-x64;%PATH%
+before_build:
+- ps: >-
+    $packages = @(
+        "boost-filesystem",
+        "boost-signals2",
+        "boost-interprocess",
+        "boost-test",
+        "libevent",
+        "openssl",
+        "zeromq",
+        "berkeleydb",
+        "secp256k1",
+        "leveldb"
+    )
+
+    for ($i=0; $i -lt $packages.length; $i++) {
+        $all_packages += $packages[$i] + ":" + $env:PLATFORM + "-windows-static "
+    }
+
+    git -C C:\Tools\vcpkg pull # This is a temporary fix, can be removed after appveyor update its image to include Microsoft/vcpkg#4046
+
+    Invoke-Expression -Command "vcpkg install $all_packages"
+- cmd: python build_msvc\msvc-autogen.py
+build:
+  project: build_msvc\bitcoin.sln
+  parallel: true
+  verbosity: minimal
+test_script:
+- cmd: build_msvc\%PLATFORM%\Release\test_bitcoin.exe
+deploy: off

build_msvc/.gitignore

@@ -8,3 +8,4 @@ packages/*
 */Release
 */x64
 *.vcxproj.user
+*.vcxproj

build_msvc/README.md

@@ -47,4 +47,10 @@ The instructions below use vcpkg to install the dependencies.
     leveldb:x64-windows-static
 ```
 
+- Use Python to generate *.vcxproj from Makefile
+
+```
+    PS >python msvc-autogen.py
+```
+
 - Build in Visual Studio.

build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj → build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj.in

@@ -20,7 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\rpc\client.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

build_msvc/libbitcoin_common/libbitcoin_common.vcxproj → build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in

@@ -165,43 +165,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\base58.h" />
-    <ClInclude Include="..\..\src\bech32.h" />
-    <ClInclude Include="..\..\src\chainparams.h" />
-    <ClInclude Include="..\..\src\coins.h" />
-    <ClInclude Include="..\..\src\compressor.h" />
-    <ClInclude Include="..\..\src\key.h" />
-    <ClInclude Include="..\..\src\keystore.h" />
-    <ClInclude Include="..\..\src\netaddress.h" />
-    <ClInclude Include="..\..\src\netbase.h" />
-    <ClInclude Include="..\..\src\policy\feerate.h" />
-    <ClInclude Include="..\..\src\protocol.h" />
-    <ClInclude Include="..\..\src\scheduler.h" />
-    <ClInclude Include="..\..\src\script\sign.h" />
-    <ClInclude Include="..\..\src\script\standard.h" />
-    <ClInclude Include="..\..\src\warnings.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\base58.cpp" />
-    <ClCompile Include="..\..\src\bech32.cpp" />
-    <ClCompile Include="..\..\src\chainparams.cpp" />
-    <ClCompile Include="..\..\src\coins.cpp" />
-    <ClCompile Include="..\..\src\compressor.cpp" />
-    <ClCompile Include="..\..\src\core_read.cpp" />
-    <ClCompile Include="..\..\src\core_write.cpp" />
-    <ClCompile Include="..\..\src\key.cpp" />
-    <ClCompile Include="..\..\src\key_io.cpp" />
-    <ClCompile Include="..\..\src\keystore.cpp" />
-    <ClCompile Include="..\..\src\netaddress.cpp" />
-    <ClCompile Include="..\..\src\netbase.cpp" />
-    <ClCompile Include="..\..\src\policy\feerate.cpp" />
-    <ClCompile Include="..\..\src\protocol.cpp" />
-    <ClCompile Include="..\..\src\scheduler.cpp" />
-    <ClCompile Include="..\..\src\script\descriptor.cpp" />
-    <ClCompile Include="..\..\src\script\sign.cpp" />
-    <ClCompile Include="..\..\src\script\ismine.cpp" />
-    <ClCompile Include="..\..\src\script\standard.cpp" />
-    <ClCompile Include="..\..\src\warnings.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj → build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj.in

@@ -151,25 +151,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\crypto\aes.h" />
-    <ClInclude Include="..\..\src\crypto\chacha20.h" />
-    <ClInclude Include="..\..\src\crypto\common.h" />
-    <ClInclude Include="..\..\src\crypto\hmac_sha256.h" />
-    <ClInclude Include="..\..\src\crypto\hmac_sha512.h" />
-    <ClInclude Include="..\..\src\crypto\ripemd160.h" />
-    <ClInclude Include="..\..\src\crypto\sha1.h" />
-    <ClInclude Include="..\..\src\crypto\sha256.h" />
-    <ClInclude Include="..\..\src\crypto\sha512.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\crypto\aes.cpp" />
-    <ClCompile Include="..\..\src\crypto\chacha20.cpp" />
-    <ClCompile Include="..\..\src\crypto\hmac_sha256.cpp" />
-    <ClCompile Include="..\..\src\crypto\hmac_sha512.cpp" />
-    <ClCompile Include="..\..\src\crypto\ripemd160.cpp" />
-    <ClCompile Include="..\..\src\crypto\sha1.cpp" />
-    <ClCompile Include="..\..\src\crypto\sha256.cpp" />
-    <ClCompile Include="..\..\src\crypto\sha512.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <Import Label="configTarget" Project="..\common.vcxproj" />
 </Project>

build_msvc/libbitcoin_server/libbitcoin_server.vcxproj → build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in

@@ -154,53 +154,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\addrdb.cpp" />
-    <ClCompile Include="..\..\src\addrman.cpp" />
-    <ClCompile Include="..\..\src\blockencodings.cpp" />
-    <ClCompile Include="..\..\src\bloom.cpp" />
-    <ClCompile Include="..\..\src\chain.cpp" />
-    <ClCompile Include="..\..\src\checkpoints.cpp" />
-    <ClCompile Include="..\..\src\consensus\tx_verify.cpp" />
-    <ClCompile Include="..\..\src\dbwrapper.cpp" />
-    <ClCompile Include="..\..\src\httprpc.cpp" />
-    <ClCompile Include="..\..\src\httpserver.cpp" />
-    <ClCompile Include="..\..\src\index\base.cpp" />
-    <ClCompile Include="..\..\src\init.cpp" />
-    <ClCompile Include="..\..\src\merkleblock.cpp" />
-    <ClCompile Include="..\..\src\miner.cpp" />
-    <ClCompile Include="..\..\src\net.cpp" />
-    <ClCompile Include="..\..\src\net_processing.cpp" />
-    <ClCompile Include="..\..\src\noui.cpp" />
-    <ClCompile Include="..\..\src\outputtype.cpp" />
-    <ClCompile Include="..\..\src\policy\fees.cpp" />
-    <ClCompile Include="..\..\src\policy\policy.cpp" />
-    <ClCompile Include="..\..\src\policy\rbf.cpp" />
-    <ClCompile Include="..\..\src\pow.cpp" />
-    <ClCompile Include="..\..\src\rest.cpp" />
-    <ClCompile Include="..\..\src\shutdown.cpp" />
-    <ClCompile Include="..\..\src\rpc\blockchain.cpp" />
-    <ClCompile Include="..\..\src\rpc\mining.cpp" />
-    <ClCompile Include="..\..\src\rpc\misc.cpp" />
     <ClCompile Include="..\..\src\rpc\net.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\netrpc.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\netrpc.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\netrpc.obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\netrpc.obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\rpc\rawtransaction.cpp" />
-    <ClCompile Include="..\..\src\rpc\server.cpp" />
-    <ClCompile Include="..\..\src\rpc\util.cpp" />
-    <ClCompile Include="..\..\src\script\ismine.cpp" />
-    <ClCompile Include="..\..\src\script\sigcache.cpp" />
-    <ClCompile Include="..\..\src\timedata.cpp" />
-    <ClCompile Include="..\..\src\torcontrol.cpp" />
-    <ClCompile Include="..\..\src\txdb.cpp" />
-    <ClCompile Include="..\..\src\txmempool.cpp" />
-    <ClCompile Include="..\..\src\ui_interface.cpp" />
-    <ClCompile Include="..\..\src\validation.cpp" />
-    <ClCompile Include="..\..\src\validationinterface.cpp" />
-    <ClCompile Include="..\..\src\versionbits.cpp" />
-    <ClCompile Include="..\..\src\index\txindex.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

build_msvc/libbitcoin_util/libbitcoin_util.vcxproj → build_msvc/libbitcoin_util/libbitcoin_util.vcxproj.in

@@ -174,23 +174,7 @@
     </ProjectReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\chainparamsbase.cpp" />
-    <ClCompile Include="..\..\src\clientversion.cpp" />
-    <ClCompile Include="..\..\src\compat\glibcxx_sanity.cpp" />
-    <ClCompile Include="..\..\src\compat\glibc_sanity.cpp" />
-    <ClCompile Include="..\..\src\compat\strnlen.cpp" />
-    <ClCompile Include="..\..\src\fs.cpp" />
-    <ClCompile Include="..\..\src\logging.cpp" />
-    <ClCompile Include="..\..\src\random.cpp" />
-    <ClCompile Include="..\..\src\rpc\protocol.cpp" />
-    <ClCompile Include="..\..\src\support\cleanse.cpp" />
-    <ClCompile Include="..\..\src\support\lockedpool.cpp" />
-    <ClCompile Include="..\..\src\sync.cpp" />
-    <ClCompile Include="..\..\src\threadinterrupt.cpp" />
-    <ClCompile Include="..\..\src\util.cpp" />
-    <ClCompile Include="..\..\src\utilmoneystr.cpp" />
-    <ClCompile Include="..\..\src\utilstrencodings.cpp" />
-    <ClCompile Include="..\..\src\utiltime.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <Import Label="configTarget" Project="..\common.vcxproj" />
 </Project>

build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj → build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj.in

@@ -20,18 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\wallet\coinselection.cpp" />
-    <ClCompile Include="..\..\src\wallet\coincontrol.cpp" />
-    <ClCompile Include="..\..\src\wallet\crypter.cpp" />
-    <ClCompile Include="..\..\src\wallet\db.cpp" />
-    <ClCompile Include="..\..\src\wallet\feebumper.cpp" />
-    <ClCompile Include="..\..\src\wallet\fees.cpp" />
-    <ClCompile Include="..\..\src\wallet\init.cpp" />
-    <ClCompile Include="..\..\src\wallet\rpcdump.cpp" />
-    <ClCompile Include="..\..\src\wallet\rpcwallet.cpp" />
-    <ClCompile Include="..\..\src\wallet\wallet.cpp" />
-    <ClCompile Include="..\..\src\wallet\walletdb.cpp" />
-    <ClCompile Include="..\..\src\wallet\walletutil.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj → build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj.in

@@ -20,10 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\zmq\zmqabstractnotifier.cpp" />
-    <ClCompile Include="..\..\src\zmq\zmqnotificationinterface.cpp" />
-    <ClCompile Include="..\..\src\zmq\zmqpublishnotifier.cpp" />
-    <ClCompile Include="..\..\src\zmq\zmqrpc.cpp" />
+@SOURCE_FILES@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

build_msvc/msvc-autogen.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+
+import os
+import re
+
+SOURCE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src'))
+
+libs = [
+    'libbitcoin_cli',
+    'libbitcoin_common',
+    'libbitcoin_crypto',
+    'libbitcoin_server',
+    'libbitcoin_util',
+    'libbitcoin_wallet',
+    'libbitcoin_zmq',
+]
+
+ignore_list = [
+    'rpc/net.cpp',
+    'interfaces/handler.cpp',
+    'interfaces/node.cpp',
+    'interfaces/wallet.cpp',
+]
+
+lib_sources = {}
+
+
+def parse_makefile(makefile):
+    with open(makefile, 'r', encoding='utf-8') as file:
+        current_lib = ''
+        for line in file.read().splitlines():
+            if current_lib:
+                source = line.split()[0]
+                if source.endswith('.cpp') and not source.startswith('$') and source not in ignore_list:
+                    lib_sources[current_lib].append(source.replace('/', '\\'))
+                if not line.endswith('\\'):
+                    current_lib = ''
+                continue
+            for lib in libs:
+                _lib = lib.replace('-', '_')
+                if re.search(_lib + '.*_SOURCES \\= \\\\', line):
+                    current_lib = lib
+                    lib_sources[current_lib] = []
+                    break
+
+
+def main():
+    for makefile_name in os.listdir(SOURCE_DIR):
+        if 'Makefile' in makefile_name:
+            parse_makefile(os.path.join(SOURCE_DIR, makefile_name))
+    for key, value in lib_sources.items():
+        vcxproj_filename = os.path.abspath(os.path.join(os.path.dirname(__file__), key, key + '.vcxproj'))
+        content = ''
+        for source_filename in value:
+            content += '    <ClCompile Include="..\\..\\src\\' + source_filename + '" />\n'
+        with open(vcxproj_filename + '.in', 'r', encoding='utf-8') as vcxproj_in_file:
+            with open(vcxproj_filename, 'w', encoding='utf-8') as vcxproj_file:
+                vcxproj_file.write(vcxproj_in_file.read().replace(
+                    '@SOURCE_FILES@\n', content))
+
+
+if __name__ == '__main__':
+    main()

build_msvc/test_bitcoin/test_bitcoin.vcxproj

@@ -20,72 +20,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\test\addrman_tests.cpp" />
-    <ClCompile Include="..\..\src\test\allocator_tests.cpp" />
-    <ClCompile Include="..\..\src\test\amount_tests.cpp" />
-    <ClCompile Include="..\..\src\test\arith_uint256_tests.cpp" />
-    <ClCompile Include="..\..\src\test\base32_tests.cpp" />
-    <ClCompile Include="..\..\src\test\base58_tests.cpp" />
-    <ClCompile Include="..\..\src\test\base64_tests.cpp" />
-    <ClCompile Include="..\..\src\test\bech32_tests.cpp" />
-    <ClCompile Include="..\..\src\test\bip32_tests.cpp" />
-    <ClCompile Include="..\..\src\test\blockchain_tests.cpp" />
-    <ClCompile Include="..\..\src\test\blockencodings_tests.cpp" />
-    <ClCompile Include="..\..\src\test\bloom_tests.cpp" />
-    <ClCompile Include="..\..\src\test\bswap_tests.cpp" />
-    <ClCompile Include="..\..\src\test\checkqueue_tests.cpp" />
-    <ClCompile Include="..\..\src\test\coins_tests.cpp" />
-    <ClCompile Include="..\..\src\test\compress_tests.cpp" />
-    <ClCompile Include="..\..\src\test\crypto_tests.cpp" />
-    <ClCompile Include="..\..\src\test\cuckoocache_tests.cpp" />
-    <ClCompile Include="..\..\src\test\dbwrapper_tests.cpp" />
-    <ClCompile Include="..\..\src\test\denialofservice_tests.cpp" />
-    <ClCompile Include="..\..\src\test\getarg_tests.cpp" />
-    <ClCompile Include="..\..\src\test\hash_tests.cpp" />
-    <ClCompile Include="..\..\src\test\key_tests.cpp" />
-    <ClCompile Include="..\..\src\test\limitedmap_tests.cpp" />
-    <ClCompile Include="..\..\src\test\main_tests.cpp" />
-    <ClCompile Include="..\..\src\test\mempool_tests.cpp" />
-    <ClCompile Include="..\..\src\test\merkle_tests.cpp" />
-    <ClCompile Include="..\..\src\test\miner_tests.cpp" />
-    <ClCompile Include="..\..\src\test\multisig_tests.cpp" />
-    <ClCompile Include="..\..\src\test\netbase_tests.cpp" />
-    <ClCompile Include="..\..\src\test\net_tests.cpp" />
-    <ClCompile Include="..\..\src\test\pmt_tests.cpp" />
-    <ClCompile Include="..\..\src\test\policyestimator_tests.cpp" />
-    <ClCompile Include="..\..\src\test\pow_tests.cpp" />
-    <ClCompile Include="..\..\src\test\prevector_tests.cpp" />
-    <ClCompile Include="..\..\src\test\raii_event_tests.cpp" />
-    <ClCompile Include="..\..\src\test\random_tests.cpp" />
-    <ClCompile Include="..\..\src\test\reverselock_tests.cpp" />
-    <ClCompile Include="..\..\src\test\rpc_tests.cpp" />
-    <ClCompile Include="..\..\src\test\sanity_tests.cpp" />
-    <ClCompile Include="..\..\src\test\scheduler_tests.cpp" />
-    <ClCompile Include="..\..\src\test\scriptnum_tests.cpp" />
-    <ClCompile Include="..\..\src\test\script_p2sh_tests.cpp" />
-    <ClCompile Include="..\..\src\test\script_standard_tests.cpp" />
-    <ClCompile Include="..\..\src\test\script_tests.cpp" />
-    <ClCompile Include="..\..\src\test\serialize_tests.cpp" />
-    <ClCompile Include="..\..\src\test\sighash_tests.cpp" />
-    <ClCompile Include="..\..\src\test\sigopcount_tests.cpp" />
-    <ClCompile Include="..\..\src\test\skiplist_tests.cpp" />
-    <ClCompile Include="..\..\src\test\streams_tests.cpp" />
+    <ClCompile Include="..\..\src\test\*_tests.cpp" />
+    <ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
     <ClCompile Include="..\..\src\test\test_bitcoin.cpp" />
     <ClCompile Include="..\..\src\test\test_bitcoin_main.cpp" />
-    <ClCompile Include="..\..\src\test\timedata_tests.cpp" />
-    <ClCompile Include="..\..\src\test\torcontrol_tests.cpp" />
-    <ClCompile Include="..\..\src\test\transaction_tests.cpp" />
-    <ClCompile Include="..\..\src\test\txindex_tests.cpp" />
-    <ClCompile Include="..\..\src\test\txvalidationcache_tests.cpp" />
-    <ClCompile Include="..\..\src\test\uint256_tests.cpp" />
-    <ClCompile Include="..\..\src\test\util_tests.cpp" />
-    <ClCompile Include="..\..\src\test\validation_block_tests.cpp" />
-    <ClCompile Include="..\..\src\test\versionbits_tests.cpp" />
-    <ClCompile Include="..\..\src\wallet\test\accounting_tests.cpp" />
-    <ClCompile Include="..\..\src\wallet\test\coinselector_tests.cpp" />
-    <ClCompile Include="..\..\src\wallet\test\psbt_wallet_tests.cpp" />
-    <ClCompile Include="..\..\src\wallet\test\wallet_crypto_tests.cpp" />
-    <ClCompile Include="..\..\src\wallet\test\wallet_tests.cpp" />
     <ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -266,4 +204,4 @@
   </Target>
   <Import Label="configTarget" Project="..\common.vcxproj" />
   <Import Label="hexdumpTarget" Project="..\msbuild\tasks\hexdump.targets" />
-</Project>
+</Project>