app-builder-lib 22.10.1 → 22.10.5

package/scheme.json

@@ -1304,6 +1304,9 @@
             "string"
           ]
         },
+        "defaultArch": {
+          "type": "string"
+        },
         "description": {
           "description": "As [description](/configuration/configuration#Metadata-description) from application package.json, but allows you to specify different for Linux.",
           "type": [
@@ -1341,7 +1344,7 @@
           "description": "The executable parameters. Pass to executableName"
         },
         "executableName": {
-          "description": "The executable name. Defaults to `productName`.\nCannot be specified per target, allowed only in the `linux`.",
+          "description": "The executable name. Defaults to `productName`.",
           "type": [
             "null",
             "string"
@@ -1942,6 +1945,9 @@
           "description": "Whether a dark mode is supported. If your app does have a dark mode, you can make your app follow the system-wide dark mode setting.",
           "type": "boolean"
         },
+        "defaultArch": {
+          "type": "string"
+        },
         "detectUpdateChannel": {
           "default": true,
           "description": "Whether to infer update channel from application version pre-release components. e.g. if version `0.12.1-alpha.1`, channel will be set to `alpha`. Otherwise to `latest`.",
@@ -1989,6 +1995,13 @@
             "string"
           ]
         },
+        "executableName": {
+          "description": "The executable name. Defaults to `productName`.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
         "extendInfo": {
           "description": "The extra entries for `Info.plist`."
         },
@@ -2524,6 +2537,9 @@
           "description": "Whether a dark mode is supported. If your app does have a dark mode, you can make your app follow the system-wide dark mode setting.",
           "type": "boolean"
         },
+        "defaultArch": {
+          "type": "string"
+        },
         "detectUpdateChannel": {
           "default": true,
           "description": "Whether to infer update channel from application version pre-release components. e.g. if version `0.12.1-alpha.1`, channel will be set to `alpha`. Otherwise to `latest`.",
@@ -2571,6 +2587,13 @@
             "string"
           ]
         },
+        "executableName": {
+          "description": "The executable name. Defaults to `productName`.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
         "extendInfo": {
           "description": "The extra entries for `Info.plist`."
         },
@@ -4515,7 +4538,14 @@
           ]
         },
         "layout": {
-          "type": "object",
+          "anyOf": [
+            {
+              "typeof": "function"
+            },
+            {
+              "type": "null"
+            }
+          ],
           "description": "Specifies any files to make accessible from locations such as `/usr`, `/var`, and `/etc`. See [snap layouts](https://snapcraft.io/docs/snap-layouts) to learn more."
         },
         "mimeTypes": {
@@ -4554,7 +4584,7 @@
               "type": "null"
             }
           ],
-          "description": "The list of [plugs](https://snapcraft.io/docs/reference/interfaces).\nDefaults to `[\"desktop\", \"desktop-legacy\", \"home\", \"x11\", \"unity7\", \"browser-support\", \"network\", \"gsettings\", \"audio-playback\", \"pulseaudio\", \"opengl\"]`.\n\nIf list contains `default`, it will be replaced to default list, so, `[\"default\", \"foo\"]` can be used to add custom plug `foo` in addition to defaults.\n\nAdditional attributes can be specified using object instead of just name of plug:\n```\n[\n  {\n    \"browser-sandbox\": {\n      \"interface\": \"browser-support\",\n      \"allow-sandbox\": true\n    },\n  },\n  \"another-simple-plug-name\"\n]\n```"
+          "description": "The list of [plugs](https://snapcraft.io/docs/reference/interfaces).\nDefaults to `[\"desktop\", \"desktop-legacy\", \"home\", \"x11\", \"unity7\", \"browser-support\", \"network\", \"gsettings\", \"audio-playback\", \"pulseaudio\", \"opengl\"]`.\n\nIf list contains `default`, it will be replaced to default list, so, `[\"default\", \"foo\"]` can be used to add custom plug `foo` in addition to defaults.\n\nAdditional attributes can be specified using object instead of just name of plug:\n```\n[\n {\n   \"browser-sandbox\": {\n     \"interface\": \"browser-support\",\n     \"allow-sandbox\": true\n   },\n },\n \"another-simple-plug-name\"\n]\n```"
         },
         "publish": {
           "anyOf": [
@@ -4640,7 +4670,7 @@
               "type": "null"
             }
           ],
