github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,803 Commits 140 Branches 571 Tags
b7df08cbdd87a6bdb2221decd751a70adb0d412e
Commit Graph

87 Commits

Author SHA1 Message Date
Corey Johnson
f30c56c237 Don't require 32bit node 2014-05-15 14:55:58 -07:00
Corey Johnson
bb9d67a1b1 Merge remote-tracking branch 'origin/master' into cj-windows-build-instructions-update 
Conflicts:
	script/bootstrap
 2014-05-15 14:34:07 -07:00
Corey Johnson
a2be86d15a Require fs in bootstrap 2014-05-14 15:42:05 -07:00
Corey Johnson
0b5b741db4 Make sure python2.7 is installed on win32 
Closes #2193 
Closes #2167
Closes atom/node-runas#5
 2014-05-14 15:29:21 -07:00
Corey Johnson
aeac32ae47 Ensure that node is 32bit on win32 2014-05-14 14:49:35 -07:00
Eric Engeström
9302242299 Allowing node > 1.0 (no reason not to already do that, I guess) 2014-05-09 00:45:13 +02:00
Eric Engeström
ed90a78ea5 Replacing string comparison with actual int comparison 2014-05-09 00:42:40 +02:00
Eric Engeström
2ff5309d54 Allow newer version of nodejs 2014-05-07 00:00:44 +02:00
Kevin Sawicki
806ff4e141 Resolve path to apm 
Refs #1936
 2014-05-06 09:56:03 -07:00
Kevin Sawicki
e8090b16f3 Move apm version to apm/package.json 2014-04-24 15:43:35 -07:00
Kevin Sawicki
8f2cdae0eb Install apm from npmjs.org 2014-04-24 15:43:35 -07:00
Cheng Zhao
645fc1511a Do not add parameter in shebang string. 
On Linux "#!/usr/bin/env node --harmony_collections" is unfortunately
not recognized by system.
 2014-03-25 15:40:43 +08:00
Nathan Sobo
65ff108615 Warn and exit if script/bootstrap is run with wrong node version 2014-03-20 13:05:49 -06:00
Kevin Sawicki
f912eb805d Add npm as build dependency 
This switches script/bootstrap to use a locally installed npm so that
the version of npm being used to bootstrap apm is now managed in
build/package.json instead of whatever version is installed globally on the
machine running script/bootstrap.

Closes #1770
 2014-03-19 08:41:08 -07:00
Kevin Sawicki
f1b0390b9b Remove apm from node_modules 2014-03-04 17:26:52 -08:00
Kevin Sawicki
01eb6e31ba Revert "Set --ca to null on the command line" 
This reverts commit 7f4c8023aee10ded0088076773c6c13f92993aab.
 2014-03-04 10:19:20 -08:00
Kevin Sawicki
071e6f885f Set --ca to null on the command line 2014-03-04 10:19:20 -08:00
Kevin Sawicki
5fcde96f88 Add .npmrc file with default ca value 2014-03-04 10:19:20 -08:00
Kevin Sawicki
d8e314b0a0 Upgrade apm to include bundled node 2014-03-03 12:43:01 -08:00
Kevin Sawicki
d660e9a066 Go back to strict-ssl false 2014-02-28 10:01:54 -08:00
Kevin Sawicki
abcaaa3264 Try single quotes for empty ca arg 2014-02-28 09:53:39 -08:00
Kevin Sawicki
7f2b871885 Use known list of registrars 2014-02-28 09:43:38 -08:00
Kevin Sawicki
e51dd05989 Disable strict-ssl for now on janky machines 
This is until we can get npm upgraded there.
 2014-02-28 09:33:18 -08:00
