8000 ide integration fix by paulr34 · Pull Request #1587 · project-chip/zap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

ide integration fix #1587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 13, 2025
Merged

ide integration fix #1587

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
131c302
ide integration fix
paulr34 Apr 30, 2025
9bb3ee0
actually call the variable
paulr34 Apr 30, 2025
7b48229
replace all paths with sdkProvidedProperties
paulr34 Apr 30, 2025
43f90cb
fix another hardcoded path
paulr34 Apr 30, 2025
c67eb87
maintain backwards compatibility
paulr34 May 2, 2025
b5c3cdf
fix syntax error
paulr34 May 9, 2025
0349d60
only pass in one path
paulr34 May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions apack.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
"description": "Graphical configuration tool for application and libraries based on Zigbee Cluster Library.",
"path": [".", "node_modules/.bin/", "ZAP.app/Contents/MacOS"],
"requiredFeatureLevel": "apack.core:9",
"featureLevel": 106,
"featureLevel": 107,
"uc.triggerExtension": "zap",
"uc.sdkProvidedProperties": "zcl.matterZclJsonFile,zcl.matterTemplateJsonFile,zcl.zigbeeZclJsonFile,zcl.zigbeeTemplateJsonFile",
"executable": {
"zap:win32.x86_64": {
"exe": "zap.exe",
Expand Down Expand Up @@ -74,10 +75,10 @@
"cmd": "$(zap-cli) --version"
},
"uc_generate": {
"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 --upgradeZapFile"
"cmd": "$(zap-cli) generate --noUi --noServer -o ${generationOutput} --packageMatch fuzzy [ --zcl ${sdkRoot}/app/zcl/zcl-zap.json | --zcl ${zcl.zigbeeZclJsonFile} ] [ --zcl ${sdkRoot}/extension/matter_extension/src/app/zap-templates/zcl/zcl.json | --zcl ${zcl.matterZclJsonFile} ] [ --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json | --generationTemplate ${zcl.zigbeeTemplateJsonFile} ] [ --generationTemplate ${sdkRoot}/extension/matter_extension/src/app/zap-templates/app-templates.json | --generationTemplate ${zcl.matterTemplateJsonFile} ] --in ${contentFolder} --noLoadingFailure --appendGenerationSubdirectory --upgradeZapFile"
},
"uc_upgrade": {
"cmd": "$(zap-cli) upgrade --results ${results} -d ${tempContentFolder} --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 --noLoadingFailure"
"cmd": "$(zap-cli) upgrade --results ${results} -d ${tempContentFolder} [ --zcl ${sdkRoot}/app/zcl/zcl-zap.json | --zcl ${zcl.zigbeeZclJsonFile} ] [ --zcl ${sdkRoot}/extension/matter_extension/src/app/zap-templates/zcl/zcl.json | --zcl ${zcl.matterZclJsonFile} ] [ --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json | --generationTemplate ${zcl.zigbeeTemplateJsonFile} ] [ --generationTemplate ${sdkRoot}/extension/matter_extension/src/app/zap-templates/app-templates.json | --generationTemplate ${zcl.matterTemplateJsonFile} ] --noLoadingFailure"
},
"zapHelp": {
"cmd": "$(zap) --help"
Expand All @@ -86,7 +87,7 @@
"cmd": "$(zap) selfCheck"
},
"zapServer": {
"cmd": "$(zap) server --reuseZapInstance --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 --studioHttpPort ${studioHttpPort} --noLoadingFailure --appendGenerationSubdirectory"
"cmd": "$(zap) server --reuseZapInstance --packageMatch fuzzy [ --zcl ${sdkRoot}/app/zcl/zcl-zap.json | --zcl ${zcl.zigbeeZclJsonFile} ] [ --zcl ${sdkRoot}/extension/matter_extension/src/app/zap-templates/zcl/zcl.json | --zcl ${zcl.matterZclJsonFile} ] [ --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json | --generationTemplate ${zcl.zigbeeTemplateJsonFile} ] [ --generationTemplate ${sdkRoot}/extension/matter_extension/src/app/zap-templates/app-templates.json | --generationTemplate ${zcl.matterTemplateJsonFile} ] --studioHttpPort ${studioHttpPort} --noLoadingFailure --appendGenerationSubdirectory"
},
"zapStop": {
"cmd": "$(zap) stop --reuseZapInstance"
Expand All @@ -98,16 +99,16 @@
"cmd": "$(zap) server --reuseZapInstance --studioHttpPort ${studioHttpPort}"
},
"zapFull": {
"cmd": "$(zap) --showUrl --zcl ${sdkRoot}/app/zcl/zcl-zap.json"
"cmd": "$(zap) --showUrl [ --zcl ${sdkRoot}/app/zcl/zcl-zap.json | --zcl ${zcl.zigbeeZclJsonFile} ]"
},
"zapRegenSdk": {
"cmd": "$(zap) regenerateSdk --sdk ${sdkJsonFile}"
},
"zapIscConvert": {
"cmd": "$(zap) convert --noUi --noServer --noZapFileLog --zcl ${sdkRoot}/app/zcl/zcl-zap.json --out ${outFile} ${inFile}"
"cmd": "$(zap) convert --noUi --noServer --noZapFileLog [ --zcl ${sdkRoot}/app/zcl/zcl-zap.json | --zcl ${zcl.zigbeeZclJsonFile} ] --out ${outFile} ${inFile}"
},
"zapIscOpen": {
"cmd": "$(zap) --noServer --zcl ${sdkRoot}/app/zcl/zcl-zap.json --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-teplates.json ${inFile}"
"cmd": "$(zap) --noServer [ --zcl ${sdkRoot}/app/zcl/zcl-zap.json | --zcl ${zcl.zigbeeZclJsonFile} ] [ --generationTemplate ${sdkRoot}/protocol/zigbee/app/framework/gen-template/gen-templates.json | --generationTemplate ${zcl.zigbeeTemplateJsonFile} ] ${inFile}"
}
}
}
0