public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

Merge v0.5.11

Browse Source 
Conflicts:
	browser/main/index.js
	package.json
This commit is contained in:
Rokt33r
2016-04-29 12:25:55 +09:00
parent ac7e08ae2c f6208c1324
commit b9fd3b8b7d
33 changed files with 723 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gruntfile.js
View File

@@ -4,6 +4,8 @@ const packager = require('electron-packager')
const fs = require('fs')
const merge = require('merge-stream')
const WIN = process.platform === 'win32'
module.exports = function (grunt) {
var auth_code
try {
@@ -55,7 +57,9 @@ module.exports = function (grunt) {
grunt.initConfig(initConfig)
grunt.loadNpmTasks('grunt-electron-installer')
grunt.loadNpmTasks('grunt-electron-installer-debian')
if (!WIN) {
grunt.loadNpmTasks('grunt-electron-installer-debian')
}
grunt.registerTask('copy', function () {
var done = this.async()
@@ -116,11 +120,11 @@ module.exports = function (grunt) {
version: grunt.config.get('pkg.config.electron-version'),
'app-version': grunt.config.get('pkg.version'),
'app-bundle-id': 'com.maisin.boost',
asar: true,
asar: false,
prune: true,
overwrite: true,
out: path.join(__dirname, 'dist'),
ignore: /submodules\/ace\/(?!src-min)|submodules\/ace\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json/
ignore: /submodules\/ace\/(?!src-min)|submodules\/ace\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/
}
switch (platform) {
case 'win':