From c602d408f17599e724408f6d29deb54d5ee2f635 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Tue, 9 May 2017 10:48:14 +0200 Subject: [PATCH 1/8] Update electron-build-env to 0.2.0 (#633) --- electron/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/package.json b/electron/package.json index 6fa2cc83b1f..05fe06d1b3b 100644 --- a/electron/package.json +++ b/electron/package.json @@ -27,7 +27,7 @@ "winston": "https://github.com/wireapp/winston.git#2.2.0-e" }, "devDependencies": { - "electron-build-env": "0.1.0" + "electron-build-env": "0.2.0" }, "optionalDependencies": { "libsodium-neon": "2.0.6", From 52e06e7c5971c16f7bac9b29ec70891aad319274 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Tue, 9 May 2017 11:31:57 +0200 Subject: [PATCH 2/8] Update libsodium-neon to 2.1.0 (#634) --- electron/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/package.json b/electron/package.json index 05fe06d1b3b..1455810c393 100644 --- a/electron/package.json +++ b/electron/package.json @@ -30,7 +30,7 @@ "electron-build-env": "0.2.0" }, "optionalDependencies": { - "libsodium-neon": "2.0.6", + "libsodium-neon": "2.1.0", "node-addressbook": "https://github.com/wireapp/node-addressbook.git#2.0.0" }, "scripts": { From 8ce707c6309e2879b5e85ad35ff4e2dcf9193366 Mon Sep 17 00:00:00 2001 From: Sven Jost Date: Tue, 9 May 2017 12:13:27 +0200 Subject: [PATCH 3/8] Add template for github issues --- .github/issue_template.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/issue_template.md diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 00000000000..92456c48ca2 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,18 @@ +Wire Version: +Wire for Web Version: +OS: +Do you have an antivirus software installed: + +What steps will reproduce the problem? +1. +2. +3. + +What is the expected result? + + +What happens instead? + + +Please provide any additional information below. Attach a screenshot if +possible. From 5214c07298dda0fdf677aa73ef7e734ace27926e Mon Sep 17 00:00:00 2001 From: Gregor Herdmann Date: Tue, 9 May 2017 17:46:54 +0200 Subject: [PATCH 4/8] Release 2.14.2743 --- electron/package.json | 2 +- info.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/electron/package.json b/electron/package.json index 1455810c393..3a18786f4d7 100644 --- a/electron/package.json +++ b/electron/package.json @@ -2,7 +2,7 @@ "name": "wire-desktop", "productName": "Wire", "description": "Modern communication, full privacy.", - "version": "2.13.2742", + "version": "2.14.2743", "main": "main.js", "updateWinUrl": "https://wire-app.wire.com/win/prod/", "environment": "production", diff --git a/info.json b/info.json index 25e8dc9fac7..b6280986ad8 100644 --- a/info.json +++ b/info.json @@ -2,8 +2,8 @@ "name": "Wire", "nameInternal": "WireInternal", "description": "Wire", - "version": "2.13", - "build": "2742", + "version": "2.14", + "build": "2743", "copyright": "© Wire Swiss GmbH", "updateWinUrlInternal": "https://wire-app.wire.com/win/internal/", "updateWinUrlProd": "https://wire-app.wire.com/win/prod/", From 2cd1a4b481af1aa9abdbe27741dd7c93c002f344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Herrmann?= Date: Fri, 12 May 2017 12:12:12 +0200 Subject: [PATCH 5/8] electron 1.6.9 (#637) electron 1.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d1ab3a71e5..412a9b660e0 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ } }, "devDependencies": { - "electron": "1.6.8", + "electron": "1.7.0", "electron-builder": "12.3.1", "electron-mocha": "3.4.0", "electron-packager": "8.6.0", From 4155b72f792db65a0a05d8bf21ea31a5d81cf617 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Mon, 15 May 2017 11:14:39 +0200 Subject: [PATCH 6/8] Use new V8 inspector (#641) --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 412a9b660e0..8aade89f7e1 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,10 @@ "preinstall": "cd electron && npm install", "install": "npm run rebuild-native-modules", "postinstall": "cd electron && npm run rebuild-neon", - "start": "electron electron --debug=5858 --devtools --enable-logging", - "staging": "electron electron --debug=5858 --devtools --enable-logging --env=https://wire-webapp-staging.zinfra.io", - "prod": "electron electron --debug=5858 --devtools --enable-logging --env=https://app.wire.com", - "localhost": "electron electron --debug=5858 --devtools --enable-logging --env=http://localhost:8888", + "start": "electron electron --inspect --devtools --enable-logging", + "staging": "electron electron --inspect --devtools --enable-logging --env=https://wire-webapp-staging.zinfra.io", + "prod": "electron electron --inspect --devtools --enable-logging --env=https://app.wire.com", + "localhost": "electron electron --inspect --devtools --enable-logging --env=http://localhost:8888", "test": "eslint electron && electron-mocha tests", "rebuild-native-modules": "electron-rebuild -f -m ./electron/node_modules", "build:macos": "grunt macos-prod", From c5bc2c7224d77ecd1018e642a310ed7a5e317724 Mon Sep 17 00:00:00 2001 From: Gregor Herdmann Date: Mon, 15 May 2017 11:34:22 +0200 Subject: [PATCH 7/8] Publish amplify events when joining calls (#629) --- electron/js/preload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/js/preload.js b/electron/js/preload.js index 9d152c50e6e..ef648b2dfd0 100644 --- a/electron/js/preload.js +++ b/electron/js/preload.js @@ -165,11 +165,11 @@ ipcRenderer.on('conversation-ping', function() { }); ipcRenderer.on('conversation-call', function() { - wire.app.view.content.conversation_titlebar.click_on_call_button(); + amplify.publish(z.event.WebApp.CALL.STATE.TOGGLE, false); }); ipcRenderer.on('conversation-video-call', function() { - wire.app.view.content.conversation_titlebar.click_on_video_button(); + amplify.publish(z.event.WebApp.CALL.STATE.TOGGLE, true); }); ipcRenderer.on('conversation-people', function() { From 2709a0e0bdeb819d60b4007a0faa3c356ec148c2 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Tue, 16 May 2017 15:59:06 +0200 Subject: [PATCH 8/8] New native module rebuilding (#643) --- electron/package.json | 7 ++-- electron/rebuild-native-modules.js | 55 ++++++++++++++++++++++++++++++ package.json | 4 +-- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100755 electron/rebuild-native-modules.js diff --git a/electron/package.json b/electron/package.json index 3a18786f4d7..390a9a57c6d 100644 --- a/electron/package.json +++ b/electron/package.json @@ -27,13 +27,16 @@ "winston": "https://github.com/wireapp/winston.git#2.2.0-e" }, "devDependencies": { - "electron-build-env": "0.2.0" + "cross-spawn": "5.1.0", + "electron-build-env": "0.2.0", + "electron-rebuild": "1.5.11" }, "optionalDependencies": { "libsodium-neon": "2.1.0", "node-addressbook": "https://github.com/wireapp/node-addressbook.git#2.0.0" }, "scripts": { - "rebuild-neon": "electron-build-env neon build libsodium-neon" + "rebuild-native-modules": "node ./rebuild-native-modules.js \"electron-rebuild\" \"-f -m ./\"", + "rebuild-neon": "node ./rebuild-native-modules.js \"electron-build-env\" \"neon build libsodium-neon\"" } } diff --git a/electron/rebuild-native-modules.js b/electron/rebuild-native-modules.js new file mode 100755 index 00000000000..332f42f36a1 --- /dev/null +++ b/electron/rebuild-native-modules.js @@ -0,0 +1,55 @@ +#!/usr/bin/env node +/* + * Wire + * Copyright (C) 2017 Wire Swiss GmbH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +'use strict'; + +const spawn = require('cross-spawn'); +const exec = require('child_process').exec; +const arch = process.env.wire_target_arch ? process.env.wire_target_arch : process.arch; + +const normalize = (args) => { + return args.map((arg) => { + Object.keys(process.env).forEach((key) => { + const variableRegex = new RegExp(`\\$${key}|%${key}%`, 'i'); + arg = arg.replace(variableRegex, process.env[key]); + }); + return arg; + }); +}; + +let args = process.argv.slice(2); +if (args.length === 1) { + const [command] = normalize(args); + const proc = exec(command, (error, stdout, stderr) => { + if (error) { + console.error('Execution error:', error); + return; + } + process.stdout.write(stdout); + process.stderr.write(stderr); + process.exit(proc.code); + }); +} else { + args = normalize(args); + const command = args.shift(); + args.unshift('--arch', arch, '--'); + const proc = spawn.sync(command, args, {stdio: 'inherit'}); + process.exit(proc.status); +} diff --git a/package.json b/package.json index 8aade89f7e1..d6aa908080b 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,13 @@ "private": true, "scripts": { "preinstall": "cd electron && npm install", - "install": "npm run rebuild-native-modules", + "install": "cd electron && npm run rebuild-native-modules", "postinstall": "cd electron && npm run rebuild-neon", "start": "electron electron --inspect --devtools --enable-logging", "staging": "electron electron --inspect --devtools --enable-logging --env=https://wire-webapp-staging.zinfra.io", "prod": "electron electron --inspect --devtools --enable-logging --env=https://app.wire.com", "localhost": "electron electron --inspect --devtools --enable-logging --env=http://localhost:8888", "test": "eslint electron && electron-mocha tests", - "rebuild-native-modules": "electron-rebuild -f -m ./electron/node_modules", "build:macos": "grunt macos-prod", "build:win": "grunt win-prod", "build:linux": "grunt linux-prod" @@ -32,7 +31,6 @@ "electron-builder": "12.3.1", "electron-mocha": "3.4.0", "electron-packager": "8.6.0", - "electron-rebuild": "1.4.0", "electron-winstaller": "2.5.2", "eslint": "3.19.0", "grunt": "1.0.1",