Skip to content

Commit

Permalink
Merge pull request #1545 from pmienk/master
Browse files Browse the repository at this point in the history 
Regenerate artifacts.
  • Loading branch information
@pmienk
pmienk authored Oct 31, 2024
2 parents 4968ba9 + 9d87894 commit 9ca0293
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 241 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ jobs:
matrix:
include:
- os: ubuntu-22.04
preset: "nix-gnu-debug-shared-without_icu"
preset: "nix-gnu-debug-shared"
cxx: "clang++-15"
link: "dynamic"
optimization: "debug"
Expand All @@ -496,7 +496,7 @@ jobs:
packages: ""

- os: ubuntu-22.04
preset: "nix-gnu-release-static-size-with_icu"
preset: "nix-gnu-release-static"
cxx: "clang++-15"
link: "static"
optimization: "size"
Expand All @@ -511,7 +511,7 @@ jobs:
packages: ""

- os: ubuntu-22.04
preset: "nix-gnu-release-shared-size-without_icu"
preset: "nix-gnu-release-shared"
cxx: "g++-11"
link: "dynamic"
optimization: "size"
Expand Down
4 changes: 4 additions & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",
"cmake.useCMakePresets": "always"
}
231 changes: 24 additions & 207 deletions builds/cmake/CMakePresets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,179 +75,44 @@
}
},
{
"name": "gnu-optimized-size",
"description": "Factored size optimization settings.",
"hidden": true,
"cacheVariables": {
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os",
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os"
}
},
{
"name": "with_icu",
"description": "Factored ICU inclusion flag.",
"hidden": true,
"cacheVariables": {
"with-icu": {
"type": "BOOL",
"value": "ON"
}
}
},
{
"name": "without_icu",
"description": "Factored ICU exclusion flag.",
"hidden": true,
"cacheVariables": {
"with-icu": {
"type": "BOOL",
"value": "OFF"
}
}
},
{
"name": "nix-gnu-debug-static-with_icu",
"displayName": "*nix/GNU/Debug/Static/WithICU",
"description": "Debug build with static linking and with icu.",
"name": "nix-gnu-debug-static",
"displayName": "*nix/GNU/Debug/Static",
"description": "Debug build with static linking.",
"hidden": false,
"inherits": [
"with_icu",
"static",
"gnu-debug",
"nix-base"
]
},
{
"name": "nix-gnu-debug-static-without_icu",
"displayName": "*nix/GNU/Debug/Static/WithoutICU",
"description": "Debug build with static linking and without icu.",
"name": "nix-gnu-debug-shared",
"displayName": "*nix/GNU/Debug/Shared",
"description": "Debug build with shared linking.",
"hidden": false,
"inherits": [
"without_icu",
"static",
"gnu-debug",
"nix-base"
]
},
{
"name": "nix-gnu-debug-shared-with_icu",
"displayName": "*nix/GNU/Debug/Shared/WithICU",
"description": "Debug build with shared linking and with icu.",
"hidden": false,
"inherits": [
"with_icu",
"shared",
"gnu-debug",
"nix-base"
]
},
{
"name": "nix-gnu-debug-shared-without_icu",
"displayName": "*nix/GNU/Debug/Shared/WithoutICU",
"description": "Debug build with shared linking and without icu.",
"hidden": false,
"inherits": [
"without_icu",
"shared",
"gnu-debug",
"nix-base"
]
},
{
"name": "nix-gnu-release-static-with_icu",
"displayName": "*nix/GNU/Release/Static/WithICU",
"description": "Release build with static linking and standard optimizations and with icu.",
"name": "nix-gnu-release-static",
"displayName": "*nix/GNU/Release/Static",
"description": "Release build with static linking and standard optimizations.",
"hidden": false,
"inherits": [
"with_icu",
"static",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-static-without_icu",
"displayName": "*nix/GNU/Release/Static/WithoutICU",
"description": "Release build with static linking and standard optimizations and without icu.",
"name": "nix-gnu-release-shared",
"displayName": "*nix/GNU/Release/Shared",
"description": "Release build with shared linking and standard optimizations.",
"hidden": false,
"inherits": [
"without_icu",
"static",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-shared-with_icu",
"displayName": "*nix/GNU/Release/Shared/WithICU",
"description": "Release build with shared linking and standard optimizations and with icu.",
"hidden": false,
"inherits": [
"with_icu",
"shared",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-shared-without_icu",
"displayName": "*nix/GNU/Release/Shared/WithoutICU",
"description": "Release build with shared linking and standard optimizations and without icu.",
"hidden": false,
"inherits": [
"without_icu",
"shared",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-static-size-with_icu",
"displayName": "*nix/GNU/Release/Static/Size/WithICU",
"description": "Release build with static linking and optimizations for size and with icu.",
"hidden": false,
"inherits": [
"with_icu",
"gnu-optimized-size",
"static",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-static-size-without_icu",
"displayName": "*nix/GNU/Release/Static/Size/WithoutICU",
"description": "Release build with static linking and optimizations for size and without icu.",
"hidden": false,
"inherits": [
"without_icu",
"gnu-optimized-size",
"static",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-shared-size-with_icu",
"displayName": "*nix/GNU/Release/Shared/Size/WithICU",
"description": "Release build with shared linking and optimizations for size and with icu.",
"hidden": false,
"inherits": [
"with_icu",
"gnu-optimized-size",
"shared",
"gnu-release",
"nix-base"
]
},
{
"name": "nix-gnu-release-shared-size-without_icu",
"displayName": "*nix/GNU/Release/Shared/Size/WithoutICU",
"description": "Release build with shared linking and optimizations for size and without icu.",
"hidden": false,
"inherits": [
"without_icu",
"gnu-optimized-size",
"shared",
"gnu-release",
"nix-base"
Expand All @@ -265,76 +130,28 @@
]
},
{
"name": "nix-gnu-debug-static-with_icu",
"displayName": "*nix/GNU/Debug/Static/WithICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-debug-static-with_icu"
},
{
"name": "nix-gnu-debug-static-without_icu",
"displayName": "*nix/GNU/Debug/Static/WithoutICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-debug-static-without_icu"
},
{
"name": "nix-gnu-debug-shared-with_icu",
"displayName": "*nix/GNU/Debug/Shared/WithICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-debug-shared-with_icu"
},
{
"name": "nix-gnu-debug-shared-without_icu",
"displayName": "*nix/GNU/Debug/Shared/WithoutICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-debug-shared-without_icu"
},
{
"name": "nix-gnu-release-static-with_icu",
"displayName": "*nix/GNU/Release/Static/WithICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-static-with_icu"
},
{
"name": "nix-gnu-release-static-without_icu",
"displayName": "*nix/GNU/Release/Static/WithoutICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-static-without_icu"
},
{
"name": "nix-gnu-release-shared-with_icu",
"displayName": "*nix/GNU/Release/Shared/WithICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-shared-with_icu"
},
{
"name": "nix-gnu-release-shared-without_icu",
"displayName": "*nix/GNU/Release/Shared/WithoutICU",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-shared-without_icu"
},
{
"name": "nix-gnu-release-static-size-with_icu",
"displayName": "*nix/GNU/Release/Static/Size/WithICU",
"name": "nix-gnu-debug-static",
"displayName": "*nix/GNU/Debug/Static",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-static-size-with_icu"
"configurePreset": "nix-gnu-debug-static"
},
{
"name": "nix-gnu-release-static-size-without_icu",
"displayName": "*nix/GNU/Release/Static/Size/WithoutICU",
"name": "nix-gnu-debug-shared",
"displayName": "*nix/GNU/Debug/Shared",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-static-size-without_icu"
"configurePreset": "nix-gnu-debug-shared"
},
{
"name": "nix-gnu-release-shared-size-with_icu",
"displayName": "*nix/GNU/Release/Shared/Size/WithICU",
"name": "nix-gnu-release-static",
"displayName": "*nix/GNU/Release/Static",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-shared-size-with_icu"
"configurePreset": "nix-gnu-release-static"
},
{
"name": "nix-gnu-release-shared-size-without_icu",
"displayName": "*nix/GNU/Release/Shared/Size/WithoutICU",
"name": "nix-gnu-release-shared",
"displayName": "*nix/GNU/Release/Shared",
"inherits": [ "nix-target-list" ],
"configurePreset": "nix-gnu-release-shared-size-without_icu"
"configurePreset": "nix-gnu-release-shared"
}
]
}
8 changes: 8 additions & 0 deletions builds/vscode/system.code-workspace
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"folders": [
{
"path": "../../../libbitcoin-system"
}
],
"settings": {}
}
40 changes: 9 additions & 31 deletions install-cmakepresets.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,49 +354,27 @@ handle_custom_options()
($PRESET_ID != "gnu-release") &&
($PRESET_ID != "static") &&
($PRESET_ID != "shared") &&
($PRESET_ID != "gnu-optimized-size") &&
($PRESET_ID != "with_icu") &&
($PRESET_ID != "without_icu") &&
($PRESET_ID != "nix-gnu-debug-static-with_icu") &&
($PRESET_ID != "nix-gnu-debug-static-without_icu") &&
($PRESET_ID != "nix-gnu-debug-shared-with_icu") &&
($PRESET_ID != "nix-gnu-debug-shared-without_icu") &&
($PRESET_ID != "nix-gnu-release-static-with_icu") &&
($PRESET_ID != "nix-gnu-release-static-without_icu") &&
($PRESET_ID != "nix-gnu-release-shared-with_icu") &&
($PRESET_ID != "nix-gnu-release-shared-without_icu") &&
($PRESET_ID != "nix-gnu-release-static-size-with_icu") &&
($PRESET_ID != "nix-gnu-release-static-size-without_icu") &&
($PRESET_ID != "nix-gnu-release-shared-size-with_icu") &&
($PRESET_ID != "nix-gnu-release-shared-size-without_icu")]]; then
($PRESET_ID != "nix-gnu-debug-static") &&
($PRESET_ID != "nix-gnu-debug-shared") &&
($PRESET_ID != "nix-gnu-release-static") &&
($PRESET_ID != "nix-gnu-release-shared")]]; then
display_error "Unsupported preset: $PRESET_ID"
display_error "Supported values are:"
display_error " nix-base"
display_error " gnu-debug"
display_error " gnu-release"
display_error " static"
display_error " shared"
display_error " gnu-optimized-size"
display_error " with_icu"
display_error " without_icu"
display_error " nix-gnu-debug-static-with_icu"
display_error " nix-gnu-debug-static-without_icu"
display_error " nix-gnu-debug-shared-with_icu"
display_error " nix-gnu-debug-shared-without_icu"
display_error " nix-gnu-release-static-with_icu"
display_error " nix-gnu-release-static-without_icu"
display_error " nix-gnu-release-shared-with_icu"
display_error " nix-gnu-release-shared-without_icu"
display_error " nix-gnu-release-static-size-with_icu"
display_error " nix-gnu-release-static-size-without_icu"
display_error " nix-gnu-release-shared-size-with_icu"
display_error " nix-gnu-release-shared-size-without_icu"
display_error " nix-gnu-debug-static"
display_error " nix-gnu-debug-shared"
display_error " nix-gnu-release-static"
display_error " nix-gnu-release-shared"
display_error ""
display_help
exit 1
fi

BASE_PRESET_ID=${PRESET_ID/%-with*_*/}
BASE_PRESET_ID="$PRESET_ID"
REPO_PRESET[libbitcoin-system]="$PRESET_ID"
display_message "REPO_PRESET[libbitcoin-system]=${REPO_PRESET[libbitcoin-system]}"

Expand Down

0 comments on commit 9ca0293

Please sign in to comment.