isaacs
18d179c2d8
Merge remote-tracking branch 'ry/v0.6' into master
...
Conflicts:
ChangeLog
deps/uv/src/unix/udp.c
deps/uv/src/win/fs.c
deps/uv/src/win/udp.c
deps/uv/test/test-fs.c
doc/index.html
doc/logos/index.html
doc/template.html
src/node_version.h
2012-01-31 18:18:00 -08:00
Fedor Indutny
85a86b5fd6
waf: predict target arch for OSX
2012-01-27 20:37:30 +06:00
isaacs
6768d2fc93
doc: Pixel-nudging
2012-01-23 13:11:33 -08:00
isaacs
5d7577c71a
doctool: correct improperly nested ul/li handling
2012-01-23 13:11:33 -08:00
Fedor Indutny
6e76a7cb45
installer: install node-waf
...
* added --without-waf flag for configure script
2012-01-16 21:56:05 -08:00
Ryan Dahl
1afd0b52fe
Revert "gyp: install node-gyp"
...
No.
This reverts commit 3d1476a316 .
2012-01-16 14:07:35 -08:00
Fedor Indutny
3d1476a316
gyp: install node-gyp
...
* fixes #2480
2012-01-17 02:44:26 +06:00
Fedor Indutny
9e6957b0a5
Merge branch 'v0.6'
...
Conflicts:
src/handle_wrap.cc
src/node_zlib.cc
src/process_wrap.cc
2012-01-12 02:17:44 +06:00
Ryan Dahl
290bc0c067
Use .jpg instead of .bmp for .msi
...
smaller.
2012-01-10 14:26:22 -08:00
Shigeki Ohtsu
a993d22c0f
build: set product_prefix to empty for Linux
2012-01-05 16:50:44 +01:00
Ben Noordhuis
e21643d618
build: fix npm-cli.js install
2012-01-04 16:36:08 +01:00
Ryan Dahl
624f70e88f
GYP: rename options.gypi to config.gypi
...
Sounds more familiar to unix users used to config.h
2011-12-23 14:25:17 -08:00
Ryan Dahl
60a9e1e40f
Upgrade GYP to r1115
2011-12-21 12:39:36 -08:00
Ryan Dahl
18b92201be
Support addons with gyp
...
Initial pass.
2011-12-20 22:03:35 -08:00
Ryan Dahl
b603578b53
Fix 'make install'
...
Broken in 45605c because configure does not spit out proper JavaScript.
Needed to change single quotes to double.
2011-12-19 18:06:21 -08:00
Fedor Indutny
a9f2c4aa30
--without-npm option
...
Fixes #2353 .
2011-12-17 00:39:04 -08:00
Ryan Dahl
64de69c1a4
Upgrade GYP to r1107
2011-12-16 14:06:29 -08:00
Ryan Dahl
1865b11dcb
Merge remote branch 'origin/v0.6'
...
Conflicts:
wscript
2011-12-16 13:57:36 -08:00
Ryan Dahl
de5ba2db25
Don't print args from gyp_node
2011-12-15 13:19:36 -08:00
Fedor Indutny
be23c51f69
Implement make install
...
Fixes #2331 , #2197 , #2283
2011-12-14 14:41:44 -08:00
Igor Zinkovsky
8e2c014e43
Fix MSI generation on VC Express
2011-12-09 17:20:22 -08:00
Ryan Dahl
429efdd974
Change artwork in msi
2011-12-09 17:14:39 -08:00
Igor Zinkovsky
b24cdb3d36
Enable upgrades in MSI.
...
Fixes #2228 .
2011-12-08 15:02:59 -08:00
Ryan Dahl
2003593143
Merge remote branch 'origin/v0.6'
...
Conflicts:
deps/v8/src/debug.cc
deps/v8/src/version.cc
src/node_version.h
2011-12-06 11:50:54 -08:00
isaacs
db273818f6
s/NPM/npm/
...
http://npmjs.org/doc/faq.html#If-npm-is-an-acronym-why-is-it-never-capitalized
2011-12-05 16:20:44 -08:00
Ben Noordhuis
e90623edc2
gyp: upgrade to r1103
2011-12-03 21:28:17 +01:00
Ben Noordhuis
49ba55b100
Merge branch 'v0.6'
...
Conflicts:
src/node_version.h
2011-12-02 16:34:33 +01:00
isaacs
0f6d3e22d9
Remove duplicate npmrc file
2011-12-01 12:23:43 -08:00
Igor Zinkovsky
3e7f4b0f82
npm msi changes
2011-12-01 21:12:17 +01:00
isaacs
d5f401147a
Re #2207 Add default npmrc for MSI install
2011-12-01 21:12:17 +01:00
Ben Noordhuis
a5c51b4858
docs: add rel="canonical" link to latest API docs
2011-11-28 16:47:53 +01:00
Bert Belder
cffd0bb68d
Merge branch 'v0.6'
...
Conflicts:
Makefile
src/node_version.h
test/simple/test-http-response-no-headers.js
2011-11-25 12:34:29 +01:00
Ryan Dahl
b906e85996
Fixes #2076 . Add logos to MSI
2011-11-22 19:23:41 -08:00
Ryan Dahl
e5cf3f9751
Fixes #2083 . Support installing npm in the .msi
2011-11-22 17:59:18 -08:00
Ryan Dahl
8595981195
Merge remote branch 'origin/v0.6'
...
Conflicts:
Makefile
src/node_version.h
test/simple/test-crypto.js
2011-11-22 13:01:10 -08:00
Ryan Dahl
38c49fbc4a
Fix broken commit 2cd5adc
2011-11-22 12:44:01 -08:00
Ryan Dahl
2cd5adc28b
Install npm with 'make install'
2011-11-22 12:38:48 -08:00
Ryan Dahl
b488be127a
Include NPM, update .pkg to install it.
...
.msi update coming soon.
2011-11-21 10:50:52 -08:00
Ryan Dahl
9d1bdbcf05
Fixes #2084 . Makeify tools/osx-dist.sh
2011-11-20 19:22:30 -08:00
Paddy Byers
4f8d6d0834
build: fix gyp xcode project generator
...
Only attempt to generate FrameworkPhase output for code targets.
2011-11-17 23:49:55 +01:00
Ryan Dahl
93dc713670
Merge remote branch 'origin/v0.6'
2011-11-16 13:37:20 -08:00
Ryan Dahl
14b04b06b4
Remove SCONS deprecate WAF
...
We keep around WAF for node-waf only.
We need great diligence by people over the next couple weeks to work out all
the kinks in the GYP build system. We realize that it is currently several
times slower than the WAF build. Please lend a hand.
Fixes #1504
Fixes #1500
2011-11-14 19:17:42 -08:00
Ryan Dahl
4b0241d589
Remove str.format to support python2.5.
...
Fixes #2077
Fixes #2108
Thanks to David Keegan for debugging and the patch.
2011-11-14 17:09:44 -08:00
Ryan Dahl
d214576d2b
Be consistent with v before version in packages
2011-11-11 14:02:42 -08:00
Igor Zinkovsky
2095eea3da
msi changes
...
- remove license from MSI
- adjust path on install
- add message to the end
2011-11-11 12:50:04 -08:00
Ryan Dahl
895fa3a56b
Simplify and move getnodeversion.py
2011-11-11 12:09:48 -08:00
Ryan Dahl
dc39ab3bbf
Improve OSX installer
2011-11-10 18:41:44 -08:00
Igor Zinkovsky
ec90ede1cf
fix msi builder
2011-11-10 18:40:49 -08:00
Igor Zinkovsky
09329e7833
Add node.rc with a version resource
...
Fixes #2059
2011-11-10 13:22:13 -08:00
Ryan Dahl
850609ea2d
Remove separation of libuv tests
2011-11-02 16:38:59 -07:00