Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compile linux for different architectures separately #238

Closed
wants to merge 7 commits into from
Closed

Compile linux for different architectures separately #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
605c765
Different build tasks for different architectures
mythsunwind Dec 1, 2016
39ab4f2
Update README on different architectures and grunt installation
mythsunwind Dec 1, 2016
8b9ec80
Move spellchecker from optional to non-optional dependencies
mythsunwind Dec 1, 2016
72412b6
Sort dependencies alphabetically
mythsunwind Dec 1, 2016
75c2330
Merge branch 'master' into linux-spellcheck
lipis Dec 1, 2016
21ab97c
Merge branch 'master' into linux-spellcheck
lipis Dec 3, 2016
16b78bc
Merge branch 'master' into linux-spellcheck
lipis Dec 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Gruntfile.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
26 changes: 22 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,7 +52,7 @@ yarn start
yarn test
```

### Tasks
### Package

```shell
# Build for macOS
Expand All @@ -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
```
4 changes: 2 additions & 2 deletions electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"open-graph": "0.2.1",
"raygun": "0.9.0",
"request": "2.76.0",
"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",
"spellchecker": "3.3.1"
"node-addressbook": "https://github.com/wireapp/node-addressbook.git#1.0.1"
}
}