Skip to content
代码片段 群组 项目
未验证 提交 6e5e5a1d 编辑于 作者: Timotej Ecimovic's avatar Timotej Ecimovic 提交者: GitHub
浏览文件

Remove the references to zcl_config.zap from the apack.json. (#1027)

* Remove the references to zcl_config.zap from the apack.json.

* Add a no-op conversion.
上级 dd1e60f0
No related branches found
No related tags found
无相关合并请求
......@@ -64,7 +64,7 @@
"cmd": "$(zap-cli) generate --noUi --noServer -o ${generationOutput} --packageMatch fuzzy --zcl ${sdkRoot}/app/zcl/zcl-zap.json --zcl ${sdkRoot}/extension/matter_extension/src/app/zap-templates/zcl/zcl.json --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json --generationTemplate ${sdkRoot}/extension/matter_extension/src/app/zap-templates/app-templates.json --in ${contentFolder} --noLoadingFailure --appendGenerationSubdirectory"
},
"uc_upgrade": {
"cmd": "$(zap-cli) convert --noUi --noServer -o ${tempContentFolder}/zcl_config.zap --packageMatch fuzzy --zcl ${sdkRoot}/app/zcl/zcl-zap.json --zcl ${sdkRoot}/extension/matter_extension/src/app/zap-templates/zcl/zcl.json --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json --generationTemplate ${sdkRoot}/extension/matter_extension/src/app/zap-templates/app-templates.json --in ${tempContentFolder}/zcl_config.zap --results ${results} --noLoadingFailure --appendGenerationSubdirectory"
"cmd": "$(zap-cli) convert --noUi --noServer -o {name} --packageMatch fuzzy --zcl ${sdkRoot}/app/zcl/zcl-zap.json --zcl ${sdkRoot}/extension/matter_extension/src/app/zap-templates/zcl/zcl.json --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json --generationTemplate ${sdkRoot}/extension/matter_extension/src/app/zap-templates/app-templates.json --in ${tempContentFolder} --results ${results} --noLoadingFailure --appendGenerationSubdirectory"
},
"zapHelp": {
"cmd": "$(zap) --help"
......
......@@ -170,6 +170,15 @@ function gatherFiles(filesArg, options = { suffix: '.zap', doBlank: true }) {
return list
}
async function noopConvert(resultsFile, logger) {
if (resultsFile != null) {
logger(`😎 No-op conversion: ${resultsFile}`)
return writeConversionResultsFile(resultsFile)
} else {
logger(`😎 No-op, no result, conversion.`)
}
}
/**
* Perform file conversion.
*
......@@ -177,6 +186,12 @@ function gatherFiles(filesArg, options = { suffix: '.zap', doBlank: true }) {
* @param {*} output
*/
async function startConvert(argv, options) {
let noop = argv.noop === true
if (noop) {
return noopConvert(argv.results, options.logger)
}
let zapFiles = argv.zapFiles
let files = gatherFiles(zapFiles, { suffix: '.zap', doBlank: true })
if (files.length == 0) {
......@@ -257,18 +272,7 @@ async function startConvert(argv, options) {
try {
if (conversion_results != null)
await fsp.writeFile(
conversion_results,
YAML.stringify({
upgrade_results: [
{
message:
'Zigbee Cluster Configurator configuration has been successfully upgraded.',
status: 'automatic',
},
],
})
)
await writeConversionResultsFile(conversion_results)
options.logger(` 👉 write out: ${conversion_results}`)
} catch (error) {
options.logger(` ⚠️ failed to write out: ${conversion_results}`)
......@@ -280,6 +284,21 @@ async function startConvert(argv, options) {
}
}
async function writeConversionResultsFile(file) {
return fsp.writeFile(
file,
YAML.stringify({
upgrade_results: [
{
message:
'Zigbee Cluster Configurator configuration has been successfully upgraded.',
status: 'automatic',
},
],
})
)
}
/**
* Performs a full SDK regeneration.
*
......
......@@ -244,6 +244,11 @@ export function processCommandLineArguments(argv: string[]) {
desc: 'Disable query caching when accessing database',
type: 'boolean',
})
.option('noop', {
desc: 'If this flag is present, then conversion will not do anything, while reporting success.',
type: 'boolean',
deafult: false,
})
.usage('Usage: $0 <command> [options] ... [file.zap] ...')
.version(
`Version: ${zapVersion.version}\nFeature level: ${
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册