Commit Graph

180 Commits (6aa755070a5d89f5adeb6d53e6eea6fbf49a6bb7)

Author SHA1 Message Date
isaacs 46376888cd Remove hard-coded version number from docs 2012-03-16 08:13:41 -07:00
isaacs ec735cbce0 Merge remote-tracking branch 'ry/v0.6' into merge-v0.6
Conflicts:
	ChangeLog
	deps/npm/AUTHORS
	deps/npm/html/api/bin.html
	deps/npm/html/api/bugs.html
	deps/npm/html/api/commands.html
	deps/npm/html/api/config.html
	deps/npm/html/api/deprecate.html
	deps/npm/html/api/docs.html
	deps/npm/html/api/edit.html
	deps/npm/html/api/explore.html
	deps/npm/html/api/help-search.html
	deps/npm/html/api/init.html
	deps/npm/html/api/install.html
	deps/npm/html/api/link.html
	deps/npm/html/api/load.html
	deps/npm/html/api/ls.html
	deps/npm/html/api/npm.html
	deps/npm/html/api/outdated.html
	deps/npm/html/api/owner.html
	deps/npm/html/api/pack.html
	deps/npm/html/api/prefix.html
	deps/npm/html/api/prune.html
	deps/npm/html/api/publish.html
	deps/npm/html/api/rebuild.html
	deps/npm/html/api/restart.html
	deps/npm/html/api/root.html
	deps/npm/html/api/run-script.html
	deps/npm/html/api/search.html
	deps/npm/html/api/shrinkwrap.html
	deps/npm/html/api/start.html
	deps/npm/html/api/stop.html
	deps/npm/html/api/submodule.html
	deps/npm/html/api/tag.html
	deps/npm/html/api/test.html
	deps/npm/html/api/uninstall.html
	deps/npm/html/api/unpublish.html
	deps/npm/html/api/update.html
	deps/npm/html/api/version.html
	deps/npm/html/api/view.html
	deps/npm/html/api/whoami.html
	deps/npm/html/doc/README.html
	deps/npm/html/doc/adduser.html
	deps/npm/html/doc/bin.html
	deps/npm/html/doc/bugs.html
	deps/npm/html/doc/build.html
	deps/npm/html/doc/bundle.html
	deps/npm/html/doc/cache.html
	deps/npm/html/doc/changelog.html
	deps/npm/html/doc/coding-style.html
	deps/npm/html/doc/completion.html
	deps/npm/html/doc/config.html
	deps/npm/html/doc/deprecate.html
	deps/npm/html/doc/developers.html
	deps/npm/html/doc/disputes.html
	deps/npm/html/doc/docs.html
	deps/npm/html/doc/edit.html
	deps/npm/html/doc/explore.html
	deps/npm/html/doc/faq.html
	deps/npm/html/doc/folders.html
	deps/npm/html/doc/help-search.html
	deps/npm/html/doc/help.html
	deps/npm/html/doc/index.html
	deps/npm/html/doc/init.html
	deps/npm/html/doc/install.html
	deps/npm/html/doc/json.html
	deps/npm/html/doc/link.html
	deps/npm/html/doc/list.html
	deps/npm/html/doc/npm.html
	deps/npm/html/doc/outdated.html
	deps/npm/html/doc/owner.html
	deps/npm/html/doc/pack.html
	deps/npm/html/doc/prefix.html
	deps/npm/html/doc/prune.html
	deps/npm/html/doc/publish.html
	deps/npm/html/doc/rebuild.html
	deps/npm/html/doc/registry.html
	deps/npm/html/doc/removing-npm.html
	deps/npm/html/doc/restart.html
	deps/npm/html/doc/root.html
	deps/npm/html/doc/run-script.html
	deps/npm/html/doc/scripts.html
	deps/npm/html/doc/search.html
	deps/npm/html/doc/semver.html
	deps/npm/html/doc/shrinkwrap.html
	deps/npm/html/doc/star.html
	deps/npm/html/doc/start.html
	deps/npm/html/doc/stop.html
	deps/npm/html/doc/submodule.html
	deps/npm/html/doc/tag.html
	deps/npm/html/doc/test.html
	deps/npm/html/doc/uninstall.html
	deps/npm/html/doc/unpublish.html
	deps/npm/html/doc/update.html
	deps/npm/html/doc/version.html
	deps/npm/html/doc/view.html
	deps/npm/html/doc/whoami.html
	deps/npm/man/man1/npm.1
	deps/npm/man/man3/npm.3
	deps/npm/node_modules/node-gyp/README.md
	deps/npm/node_modules/node-gyp/lib/build.js
	deps/npm/node_modules/node-gyp/lib/configure.js
	deps/npm/node_modules/node-gyp/lib/install.js
	deps/npm/node_modules/node-gyp/lib/node-gyp.js
	deps/npm/node_modules/node-gyp/node_modules/ansi/package.json
	deps/npm/node_modules/node-gyp/node_modules/glob/node_modules/minimatch/package.json
	deps/npm/node_modules/node-gyp/node_modules/glob/package.json
	deps/npm/node_modules/node-gyp/package.json
	deps/npm/package.json
	doc/about/index.html
	doc/api/path.markdown
	doc/community/index.html
	doc/index.html
	doc/logos/index.html
	src/node_version.h
