From 1ae00f3a3dbd0e596086e777246be1d6c3a362d8 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 21 Sep 2026 10:37:27 -0700 Subject: [PATCH 1/4] Initial version.hpp -> version.hpp.in conversion. --- builds/cmake/CMakeLists.txt | 13 +++++++++++++ .../vs2026/libbitcoin-node/libbitcoin-node.vcxproj | 2 +- .../libbitcoin-node/libbitcoin-node.vcxproj.filters | 6 +++--- .../bitcoin/node/{version.hpp => version.hpp.in} | 11 +++++++---- 4 files changed, 24 insertions(+), 8 deletions(-) rename include/bitcoin/node/{version.hpp => version.hpp.in} (51%) diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 82e81bf7..26f2fac9 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -171,6 +171,15 @@ endif() #------------------------------------------------------------------------------ include(CheckLinkerFlag) +#------------------------------------------------------------------------------ +# Configurable file(s). +#------------------------------------------------------------------------------ + +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/../../include/bitcoin/node/version.hpp.in + ${CMAKE_CURRENT_BINARY_DIR}/include/bitcoin/node/version.hpp + @ONLY ) + #------------------------------------------------------------------------------ # libbitcoin-node library #------------------------------------------------------------------------------ @@ -212,6 +221,10 @@ target_sources( libbitcoin-node BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../include" FILES ${libbitcoin_node_HEADERS} + FILE_SET HEADERS + BASE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/include" + FILES + "${CMAKE_CURRENT_BINARY_DIR}/include/bitcoin/node/version.hpp" PRIVATE ${libbitcoin_node_SOURCES} ) diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj index c4141838..e0ce66fb 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj @@ -219,10 +219,10 @@ - + diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters index ab9882c8..c705c7bf 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters @@ -344,14 +344,14 @@ include\bitcoin\node - - include\bitcoin\node - include\bitcoin\node\impl\sessions + + include\bitcoin\node + diff --git a/include/bitcoin/node/version.hpp b/include/bitcoin/node/version.hpp.in similarity index 51% rename from include/bitcoin/node/version.hpp rename to include/bitcoin/node/version.hpp.in index 7fda30ba..803342a7 100644 --- a/include/bitcoin/node/version.hpp +++ b/include/bitcoin/node/version.hpp.in @@ -12,9 +12,12 @@ * For interpretation of the versioning scheme see: http://semver.org */ -#define LIBBITCOIN_NODE_VERSION "4.0.0" -#define LIBBITCOIN_NODE_MAJOR_VERSION 4 -#define LIBBITCOIN_NODE_MINOR_VERSION 0 -#define LIBBITCOIN_NODE_PATCH_VERSION 0 +#define LIBBITCOIN_NODE_VERSION "@LIBBITCOIN_VERSION_MAJOR@.@LIBBITCOIN_VERSION_MINOR@.@LIBBITCOIN_VERSION_PATCH@" +#define LIBBITCOIN_NODE_MAJOR_VERSION @LIBBITCOIN_VERSION_MAJOR@ +#define LIBBITCOIN_NODE_MINOR_VERSION @LIBBITCOIN_VERSION_MINOR@ +#define LIBBITCOIN_NODE_PATCH_VERSION @LIBBITCOIN_VERSION_PATCH@ +#define LIBBITCOIN_NODE_COMMIT_HASH "@GIT_COMMIT_HASH@" +#define LIBBITCOIN_NODE_REPOSITORY_URL "@GIT_ORIGIN_URL@" +#define LIBBITCOIN_NODE_IS_DIRTY @GIT_DIRTY@ #endif From 8560ec3ede29941f7652ec665d404cbf4aaacfc8 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Mon, 21 Sep 2026 16:48:23 -0700 Subject: [PATCH 2/4] Alter gnu build for patch from git version. --- builds/gnu/Makefile.am | 3 ++- builds/gnu/configure.ac | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/builds/gnu/Makefile.am b/builds/gnu/Makefile.am index 46e40dec..3edd78b9 100644 --- a/builds/gnu/Makefile.am +++ b/builds/gnu/Makefile.am @@ -37,6 +37,7 @@ lib_LTLIBRARIES = src/libbitcoin-node.la src_libbitcoin_node_la_LIBS = src/libbitcoin-node.la src_libbitcoin_node_la_CPPFLAGS = \ + -I${top_builddir}/include \ -I${srcdir}/../../include \ ${libbitcoin_database_BUILD_CPPFLAGS} \ ${libbitcoin_network_BUILD_CPPFLAGS} @@ -115,7 +116,7 @@ include_bitcoin_node_HEADERS = \ ${srcdir}/../../include/bitcoin/node/events.hpp \ ${srcdir}/../../include/bitcoin/node/full_node.hpp \ ${srcdir}/../../include/bitcoin/node/settings.hpp \ - ${srcdir}/../../include/bitcoin/node/version.hpp + include/bitcoin/node/version.hpp include_bitcoin_node_channelsdir = \ ${includedir}/bitcoin/node/channels diff --git a/builds/gnu/configure.ac b/builds/gnu/configure.ac index 6ce944d2..c0f17307 100644 --- a/builds/gnu/configure.ac +++ b/builds/gnu/configure.ac @@ -296,6 +296,7 @@ AS_IF([(test "x${with_tests}" != "xno")], AC_CONFIG_FILES([ Makefile libbitcoin-node.pc + include/bitcoin/node/version.hpp:${repository_root_dir}/include/bitcoin/node/version.hpp.in ]) AC_OUTPUT From a5239afa67e2f62e120d36b455dc94265f605657 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Wed, 23 Sep 2026 13:17:49 -0700 Subject: [PATCH 3/4] Regenerate with msvc version.hpp.in support. --- .gitignore | 1 + builds/msvc/properties/GitSubstitute.ps1 | 89 +++++++++++++++ builds/msvc/properties/GitSubstitution.props | 104 ++++++++++++++++++ .../vs2026/libbitcoin-database.import.props | 3 +- .../vs2026/libbitcoin-network.import.props | 3 +- .../libbitcoin-node-test.props | 4 + .../msvc/vs2026/libbitcoin-node.import.props | 3 +- .../libbitcoin-node/libbitcoin-node.props | 4 + .../libbitcoin-node/libbitcoin-node.vcxproj | 16 +++ .../vs2026/libbitcoin-system.import.props | 2 + 10 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 builds/msvc/properties/GitSubstitute.ps1 create mode 100644 builds/msvc/properties/GitSubstitution.props diff --git a/.gitignore b/.gitignore index 497f8205..a099b9cf 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ builds/gnu/*.pc bin build obj +non-persistent # KDevelop IDE /*.kdev4 diff --git a/builds/msvc/properties/GitSubstitute.ps1 b/builds/msvc/properties/GitSubstitute.ps1 new file mode 100644 index 00000000..4b90a272 --- /dev/null +++ b/builds/msvc/properties/GitSubstitute.ps1 @@ -0,0 +1,89 @@ +# GitSubstitute.ps1 +# Substitutes @TOKEN@ placeholders in a template (.in) file using values passed from MSBuild. +# Intended to be invoked by GitSubstitution.props. + +[CmdletBinding()] +param( + [Parameter(Mandatory = $true)] + [string] $InputPath, + + [Parameter(Mandatory = $true)] + [string] $OutputPath, + + [Parameter(Mandatory = $true)] + [string] $VersionMajorToken, + + [Parameter(Mandatory = $true)] + [string] $VersionMinorToken, + + [Parameter(Mandatory = $true)] + [string] $VersionPatchToken, + + [Parameter(Mandatory = $true)] + [string] $GitCommitHashToken, + + [Parameter(Mandatory = $true)] + [string] $GitOriginUrlToken, + + [Parameter(Mandatory = $true)] + [string] $GitDirtyToken, + + [Parameter(Mandatory = $true)] + [string] $VersionMajorValue, + + [Parameter(Mandatory = $true)] + [string] $VersionMinorValue, + + [Parameter(Mandatory = $true)] + [string] $VersionPatchValue, + + [Parameter(Mandatory = $true)] + [AllowEmptyString()] + [string] $GitCommitHash, + + [Parameter(Mandatory = $true)] + [AllowEmptyString()] + [string] $GitOriginUrl, + + [Parameter(Mandatory = $true)] + [string] $GitDirty +) + +$ErrorActionPreference = 'Stop' + +function Escape-RegexLiteral { + param([string] $Text) + return [regex]::Escape($Text) +} + +if (-not (Test-Path -LiteralPath $InputPath)) { + throw "Input template not found: $InputPath" +} + +$outDir = Split-Path -Parent $OutputPath +if ($outDir -and -not (Test-Path -LiteralPath $outDir)) { + New-Item -ItemType Directory -Path $outDir -Force | Out-Null +} + +$content = Get-Content -LiteralPath $InputPath -Raw + +# -replace treats the pattern as regex; escape tokens so '@...@' is matched literally. +$replacements = @( + @{ Token = $VersionMajorToken; Value = $VersionMajorValue } + @{ Token = $VersionMinorToken; Value = $VersionMinorValue } + @{ Token = $VersionPatchToken; Value = $VersionPatchValue } + @{ Token = $GitCommitHashToken; Value = $GitCommitHash } + @{ Token = $GitOriginUrlToken; Value = $GitOriginUrl } + @{ Token = $GitDirtyToken; Value = $GitDirty } +) + +foreach ($r in $replacements) { + $pattern = '@' + (Escape-RegexLiteral $r.Token) + '@' + # Replacement string: use MatchEvaluator so $ and other specials in values stay literal. + $content = [regex]::Replace($content, $pattern, { param($m) $r.Value }) +} + +# -NoNewline matches the previous inline script behavior. +Set-Content -LiteralPath $OutputPath -Value $content -NoNewline -Encoding utf8 + +Write-Host "Generated: $OutputPath" diff --git a/builds/msvc/properties/GitSubstitution.props b/builds/msvc/properties/GitSubstitution.props new file mode 100644 index 00000000..544fa6dc --- /dev/null +++ b/builds/msvc/properties/GitSubstitution.props @@ -0,0 +1,104 @@ + + + + + <_PropertySheetDisplayName>Git Substitution (ConfigurableFile) + + + $(IntDir)generated\include\ + + + LIBBITCOIN_VERSION_MAJOR + LIBBITCOIN_VERSION_MINOR + LIBBITCOIN_VERSION_PATCH + GIT_COMMIT_HASH + GIT_ORIGIN_URL + GIT_DIRTY + + + 4 + 0 + + + + + + + $(GeneratedIncludeDir);%(AdditionalIncludeDirectories) + + + + + + + + + <_GitRepoRoot Condition="'$(RepoRoot)' != ''">$([System.IO.Path]::GetFullPath('$(RepoRoot)').TrimEnd('\')) + <_GitRepoRoot Condition="'$(RepoRoot)' == ''">. + + + + + + + + + + + + + + + + + + + + + + + unknown + unknown + + + 0 + 0 + + + + + + + 1 + 0 + + $(GitCommitHeight) + + + + + + + + + diff --git a/builds/msvc/vs2026/libbitcoin-database.import.props b/builds/msvc/vs2026/libbitcoin-database.import.props index de00e1d2..53275091 100644 --- a/builds/msvc/vs2026/libbitcoin-database.import.props +++ b/builds/msvc/vs2026/libbitcoin-database.import.props @@ -16,6 +16,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-database\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-database\non-persistent\include\;%(AdditionalIncludeDirectories) BCD_STATIC;%(PreprocessorDefinitions) @@ -32,4 +33,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2026/libbitcoin-network.import.props b/builds/msvc/vs2026/libbitcoin-network.import.props index d2b892a1..c0d76ed9 100644 --- a/builds/msvc/vs2026/libbitcoin-network.import.props +++ b/builds/msvc/vs2026/libbitcoin-network.import.props @@ -28,6 +28,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-network\non-persistent\include\;%(AdditionalIncludeDirectories) $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories) @@ -59,4 +60,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props index b2d9d4ca..668cb1d9 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props +++ b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props @@ -1,6 +1,10 @@  + + + + <_PropertySheetDisplayName>Libbitcoin Node Test Common Settings AllRules.ruleset diff --git a/builds/msvc/vs2026/libbitcoin-node.import.props b/builds/msvc/vs2026/libbitcoin-node.import.props index 65d8b1c6..de487a73 100644 --- a/builds/msvc/vs2026/libbitcoin-node.import.props +++ b/builds/msvc/vs2026/libbitcoin-node.import.props @@ -16,6 +16,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-node\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-node\non-persistent\include\;%(AdditionalIncludeDirectories) BCN_STATIC;%(PreprocessorDefinitions) @@ -32,4 +33,4 @@ - \ No newline at end of file + diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props index 10beb2d4..2534aca4 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props @@ -1,6 +1,10 @@  + + + + <_PropertySheetDisplayName>Libbitcoin Node Library Common Settings AllRules.ruleset diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj index e0ce66fb..7c2fc4a2 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj @@ -109,6 +109,22 @@ x64 + + $(ProjectDir)..\..\..\..\non-persistent\ + $(GeneratedIncludeDirBase)include\ + + + + $(RepoRoot)include\bitcoin\node\version.hpp.in + $(GeneratedIncludeDirBase)include\bitcoin\node\version.hpp + + + + + + %(ConfigurableFile.FileInput) + + StaticLibrary DynamicLibrary diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props index e0bfc247..2d45bfff 100644 --- a/builds/msvc/vs2026/libbitcoin-system.import.props +++ b/builds/msvc/vs2026/libbitcoin-system.import.props @@ -52,6 +52,8 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-system\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-system\non-persistent\include\;%(AdditionalIncludeDirectories) + WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions) From 5b69a67e1be84a42845796afb8a642d5b88db815 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Thu, 24 Sep 2026 10:19:03 -0700 Subject: [PATCH 4/4] Regenerate artifacts. --- .gitignore | 4 +- builds/cmake/CMakeLists.txt | 12 ++++- builds/gnu/configure.ac | 2 +- builds/msvc/properties/Git.props | 52 +++++++++++++++++++ builds/msvc/properties/Output.props | 1 + .../vs2026/libbitcoin-database.import.props | 2 +- .../vs2026/libbitcoin-network.import.props | 2 +- .../libbitcoin-node-test.props | 4 -- .../msvc/vs2026/libbitcoin-node.import.props | 2 +- .../libbitcoin-node/libbitcoin-node.props | 5 +- .../libbitcoin-node/libbitcoin-node.vcxproj | 28 ++++------ .../libbitcoin-node.vcxproj.filters | 26 ++++------ .../vs2026/libbitcoin-system.import.props | 2 +- include/bitcoin/node/version.hpp.in | 12 ++--- 14 files changed, 98 insertions(+), 56 deletions(-) create mode 100644 builds/msvc/properties/Git.props diff --git a/.gitignore b/.gitignore index a099b9cf..ea125ca8 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,9 @@ builds/gnu/.dirstamp # pkg-config pc file from .pc.in builds/gnu/*.pc +# configured headers from in-tree configure +builds/gnu/include + # msbuild/msvc /.vs *.db @@ -52,7 +55,6 @@ builds/gnu/*.pc bin build obj -non-persistent # KDevelop IDE /*.kdev4 diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 26f2fac9..0e45b5cc 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(Git QUIET) set( GIT_COMMIT_HASH "unknown" ) set( GIT_COMMIT_HEIGHT 0 ) set( GIT_DIRTY 0 ) -set( GIT_ORIGIN_URL "https://github.com/libbitcoin/libbitcoin-node" ) +set( GIT_ORIGIN_URL "unknown" ) if ( GIT_EXECUTABLE ) execute_process( @@ -21,6 +21,10 @@ if ( GIT_EXECUTABLE ) OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET ) + if ( NOT GIT_COMMIT_HASH ) + set( GIT_COMMIT_HASH "unknown" ) + endif() + execute_process( COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} @@ -33,12 +37,16 @@ if ( GIT_EXECUTABLE ) endif() execute_process( - COMMAND ${GIT_EXECUTABLE} remote get-url origin + COMMAND ${GIT_EXECUTABLE} ls-remote --get-url WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_ORIGIN_URL OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET ) + if ( NOT GIT_ORIGIN_URL MATCHES "://|@" ) + set( GIT_ORIGIN_URL "unknown" ) + endif() + execute_process( COMMAND ${GIT_EXECUTABLE} status --porcelain WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} diff --git a/builds/gnu/configure.ac b/builds/gnu/configure.ac index c0f17307..c838d66d 100644 --- a/builds/gnu/configure.ac +++ b/builds/gnu/configure.ac @@ -24,7 +24,7 @@ m4_define([_git_dirty], m4_define([_GIT_DIRTY], m4_ifnblank(_git_dirty, [_git_dirty], [0])) m4_define([_GIT_ORIGIN_URL], - m4_dquote(m4_esyscmd_s([git remote get-url origin 2>/dev/null || echo https://github.com/libbitcoin/libbitcoin-node]))) + m4_dquote(m4_esyscmd_s([git ls-remote --get-url 2>/dev/null | grep -e '://' -e '@' || echo unknown]))) m4_define([_LIBBITCOIN_VERSION_MAJOR], [4]) m4_define([_LIBBITCOIN_VERSION_MINOR], [0]) diff --git a/builds/msvc/properties/Git.props b/builds/msvc/properties/Git.props new file mode 100644 index 00000000..516becbd --- /dev/null +++ b/builds/msvc/properties/Git.props @@ -0,0 +1,52 @@ + + + + + <_PropertySheetDisplayName>Git Settings + + + + + + + + + + + + + + + + + + + + unknown + 0 + 1 + 0 + unknown + $(GitCommitHeight) + + + + <_Configured>$([System.IO.File]::ReadAllText('%(ConfigurableFile.FullPath)')) + <_Configured>$(_Configured.Replace('@LIBBITCOIN_VERSION_MAJOR@', '$(VersionMajor)')) + <_Configured>$(_Configured.Replace('@LIBBITCOIN_VERSION_MINOR@', '$(VersionMinor)')) + <_Configured>$(_Configured.Replace('@LIBBITCOIN_VERSION_PATCH@', '$(VersionPatch)')) + <_Configured>$(_Configured.Replace('@GIT_COMMIT_HASH@', '$(GitCommitHash)')) + <_Configured>$(_Configured.Replace('@GIT_ORIGIN_URL@', '$(GitOriginUrl)')) + <_Configured>$(_Configured.Replace('@GIT_DIRTY@', '$(GitDirty)')) + + + + + + + + + + + + diff --git a/builds/msvc/properties/Output.props b/builds/msvc/properties/Output.props index 492876cf..deb3dba7 100644 --- a/builds/msvc/properties/Output.props +++ b/builds/msvc/properties/Output.props @@ -25,6 +25,7 @@ + \ No newline at end of file diff --git a/builds/msvc/vs2026/libbitcoin-database.import.props b/builds/msvc/vs2026/libbitcoin-database.import.props index 53275091..cd2a9051 100644 --- a/builds/msvc/vs2026/libbitcoin-database.import.props +++ b/builds/msvc/vs2026/libbitcoin-database.import.props @@ -16,7 +16,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-database\include\;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\..\..\..\libbitcoin-database\non-persistent\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-database\build\include\;%(AdditionalIncludeDirectories) BCD_STATIC;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2026/libbitcoin-network.import.props b/builds/msvc/vs2026/libbitcoin-network.import.props index c0d76ed9..d04ce592 100644 --- a/builds/msvc/vs2026/libbitcoin-network.import.props +++ b/builds/msvc/vs2026/libbitcoin-network.import.props @@ -28,7 +28,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\..\..\..\libbitcoin-network\non-persistent\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-network\build\include\;%(AdditionalIncludeDirectories) $(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories) diff --git a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props index 668cb1d9..b2d9d4ca 100644 --- a/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props +++ b/builds/msvc/vs2026/libbitcoin-node-test/libbitcoin-node-test.props @@ -1,10 +1,6 @@  - - - - <_PropertySheetDisplayName>Libbitcoin Node Test Common Settings AllRules.ruleset diff --git a/builds/msvc/vs2026/libbitcoin-node.import.props b/builds/msvc/vs2026/libbitcoin-node.import.props index de487a73..b71e6531 100644 --- a/builds/msvc/vs2026/libbitcoin-node.import.props +++ b/builds/msvc/vs2026/libbitcoin-node.import.props @@ -16,7 +16,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-node\include\;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\..\..\..\libbitcoin-node\non-persistent\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-node\build\include\;%(AdditionalIncludeDirectories) BCN_STATIC;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props index 2534aca4..c0f53503 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.props @@ -1,10 +1,6 @@  - - - - <_PropertySheetDisplayName>Libbitcoin Node Library Common Settings AllRules.ruleset @@ -22,6 +18,7 @@ $(RepoRoot)include\;%(AdditionalIncludeDirectories) + $(RepoRoot)build\include\;%(AdditionalIncludeDirectories) false BCN_DLL;%(PreprocessorDefinitions) BCN_STATIC;%(PreprocessorDefinitions) diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj index 7c2fc4a2..dcd4e43b 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj @@ -109,22 +109,6 @@ x64 - - $(ProjectDir)..\..\..\..\non-persistent\ - $(GeneratedIncludeDirBase)include\ - - - - $(RepoRoot)include\bitcoin\node\version.hpp.in - $(GeneratedIncludeDirBase)include\bitcoin\node\version.hpp - - - - - - %(ConfigurableFile.FileInput) - - StaticLibrary DynamicLibrary @@ -136,6 +120,16 @@ + + 4 + 0 + + + + ..\..\..\..\build\include\bitcoin\node\version.hpp + + + @@ -183,7 +177,6 @@ - @@ -242,7 +235,6 @@ - diff --git a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters index c705c7bf..dd4d55d8 100644 --- a/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters +++ b/builds/msvc/vs2026/libbitcoin-node/libbitcoin-node.vcxproj.filters @@ -34,23 +34,20 @@ {5FFB5F52-0772-4404-0000-000000000008} - - {5FFB5F52-0772-4404-0000-000000000009} - - {5FFB5F52-0772-4404-0000-00000000000A} + {5FFB5F52-0772-4404-0000-000000000009} - {5FFB5F52-0772-4404-0000-00000000000B} + {5FFB5F52-0772-4404-0000-00000000000A} - {5FFB5F52-0772-4404-0000-00000000000C} + {5FFB5F52-0772-4404-0000-00000000000B} - {5FFB5F52-0772-4404-0000-00000000000D} + {5FFB5F52-0772-4404-0000-00000000000C} - {5FFB5F52-0772-4404-0000-00000000000E} + {5FFB5F52-0772-4404-0000-00000000000D} @@ -188,9 +185,6 @@ - - resource - include\bitcoin @@ -345,6 +339,11 @@ include\bitcoin\node + + + include\bitcoin\node + + include\bitcoin\node\impl\sessions @@ -357,9 +356,4 @@ - - - resource - - diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props index 2d45bfff..6aaae20b 100644 --- a/builds/msvc/vs2026/libbitcoin-system.import.props +++ b/builds/msvc/vs2026/libbitcoin-system.import.props @@ -52,7 +52,7 @@ $(ProjectDir)..\..\..\..\..\libbitcoin-system\include\;%(AdditionalIncludeDirectories) - $(ProjectDir)..\..\..\..\..\libbitcoin-system\non-persistent\include\;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\..\..\..\libbitcoin-system\build\include\;%(AdditionalIncludeDirectories) diff --git a/include/bitcoin/node/version.hpp.in b/include/bitcoin/node/version.hpp.in index 803342a7..2a8ddd8f 100644 --- a/include/bitcoin/node/version.hpp.in +++ b/include/bitcoin/node/version.hpp.in @@ -12,12 +12,12 @@ * For interpretation of the versioning scheme see: http://semver.org */ -#define LIBBITCOIN_NODE_VERSION "@LIBBITCOIN_VERSION_MAJOR@.@LIBBITCOIN_VERSION_MINOR@.@LIBBITCOIN_VERSION_PATCH@" -#define LIBBITCOIN_NODE_MAJOR_VERSION @LIBBITCOIN_VERSION_MAJOR@ -#define LIBBITCOIN_NODE_MINOR_VERSION @LIBBITCOIN_VERSION_MINOR@ -#define LIBBITCOIN_NODE_PATCH_VERSION @LIBBITCOIN_VERSION_PATCH@ -#define LIBBITCOIN_NODE_COMMIT_HASH "@GIT_COMMIT_HASH@" +#define LIBBITCOIN_NODE_VERSION "@LIBBITCOIN_VERSION_MAJOR@.@LIBBITCOIN_VERSION_MINOR@.@LIBBITCOIN_VERSION_PATCH@" +#define LIBBITCOIN_NODE_MAJOR_VERSION @LIBBITCOIN_VERSION_MAJOR@ +#define LIBBITCOIN_NODE_MINOR_VERSION @LIBBITCOIN_VERSION_MINOR@ +#define LIBBITCOIN_NODE_PATCH_VERSION @LIBBITCOIN_VERSION_PATCH@ +#define LIBBITCOIN_NODE_COMMIT_HASH "@GIT_COMMIT_HASH@" #define LIBBITCOIN_NODE_REPOSITORY_URL "@GIT_ORIGIN_URL@" -#define LIBBITCOIN_NODE_IS_DIRTY @GIT_DIRTY@ +#define LIBBITCOIN_NODE_IS_DIRTY @GIT_DIRTY@ #endif