From 94ef35317b1b73736435790ef019372de7d24db0 Mon Sep 17 00:00:00 2001
From: Timotej Ecimovic <timotej.ecimovic@silabs.com>
Date: Thu, 31 Mar 2022 14:16:11 -0400
Subject: [PATCH] Correctly detect --version executable.
---
Jenkinsfile | 1 +
package.json | 1 +
src-script/zap-start.js | 5 ++++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0600a602..44587aa4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,6 +40,7 @@ pipeline
script
{
sh 'npm run version-stamp'
+ sh 'npm run version'
}
}
}
diff --git a/package.json b/package.json
index 66833d24..6e99911a 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
"self-check": "node src-script/zap-start.js selfCheck -g ./test/gen-template/zigbee/gen-templates.json",
"post-import": "node src-script/zap-start.js convert --postImportScript test/resource/test-script.js test/resource/three-endpoint-device.zap -o test.zap",
"analyze": "node src-script/zap-start.js analyze -z ./zcl-builtin/silabs/zcl.json -g ./test/gen-template/zigbee/gen-templates.json ./test/resource/three-endpoint-device.zap -o ./tmp",
+ "version": "node src-script/zap-start.js --version",
"gen": "node src-script/zap-generate.js --genResultFile --stateDirectory ~/.zap/gen -z ./zcl-builtin/silabs/zcl.json -g ./test/gen-template/zigbee/gen-templates.json -i ./test/resource/three-endpoint-device.zap -o ./tmp",
"gen2": "node src-script/zap-generate.js --genResultFile -z ./zcl-builtin/silabs/zcl.json -g ./test/gen-template/zigbee/gen-templates.json -i ./test/resource/generation-test-file-1.zap -o ./tmp",
"gen3": "node src-script/zap-generate.js --genResultFile --stateDirectory ~/.zap/gen3 -z ./zcl-builtin/dotdot/library.xml -g ./test/gen-template/zigbee/gen-templates.json -i ./test/resource/generation-test-file-1.zap -o ./tmp",
diff --git a/src-script/zap-start.js b/src-script/zap-start.js
index 86cbdc40..719b825c 100755
--- a/src-script/zap-start.js
+++ b/src-script/zap-start.js
@@ -50,7 +50,10 @@ scriptUtil
main = scriptUtil.mainPath(true)
break
}
- console.log(`Determining executable: ${args[0]}`)
+ if (args.includes('--version')) {
+ executable = 'node'
+ main = scriptUtil.mainPath(false)
+ }
let cmdArgs = [executable]
if (executable == 'node') {
--
GitLab