Skip to content

Commit 2a40e10

Browse files
committed
Regenerate artifacts.
1 parent 7871545 commit 2a40e10

File tree

5 files changed

+16
-59
lines changed

5 files changed

+16
-59
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ jobs:
511511
packages: ""
512512

513513
- os: ubuntu-22.04
514-
preset: "nix-gnu-release-static-size"
514+
preset: "nix-gnu-release-static"
515515
cxx: "clang++-15"
516516
link: "static"
517517
optimization: "size"
@@ -527,7 +527,7 @@ jobs:
527527
packages: ""
528528

529529
- os: ubuntu-22.04
530-
preset: "nix-gnu-release-shared-size"
530+
preset: "nix-gnu-release-shared"
531531
cxx: "g++-11"
532532
link: "dynamic"
533533
optimization: "size"

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"cmake.sourceDirectory": "${workspaceFolder}/builds/cmake",
3+
"cmake.useCMakePresets": "always"
4+
}

builds/cmake/CMakePresets.json

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,6 @@
7474
}
7575
}
7676
},
77-
{
78-
"name": "gnu-optimized-size",
79-
"description": "Factored size optimization settings.",
80-
"hidden": true,
81-
"cacheVariables": {
82-
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Os",
83-
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Os"
84-
}
85-
},
8677
{
8778
"name": "nix-gnu-debug-static",
8879
"displayName": "*nix/GNU/Debug/Static",
@@ -126,30 +117,6 @@
126117
"gnu-release",
127118
"nix-base"
128119
]
129-
},
130-
{
131-
"name": "nix-gnu-release-static-size",
132-
"displayName": "*nix/GNU/Release/Static/Size",
133-
"description": "Release build with static linking and optimizations for size.",
134-
"hidden": false,
135-
"inherits": [
136-
"gnu-optimized-size",
137-
"static",
138-
"gnu-release",
139-
"nix-base"
140-
]
141-
},
142-
{
143-
"name": "nix-gnu-release-shared-size",
144-
"displayName": "*nix/GNU/Release/Shared/Size",
145-
"description": "Release build with shared linking and optimizations for size.",
146-
"hidden": false,
147-
"inherits": [
148-
"gnu-optimized-size",
149-
"shared",
150-
"gnu-release",
151-
"nix-base"
152-
]
153120
}
154121
],
155122
"buildPresets": [
@@ -184,18 +151,6 @@
184151
"displayName": "*nix/GNU/Release/Shared",
185152
"inherits": [ "nix-target-list" ],
186153
"configurePreset": "nix-gnu-release-shared"
187-
},
188-
{
189-
"name": "nix-gnu-release-static-size",
190-
"displayName": "*nix/GNU/Release/Static/Size",
191-
"inherits": [ "nix-target-list" ],
192-
"configurePreset": "nix-gnu-release-static-size"
193-
},
194-
{
195-
"name": "nix-gnu-release-shared-size",
196-
"displayName": "*nix/GNU/Release/Shared/Size",
197-
"inherits": [ "nix-target-list" ],
198-
"configurePreset": "nix-gnu-release-shared-size"
199154
}
200155
]
201156
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "../../../libbitcoin-protocol"
5+
}
6+
],
7+
"settings": {}
8+
}

install-cmakepresets.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -362,27 +362,21 @@ handle_custom_options()
362362
($PRESET_ID != "gnu-release") &&
363363
($PRESET_ID != "static") &&
364364
($PRESET_ID != "shared") &&
365-
($PRESET_ID != "gnu-optimized-size") &&
366365
($PRESET_ID != "nix-gnu-debug-static") &&
367366
($PRESET_ID != "nix-gnu-debug-shared") &&
368367
($PRESET_ID != "nix-gnu-release-static") &&
369-
($PRESET_ID != "nix-gnu-release-shared") &&
370-
($PRESET_ID != "nix-gnu-release-static-size") &&
371-
($PRESET_ID != "nix-gnu-release-shared-size")]]; then
368+
($PRESET_ID != "nix-gnu-release-shared")]]; then
372369
display_error "Unsupported preset: $PRESET_ID"
373370
display_error "Supported values are:"
374371
display_error " nix-base"
375372
display_error " gnu-debug"
376373
display_error " gnu-release"
377374
display_error " static"
378375
display_error " shared"
379-
display_error " gnu-optimized-size"
380376
display_error " nix-gnu-debug-static"
381377
display_error " nix-gnu-debug-shared"
382378
display_error " nix-gnu-release-static"
383379
display_error " nix-gnu-release-shared"
384-
display_error " nix-gnu-release-static-size"
385-
display_error " nix-gnu-release-shared-size"
386380
display_error ""
387381
display_help
388382
exit 1
@@ -391,11 +385,7 @@ handle_custom_options()
391385
BASE_PRESET_ID="$PRESET_ID"
392386
REPO_PRESET[libbitcoin-protocol]="$PRESET_ID"
393387
display_message "REPO_PRESET[libbitcoin-protocol]=${REPO_PRESET[libbitcoin-protocol]}"
394-
if [[ $WITH_ICU ]]; then
395-
REPO_PRESET[libbitcoin-system]="$BASE_PRESET_ID-with_icu"
396-
else
397-
REPO_PRESET[libbitcoin-system]="$BASE_PRESET_ID-without_icu"
398-
fi
388+
REPO_PRESET[libbitcoin-system]="$BASE_PRESET_ID"
399389
display_message "REPO_PRESET[libbitcoin-system]=${REPO_PRESET[libbitcoin-system]}"
400390

401391
CUMULATIVE_FILTERED_ARGS=""

0 commit comments

Comments
 (0)