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

Merge pull request #49 from mbilker/node-v4

Browse source 
Compile on Node 4.x and 0.12
This commit is contained in:
Evan Morikawa 2015-10-07 10:55:51 -07:00
commit e9310b80c2
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apm/package.json
View file

@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "0.167.0"
"atom-package-manager": "1.1.1"
}
}

17
build/package.json
View file

@ -10,20 +10,22 @@
"async": "~0.2.9",
"bluebird": "^2.3",
"coffee-react-transform": "^3.1.0",
"coffeelint-cjsx": "^2.0",
"donna": "1.0.10",
"formidable": "~1.0.14",
"fs-plus": "2.x",
"github-releases": "~0.2.0",
"grunt": "~0.4.1",
"grunt-electron-installer": "^0.35",
"grunt-cli": "~0.1.9",
"grunt-coffee-react": "^2.1.0",
"grunt-coffeelint": "git+https://github.com/atom/grunt-coffeelint.git#cfb99aa99811d52687969532bd5a98011ed95bfe",
"grunt-coffeelint-cjsx": "^0.1",
"grunt-contrib-coffee": "~0.12.0",
"grunt-contrib-csslint": "~0.1.2",
"grunt-contrib-less": "~0.8.0",
"grunt-cson": "0.14.0",
"grunt-download-electron": "~2.1",
"grunt-download-electron": "^2.1.1",
"grunt-electron-installer": "1.0.5",
"grunt-lesslint": "0.13.0",
"grunt-markdown": "^0.7.0",
"grunt-peg": "~1.1.0",
@ -36,21 +38,18 @@
"meta-marked": "^0.3.3",
"minidump": "~0.8",
"moment": "^2.8",
"npm": "~1.4.5",
"node-gyp":"0.13.1",
"npm": "2.13.3",
"rcedit": "~0.3.0",
"request": "~2.27.0",
"rimraf": "~2.2.2",
"runas": "~1.0.1",
"runas": "^3.1",
"s3": "^4.3",
"tello": "git+https://github.com/nylas/tello.git#built",
"temp": "~0.8.1",
"underscore": "^1.8",
"underscore.string": "^3.0",
"unzip": "~0.1.9",
"vm-compatibility-layer": "~0.1.0"
},
"devDependencies": {
"grunt-coffee-react": "^2.1.0"
"vm-compatibility-layer": "~0.1.0",
"webdriverio": "^2.4.5"
}
}

2
package.json
View file

@ -11,7 +11,7 @@
"bugs": {
"url": "https://github.com/nylas/edgehill/issues"
},
"electronVersion": "0.29.2",
"electronVersion": "0.30.7",
"dependencies": {
"6to5-core": "^3.5",
"asar": "^0.5.0",

6
script/bootstrap
View file

@ -33,7 +33,7 @@ function printArgs(args) {
function makeSqlite3Command() {
var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
var nodeGypPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'node-gyp');
var nodeGypPath = path.resolve(__dirname, '..', 'build', 'node_modules', 'npm', 'node_modules', '.bin', 'node-gyp');
var appPackageJSON = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', 'package.json')));
var targetVersion = appPackageJSON['electronVersion'];
var targetPlatform = require('os').platform();
@ -43,7 +43,7 @@ function makeSqlite3Command() {
// Unless electron for windows goes 64bit, this should stay
throw new Error("Building for win32 with architecture "+targetArch+". Are you sure you meant to do this?");
}
return npmPath+" install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+npmPath+" run prepublish && "+nodeGypPath+" configure --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch+" && "+nodeGypPath+" rebuild --target="+targetVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch
return npmPath+" install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+npmPath+" run prepublish && "+nodeGypPath+" configure rebuild --target="+targetVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch
}
function bootstrap() {
@ -66,7 +66,7 @@ function bootstrap() {
var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};
var apmInstallCommand = npmPath + npmFlags + 'install';
var apmInstallCommand = npmPath + npmFlags + '--target=0.10.40 ' + 'install';
var apmInstallOptions = {cwd: apmInstallPath};
var rebuildSqlite3Command = makeSqlite3Command();