From 605c765ea29fa24f95edc952abb642c05719f55e Mon Sep 17 00:00:00 2001
From: Sven Jost <sven@wire.com>
Date: Thu, 1 Dec 2016 10:28:57 +0100
Subject: [PATCH 1/4] Different build tasks for different architectures

---
 Gruntfile.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index d796b93a485..7ddeec0f935 100755
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -259,5 +259,7 @@ module.exports = (grunt) ->
   grunt.registerTask 'win',        ['clean:win', 'update-keys', 'release-internal', 'electron:win_internal', 'create-windows-installer:internal']
   grunt.registerTask 'win-prod',   ['clean:win', 'update-keys', 'release-prod', 'electron:win_prod', 'create-windows-installer:prod']
 
-  grunt.registerTask 'linux',      ['clean:linux', 'update-keys', 'release-internal', 'shell']
-  grunt.registerTask 'linux-prod', ['clean:linux', 'update-keys', 'release-prod', 'shell']
+  grunt.registerTask 'linux-32',      ['clean:linux', 'update-keys', 'release-internal', 'shell:linux32']
+  grunt.registerTask 'linux-64',      ['clean:linux', 'update-keys', 'release-internal', 'shell:linux64']
+  grunt.registerTask 'linux-32-prod', ['clean:linux', 'update-keys', 'release-prod', 'shell:linux32']
+  grunt.registerTask 'linux-64-prod', ['clean:linux', 'update-keys', 'release-prod', 'shell:linux64']

From 39ab4f2983013dec38d38d6bafc69c83caef8484 Mon Sep 17 00:00:00 2001
From: Sven Jost <sven@wire.com>
Date: Thu, 1 Dec 2016 10:29:51 +0100
Subject: [PATCH 2/4] Update README on different architectures and grunt
 installation

---
 README.md | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 09836951a7d..c04e642614c 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,22 @@ Based on [Electron](http://electron.atom.io).
 
 1. Install [Node.js](https://nodejs.org/)
 2. Install [Yarn](https://yarnpkg.com) (`npm install -g yarn`)
+3. Install [Grunt](https://gruntjs.com) (`npm install -g grunt-cli`)
 
 ### Clone
 
 ```shell
 git clone https://github.com/wireapp/wire-desktop.git
 cd wire-desktop
+```
+
+### Compile
+
+```shell
 yarn
 ```
 
-### Start
+### Start for debugging/developing
 
 ```shell
 yarn start
@@ -46,7 +52,7 @@ yarn start
 yarn test
 ```
 
-### Tasks
+### Package
 
 ```shell
 # Build for macOS
@@ -55,6 +61,18 @@ grunt macos-prod
 # Build for Windows
 grunt win-prod
 
-# Build for Linux
-grunt linux-prod
+# Build for Windows 32-bit on a 64-bit system
+export npm_config_target_arch=ia32
+npm install
+grunt win-prod
+
+# Build for Linux 32-bit
+export npm_config_target_arch=ia32
+npm install
+grunt linux-prod-32
+
+# Build for Linux 64-bit
+export npm_config_target_arch=x64
+npm install
+grunt linux-prod-64
 ```

From 8b9ec8067c12073c127911df671d3b409321ff23 Mon Sep 17 00:00:00 2001
From: Sven Jost <sven@wire.com>
Date: Thu, 1 Dec 2016 15:51:42 +0100
Subject: [PATCH 3/4] Move spellchecker from optional to non-optional
 dependencies

---
 electron/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/electron/package.json b/electron/package.json
index fc6d6fd55a3..9ba504b4b62 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -21,10 +21,10 @@
     "open-graph": "0.2.1",
     "raygun": "0.9.0",
     "request": "2.76.0",
-    "winston": "https://github.com/wireapp/winston.git#2.2.0-e"
+    "winston": "https://github.com/wireapp/winston.git#2.2.0-e",
+    "spellchecker": "3.3.1"
   },
   "optionalDependencies": {
     "node-addressbook": "https://github.com/wireapp/node-addressbook.git#1.0.1",
-    "spellchecker": "3.3.1"
   }
 }

From 72412b68be8144a0ed2965c45213116066dcc526 Mon Sep 17 00:00:00 2001
From: Sven Jost <sven@wire.com>
Date: Thu, 1 Dec 2016 18:17:40 +0100
Subject: [PATCH 4/4] Sort dependencies alphabetically

---
 electron/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/electron/package.json b/electron/package.json
index 9ba504b4b62..c13ba8bdb76 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -21,10 +21,10 @@
     "open-graph": "0.2.1",
     "raygun": "0.9.0",
     "request": "2.76.0",
-    "winston": "https://github.com/wireapp/winston.git#2.2.0-e",
-    "spellchecker": "3.3.1"
+    "spellchecker": "3.3.1",
+    "winston": "https://github.com/wireapp/winston.git#2.2.0-e"
   },
   "optionalDependencies": {
-    "node-addressbook": "https://github.com/wireapp/node-addressbook.git#1.0.1",
+    "node-addressbook": "https://github.com/wireapp/node-addressbook.git#1.0.1"
   }
 }