fix: vendor/osx/7za seems to be broken

Closes #296

Author: develar

.travis.yml

@@ -28,12 +28,13 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gnu-tar dpkg libicns graphicsmagick git-lfs; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git lfs pull; fi
   - gem install --no-rdoc --no-ri fpm
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -L https://github.com/github/git-lfs/releases/download/v1.1.2/git-lfs-linux-amd64-1.1.2.tar.gz | tar -xz; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git-lfs-1.1.2/git-lfs pull; fi
 
 install:
 - nvm install $NODE_VERSION
 - npm install npm -g
 - npm prune
-- npm install Microsoft/TypeScript
 - npm install
 
 script:

docs/multi-platform-build.md

@@ -31,9 +31,26 @@ gem install fpm
 ## Linux
 To build app in distributable format for Linux:
 ```
-sudo apt-get install icnsutils graphicsmagick
+sudo apt-get install ruby-dev gcc make icnsutils graphicsmagick
+gem install fpm
 ```
 
+To build app in distributable format for Windows on Linux:
+* Install Wine:
+   ```
+  sudo add-apt-repository ppa:ubuntu-wine/ppa
+  sudo apt-get update
+  sudo apt-get install wine1.8 winetricks
+  winetricks -q vcrun2013
+   ```
+* Install [Mono](http://www.mono-project.com/docs/getting-started/install/linux/#usage):
+   ```
+   sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+   echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
+   sudo apt-get update
+   sudo apt-get install mono-complete
+  ```
+
 ## Windows
 
 Not documented yet.

package.json

@@ -5,8 +5,7 @@
   "main": "out/index.js",
   "files": [
     "out",
-    "templates",
-    "vendor"
+    "templates"
   ],
   "bin": {
     "build": "./out/build-cli.js",
@@ -55,12 +54,11 @@
   "dependencies": {
     "bluebird": "^3.3.4",
     "command-line-args": "^2.1.6",
-    "electron-packager": "^6.0.0",
-    "electron-winstaller-fixed": "^2.0.6-beta.7",
+    "electron-packager": "^6.0.1",
+    "electron-winstaller-fixed": "^2.0.6-beta.8",
     "fs-extra": "^0.26.7",
     "fs-extra-p": "^0.2.0",
     "globby": "^4.0.0",
-    "gm": "^1.21.1",
     "hosted-git-info": "^2.1.4",
     "image-size": "^0.5.0",
     "lodash.template": "^4.2.4",
@@ -69,7 +67,8 @@
     "progress-stream": "^1.2.0",
     "read-package-json": "^2.0.3",
     "source-map-support": "^0.4.0",
-    "tmp": "0.0.28"
+    "tmp": "0.0.28",
+    "7zip-bin": "^0.0.3"
   },
   "optionalDependencies": {
     "appdmg": "^0.3.6"
@@ -90,7 +89,7 @@
     "ts-babel": "^0.6.9",
     "tsconfig-glob": "^0.4.3",
     "tslint": "next",
-    "typescript": "^1.9.0-dev.20160405",
+    "typescript": "^1.9.0-dev.20160408",
     "validate-commit-msg": "^2.5.0"
   },
   "babel": {

src/builder.ts

@@ -40,7 +40,7 @@ export async function build(originalOptions?: BuildOptions): Promise<void> {
     options.dist = true
   }
   else if (options.dist === undefined) {
-    options.dist = lifecycleEvent === "dist" || lifecycleEvent === "build" || lifecycleEvent.startsWith("dist:")
+    options.dist = lifecycleEvent === "dist" || lifecycleEvent === "build" || (lifecycleEvent != null && lifecycleEvent.startsWith("dist:"))
   }
 
   let isPublishOptionGuessed = false

src/linuxPackager.ts

@@ -5,7 +5,6 @@ import { Platform, LinuxBuildOptions } from "./metadata"
 import { dir as _tpmDir, TmpOptions } from "tmp"
 import { exec, log } from "./util"
 import { outputFile, readFile, readdir } from "fs-extra-p"
-import { State as Gm } from "gm"
 const template = require("lodash.template")
 
 //noinspection JSUnusedLocalSymbols
@@ -100,16 +99,11 @@ Icon=${this.metadata.name}
     const output = outputs[0].toString()
     log(output)
 
-    const gm = require("gm")
-
     const imagePath = path.join(tempDir, "icon_256x256x32.png")
 
     function resize(size: number): BluebirdPromise<any> {
-      return new BluebirdPromise((resolve, reject) => {
-        (<Gm>gm(imagePath))
-          .resize(size, size)
-          .write(path.join(tempDir, `icon_${size}x${size}x32.png`), error => error == null ? resolve() : reject(error))
-      })
+      const sizeArg = `${size}x${size}`
+      return exec("gm", ["convert", "-size", sizeArg, imagePath, "-resize", sizeArg, path.join(tempDir, `icon_${size}x${size}x32.png`)])
     }
 
     const promises: Array<Promise<any>> = [resize(24), resize(96)]

src/macPackager.ts

@@ -5,6 +5,7 @@ import { Promise as BluebirdPromise } from "bluebird"
 import { log, spawn } from "./util"
 import { createKeychain, deleteKeychain, CodeSigningInfo, generateKeychainName, sign } from "./codeSign"
 import { stat } from "fs-extra-p"
+import { path7za } from "7zip-bin"
 
 //noinspection JSUnusedLocalSymbols
 const __awaiter = require("./awaiter")
@@ -112,7 +113,7 @@ export default class MacPackager extends PlatformPackager<OsXBuildOptions> {
     }
     args.push(resultPath, this.appName + ".app")
 
-    return spawn(path.join(__dirname, "..", "vendor", "osx", "7za"), args, {
+    return spawn(path7za, args, {
       cwd: outDir,
       stdio: ["ignore", "ignore", "inherit"],
     })

src/util.ts

@@ -35,7 +35,7 @@ export function installDependencies(appDir: string, electronVersion: string, arc
   let npmExecPath = process.env.npm_execpath || process.env.NPM_CLI_JS
   const npmExecArgs = [command, "--production"]
   if (npmExecPath == null) {
-    npmExecPath = "npm"
+    npmExecPath = process.platform === "win32" ? "npm.cmd" : "npm"
   }
   else {
     npmExecArgs.unshift(npmExecPath)

test/README.md

@@ -1,16 +1,4 @@
-# Running Windows tests on OS X
-
-```
-brew install Caskroom/cask/xquartz wine mono
-```
-
-# Running Linux tests on OS X
-Do not use OS X bundled Ruby. Install using `brew`.
-
-```
-brew install ruby gnu-tar dpkg libicns graphicsmagick
-gem install fpm
-```
+In addition to [required system packages](./multi-platform-build.md), on OS X `dpkg` is required to run Linux tests: `brew install dpkg`
 
 # Inspect output if test uses temporary directory
 Set environment variable `TEST_APP_TMP_DIR` (e.g. `/tmp/electron-builder-test`).

test/fixtures/test-app-one/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "TestApp",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "homepage": "http://foo.example.com",
   "description": "Test Application",
   "scripts": {
@@ -10,15 +10,12 @@
   "author": "Foo Bar <foo@example.com>",
   "license": "MIT",
   "devDependencies": {
-    "electron-prebuilt": "^0.37.3"
+    "electron-prebuilt": "^0.37.5"
   },
   "build": {
     "app-bundle-id": "your.id",
     "app-category-type": "your.app.category.type",
     "iconUrl": "https://raw.githubusercontent.com/szwacz/electron-boilerplate/master/resources/windows/icon.ico",
-    "compression": "store",
-    "win": {
-      "title": "My App"
-    }
+    "compression": "store"
   }
 }

test/fixtures/test-app/app/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "TestApp",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Test Application",
   "author": "Foo Bar",
   "homepage": "https://github.com/atom/electron-quick-start#readme",