Kevin Sawicki
3434a68ac0 Only use token to download grunt-download-atom-shell 2014-02-25 19:55:19 -08:00
Kevin Sawicki
9a941b97cb Use new atom-bot token 2014-02-25 19:52:59 -08:00
Kevin Sawicki
0dce31e02d Don't dedupe nan 2014-02-17 15:26:40 -08:00
Kevin Sawicki
d79d819048 Dedupe fs-plus and season 2014-01-31 14:09:19 -08:00
Kevin Sawicki
677ec44b37 Dedupe humanize-plus 2014-01-16 18:54:58 -08:00
Kevin Sawicki
4122b5a43f Dedupe nan module 2014-01-15 16:58:43 -08:00
Kevin Sawicki
2d04c50184 Dedupe oniguruma 2014-01-15 16:24:30 -08:00
Kevin Sawicki
f86ca9b59a 💄 Add array of packages to dedupe 2014-01-15 15:48:19 -08:00
Kevin Sawicki
58cccd76a4 Dedupe roaster when bootstrapping 2014-01-15 15:48:19 -08:00
Kevin Sawicki
601466782f Install build dependencies in tasks/node_modules 2014-01-03 08:32:22 -08:00
Kevin Sawicki
902406c572 Enable harmony collections in all scripts 2013-12-31 14:40:45 -08:00
Kevin Sawicki
cef7577826 Install apm into node_modules 
settings-views launches apm via a NodeBufferedProcess so it still needs to
be available built against Atom's headers.

The version in apm/ is just for running via the CLI directly and is compiled
against node's headers.
 2013-12-17 19:25:44 -08:00
Kevin Sawicki
75c573fe61 Run apm commands from new apm directory 2013-12-17 16:53:31 -08:00
Kevin Sawicki
ed8800d182 Install apm to apm/ from vendor/apm 2013-12-17 16:53:31 -08:00
Kevin Sawicki
31fc4fcde8 Disable colors in constructicon output 2013-12-17 09:22:14 -08:00
Kevin Sawicki
f48514114d Disable colors when BUILT_PRODUCTS_DIR env var is set 2013-12-17 09:15:04 -08:00
Kevin Sawicki
e5bd341f05 Set npm log level to warn instead of silent 2013-12-11 10:03:32 -08:00
Kevin Sawicki
e9d4563084 Disable apm colors in CI builds 2013-12-11 09:40:30 -08:00
Kevin Sawicki
2136fdaa60 Set cwd to vendor/apm instead of cd'ing 2013-12-10 14:11:10 -08:00
Kevin Sawicki
31a909828d Don't override ATOM_ACCESS_TOKEN if already set 2013-12-04 14:40:37 -08:00
Kevin Sawicki
63dc8863e3 Use atom-bot's token as ATOM_ACCESS_TOKEN 2013-12-04 11:38:25 -08:00
Kevin Sawicki
caffcafe2e 🙉 Ignore stdout from installation of apm 2013-11-15 09:54:36 -08:00
Kevin Sawicki
b0da17701b Run apm clean during bootstrap 
Closes #905
 2013-11-02 19:29:52 -07:00
Cheng Zhao
53954c236c Use the apm in node_modules/atom-package-manager instead of vendor/apm. 2013-10-30 23:44:05 +08:00
Cheng Zhao
e4400c648d Revert "Run apm from node_modules" 
This reverts commit 8742f6c06c.

The `node_modules/.bin/apm` is a bash script not a js script, so on
Windows `node node_modules/.bin/apm` would fail with:

```
C:\cygwin\home\zcbenz\codes\atom\node_modules\.bin\apm:2
basedir=`dirname "$0"`
        ^
SyntaxError: Unexpected token ILLEGAL
    at Module._compile (module.js:439:25)
    at Object.Module._extensions..js (module.js:474:10)
    at Module.load (module.js:356:32)
    at Function.Module._load (module.js:312:12)
    at Function.Module.runMain (module.js:497:10)
    at startup (node.js:119:16)
    at node.js:901:3
```
 2013-10-30 10:51:06 +08:00
Kevin Sawicki
2f62123a75 Merge branch 'master' into win-bootstrap-native-modules 2013-10-28 17:33:39 -07:00
Kevin Sawicki
8742f6c06c Run apm from node_modules 2013-10-26 14:54:23 -07:00