diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-12-17 01:57:36 +0400 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-12-17 01:57:36 +0400 |
| commit | 1865b11dcb77b452ef84fac6970cc742b387dfab (patch) | |
| tree | 4f7a6fd12041fc0598606188d68a1b036701bd70 /Makefile | |
| parent | 67e12a0f84eb16bab804a6dde88154d66da9dba3 (diff) | |
| parent | a599aeb2a8159c48eafbe066466ea5bc90d0c71c (diff) | |
Merge remote branch 'origin/v0.6'
Conflicts:
wscript
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 18 insertions, 4 deletions
@@ -62,7 +62,7 @@ test-internet: all apidoc_sources = $(wildcard doc/api/*.markdown) apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) -apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets +apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) @@ -75,8 +75,22 @@ website_files = \ out/doc/sh_vim-dark.css \ out/doc/logo.png \ out/doc/sponsored.png \ - out/doc/favicon.ico \ - out/doc/pipe.css + out/doc/favicon.ico \ + out/doc/pipe.css \ + out/doc/about/index.html \ + out/doc/close-downloads.png \ + out/doc/community/index.html \ + out/doc/community/not-invented-here.png \ + out/doc/download-logo.png \ + out/doc/ebay-logo.png \ + out/doc/footer-logo.png \ + out/doc/icons.png \ + out/doc/linkedin-logo.png \ + out/doc/logos/index.html \ + out/doc/microsoft-logo.png \ + out/doc/platform-icons.png \ + out/doc/ryan-speaker.jpg \ + out/doc/yahoo-logo.png doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) @@ -95,7 +109,7 @@ out/doc/api/%.html: doc/api/%.markdown out/Release/node $(apidoc_dirs) $(apiasse out/doc/%: website-upload: doc - scp -r out/doc/* $(web_root) + rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/ docopen: out/doc/api/all.html -google-chrome out/doc/api/all.html |