-          "description": "The list of [slots](https://snapcraft.io/docs/reference/interfaces).\n\nAdditional attributes can be specified using object instead of just name of slot:\n```\n[\n  {\n    \"mpris\": {\n      \"name\": \"chromium\"\n    },\n  }\n]\n\nIn case you want your application to be a compliant MPris player, you will need to definie\nThe mpris slot with \"chromium\" name.\nThis electron has it [hardcoded](https://source.chromium.org/chromium/chromium/src/+/master:components/system_media_controls/linux/system_media_controls_linux.cc;l=51;bpv=0;bpt=1),\nand we need to pass this name so snap [will allow it](https://forum.snapcraft.io/t/unable-to-use-mpris-interface/15360/7) in strict confinement."
+          "description": "The list of [slots](https://snapcraft.io/docs/reference/interfaces).\n\nAdditional attributes can be specified using object instead of just name of slot:\n```\n[\n {\n   \"mpris\": {\n     \"name\": \"chromium\"\n   },\n }\n]\n\nIn case you want your application to be a compliant MPris player, you will need to definie\nThe mpris slot with \"chromium\" name.\nThis electron has it [hardcoded](https://source.chromium.org/chromium/chromium/src/+/master:components/system_media_controls/linux/system_media_controls_linux.cc;l=51;bpv=0;bpt=1),\nand we need to pass this name so snap [will allow it](https://forum.snapcraft.io/t/unable-to-use-mpris-interface/15360/7) in strict confinement."
         },
         "stagePackages": {
           "anyOf": [
@@ -4960,6 +4990,7 @@
                   "arm64",
                   "armv7l",
                   "ia32",
+                  "universal",
                   "x64"
                 ],
                 "type": "string"
@@ -4971,6 +5002,7 @@
                 "arm64",
                 "armv7l",
                 "ia32",
+                "universal",
                 "x64"
               ],
               "type": "string"
@@ -5102,6 +5134,9 @@
             "string"
           ]
         },
+        "defaultArch": {
+          "type": "string"
+        },
         "detectUpdateChannel": {
           "default": true,
           "description": "Whether to infer update channel from application version pre-release components. e.g. if version `0.12.1-alpha.1`, channel will be set to `alpha`. Otherwise to `latest`.",
@@ -5114,6 +5149,13 @@
             "string"
           ]
         },
