fix(AppImage): support for Tray icons

electron-userland · Sep 29, 2017 · a3240c2 · a3240c2
1 parent ba3d0bb
commit a3240c2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/docs/configuration/win.md b/docs/configuration/win.md
@@ -50,7 +50,7 @@ exports.default = async function(configuration) {
 
 #### How do create Parallels Windows 10 Virtual Machine?
 
-You don't need to have Windows 10 license. Free (expire after 90 days, but it is not a problem because no additional setup is required) is provided.
+You don't need to have Windows 10 license. Free is provided (expire after 90 days, but it is not a problem because no additional setup is required).
 
 1. Open Parallels Desktop.
 2. File -> New.
@@ -59,6 +59,8 @@ You don't need to have Windows 10 license. Free (expire after 90 days, but it is
 5. Select "Microsoft Edge on Windows 10".
 6. The next steps are general, see [Installing Windows on your Mac using Parallels Desktop](http://kb.parallels.com/4729) from "Step 6: Specify a name and location".
 
+Parallels Windows 10 VM will be used automatically to build AppX on macOS. No need even start VM — it will be started automatically on demand and suspended after build. No need to specify VM — it will be detected automatically (first Windows 10 VM will be used).
+
 #### How do create VirtualBox Windows 10 Virtual Machine?
 
 If you are not on macOS or don't want to buy [http://www.parallels.com/products/desktop/](Parallels Desktop), you can use free [VirtualBox](https://www.virtualbox.org/wiki/Downloads).

diff --git a/packages/electron-builder/src/targets/appImage.ts b/packages/electron-builder/src/targets/appImage.ts
@@ -85,7 +85,7 @@ export default class AppImageTarget extends Target {
 
     if (arch === Arch.x64 || arch === Arch.ia32) {
       // noinspection SpellCheckingInspection
-      args.push("-map", path.join(await getBinFromGithub("appimage-packages", "25-09-17", "op5TeNhsqVD6X1AC4QukdpNPk2+7b3TNmiVFQdgLmAdnk3xzC7ZxXqYWmvRzQjyoIV4aHbq/iYTpfWwjRwi5XQ=="), arch === Arch.x64 ? "x86_64-linux-gnu" : "i386-linux-gnu"), "/usr/lib")
+      args.push("-map", path.join(await getBinFromGithub("appimage-packages", "29-09-17", "sMMu1L1tL4QbzvGDxh1pNiIFC+ARnIOVvVdM0d6FBRtSDl0rHXgZMVLiuIAEz6+bJ+daHvYfLlPo1Y8zS6FXaQ=="), arch === Arch.x64 ? "x86_64-linux-gnu" : "i386-linux-gnu"), "/usr/lib")
     }
 
     args.push("-chown_r", "0", "/", "--")

diff --git a/packages/electron-builder/src/util/yarn.ts b/packages/electron-builder/src/util/yarn.ts
@@ -53,6 +53,9 @@ export function getGypEnv(frameworkInfo: DesktopFrameworkInfo, platform: string,
     npm_config_arch: arch,
     npm_config_target_arch: arch,
     npm_config_platform: platform,
+    // required for node-pre-gyp
+    npm_config_target_platform: platform,
+    npm_config_fallback_to_build: true,
     npm_config_build_from_source: buildFromSource,
     npm_config_devdir: getElectronGypCacheDir(),
   }
@@ -63,7 +66,7 @@ function installDependencies(appDir: string, options: RebuildOptions): Promise<a
   const arch = options.arch || process.arch
   const additionalArgs = options.additionalArgs
 
-  log(`Installing app dependencies for arch ${arch} to ${appDir}`)
+  log(`Installing app dependencies for ${platform}:${arch} to ${appDir}`)
   let execPath = process.env.npm_execpath || process.env.NPM_CLI_JS
   const execArgs = ["install", "--production"]
 

diff --git a/test/out/__snapshots__/BuildTest.js.snap b/test/out/__snapshots__/BuildTest.js.snap
@@ -529,7 +529,7 @@ Object {
                 },
               },
             },
-            "binding-v3.0.1-electron-v1.7-darwin-x64": Object {
+            "binding-v3.0.1-electron-v1.7-linux-x64": Object {
               "files": Object {
                 "lzma_native.node": Object {
                   "executable": true,

diff --git a/...ut/mac/__snapshots__/CodeSignTest.js.snap → ...mac/__snapshots__/macCodeSignTest.js.snap b/...ut/mac/__snapshots__/CodeSignTest.js.snap → ...mac/__snapshots__/macCodeSignTest.js.snap
diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
@@ -51,10 +51,11 @@ async function runTests() {
       args.push("winCodeSignTest")
       args.push("squirrelWindowsTest")
       args.push("nsisUpdaterTest")
+      args.push("macArchiveTest")
     }
     else if (circleNodeIndex === 1) {
       args.push("BuildTest")
-      args.push("mac.+")
+      args.push("macCodeSignTest")
       args.push("oneClickInstallerTest")
     }
     else if (circleNodeIndex === 2) {
@@ -71,6 +72,7 @@ async function runTests() {
       args.push("globTest")
       args.push("ignoreTest")
       args.push("extraMetadataTest")
+      args.push("macPackagerTest")
     }
     console.log(`Test files for node ${circleNodeIndex}: ${args.join(", ")}`)
   }

diff --git a/test/src/mac/CodeSignTest.ts → test/src/mac/macCodeSignTest.ts b/test/src/mac/CodeSignTest.ts → test/src/mac/macCodeSignTest.ts