Add custom build configuration (electron builder)

esrlabs · May 8, 2024 · 5f6441e · 5f6441e
1 parent 2045884
commit 5f6441e
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 63 deletions.
diff --git a/application/holder/electron.config.darwin.arm64.json b/application/holder/electron.config.darwin.arm64.json
@@ -0,0 +1,45 @@
+{
+    "asar": true,
+    "appId": "com.esrlabs.chipmunk",
+    "productName": "chipmunk",
+    "copyright": "Copyright © 2022 year ESR Labs",
+    "files": [
+        "./dist/**",
+        "./resources/**"
+    ],
+    "extraFiles": [
+        {
+            "from": "../apps/precompiled/updater/target/release",
+            "to": "Resources/bin",
+            "filter": [
+                "updater",
+                "updater.exe"
+            ]
+        }
+    ],
+    "directories": {
+        "output": "release",
+        "buildResources": "resources"
+    },
+    "asarUnpack": [
+        "resources"
+    ],
+    "npmRebuild": true,
+    "afterSign": "hooks/afterSign.js",
+    "mac": {
+        "category": "public.app-category.developer-tools",
+        "icon": "resources/mac/chipmunk.icns",
+        "target": [],
+        "binaries": [
+            "./release/mac-arm64/chipmunk.app/Contents/Resources/bin/updater"
+        ],
+        "extendInfo": {
+            "NSCameraUsageDescription": "",
+            "NSMicrophoneUsageDescription": ""
+        },
+        "hardenedRuntime": true,
+        "gatekeeperAssess": false,
+        "entitlements": "./resources/mac/entitlements.mac.plist",
+        "entitlementsInherit": "./resources/mac/entitlements.mac.plist"
+    }
+}
diff --git a/application/holder/electron.config.darwin.x86.json b/application/holder/electron.config.darwin.x86.json
@@ -0,0 +1,45 @@
+{
+    "asar": true,
+    "appId": "com.esrlabs.chipmunk",
+    "productName": "chipmunk",
+    "copyright": "Copyright © 2022 year ESR Labs",
+    "files": [
+        "./dist/**",
+        "./resources/**"
+    ],
+    "extraFiles": [
+        {
+            "from": "../apps/precompiled/updater/target/release",
+            "to": "Resources/bin",
+            "filter": [
+                "updater",
+                "updater.exe"
+            ]
+        }
+    ],
+    "directories": {
+        "output": "release",
+        "buildResources": "resources"
+    },
+    "asarUnpack": [
+        "resources"
+    ],
+    "npmRebuild": true,
+    "afterSign": "hooks/afterSign.js",
+    "mac": {
+        "category": "public.app-category.developer-tools",
+        "icon": "resources/mac/chipmunk.icns",
+        "target": [],
+        "binaries": [
+            "./release/mac/chipmunk.app/Contents/Resources/bin/updater"
+        ],
+        "extendInfo": {
+            "NSCameraUsageDescription": "",
+            "NSMicrophoneUsageDescription": ""
+        },
+        "hardenedRuntime": true,
+        "gatekeeperAssess": false,
+        "entitlements": "./resources/mac/entitlements.mac.plist",
+        "entitlementsInherit": "./resources/mac/entitlements.mac.plist"
+    }
+}
diff --git a/application/holder/electron.config.linux.json b/application/holder/electron.config.linux.json
@@ -0,0 +1,35 @@
+{
+    "asar": true,
+    "appId": "com.esrlabs.chipmunk",
+    "productName": "chipmunk",
+    "copyright": "Copyright © 2022 year ESR Labs",
+    "files": [
+        "./dist/**",
+        "./resources/**"
+    ],
+    "extraFiles": [
+        {
+            "from": "../apps/precompiled/updater/target/release",
+            "to": "Resources/bin",
+            "filter": [
+                "updater",
+                "updater.exe"
+            ]
+        }
+    ],
+    "directories": {
+        "output": "release",
+        "buildResources": "resources"
+    },
+    "asarUnpack": [
+        "resources"
+    ],
+    "npmRebuild": true,
+    "afterSign": "hooks/afterSign.js",
+    "linux": {
+        "icon": "resources/icons/png/256.png",
+        "executableName": "chipmunk",
+        "desktop": "resources/linux/chipmunk.desktop",
+        "target": []
+    }
+}
diff --git a/application/holder/electron.config.win.json b/application/holder/electron.config.win.json
@@ -0,0 +1,34 @@
+{
+    "asar": true,
+    "appId": "com.esrlabs.chipmunk",
+    "productName": "chipmunk",
+    "copyright": "Copyright © 2022 year ESR Labs",
+    "files": [
+        "./dist/**",
+        "./resources/**"
+    ],
+    "extraFiles": [
+        {
+            "from": "../apps/precompiled/updater/target/release",
+            "to": "Resources/bin",
+            "filter": [
+                "updater",
+                "updater.exe"
+            ]
+        }
+    ],
+    "directories": {
+        "output": "release",
+        "buildResources": "resources"
+    },
+    "asarUnpack": [
+        "resources"
+    ],
+    "npmRebuild": true,
+    "afterSign": "hooks/afterSign.js",
+    "win": {
+        "icon": "resources/win/chipmunk.ico",
+        "target": [],
+        "publisherName": "ESR Labs"
+    }
+}
diff --git a/application/holder/package.json b/application/holder/package.json
@@ -23,62 +23,6 @@
     ],
     "main": "./dist/app.js",
     "copyright": "Copyright © 2023 year ESR Labs",
