Merge branch 'master' into copy-endpoint

project-chip · Oct 22, 2024 · c0f4626 · c0f4626
2 parents 32e9c39 + 3ef94ba
commit c0f4626
Show file tree

Hide file tree

Showing 12 changed files with 765 additions and 87 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -210,15 +210,9 @@ jobs:
  - name: Build & Release for Windows / Mac universal binary on macOS
  if: startsWith(matrix.os, 'macos')
  run: |
- npm run pack:win
- npm run pkg:win
- ls ./dist/
- npm run pack:cli:win
+ node src-script/build-release-package.js --platform w
 
- npm run pack:mac
- npm run pkg:mac
- ls ./dist/
- npm run pack:cli:mac
+ node src-script/build-release-package.js --platform m
 
  env:
  GH_TOKEN: ${{ secrets.github_token }}
@@ -230,10 +224,7 @@ jobs:
  - name: Build & Release for Linux
  if: startsWith(matrix.os, 'ubuntu')
  run: |
- npm run pack:linux
- npm run pkg:linux
- ls ./dist/
- npm run pack:cli:linux
+ node src-script/build-release-package.js --platform l
 
  mv dist/zap-linux-amd64.deb dist/zap-linux-x64.deb
  mv dist/zap-linux-x86_64.rpm dist/zap-linux-x64.rpm

diff --git a/docs/development-instructions.md b/docs/development-instructions.md
@@ -99,26 +99,27 @@ npm run apidoc
 
 See [Configuring quasar.conf.js](https://quasar.dev/quasar-cli/quasar-conf-js).
 
+**Building Release Packages locally**
+
 **Build & Release for Windows / Mac universal binary on macOS:**
 
-```npm run pack:win
- npm run pkg:win
- ls ./dist/
- npm run pack:cli:win
+```
+npm run dist:win \\ Windows
 
- npm run pack:mac
- npm run pkg:mac
- ls ./dist/
- npm run pack:cli:mac
+npm run dist:mac \\ Mac
 ```
 
 **Build & Release for Linux:**
 
-```npm run pack:linux
- npm run pkg:linux
- ls ./dist/
- npm run pack:cli:linux
+```
+npm run dist:linux
+```
+
+Running the following will detect and build for the os user's machine is on.
+
+```
+npm run dist
 
- mv dist/zap-linux-amd64.deb dist/zap-linux-x64.deb
- mv dist/zap-linux-x86_64.rpm dist/zap-linux-x64.rpm
 ```
+
+All release packages built will be found at `dist/release` and any other files from the build process will be found at `dist`.
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
  "zapall": "node src-script/zap-start.js --logToStdout --zcl ./test/resource/meta/zcl.json --zcl ./zcl-builtin/silabs/zcl.json --zcl ./zcl-builtin/matter/zcl.json --gen ./test/gen-template/zigbee/gen-templates.json --gen ./test/gen-template/matter/gen-test.json --gen ./test/resource/meta/gen-test.json",
  "zapmultiprotocol": "node src-script/zap-start.js --logToStdout --zcl ./zcl-builtin/silabs/zcl.json --zcl ./zcl-builtin/matter/zcl-with-test-extensions.json --gen ./test/gen-template/zigbee/gen-templates.json --gen ./test/gen-template/matter/gen-test.json",
  "zapzigbee": "node src-script/zap-start.js --logToStdout --zcl ./zcl-builtin/silabs/zcl.json --gen ./test/gen-template/zigbee/gen-templates.json",
- "zapmatter": "node src-script/zap-start.js --logToStdoutc --zcl ./zcl-builtin/matter/zcl.json --gen ./test/gen-template/matter/gen-test.json",
+ "zapmatter": "node src-script/zap-start.js --logToStdout --zcl ./zcl-builtin/matter/zcl.json --gen ./test/gen-template/matter/gen-test.json",
  "zapmeta": "node src-script/zap-start.js --logToStdout --zcl ./test/resource/meta/zcl.json --gen ./test/resource/meta/gen-test.json --in ./test/resource/test-meta.zap",
  "zaphelp": "node src-script/zap-start.js --help",
  "zap-dotdot": "node src-script/zap-start.js --logToStdout --zcl ./zcl-builtin/dotdot/library.xml -g ./test/gen-template/dotdot/dotdot-templates.json",
@@ -114,6 +114,11 @@
  "pkg-use-local-fork": "node ../pkg/lib-es5/bin.js -t node18-linux-x64 --output dist/zap-linux --compress GZip --options max-old-space-size=4096 .",
  "pkg:win": "npx pkg -t node18-win-x64,node18-win-arm64 --public --no-bytecode --output dist/zap-win --compress GZip --options max-old-space-size=4096 .",
  "pkg:mac": "npx pkg -t node18-macos-x64 --output dist/zap-macos --compress GZip --options max-old-space-size=4096 .",
+ "dist": "node src-script/build-release-package.js --output dist/release",
+ "dist:mac": "node src-script/build-release-package.js --platform m --output dist/release",
+ "dist:win": "node src-script/build-release-package.js --platform w --output dist/release",
+ "dist:linux": "node src-script/build-release-package.js --platform l --output dist/release",
+ "dist:all": "node src-script/build-release-package.js --platform mwl --output dist/release",
  "mattersdk": "node src-script/zap-start.js regenerateSdk --sdk ~/git/matter/scripts/tools/sdk.json",
  "metasdk": "node src-script/zap-start.js regenerateSdk --sdk test/resource/meta/sdk.json",
  "zip": "node ./src-script/7zip-bin-wrapper.js"