Skip to content

Commit ff34cba

Browse files
committed
zephyr don't add strips "-s" to xsl if no strips defined. clean comment warning
1 parent 2c1f832 commit ff34cba

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

build/devices/zephyr/config/CMakeLists.txt.suffix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# --- suffix file
22

3+
LIST(LENGTH mSTRIPS stripsLen)
4+
if (stripsLen GREATER 0)
5+
set(STRIPS -s ${mSTRIPS})
6+
endif()
7+
38
add_custom_command (
49
OUTPUT ${TMP_DIR}/mc.xs.c ${TMP_DIR}/mc.xs.h
510
DEPENDS ${mMODULES} ${mRESOURCES}
6-
COMMAND xsl -b ${MODULES_DIR} -o ${TMP_DIR} ${mPRELOADS} -s ${mSTRIPS} ${mCREATION} ${mMODULES}
11+
COMMAND xsl -b ${MODULES_DIR} -o ${TMP_DIR} ${mPRELOADS} ${STRIPS} ${mCREATION} ${mMODULES}
712
VERBATIM
813
)
914

tools/mcmanifest.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
10321032
var output = "${RESOURCES_DIR}" + tool.slash + target;
10331033
//@@
10341034
this.line("add_custom_command(");
1035-
this.line("\tCOMMENT copy resource file");
1035+
this.line("\tCOMMENT copy-resource-file");
10361036
this.line("\tOUTPUT " + output);
10371037
this.line("\tCOMMAND ${CMAKE_COMMAND} -E copy " + source + " " + output )
10381038
this.line("\tDEPENDS " + source);
@@ -1069,7 +1069,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
10691069
var target = result.target;
10701070
if (tool.platform == "zephyr") {
10711071
this.line("add_custom_command (");
1072-
this.line("\tCOMMENT buildclut " + target);
1072+
this.line("\tCOMMENT buildclut ");
10731073
this.line("\tOUTPUT ${RESOURCES_DIR}", tool.slash, target);
10741074
this.line("\tDEPENDS ", source);
10751075
this.line("\tCOMMAND buildclut ", source, " -o ${RESOURCES_DIR}");
@@ -1099,7 +1099,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
10991099
manifest = " $(MANIFEST)";
11001100
}
11011101
this.line("add_custom_command (");
1102-
this.line("\tCOMMENT bmpAlphaFiles " + target);
1102+
this.line("\tCOMMENT bmpAlphaFiles ");
11031103
this.line("\tOUTPUT ${RESOURCES_DIR}" + tool.slash + target);
11041104
this.line("\tDEPENDS ", source, " ", rotationPath, manifest);
11051105
this.write("\tCOMMAND png2bmp " + source + " -a");
@@ -1157,7 +1157,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
11571157
if (tool.platform == "zephyr") {
11581158
clutSource = result.clutName ? "${RESOURCES_DIR}" + tool.slash + result.clutName + ".cct" : null;
11591159
this.line("add_custom_command (");
1160-
this.line("\tCOMMENT bmpColorFiles " + target);
1160+
this.line("\tCOMMENT bmpColorFiles ");
11611161
this.write("\tOUTPUT ${RESOURCES_DIR}" + tool.slash + target);
11621162
if (alphaTarget)
11631163
this.write(" ${RESOURCES_DIR}" + tool.slash + alphaTarget);
@@ -1253,7 +1253,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
12531253
var bmpSource = "${RESOURCES_DIR}" + tool.slash + bmpTarget;
12541254
// this.echo(tool, "compressbmf ", target);
12551255
this.line("add_custom_command(");
1256-
this.line("\tCOMMENT bmpFontFiles " + target);
1256+
this.line("\tCOMMENT bmpFontFiles ");
12571257
this.line("\tOUTPUT ${RESOURCES_DIR}", tool.slash, target);
12581258
this.line("\tDEPENDS ", source, " ", bmpSource, " ", rotationPath);
12591259
this.line("\tCOMMAND compressbmf ", source, " -i ", bmpSource, " -o ${RESOURCES_DIR} -r ", tool.rotation);
@@ -1262,7 +1262,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
12621262
// this.echo(tool, "png2bmp ", bmpTarget);
12631263

12641264
this.line("add_custom_command(");
1265-
this.line("\tCOMMENT bmpFontFiles " + target);
1265+
this.line("\tCOMMENT bmpFontFiles ");
12661266
this.line("\tOUTPUT ", bmpSource);
12671267
this.line("\tDEPENDS ", pngSource, " ", rotationPath);
12681268
this.line("\tCOMMAND png2bmp ", pngSource, " -a -o ${RESOURCES_DIR} -r ", tool.rotation, " -t");
@@ -1289,7 +1289,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
12891289
if (tool.platform == "zephyr") {
12901290
bmpSource = "${RESOURCES_DIR}" + tool.slash + bmpTarget;
12911291
this.line("add_custom_command(");
1292-
this.line("\tCOMMENT bmpMaskFiles " + target);
1292+
this.line("\tCOMMENT bmpMaskFiles ");
12931293
this.line("\tOUTPUT ${RESOURCES_DIR}", tool.slash, target);
12941294
this.line("\tDEPENDS ", bmpSource);
12951295
// this.echo(tool, "rle4encode ", target);
@@ -1305,7 +1305,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
13051305
this.line("\tVERBATIM)");
13061306
this.line();
13071307
this.line("add_custom_command(");
1308-
this.line("\tCOMMENT bmpMaskFiles " + target);
1308+
this.line("\tCOMMENT bmpMaskFiles ");
13091309
this.line("\tOUTPUT ", bmpSource);
13101310
this.line("\tDEPENDS ", source, " ", rotationPath, manifest);
13111311
// this.echo(tool, "png2bmp ", bmpTarget);
@@ -1339,15 +1339,15 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
13391339
var temporary = target + result.quality;
13401340
if (tool.platform == "zephyr") {
13411341
this.line("add_custom_command(");
1342-
this.line("\tCOMMENT imageFiles+quality" + target);
1342+
this.line("\tCOMMENT imageFiles+quality");
13431343
this.line("\tOUTPUT ${RESOURCES_DIR}", tool.slash, temporary);
13441344
this.line("\tDEPENDS ", source, " ", rotationPath);
13451345
// this.echo(tool, "image2cs ", temporary);
13461346
this.line("\tCOMMAND image2cs ", source, " -o ${RESOURCES_DIR} -q ", result.quality, " -r ", tool.rotation);
13471347
this.line("\tVERBATIM)");
13481348
this.line();
13491349
this.line("add_custom_command(");
1350-
this.line("\tCOMMENT imageFile+quality " + target);
1350+
this.line("\tCOMMENT imageFile+quality ");
13511351
this.line("\tOUTPUT ${RESOURCES_DIR}", tool.slash, target);
13521352
this.line("\tDEPENDS ${RESOURCES_DIR}", tool.slash, temporary);
13531353
this.line("\tCOMMAND ${CMAKE_COMMAND} -E copy ${RESOURCES_DIR}" + tool.slash + temporary + " " + "${RESOURCES_DIR}" + tool.slash + target);
@@ -1369,7 +1369,7 @@ otadata, data, ota, , ${OTADATA_SIZE},`;
13691369
else {
13701370
if (tool.platform == "zephyr") {
13711371
this.line("add_custom_command(");
1372-
this.line("\tCOMMENT imageFiles " + target);
1372+
this.line("\tCOMMENT imageFiles ");
13731373
this.line("\tOUTPUT ${RESOURCES_DIR}", tool.slash, target);
13741374
this.line("\tDEPENDS ", source, " ", rotationPath);
13751375
// this.echo(tool, "image2cs ", target);
@@ -1548,7 +1548,7 @@ trace(`face: ${name}\n`);
15481548
}
15491549
this.line("add_custom_command (");
15501550
this.line("\tOUTPUT " + output);
1551-
this.line("\tCOMMENT mclocal strings");
1551+
this.line("\tCOMMENT mclocal");
15521552
this.write("\tCOMMAND mclocal");
15531553
for (var result of tool.stringFiles) {
15541554
this.write(" ");

0 commit comments

Comments
 (0)