-    "build": {
-        "asar": true,
-        "appId": "com.esrlabs.chipmunk",
-        "productName": "chipmunk",
-        "copyright": "Copyright © 2022 year ESR Labs",
-        "files": [
-            "./dist/**",
-            "./resources/**"
-        ],
-        "extraFiles": [
-            {
-                "from": "../apps/precompiled/updater/target/release",
-                "to": "Resources/bin",
-                "filter": [
-                    "updater",
-                    "updater.exe"
-                ]
-            }
-        ],
-        "directories": {
-            "output": "release",
-            "buildResources": "resources"
-        },
-        "asarUnpack": [
-            "resources"
-        ],
-        "npmRebuild": true,
-        "afterSign": "hooks/afterSign.js",
-        "mac": {
-            "category": "public.app-category.developer-tools",
-            "icon": "resources/mac/chipmunk.icns",
-            "target": [],
-            "binaries": [
-                "./release/mac/chipmunk.app/Contents/Resources/bin/updater"
-            ],
-            "extendInfo": {
-                "NSCameraUsageDescription": "",
-                "NSMicrophoneUsageDescription": ""
-            },
-            "hardenedRuntime": true,
-            "gatekeeperAssess": false,
-            "entitlements": "./resources/mac/entitlements.mac.plist",
-            "entitlementsInherit": "./resources/mac/entitlements.mac.plist"
-        },
-        "linux": {
-            "icon": "resources/icons/png/256.png",
-            "executableName": "chipmunk",
-            "desktop": "resources/linux/chipmunk.desktop",
-            "target": []
-        },
-        "win": {
-            "icon": "resources/win/chipmunk.ico",
-            "target": [],
-            "publisherName": "ESR Labs"
-        }
-    },
     "dependencies": {
         "commander": "^12.0.0",
         "glob": "9.3.5",
@@ -118,9 +62,10 @@
         "build": "node_modules/.bin/tsc -p tsconfig.json",
         "start": "npm run build-ts && npm run electron",
         "postinstall": "electron-builder install-app-deps",
-        "build-darwin": "node_modules/.bin/electron-builder --mac --dir",
-        "build-linux": "node_modules/.bin/electron-builder --linux --dir",
-        "build-win": "node_modules/.bin/electron-builder --win --dir",
+        "build-darwin-arm64": "node_modules/.bin/electron-builder --mac --dir --config=./electron.config.darwin.arm64.json",
+        "build-darwin-x86": "node_modules/.bin/electron-builder --mac --dir --config=./electron.config.darwin.x86.json",
+        "build-linux": "node_modules/.bin/electron-builder --linux --dir --config=./electron.config.linux.json",
+        "build-win": "node_modules/.bin/electron-builder --win --dir --config=./electron.config.win.json",
         "lint": "node_modules/.bin/eslint . --ext .ts --max-warnings=0",
         "check": "node_modules/.bin/tsc -p tsconfig.json --noemit"
     }

diff --git a/scripts/elements/release.rb b/scripts/elements/release.rb
@@ -15,14 +15,22 @@ def self.build_cmd
     Release.load_from_env
     if OS.mac?
       if ENV.key?('APPLEID') && ENV.key?('APPLEIDPASS') && !ENV.key?('SKIP_NOTARIZE')
-        './node_modules/.bin/electron-builder --mac --dir'
+        if OS.arm64? 
+          './node_modules/.bin/electron-builder --mac --dir --config=./electron.config.darwin.arm64.json'
+        else
+          './node_modules/.bin/electron-builder --mac --dir --config=./electron.config.darwin.x86.json'
+        end  
       else
-        './node_modules/.bin/electron-builder --mac --dir -c.mac.identity=null'
+        if OS.arm64? 
+          './node_modules/.bin/electron-builder --mac --dir --config=./electron.config.darwin.arm64.json -c.mac.identity=null'
+        else
+          './node_modules/.bin/electron-builder --mac --dir --config=./electron.config.darwin.x86.json -c.mac.identity=null'
+        end  
       end
     elsif OS.linux?
-      './node_modules/.bin/electron-builder --linux --dir'
+      './node_modules/.bin/electron-builder --linux --dir --config=./electron.config.linux.json'
     else
-      './node_modules/.bin/electron-builder --win --dir'
+      './node_modules/.bin/electron-builder --win --dir --config=./electron.config.win.json'
     end
   end