daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,513 Commits
54 Branches
862 Tags
2 GiB
Commit Graph

215 Commits (252f034b30b3bf9b0c38d683725868d899209870)

Author SHA1 Message Date
isaacs 964d03bc3f New documentation generation tool 2012-02-27 10:59:01 -08:00
Nathan Rajlich 3f1f2d1497 addon: write gyp generated files to the 'out' dir 2012-02-27 02:40:09 +01:00
Shigeki Ohtsu 58e5d69250 build: fix the case where config.gypi doesn't exist 2012-02-23 14:11:26 +01:00
Shigeki Ohtsu 680d75af34 build: make default_configuration consistent with BUILDTYPE 2012-02-23 14:11:26 +01:00
Fedor Indutny 0cebfc8ddb tests: kill process group on failure 
Test suite is often leaving `stray` processes on failure. They are
harmless, but may cause future test runs fail because those `stray`
processes are occupying `common.PORT` or due to some other reasons.

Killing whole process group on test suite failure should help in such
cases.
 2012-02-20 22:07:19 +06:00
Ben Noordhuis 4af673e161 gyp: update to r1214 2012-02-20 11:47:03 +01:00
Ben Noordhuis 8a6576f764 Merge remote-tracking branch 'origin/v0.6' 
Conflicts:
	common.gypi
 2012-02-12 16:12:26 +01:00
Nathan Rajlich d4ccdeaf00 build: use -fPIC for native addons on UNIX 
No -fPIC on 32 bits Linux but do enable for the other UNIX flavors.
 2012-02-09 14:34:30 +01:00
Igor Zinkovsky 0a347559bf enable x64 windows build 
use "vcbuild x64" to do x64 build of node.exe
 2012-02-07 13:32:53 -08:00
isaacs 116835561d Merge remote-tracking branch 'ry/v0.6' 
Conflicts:
	ChangeLog
	deps/v8/src/version.cc
	deps/v8/tools/gyp/v8.gyp
	doc/about/index.html
	doc/community/index.html
	doc/index.html
	doc/logos/index.html
	doc/template.html
	lib/path.js
	lib/querystring.js
	src/node_version.h
 2012-02-06 15:43:21 -08:00
Nathan Rajlich 5e1471c806 gyp_addon: link with node.lib on Windows 
Closes GH-2685
 2012-02-06 19:02:45 +01:00
isaacs 5937d02aed msi: npm bash shim fixes 2012-02-02 16:56:42 -08:00
isaacs 30fd2f7bb2 Add npm msysgit bash shim to msi installer 2012-02-02 14:57:12 -08:00
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
Ben Noordhuis d7dff34bad gyp: support older bash versions 
Older bash versions in `sh -c` mode don't parse `export FOO=42` constructs,
they bail out with a "FOO is not an identifier" error message.

This was fixed somewhere between bash 4.1.0 and 4.1.5 but let's support the
older versions anyway.
 2011-10-26 04:59:31 +00:00
Ryan Dahl 493d3b9f7c Merge remote branch 'origin/v0.4' 
Conflicts:
	ChangeLog
	Makefile
	deps/libev/wscript
	doc/index.html
	doc/template.html
	lib/net.js
	src/node_version.h
	src/platform_cygwin.cc
	test/pummel/test-net-write-callbacks.js
	test/simple/test-buffer.js
 2011-10-21 18:02:30 -07:00
Ben Noordhuis 3c3ec7b2d7 gyp: upgrade to r1081 2011-10-21 13:49:29 -07:00
Ryan Dahl dbfc8198a6 Upgrade GYP to r1078 2011-10-18 14:39:39 -07:00
Tomasz Janczuk 6fadbec797 wix project to create msi installer for windows 
Fixes #1706.
 2011-10-11 10:29:03 -07:00
Ben Noordhuis 6b9f559984 gyp: work around sunos python flock() bug 
flock(LOCK_EX) always fails with EBADF, use fcntl(F_SETLK) instead.
 2011-10-10 20:52:37 +00:00
Vitor Balocco 97d355c273 docs: Add anchor links next to each function 
Modify doctool.js to automatically create anchor links for
every function, for easy linking.
Include support for functions that have a <h4> level

Fixes: #1718.
 2011-09-21 21:08:53 +09:00
