Skip to content

Commit 0b837de

Browse files
committed
update unify_builder
support use '<key>=<val>' preprocessor format for AC5/AC6 armasm.exe improve makefile generator
1 parent a36cb28 commit 0b837de

12 files changed

Lines changed: 20 additions & 16 deletions

File tree

res/data/models/arm.v5.model.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,11 @@
346346
],
347347
"defines": {
348348
"type": "list",
349-
"command": "--pd "
349+
"command": "--pd ",
350+
"mapper": {
351+
"^\\s*([\\w\\$]+)=(.+)": "\"$1 SETA $2\"",
352+
"^\\s*([\\w\\$]+)\\s*$": "\"$1 SETA 1\""
353+
}
350354
},
351355
"use-microLIB": {
352356
"type": "selectable",

res/data/models/arm.v6.model.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,11 @@
501501
},
502502
"defines": {
503503
"type": "list",
504-
"command": "--pd "
504+
"command": "--pd ",
505+
"mapper": {
506+
"^\\s*([\\w\\$]+)=(.+)": "\"$1 SETA $2\"",
507+
"^\\s*([\\w\\$]+)\\s*$": "\"$1 SETA 1\""
508+
}
505509
},
506510
"use-microLIB": {
507511
"type": "selectable",

res/tools/darwin/unify_builder/arm64/unify_builder.deps.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
".NETCoreApp,Version=v6.0": {},
99
".NETCoreApp,Version=v6.0/osx-arm64": {
10-
"unify_builder/3.10.3": {
10+
"unify_builder/3.10.4": {
1111
"dependencies": {
1212
"CommandLineParser": "2.9.1",
1313
"ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
122122
}
123123
},
124124
"libraries": {
125-
"unify_builder/3.10.3": {
125+
"unify_builder/3.10.4": {
126126
"type": "project",
127127
"serviceable": false,
128128
"sha512": ""
512 Bytes
Binary file not shown.

res/tools/darwin/unify_builder/x86_64/unify_builder.deps.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
".NETCoreApp,Version=v6.0": {},
99
".NETCoreApp,Version=v6.0/osx-x64": {
10-
"unify_builder/3.10.3": {
10+
"unify_builder/3.10.4": {
1111
"dependencies": {
1212
"CommandLineParser": "2.9.1",
1313
"ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
122122
}
123123
},
124124
"libraries": {
125-
"unify_builder/3.10.3": {
125+
"unify_builder/3.10.4": {
126126
"type": "project",
127127
"serviceable": false,
128128
"sha512": ""
512 Bytes
Binary file not shown.

res/tools/linux/unify_builder/unify_builder.deps.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
".NETCoreApp,Version=v6.0": {},
99
".NETCoreApp,Version=v6.0/linux-x64": {
10-
"unify_builder/3.10.3": {
10+
"unify_builder/3.10.4": {
1111
"dependencies": {
1212
"CommandLineParser": "2.9.1",
1313
"ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
122122
}
123123
},
124124
"libraries": {
125-
"unify_builder/3.10.3": {
125+
"unify_builder/3.10.4": {
126126
"type": "project",
127127
"serviceable": false,
128128
"sha512": ""
512 Bytes
Binary file not shown.

res/tools/win32/unify_builder/unify_builder.deps.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
".NETCoreApp,Version=v6.0": {},
99
".NETCoreApp,Version=v6.0/win-x64": {
10-
"unify_builder/3.10.3": {
10+
"unify_builder/3.10.4": {
1111
"dependencies": {
1212
"CommandLineParser": "2.9.1",
1313
"ConsoleTableExt": "3.1.9",
@@ -122,7 +122,7 @@
122122
}
123123
},
124124
"libraries": {
125-
"unify_builder/3.10.3": {
125+
"unify_builder/3.10.4": {
126126
"type": "project",
127127
"serviceable": false,
128128
"sha512": ""
1 KB
Binary file not shown.

0 commit comments

Comments
 (0)