Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-10 06:34:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(bootstrap): Always use npm3 in ./build to install apm

Browse source
This commit is contained in:
Ben Gotow 2015-10-27 17:04:14 -07:00
parent e76adb283c
commit a2e0a57cbf
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
script/bootstrap
View file

@ -44,12 +44,9 @@ function makeSqlite3Command() {
var targetArch = require('os').arch();
}
return makeNPMPath() + " install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+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 makeNPMPath() {
var npmPath = path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm');
return fs.existsSync(npmPath) ? '"'+npmPath+'"' : 'npm';
// Use our local version of npm (npm 3x) to build sqlite
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+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() {
@ -68,9 +65,15 @@ function bootstrap() {
var packagesToDedupe = ['fs-plus', 'humanize-plus', 'roaster', 'season', 'grim'];
var buildInstallCommand = makeNPMPath() + npmFlags + 'install';
// use the system version of npm to install build folder dependencies, including our
// own copy of NPM 3.x, which we'll use for subsequent commands
var buildInstallCommand = 'npm' + npmFlags + 'install';
var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};
var apmInstallCommand = makeNPMPath() + npmFlags + '--target=0.10.40 ' + 'install';
var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"';
// Use our local version of npm in ./build to install apm. This ensures it gets a
// flat dependency tree.
var apmInstallCommand = npmPath + npmFlags + '--target=0.10.40 ' + 'install';
var apmInstallOptions = {cwd: apmInstallPath};
var rebuildSqlite3Command = makeSqlite3Command();