2012-03-16 08:06:54 -07:00
Nathan Rajlich 7cb0f5f84a install: update install.js to use `process.config`
Now that the node_prefix is available from within node, we can use it :)
2012-03-15 17:15:49 -07:00
isaacs 06bf0707f7 makefile: Fix 'make doc' 2012-03-15 08:22:36 -07:00
isaacs ffcdcc7ff0 Use new doc generation tool
Conflicts:

	Makefile
2012-02-29 15:18:51 -08:00
isaacs 4051c2843b docs: Move images out of the dist tarball
This puts all images in doc/images/ and references them via
http://nodejs.org/images/.

Any complaints about copyright usage etc. can thus be node/joyent's
problem, rather than the problem of a downstream distribution channel.

Conflicts:

	Makefile
2012-02-29 15:17:55 -08:00
isaacs 4f8d7328a4 Fix #2822 Only remove logo images, not logo html 2012-02-27 13:08:54 -08:00
isaacs 7d6d5e263e Use new doc generation tool 2012-02-27 10:59:35 -08:00
isaacs e004721b48 Make a fat binary for the OS X pkg 2012-02-22 15:58:02 -08:00
Nathan Rajlich e60b18bbdf Make a fat binary for the OS X `make pkg`. 2012-02-22 14:27:08 -08:00
Myles Byrne 21374c3903 build: remove unused makefile target 2012-02-22 14:25:56 +01:00
isaacs bae4018b30 Run jslint after tests, not before 2012-02-21 12:02:57 -08:00
isaacs 96338432e2 jslint src/ and lib/ on 'make test' 2012-02-18 16:04:10 -08:00
Nathan Rajlich 0787287021 build: remove 'config.mk' during `make distclean` 2012-02-18 00:34:19 +01:00
isaacs 4672872ddd Fix #2770 Compile the OS X pkg as ia32 2012-02-17 12:39:45 -08:00
isaacs a7af84f988 docs: Move images out of the dist tarball
This puts all images in doc/images/ and references them via
http://nodejs.org/images/.

Any complaints about copyright usage etc. can thus be node/joyent's
problem, rather than the problem of a downstream distribution channel.
2012-02-13 15:27:06 -08:00
isaacs 02c1cb54aa Makefile: Don't use ** in globs
Many shells don't have GLOBSTAR turned on by default.  This is
why uv and v8 so often don't get cleaned out properly.
2012-02-08 09:59:53 -08:00
isaacs 349cab0b48 Check the version before building tarball
I keep forgetting to do this.  It's such a stupid thing.
2012-02-07 15:41:21 -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
Ben Noordhuis f89beaf3ac build: compile release build too if BUILDTYPE=Debug
It's backwards compatible with the old waf build system. If you want to compile
just the debug build, run `make -C out BUILDTYPE=Debug` instead.

