Skip to content

Commit c8733ef

Browse files
committed
Remove is-default and switch to default-configuration
1 parent 74fee06 commit c8733ef

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

repo_gen/generate_repo.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def create_latest(row, dir):
169169

170170
def create_latest_with_configurations(row, dir):
171171
name = row["name"]
172+
default_config = row["default-configuration"]
172173

173174
if "configurations" not in row:
174175
return ""
@@ -177,7 +178,7 @@ def create_latest_with_configurations(row, dir):
177178
for config_item in row["configurations"]:
178179
config = config_item["name"]
179180
config_name = f"{name}-{config}-latest"
180-
if config_item["is-default"]:
181+
if config == default_config:
181182
settings += config_setting_tpl.format(
182183
name=config_name,
183184
value=f"{name}",
@@ -231,10 +232,11 @@ def create_version_with_configurations(row, dir):
231232
settings = ""
232233
for version_item in row["versions"]:
233234
version = version_item["version"]
235+
default_config = row["default-configuration"]
234236
for config_item in row["configurations"]:
235237
config = config_item["name"]
236238
config_name = f"{name}-{config}-{version}"
237-
if config_item["is-default"]:
239+
if config == default_config:
238240
settings += config_setting_tpl.format(
239241
name=config_name,
240242
value=f"{name}-{version}",

repo_gen/runtimes.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
]
2020
}
2121
],
22+
"default-configuration": "shared",
2223
"configurations": [
2324
{
2425
"name": "shared",
25-
"is-default": true,
2626
"link_actions": [
2727
"-L{lib}",
2828
"-fuse-ld=lld",
@@ -36,7 +36,6 @@
3636
},
3737
{
3838
"name": "static",
39-
"is-default": false,
4039
"link_actions": [
4140
"-fuse-ld=lld",
4241
"{lib}/libc.a"

0 commit comments

Comments
 (0)