Ben Noordhuis 0f077a78ad gyp: add freebsd support 2011-08-17 07:50:58 +02:00
Ben Noordhuis 1e7a0aa883 gyp: revive sunos support, lost in 6b98a63 2011-08-17 07:50:58 +02:00
Ryan Dahl 100fc27ebb Upgrade gyp to r1046 2011-09-18 12:25:30 -07:00
Ben Noordhuis fe7e00d51a gyp: add sunos support 2011-09-12 21:48:29 +00:00
Ryan Dahl ee2c12d48e Upgrade GYP to r1034 2011-09-08 01:11:45 -07:00
Ryan Dahl 48918f5503 Reapply Peter Bright's fixes for GYP on MSVS 
Originally 71333b3f5b
 2011-08-24 16:23:12 -07:00
Ryan Dahl 06428d853c tools/test.py to support marking files a libuv-broken 
Use

  export NODE_USE_UV=1
  python tools/test.py --libuv simple pummel

To run the equivalent of "make test-uv".
 2011-08-23 23:45:46 -07:00
Ryan Dahl 4fa13152af Support MSVS build directories in tools/test.py 2011-08-23 19:59:07 -07:00
Ryan Dahl a7300c8297 WAF builds in out/ instead of build/ 2011-08-23 14:10:39 -07:00
Ryan Dahl 879eb16280 Have WAF variants match GYP configuration names 2011-08-23 14:10:35 -07:00
Ryan Dahl 80dd818290 Upgrade GYP to r1010 2011-08-22 17:09:57 -07:00
Ryan Dahl 72246d97a2 Complete GYP support for Python 2.5.2 2011-08-15 18:26:48 -07:00
Ryan Dahl e57ed540e6 GYP Support python 2.5.2 2011-08-15 21:18:21 -04:00
Ryan Dahl 721f26520d Upgrade GYP to r999 
To fix osx/make build http://codereview.chromium.org/7618052
 2011-08-15 15:47:18 -07:00
Ryan Dahl 66f77963a3 Upgrade GYP to r995 2011-08-15 13:49:15 -07:00
Peter Bright 16788f461a Rename gyp files to produce useful solution names. 
Hoist common settings into common.gypi.

Restrict v8's common.gypi to v8 projects.

Ensure v8 doesn't use /MP in debug builds.

Add basic settings for other platforms.

Make uv import common.gypi properly.

Remove LTCG warning.
 2011-08-13 19:57:42 -07:00
Peter Bright b9d777734d Fix MSVS building. 2011-08-11 04:52:33 +02:00
Ryan Dahl f145e35a93 Tests should point at the build directory until GYP is default 2011-08-08 17:01:44 -07:00
Ryan Dahl c110fbcc99 Revert "Remove scons" 
This reverts commit bd270b48a7.
 2011-08-08 14:15:51 -07:00
Ryan Dahl d53fccbce5 Fix MSVS build 2011-08-08 12:32:34 -07:00
Ryan Dahl db1bf679d8 Move GYP file to the project root 2011-08-08 12:11:48 -07:00
Ryan Dahl f57d70d3c9 sketch out configure support 2011-08-08 08:55:39 -07:00
Peter Bright e38fc6cc84 Disable optimization in debug builds. 
Enable full optimization in release builds.
 2011-08-07 14:22:59 -07:00
Peter Bright 588ef72ce0 Silence VC++ warnings about use of badly-designed parts of the C library. 2011-08-07 14:22:45 -07:00
Peter Bright 79d9f62946 Fix bad platform name. 2011-08-07 14:22:17 -07:00
Peter Bright 6ac8c55989 Make MSVS build. 
MSVS settings don't actually need to be guarded by conditions. gyp will do
the right thing.
 2011-08-06 22:39:28 -07:00
Peter Bright 71333b3f5b Modify GYP scripts for VC build 2011-08-06 19:53:11 -07:00
Ryan Dahl bd270b48a7 Remove scons 2011-08-06 03:12:09 -07:00
Ryan Dahl bef9f56cac Bring gyp into the tools directory; handwritten makefile 2011-08-06 03:12:08 -07:00
Ryan Dahl 43d7cfca18 gyp: fix test runner 2011-08-06 03:12:06 -07:00