Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-03 11:36:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Stop shipping an entire extra copy of Electron inside the app… 🙃

Browse source
This commit is contained in:
Ben Gotow 2017-09-01 23:22:35 -07:00
parent d2ab93d199
commit cc486ce72a
5 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app/build/resources/mac/nylas-Info.plist → app/build/resources/mac/extra.plist
View file

48
app/build/tasks/package-task.js
View file

@ -126,35 +126,35 @@ module.exports = (grunt) => {
// See: https://github.com/electron-userland/electron-packager/blob/master/usage.txt
grunt.config.merge({
'packager': {
'app-version': packageJSON.version,
'platform': platform,
'protocols': [{
packager: {
appVersion: packageJSON.version,
platform: platform,
protocols: [{
name: "Merani Protocol",
schemes: ["merani"],
}, {
name: "Mailto Protocol",
schemes: ["mailto"],
}],
'dir': grunt.config('appDir'),
'app-category-type': "public.app-category.business",
'tmpdir': tmpdir,
'arch': {
dir: grunt.config('appDir'),
appCategoryType: "public.app-category.business",
tmpdir: tmpdir,
arch: {
'win32': 'ia32',
}[platform],
'icon': {
icon: {
darwin: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'merani.icns'),
win32: path.resolve(grunt.config('appDir'), 'build', 'resources', 'win', 'merani.ico'),
linux: undefined,
}[platform],
'name': {
name: {
darwin: 'Merani',
win32: 'merani',
linux: 'merani',
}[platform],
'app-copyright': `Copyright (C) 2014-${new Date().getFullYear()} Foundry 376, LLC. All rights reserved.`,
'derefSymlinks': false,
'asar': {
appCopyright: `Copyright (C) 2014-${new Date().getFullYear()} Foundry 376, LLC. All rights reserved.`,
derefSymlinks: false,
asar: {
'unpack': "{" + [
'mailsync',
'mailsync.exe',
@ -166,7 +166,7 @@ module.exports = (grunt) => {
'**/node_modules/windows-shortcuts/**',
].join(',') + "}",
},
"ignore": [ // These are all relative to client-app
ignore: [ // These are all relative to client-app
// top level dirs we never want
/^\/build.*/,
/^\/dist.*/,
@ -204,23 +204,23 @@ module.exports = (grunt) => {
/node_modules[/].*[/]benchmark$/,
/@paulbetts[/]+cld[/]+deps[/]+cld/,
],
'out': grunt.config('outputDir'),
'overwrite': true,
'prune': true,
out: grunt.config('outputDir'),
overwrite: true,
prune: true,
/**
* This will automatically look for the identity in the keychain. It
* runs the `security find-identity` command. Note that
* setup-mac-keychain-task needs to be run first
*/
'osx-sign': !!process.env.SIGN_BUILD,
'win32metadata': {
osxSign: !!process.env.SIGN_BUILD,
win32metadata: {
CompanyName: 'Foundry 376, LLC',
FileDescription: 'Merani',
LegalCopyright: `Copyright (C) 2014-${new Date().getFullYear()} Foundry 376, LLC. All rights reserved.`,
ProductName: 'Merani',
},
// NOTE: The following plist keys can NOT be set in the
// nylas-Info.plist since they are manually overridden by
// extra.plist since they are manually overridden by
// electron-packager based on this config file:
//
// CFBundleDisplayName: 'name',
@ -230,12 +230,12 @@ module.exports = (grunt) => {
//
// See https://github.com/electron-userland/electron-packager/blob/master/mac.js#L50
//
// Our own nylas-Info.plist gets extended on top of the
// Our own extra.plist gets extended on top of the
// Electron.app/Contents/Info.plist. A majority of the defaults are
// left in the Electron Info.plist file
'extend-info': path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'nylas-Info.plist'),
'app-bundle-id': "com.merani.merani",
'afterCopy': [
extendInfo: path.resolve(grunt.config('appDir'), 'build', 'resources', 'mac', 'extra.plist'),
appBundleId: "com.merani.merani",
afterCopy: [
runCopyPlatformSpecificResources,
runWriteCommitHashIntoPackage,
runCopySymlinkedPackages,

3
app/package.json
View file

@ -22,7 +22,6 @@
"coffeestack": "^1.1",
"color": "^0.7.3",
"debug": "github:emorikawa/debug#nylas",
"electron": "1.7.3",
"electron-spellchecker": "1.0.1",
"emissary": "^1.3.1",
"emoji-data": "^0.2.0",
@ -55,7 +54,7 @@
"pathwatcher": "~6.2",
"pick-react-known-prop": "0.x.x",
"proxyquire": "1.3.1",
"raven": "2.1.1",
"raven": "2.1.2",
"react": "15.6.1",
"react-addons-css-transition-group": "15.6.0",
"react-addons-perf": "15.6.0-rc.1",

7
package.json
View file

@ -23,6 +23,7 @@
"commander": "^2.9.0",
"devtron": "^1.4.0",
"donna": "^1.0.16",
"electron": "1.7.3",
"electron-installer-dmg": "0.2.x",
"electron-packager": "8.7.x",
"electron-winstaller": "2.x.x",
@ -63,10 +64,10 @@
},
"scripts": {
"postinstall": "node scripts/postinstall.js",
"start": "app/node_modules/.bin/electron ./app --enable-logging --dev",
"start": "node_modules/.bin/electron ./app --enable-logging --dev",
"lint": "grunt lint --gruntfile=app/build/Gruntfile.js --base=./",
"test": "app/node_modules/.bin/electron ./app --enable-logging --test",
"test-window": "app/node_modules/.bin/electron ./app --enable-logging --test=window",
"test": "node_modules/.bin/electron ./app --enable-logging --test",
"test-window": "node_modules/.bin/electron ./app --enable-logging --test=window",
"build": "grunt build-client --gruntfile=app/build/Gruntfile.js --base=./",
"build-docs": "grunt docs --gruntfile=app/build/Gruntfile.js --base=./ && mkdir -p app/dist-docs && cp README.md ./app/build/docs_src/README.md && gitbook --gitbook=latest build . ./app/dist-docs --log=debug --debug && rm ./app/build/docs_src/README.md && rm -rf ./app/build/docs_src/classes",
"ci-setup-mac-keychain": "grunt setup-mac-keychain --gruntfile=app/build/Gruntfile.js --base=./"

2
scripts/postinstall.js
View file

@ -7,7 +7,7 @@ const fs = require('fs');
const rimraf = require('rimraf');
const {safeExec} = require('./utils/child-process-wrapper.js');
const npmElectronTarget = require('../app/package.json').dependencies.electron;
const npmElectronTarget = require('../package.json').devDependencies.electron;
const npmEnvs = {
system: process.env,
electron: Object.assign({}, process.env, {