Fixes #2615.
2012-01-26 23:49:57 +01:00
isaacs 5c0d11b12a doc: Add images to makefile 2012-01-23 13:11:33 -08:00
Ben Noordhuis e493b29598 build: respect --debug configure switch 2012-01-17 23:03:21 +01:00
Ryan Dahl 21dd53f9d3 Makefile: Don't force user to run ./configure first 2012-01-16 23:28:29 -08:00
Ryan Dahl 716f5bc66b Add make dist-upload 2012-01-16 18:52:36 -08:00
Ryan Dahl 317ba9fb64 Fix 'make dist' 2012-01-16 18:40:29 -08: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
Maciej Małecki b073989e17 makefile: ignore `lib/punycode.js` while linting
`punycode` is a third party code which generates a lot of lint errors.
Upstream was contacted in order to fix it in bestiejs/punycode.js#6, but
request was denied.

Therefore, it's reasonable to exclude this file from linting process.

Ref #2456.
2012-01-11 10:42:33 +01:00
Ryan Dahl 8b28d599a7 Merge remote branch 'origin/v0.6'
Conflicts:
	Makefile
	configure
	src/node_version.h
2012-01-09 11:20:22 -08:00
Ben Noordhuis 472a72d27f build: honour the PYTHON environment variable
Overrides the path to the python binary. Defaults to `python`.
2012-01-08 21:25:04 +01:00
isaacs d84a6ba3d1 Remove snapshot from Mac binary build 2012-01-06 16:31:03 -08: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 f7f8af8420 Merge remote branch 'origin/v0.6'
Conflicts:
	Makefile
	lib/_debugger.js
2011-12-21 12:17:23 -08:00
Ryan Dahl bb8f73419c Fix make targets so they detect changes
Broken in 10d92b3
2011-12-18 15:12:25 -08:00
Ryan Dahl 10d92b3dcd saner targets 2011-12-17 03:23:17 -08:00
isaacs d75de86e6d add 'make test-npm' 2011-12-16 18:05:17 -08:00
Ryan Dahl 1865b11dcb Merge remote branch 'origin/v0.6'
Conflicts:
	wscript
2011-12-16 13:57:36 -08:00
Ryan Dahl 67e12a0f84 Remove UVTEST from makefile 2011-12-16 13:46:42 -08:00
Ryan Dahl ee7313266a use rsync instead of scp to upload website 2011-12-15 12:51:11 -08:00
Ryan Dahl ae17e2d90a Fix doc generation for new website 2011-12-14 18:20:11 -08:00
Fedor Indutny be23c51f69 Implement make install
Fixes #2331, #2197, #2283
2011-12-14 14:41:44 -08:00
Ben Noordhuis bdd19ab40b build: update 'make install' warning message 2011-12-14 02:49:34 +01:00
eddy_me08@yahoo.com eda15387a0 build: regenerate out/Makefile from within the main Makefile
Fixes #2147.
2011-11-29 19:35:58 +01:00
Ben Noordhuis 1db9a2adbe build: print "not yet implemented" warning on `make install` 2011-11-23 13:27:53 +01:00
Ben Noordhuis ce3ccc8d5a build: fix circular dependency in doc target 2011-11-23 12:56:05 +01:00
Ryan Dahl 9d1bdbcf05 Fixes #2084. Makeify tools/osx-dist.sh 2011-11-20 19:22:30 -08:00
Ryan Dahl 585936157c Add missing rm 2011-11-18 12:03:35 -08:00
Ryan Dahl 48d21dd541 Force makefile generation in gyp 2011-11-17 17:30:30 -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 5bc1809b43 Add 'make dist-upload' 2011-11-11 14:31:15 -08:00
Ryan Dahl dc39ab3bbf Improve OSX installer 2011-11-10 18:41:44 -08:00