+        "executableName": {
+          "description": "The executable name. Defaults to `productName`.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
         "extraFiles": {
           "anyOf": [
             {
@@ -5678,6 +5720,9 @@
       ],
       "description": "Debian package options."
     },
+    "defaultArch": {
+      "type": "string"
+    },
     "detectUpdateChannel": {
       "default": true,
       "description": "Whether to infer update channel from application version pre-release components. e.g. if version `0.12.1-alpha.1`, channel will be set to `alpha`. Otherwise to `latest`.",
@@ -5709,8 +5754,15 @@
       "type": "boolean"
     },
     "electronDist": {
-      "description": "The path to custom Electron build (e.g. `~/electron/out/R`).",
-      "type": "string"
+      "anyOf": [
+        {
+          "typeof": "function"
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "description": "Returns the path to custom Electron build (e.g. `~/electron/out/R`). Zip files must follow the pattern `electron-v${version}-${platformName}-${arch}.zip`, otherwise it will be assumed to be an unpacked Electron app directory"
     },
     "electronDownload": {
       "$ref": "#/definitions/ElectronDownloadOptions",
@@ -5730,6 +5782,13 @@
         "string"
       ]
     },
+    "executableName": {
+      "description": "The executable name. Defaults to `productName`.",
+      "type": [
+        "null",
+        "string"
+      ]
+    },
     "extends": {
       "description": "The name of a built-in configuration preset or path to config file (relative to project dir). Currently, only `react-cra` is supported.\n\nIf `react-scripts` in the app dependencies, `react-cra` will be set automatically. Set to `null` to disable automatic detection.",
       "type": [

package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh

@@ -58,7 +58,7 @@
       DetailPrint `Closing running "${PRODUCT_NAME}"...`
 
       # https://github.com/electron-userland/electron-builder/issues/2516#issuecomment-372009092
-      nsExec::Exec `taskkill /t /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"` $R0
+      nsExec::Exec `taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"` $R0
       # to ensure that files are not "in-use"
       Sleep 300
 
@@ -66,7 +66,7 @@
       ${if} $R0 == 0
         # wait to give a chance to exit gracefully
         Sleep 1000
-        nsExec::Exec `taskkill /f /t /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"` $R0
+        nsExec::Exec `taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"` $R0
         ${If} $R0 != 0
           DetailPrint `Waiting for "${PRODUCT_NAME}" to close (taskkill exit code $R0).`
           Sleep 2000
@@ -74,4 +74,4 @@
       ${endIf}
     ${endIf}
   ${endIf}
-!macroend
+!macroend

package/templates/nsis/include/extractAppPackage.nsh

@@ -4,30 +4,52 @@
   !endif
 
   Var /GLOBAL packageArch
-
-  !ifdef APP_64
-  	!ifdef APP_ARM64
-      StrCpy $packageArch "ARM64"
-	  !else
-      StrCpy $packageArch "64"
-	  !endif
-
-    !insertmacro compute_files_for_current_arch
-  !else
-    !insertmacro ia32_app_files
-  !endif
+  
+  !insertmacro identify_package
+  !insertmacro compute_files_for_current_arch
 
   !ifdef COMPRESS
     SetCompress "${COMPRESS}"
   !endif
 
-  !ifdef ZIP_COMPRESSION
-    nsisunz::Unzip "$PLUGINSDIR\app-$packageArch.zip" "$INSTDIR"
-  !else
-    !insertmacro extractUsing7za "$PLUGINSDIR\app-$packageArch.7z"
+  !insertmacro decompress
+  !insertmacro custom_files_post_decompression
+!macroend
+
+!macro identify_package 
+  !ifdef APP_32
+    StrCpy $packageArch "32"
+  !endif
+  !ifdef APP_64
+    ${if} ${RunningX64}
+    ${OrIf} ${IsNativeARM64}
+      StrCpy $packageArch "64"
+    ${endif}
+  !endif
+  !ifdef APP_ARM64
+    ${if} ${IsNativeARM64}
+      StrCpy $packageArch "ARM64"
+    ${endif}
   !endif
+!macroend
+
+!macro compute_files_for_current_arch
+  ${if} $packageArch == "ARM64"
+    !ifdef APP_ARM64
+      !insertmacro arm64_app_files
+    !endif
+  ${elseif} $packageArch == "64"
+    !ifdef APP_64
+      !insertmacro x64_app_files
+    !endif
+  ${else}
+    !ifdef APP_32
+      !insertmacro ia32_app_files
+    !endif
+  ${endIf}
+!macroend
 
-  # after decompression
+!macro custom_files_post_decompression
   ${if} $packageArch == "ARM64"
     !ifmacrodef customFiles_arm64
       !insertmacro customFiles_arm64
@@ -43,36 +65,6 @@
   ${endIf}
 !macroend
 
-!macro compute_files_for_current_arch
-  !ifdef APP_32
-    !ifdef APP_ARM64
-      ${if} ${IsNativeARM64}
-        !insertmacro arm64_app_files
-      ${elseif} ${RunningX64}
-        !insertmacro x64_app_files
-      ${else}
-        !insertmacro ia32_app_files
-      ${endIf}
-    !else
-      ${if} ${RunningX64}
-        !insertmacro x64_app_files
-      ${else}
-        !insertmacro ia32_app_files
-      ${endIf}
-    !endif
-  !else
-    !ifdef APP_ARM64
-      ${if} ${IsNativeARM64}
-        !insertmacro arm64_app_files
-      ${else}
-        !insertmacro x64_app_files
-      ${endIf}
-    !else
-      !insertmacro x64_app_files
-    !endif
-  !endif
-!macroend
-
 !macro arm64_app_files
   File /oname=$PLUGINSDIR\app-arm64.${COMPRESSION_METHOD} "${APP_ARM64}"
 !macroend
@@ -82,10 +74,17 @@
 !macroend
 
 !macro ia32_app_files
-  StrCpy $packageArch "32"
   File /oname=$PLUGINSDIR\app-32.${COMPRESSION_METHOD} "${APP_32}"
 !macroend
 
+!macro decompress
+  !ifdef ZIP_COMPRESSION
+    nsisunz::Unzip "$PLUGINSDIR\app-$packageArch.zip" "$INSTDIR"
+  !else
+    !insertmacro extractUsing7za "$PLUGINSDIR\app-$packageArch.7z"
+  !endif
+!macroend
+
 !macro extractUsing7za FILE
-  Nsis7z::Extract "${FILE}"
+    Nsis7z::Extract "${FILE}"
 !macroend